Clean code

diff --git a/bbtk/src/bbcreaMaracasVisuManualContourModel_Box.cxx b/bbtk/src/bbcreaMaracasVisuManualContourModel_Box.cxx
index 47ebd804efdd1f2ba4f49cf34b65228c0469138c..258cccde50b6783708f9ccd301732c38d5eafc31 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuManualContourModel_Box.cxx
+++ b/bbtk/src/bbcreaMaracasVisuManualContourModel_Box.cxx
@@ -821,8 +821,6 @@ void ManualContourModel_Box::ShiftValues(   std::vector<double> *lstInX,
        } // if sizeLstIndexIn
 }
 
-
-
 void ManualContourModel_Box::Process()
 {
 // THE MAIN PROCESSING METHOD BODY

diff --git a/lib/maracasVisuLib/src/CutModule/kernel/CutModelPolygon.cxx b/lib/maracasVisuLib/src/CutModule/kernel/CutModelPolygon.cxx
index 1f7482fc50dab29386a3bfd147df03cba095f487..aa8f4c286d3fb5bf59d206471b1e1c8aafcba7a1 100644 (file)
--- a/lib/maracasVisuLib/src/CutModule/kernel/CutModelPolygon.cxx
+++ b/lib/maracasVisuLib/src/CutModule/kernel/CutModelPolygon.cxx
@@ -24,6 +24,7 @@
 # ------------------------------------------------------------------------ */
 
 #include "CutModelPolygon.h"
+#include <vtkVersionMacros.h>
 
 
 CutModelPolygon::CutModelPolygon() 

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx
index 948e37d08519851ba0c749085951f265831ae475..97919ee53089fcf88411d6be16dc4db1fc52a14e 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx
@@ -24,6 +24,7 @@
 # ------------------------------------------------------------------------ */
 
 #include "ContourExtractData.h"
+#include <vtkVersionMacros.h>
 
 
 //----------------------------------------------------------------------

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.h b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.h
index 265d6d3db4ea3e836d0e1b81d4eb2fa290fbf370..4d64a31168d425afdb5c8fa6e8a0ca52619ebe6a 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.h
@@ -29,7 +29,7 @@
 
 #include "manualContourModel.h"
 #include "marTypes.h"
-
+#include <vtkImageData.h>
 
   //--------------------------------------------------------------------------
   class creaMaracasVisu_EXPORT ContourExtractData 

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/creaContoursFactory.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/creaContoursFactory.h
index a88dc504715231dd84f92a81d8111868cf2517e4..bd5bc7b55f4de386106c6acd789ad5962ece2389 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/creaContoursFactory.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/creaContoursFactory.h
@@ -30,7 +30,6 @@
 #include "manualViewBaseContour.h"
 #include "manualContourBaseControler.h"
 
-
 class creaMaracasVisu_EXPORT creaContoursFactory
 {
 

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualBaseModel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualBaseModel.h
index 25057a2bf126302ecd3c59d44a0a3ed068c8dd02..e30c00f8bf0319fd9d77224a86985d5cc0f5d120 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualBaseModel.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualBaseModel.h
@@ -26,27 +26,11 @@
 #ifndef manualBaseModel_h
 #define manualBaseModel_h
 
-#include "vtkRenderWindow.h"
-
-#include "vtkRenderer.h"
-#include "vtkRenderWindowInteractor.h" //extremely important with VC++ don't remove !
-#include "vtkCommand.h"
-#include "vtkPolyData.h"
-#include "vtkCellArray.h"
-#include "vtkPolyDataMapper.h"
-#include "vtkInteractorObserver.h"
-#include "vtkInteractorStyleImage.h"
-#include <vtkCellPicker.h> 
-#include <vtkCamera.h> 
-#include <vtkPolyLine.h>
-#include <vtkDataSetMapper.h>
-#include <vtkUnstructuredGrid.h>
-
-#include "creawxVTKRenderWindowInteractor.h"
-
+#include <stdio.h>
+#include <string>
 #include <vector>
-#include "wxVtkBaseView.h"
-#include "marTypes.h"
+
+#include "creaMaracasVisu_EXPORT.h"
 #include "manualPoint.h"
 
 // --------------------------------------------------------------------------------------------

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.h
index e94a2b7022ec0252e44013fccadff9ffcdc16475..96e6dedca9960b61871e5e17a76086ab8b238bde 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.h
@@ -26,38 +26,11 @@
 #ifndef manualContourModel_h
 #define manualContourModel_h
 
-#include "vtkRenderWindow.h"
-
-#include "vtkRenderer.h"
-#include "vtkRenderWindowInteractor.h" //extremely important with VC++ don't remove !
-#include "vtkCommand.h"
-#include "vtkPolyData.h"
-#include "vtkCellArray.h"
-#include "vtkPolyDataMapper.h"
-#include "vtkInteractorObserver.h"
-#include "vtkInteractorStyleImage.h"
-#include <vtkKochanekSpline.h> 
-
-#include <vtkCellPicker.h> 
-
-
-#include <vtkCamera.h> 
-#include <vtkPolyLine.h>
-#include <vtkDataSetMapper.h>
-#include <vtkUnstructuredGrid.h>
-
-#include "creawxVTKRenderWindowInteractor.h"
-
-
-//--
-
-#include <vector>
-#include "wxVtkBaseView.h"
-#include "marTypes.h"
-#include "manualPoint.h"
+#include <vtkKochanekSpline.h>
 #include "manualBaseModel.h"
 
 
+
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualPoint.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualPoint.cpp
index 6a532b11d7fed57978d89390b064da159a4560c4..c9963dd83049ce7739ae2456e03ee645225f18bd 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualPoint.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualPoint.cpp
@@ -25,7 +25,6 @@
 
 #include "manualPoint.h"
 
-
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.cxx
index 6f41447c064c784d8520e3536e372a9a9c85e041..85849105b0d8d53735ad57b5e5263272ea21ec82 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.cxx
@@ -172,9 +172,9 @@ void wxVtk3DBaseView::Configure()
         
                _renWin->AddRenderer(_aRenderer);
 
-               _aRenderer->GradientBackgroundOn();
                _aRenderer->SetBackground( 0.33 , 0.33 , 0.33 );
                _aRenderer->SetBackground2( 0.66 , 0.66 , 0.66 );
+        _aRenderer->GradientBackgroundOn();
 
 //             _aRenderer->GradientBackgroundOff();
 //             _aRenderer->SetBackground(0,0,0 );