Commit f318af5c authored by Artur Grunau's avatar Artur Grunau
Browse files

Update the typedefs of floating point properties

Floating point properties were previously typedef'd to specific
instantiations of NumericProperty. Now that we have
FloatingPointProperty, which extends NumericProperty to control how many
decimal places should be shown when displaying the property's value, all
typedefs for floating point properties have been updated to point to it
instead.

As a result, many processors and pipelines needed to have their includes
and/or constructors fixed to import and work with the new typedefs.
parent 257fd9e1
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include "application/gui/adjusterwidgets/doubleadjusterwidget.h" #include "application/gui/adjusterwidgets/doubleadjusterwidget.h"
#include "application/gui/properties/abstractpropertywidget.h" #include "application/gui/properties/abstractpropertywidget.h"
#include "core/properties/numericproperty.h" #include "core/properties/floatingpointproperty.h"
namespace campvis { namespace campvis {
/** /**
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#define PROCESSORDECORATORBACKGROUND_H__ #define PROCESSORDECORATORBACKGROUND_H__
#include "core/pipeline/abstractprocessordecorator.h" #include "core/pipeline/abstractprocessordecorator.h"
#include "core/properties/numericproperty.h" #include "core/properties/floatingpointproperty.h"
namespace campvis { namespace campvis {
...@@ -52,4 +52,4 @@ namespace campvis { ...@@ -52,4 +52,4 @@ namespace campvis {
} }
#endif // PROCESSORDECORATORBACKGROUND_H__ #endif // PROCESSORDECORATORBACKGROUND_H__
\ No newline at end of file
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include "core/pipeline/abstractprocessordecorator.h" #include "core/pipeline/abstractprocessordecorator.h"
#include "core/properties/datanameproperty.h" #include "core/properties/datanameproperty.h"
#include "core/properties/genericproperty.h" #include "core/properties/genericproperty.h"
#include "core/properties/numericproperty.h" #include "core/properties/floatingpointproperty.h"
namespace campvis { namespace campvis {
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include "core/pipeline/abstractprocessordecorator.h" #include "core/pipeline/abstractprocessordecorator.h"
#include "core/properties/datanameproperty.h" #include "core/properties/datanameproperty.h"
#include "core/properties/genericproperty.h" #include "core/properties/genericproperty.h"
#include "core/properties/numericproperty.h" #include "core/properties/floatingpointproperty.h"
namespace campvis { namespace campvis {
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include "core/properties/cameraproperty.h" #include "core/properties/cameraproperty.h"
#include "core/properties/datanameproperty.h" #include "core/properties/datanameproperty.h"
#include "core/properties/genericproperty.h" #include "core/properties/genericproperty.h"
#include "core/properties/numericproperty.h" #include "core/properties/floatingpointproperty.h"
#include "core/properties/transferfunctionproperty.h" #include "core/properties/transferfunctionproperty.h"
#include "core/datastructures/imagerepresentationgl.h" #include "core/datastructures/imagerepresentationgl.h"
......
...@@ -208,14 +208,10 @@ namespace campvis { ...@@ -208,14 +208,10 @@ namespace campvis {
// = Typedefs ===================================================================================== // = Typedefs =====================================================================================
typedef NumericProperty<int> IntProperty; typedef NumericProperty<int> IntProperty;
typedef NumericProperty<float> FloatProperty;
typedef NumericProperty<tgt::ivec2> IVec2Property; typedef NumericProperty<tgt::ivec2> IVec2Property;
typedef NumericProperty<tgt::vec2> Vec2Property;
typedef NumericProperty<tgt::ivec3> IVec3Property; typedef NumericProperty<tgt::ivec3> IVec3Property;
typedef NumericProperty<tgt::vec3> Vec3Property;
typedef NumericProperty<tgt::ivec4> IVec4Property; typedef NumericProperty<tgt::ivec4> IVec4Property;
typedef NumericProperty<tgt::vec4> Vec4Property;
// = Template Implementation ====================================================================== // = Template Implementation ======================================================================
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include "core/pipeline/abstractprocessordecorator.h" #include "core/pipeline/abstractprocessordecorator.h"
#include "core/pipeline/visualizationprocessor.h" #include "core/pipeline/visualizationprocessor.h"
#include "core/properties/datanameproperty.h" #include "core/properties/datanameproperty.h"
#include "core/properties/floatingpointproperty.h"
#include "core/properties/genericproperty.h" #include "core/properties/genericproperty.h"
#include "core/properties/numericproperty.h" #include "core/properties/numericproperty.h"
#include "core/properties/optionproperty.h" #include "core/properties/optionproperty.h"
......
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
#include "core/pipeline/abstractprocessordecorator.h" #include "core/pipeline/abstractprocessordecorator.h"
#include "core/properties/cameraproperty.h" #include "core/properties/cameraproperty.h"
#include "core/properties/datanameproperty.h" #include "core/properties/datanameproperty.h"
#include "core/properties/floatingpointproperty.h"
#include "core/properties/genericproperty.h" #include "core/properties/genericproperty.h"
#include "core/properties/numericproperty.h"
namespace tgt { namespace tgt {
class Shader; class Shader;
......
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
#include "core/pipeline/visualizationprocessor.h" #include "core/pipeline/visualizationprocessor.h"
#include "core/pipeline/abstractprocessordecorator.h" #include "core/pipeline/abstractprocessordecorator.h"
#include "core/properties/datanameproperty.h" #include "core/properties/datanameproperty.h"
#include "core/properties/floatingpointproperty.h"
#include "core/properties/genericproperty.h" #include "core/properties/genericproperty.h"
#include "core/properties/numericproperty.h"
#include "core/properties/optionproperty.h" #include "core/properties/optionproperty.h"
#include "core/properties/cameraproperty.h" #include "core/properties/cameraproperty.h"
......
...@@ -171,9 +171,9 @@ namespace campvis { ...@@ -171,9 +171,9 @@ namespace campvis {
, p_updateButton("UpdateButton", "Perform Tracking") , p_updateButton("UpdateButton", "Perform Tracking")
, p_seedDistance("SeedDistance", "Seed Distance", 4, 1, 16, 1, AbstractProcessor::VALID) , p_seedDistance("SeedDistance", "Seed Distance", 4, 1, 16, 1, AbstractProcessor::VALID)
, p_numSteps("NumSteps", "Maximum Number of Steps", 256, 16, 1024, 1, AbstractProcessor::VALID) , p_numSteps("NumSteps", "Maximum Number of Steps", 256, 16, 1024, 1, AbstractProcessor::VALID)
, p_stepSize("StepSize", "Base Step Size", 1.f, .01f, 10.f, 0.01f, AbstractProcessor::VALID) , p_stepSize("StepSize", "Base Step Size", 1.f, .01f, 10.f, 0.01f, 2, AbstractProcessor::VALID)
, p_strainThreshold("StrainThreshold", "Local Strain Threshold", .5f, .1f, 1.f, 0.01f, AbstractProcessor::VALID) , p_strainThreshold("StrainThreshold", "Local Strain Threshold", .5f, .1f, 1.f, 0.01f, 2, AbstractProcessor::VALID)
, p_maximumAngle("MaximumAngle", "Maxium Angle", 25.f, 0.f, 100.f, 0.1f, AbstractProcessor::VALID) , p_maximumAngle("MaximumAngle", "Maxium Angle", 25.f, 0.f, 100.f, 0.1f, 2, AbstractProcessor::VALID)
{ {
addProperty(&p_strainId); addProperty(&p_strainId);
addProperty(&p_outputID); addProperty(&p_outputID);
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include "core/pipeline/abstractprocessor.h" #include "core/pipeline/abstractprocessor.h"
#include "core/properties/buttonproperty.h" #include "core/properties/buttonproperty.h"
#include "core/properties/datanameproperty.h" #include "core/properties/datanameproperty.h"
#include "core/properties/floatingpointproperty.h"
#include "core/properties/numericproperty.h" #include "core/properties/numericproperty.h"
#include <deque> #include <deque>
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#define STRAINRAYCASTER_H__ #define STRAINRAYCASTER_H__
#include "core/pipeline/raycastingprocessor.h" #include "core/pipeline/raycastingprocessor.h"
#include "core/properties/floatingpointproperty.h"
#include "core/properties/genericproperty.h" #include "core/properties/genericproperty.h"
#include "core/properties/numericproperty.h" #include "core/properties/numericproperty.h"
#include "core/properties/transferfunctionproperty.h" #include "core/properties/transferfunctionproperty.h"
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include "core/pipeline/abstractprocessor.h" #include "core/pipeline/abstractprocessor.h"
#include "core/properties/datanameproperty.h" #include "core/properties/datanameproperty.h"
#include "core/properties/numericproperty.h" #include "core/properties/floatingpointproperty.h"
namespace campvis { namespace campvis {
/** /**
...@@ -82,4 +82,4 @@ namespace campvis { ...@@ -82,4 +82,4 @@ namespace campvis {
} }
#endif // CSVDIMAGEREADER_H__ #endif // CSVDIMAGEREADER_H__
\ No newline at end of file
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include "core/pipeline/abstractprocessor.h" #include "core/pipeline/abstractprocessor.h"
#include "core/properties/datanameproperty.h" #include "core/properties/datanameproperty.h"
#include "core/properties/floatingpointproperty.h"
#include "core/properties/numericproperty.h" #include "core/properties/numericproperty.h"
#include "core/properties/optionproperty.h" #include "core/properties/optionproperty.h"
#include "core/tools/endianhelper.h" #include "core/tools/endianhelper.h"
...@@ -86,4 +87,4 @@ namespace campvis { ...@@ -86,4 +87,4 @@ namespace campvis {
} }
#endif // LTFIMAGEREADER_H__ #endif // LTFIMAGEREADER_H__
\ No newline at end of file
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include "core/pipeline/abstractprocessor.h" #include "core/pipeline/abstractprocessor.h"
#include "core/properties/datanameproperty.h" #include "core/properties/datanameproperty.h"
#include "core/properties/numericproperty.h" #include "core/properties/floatingpointproperty.h"
namespace campvis { namespace campvis {
/** /**
...@@ -83,4 +83,4 @@ namespace campvis { ...@@ -83,4 +83,4 @@ namespace campvis {
} }
#endif // MHDIMAGEREADER_H__ #endif // MHDIMAGEREADER_H__
\ No newline at end of file
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include "core/pipeline/abstractprocessor.h" #include "core/pipeline/abstractprocessor.h"
#include "core/properties/datanameproperty.h" #include "core/properties/datanameproperty.h"
#include "core/properties/floatingpointproperty.h"
#include "core/properties/numericproperty.h" #include "core/properties/numericproperty.h"
#include "core/properties/optionproperty.h" #include "core/properties/optionproperty.h"
#include "core/tools/endianhelper.h" #include "core/tools/endianhelper.h"
...@@ -90,4 +91,4 @@ namespace campvis { ...@@ -90,4 +91,4 @@ namespace campvis {
} }
#endif // RAWIMAGEREADER_H__ #endif // RAWIMAGEREADER_H__
\ No newline at end of file
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include "tgt/exception.h" #include "tgt/exception.h"
#include "core/pipeline/abstractprocessor.h" #include "core/pipeline/abstractprocessor.h"
#include "core/properties/datanameproperty.h" #include "core/properties/datanameproperty.h"
#include "core/properties/numericproperty.h" #include "core/properties/floatingpointproperty.h"
namespace campvis { namespace campvis {
/** /**
...@@ -87,4 +87,4 @@ namespace campvis { ...@@ -87,4 +87,4 @@ namespace campvis {
} }
#endif // VTKIMAGEREADER_H__ #endif // VTKIMAGEREADER_H__
\ No newline at end of file
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include "core/pipeline/visualizationprocessor.h" #include "core/pipeline/visualizationprocessor.h"
#include "core/properties/datanameproperty.h" #include "core/properties/datanameproperty.h"
#include "core/properties/floatingpointproperty.h"
#include "core/properties/genericproperty.h" #include "core/properties/genericproperty.h"
#include "core/properties/numericproperty.h" #include "core/properties/numericproperty.h"
#include "core/properties/optionproperty.h" #include "core/properties/optionproperty.h"
......
...@@ -35,8 +35,8 @@ ...@@ -35,8 +35,8 @@
#include "core/pipeline/visualizationprocessor.h" #include "core/pipeline/visualizationprocessor.h"
#include "core/properties/cameraproperty.h" #include "core/properties/cameraproperty.h"
#include "core/properties/datanameproperty.h" #include "core/properties/datanameproperty.h"
#include "core/properties/floatingpointproperty.h"
#include "core/properties/genericproperty.h" #include "core/properties/genericproperty.h"
#include "core/properties/numericproperty.h"
#include "core/properties/transferfunctionproperty.h" #include "core/properties/transferfunctionproperty.h"
#include "kisscl/kisscl.h" #include "kisscl/kisscl.h"
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include "core/pipeline/visualizationprocessor.h" #include "core/pipeline/visualizationprocessor.h"
#include "core/properties/datanameproperty.h" #include "core/properties/datanameproperty.h"
#include "core/properties/genericproperty.h" #include "core/properties/genericproperty.h"
#include "core/properties/floatingpointproperty.h"
#include "core/properties/numericproperty.h" #include "core/properties/numericproperty.h"
#include "core/properties/optionproperty.h" #include "core/properties/optionproperty.h"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment