Fixed -Wreorder warning

Affected classes:
- Columbia1
- AdvancedUsFusion
- StrainFiberRenderer
- SimilarityMeasure
- GeometryRenderer
- DataContainerFileLoaderWidget
- DataContainerInspectorCanva

application/gui/datacontainerfileloaderwidget.cpp

@@ -33,8 +33,8 @@ namespace campvis {
         , _dataContainer(0)
         , _layout(0)
         , _pipelinePropertiesScrollArea(0)
-        , _propCollectionWidget(0)
         , _fileName("fileName", "Image URL", "")
+        , _propCollectionWidget(0)
     {
         this->_parent = parentDataInspector;
         this->_dataContainer = this->_parent->getDataContainer();
@@ -110,4 +110,4 @@ namespace campvis {
         this->close();
     }
 
-}
+}
\ No newline at end of file

application/gui/datacontainerinspectorcanvas.cpp

@@ -54,16 +54,16 @@ namespace campvis {
         , p_renderGChannel("RenderGChannel", "Render Green Channel", true)
         , p_renderBChannel("RenderBChannel", "Render Blue Channel", true)
         , p_renderAChannel("RenderAChannel", "Render Alpha Channel", true)
+        , _meshGeomTexturesDirty(false)
         , _dataContainer(0)
         , _paintShader(0)
         , _quad(0)
+        , _color(0.0f, 0.0f, 0.0f, 0.0f)
         , _numTiles(0, 0)
         , _quadSize(0, 0)
         , _selectedTexture(0)
         , _renderFullscreen(false)
         , _currentSlice(-1)
-        , _color(0.0f, 0.0f, 0.0f, 0.0f)
-        , _meshGeomTexturesDirty(false)
     {
         static_cast<Geometry1DTransferFunction*>(p_transferFunction.getTF())->addGeometry(TFGeometry1D::createQuad(tgt::vec2(0.f, 1.f), tgt::col4(0, 0, 0, 255), tgt::col4(255, 255, 255, 255)));
 
@@ -655,4 +655,4 @@ namespace campvis {
             invalidateMeshGeomTextures();
         }        
     }
-}
+}

modules/advancedusvis/processors/advancedusfusion.cpp

@@ -67,8 +67,8 @@ namespace campvis {
         , p_transferFunction("transferFunction", "Transfer Function", new SimpleTransferFunction(256))
         , p_confidenceTF("ConfidenceTF", "Confidence to Uncertainty TF", new Geometry1DTransferFunction(256))
         , p_view("View", "Image to Render", viewOptions, 12)
-        , p_confidenceScaling("ConfidenceScaling", "Confidence Scaling", 1.f, .001f, 1000.f, 0.1f)
         , p_blurredScaling("BlurredScaling", "Blurred Scaling", 1.f, .001f, 1000.f, 0.1f)
+        , p_confidenceScaling("ConfidenceScaling", "Confidence Scaling", 1.f, .001f, 1000.f, 0.1f)
         , p_hue("Hue", "Hue for Uncertainty Mapping", .15f, 0.f, 1.f)
         , p_use3DTexture("Use3DTexture", "Use 3D Texture", false)
         , _shader(0)

modules/columbia/pipelines/columbia1.cpp

@@ -40,8 +40,8 @@ namespace campvis {
         , _flowReader()
         , _vtkReader()
         , _vr(&_canvasSize)
-        , _sr(&_canvasSize)
         , _src(&_canvasSize)
+        , _sr(&_canvasSize)
         , _gr(&_canvasSize)
         , _sft()
         , _sfr(&_canvasSize)
@@ -154,4 +154,4 @@ namespace campvis {
         }
     }
     
-}
+}
\ No newline at end of file

modules/columbia/processors/strainfiberrenderer.cpp

@@ -49,8 +49,8 @@ namespace campvis {
         , p_strainId("StrainDataId", "Input Strain Data ID", "gr.strain", DataNameProperty::READ)
         , p_renderTargetID("p_renderTargetID", "Output Image", "gr.output", DataNameProperty::WRITE)
         , p_camera("Camera", "Camera ID")//, "camera", DataNameProperty::READ, AbstractProcessor::INVALID_RESULT, DataNameProperty::CameraData)
-        , p_lineWidth("LineWidth", "Line width", 3.f, .5f, 10.f, 0.1f)
         , p_renderMode("RenderMode", "Render Mode", renderModeOptions, 2, AbstractProcessor::INVALID_RESULT | AbstractProcessor::INVALID_SHADER)
+        , p_lineWidth("LineWidth", "Line width", 3.f, .5f, 10.f, 0.1f)
         , p_color("color", "Rendering Color", tgt::vec4(1.f), tgt::vec4(0.f), tgt::vec4(1.f))
         , _shader(0)
     {

modules/registration/processors/similaritymeasure.cpp

@@ -60,11 +60,11 @@ namespace campvis {
         , p_applyMask("ApplyMask", "Apply Mask", true)
         , p_translation("Translation", "Moving Image Translation", tgt::vec3(0.f), tgt::vec3(-100.f), tgt::vec3(100.f), tgt::vec3(1.f), tgt::vec3(5.f))
         , p_rotation("Rotation", "Moving Image Rotation", tgt::vec3(0.f), tgt::vec3(-tgt::PIf), tgt::vec3(tgt::PIf), tgt::vec3(.01f), tgt::vec3(7.f))
-        , p_viewportSize("ViewportSize", "Viewport Size", tgt::ivec2(1), tgt::ivec2(1), tgt::ivec2(1000), tgt::ivec2(1), AbstractProcessor::VALID)
         , p_metric("Metric", "Similarity Metric", metrics, 5)
         , p_computeSimilarity("ComputeSimilarity", "Compute Similarity")
         , p_differenceImageId("DifferenceImageId", "Difference Image", "difference", DataNameProperty::WRITE, AbstractProcessor::VALID)
         , p_computeDifferenceImage("ComputeDifferenceImage", "Compute Difference Image", AbstractProcessor::INVALID_RESULT | COMPUTE_DIFFERENCE_IMAGE)
+        , p_viewportSize("ViewportSize", "Viewport Size", tgt::ivec2(1), tgt::ivec2(1), tgt::ivec2(1000), tgt::ivec2(1), AbstractProcessor::VALID)
         , _sadssdCostFunctionShader(0)
         , _nccsnrCostFunctionShader(0)
         , _differenceShader(0)

modules/vis/processors/geometryrenderer.cpp

@@ -52,9 +52,9 @@ namespace campvis {
         , p_geometryID("geometryID", "Input Geometry ID", "gr.input", DataNameProperty::READ)
         , p_renderTargetID("p_renderTargetID", "Output Image", "gr.output", DataNameProperty::WRITE)
         , p_camera("camera", "Camera")
+        , p_renderMode("RenderMode", "Render Mode", renderOptions, 7, AbstractProcessor::INVALID_RESULT | AbstractProcessor::INVALID_PROPERTIES)
         , p_useSolidColor("UseSolidColor", "Use Solid Color", true, AbstractProcessor::INVALID_RESULT | AbstractProcessor::INVALID_PROPERTIES)
         , p_solidColor("SolidColor", "Solid Color", tgt::vec4(1.f, .5f, 0.f, 1.f), tgt::vec4(0.f), tgt::vec4(1.f))
-        , p_renderMode("RenderMode", "Render Mode", renderOptions, 7, AbstractProcessor::INVALID_RESULT | AbstractProcessor::INVALID_PROPERTIES)
         , p_pointSize("PointSize", "Point Size", 3.f, .1f, 10.f)
         , p_lineWidth("LineWidth", "Line Width", 1.f, .1f, 10.f)
         , p_showWireframe("ShowWireframe", "Show Wireframe", true, AbstractProcessor::INVALID_RESULT | AbstractProcessor::INVALID_SHADER | AbstractProcessor::INVALID_PROPERTIES)