#3332 creaContours Bug New - Manual Paint UnDo ReDo with vtk update (working)

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / manualPaint / ManualPaintPanel.cpp

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintPanel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintPanel.cpp
index d943678eb3e23c244eee8c0b8f97628931ed60c5..0ff7e2a13f672c66a29332adb84ad21863394766 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintPanel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintPanel.cpp
@@ -28,7 +28,7 @@
 
 ManualPaintPanel::ManualPaintPanel()
 {
-    _manualPaintModel=NULL;
+    _manualPaintControler=NULL;
 }
 
 //---------------------------------------------------------------------------
@@ -37,18 +37,18 @@ ManualPaintPanel::~ManualPaintPanel()
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintPanel::SetManualPaintModel(ManualPaintModel* manualPaintModel)
+void ManualPaintPanel::SetManualPaintControler(ManualPaintControler* manualPaintControler)
 {
-    _manualPaintModel = manualPaintModel;
+    _manualPaintControler = manualPaintControler;
 }
 
 
 //---------------------------------------------------------------------------
 void ManualPaintPanel::SetBrushSize( int brushsize )
 {
-    if (_manualPaintModel!=NULL)
+    if (_manualPaintControler!=NULL)
     {
-        _manualPaintModel->SetBrushSize( brushsize );
+        _manualPaintControler->GetManualPaintModel()->SetBrushSize( brushsize );
     } else {
        printf("ERROR  in  ManualPaintPanel  _manualPaintModel not set.\n");
     }
@@ -57,9 +57,9 @@ void ManualPaintPanel::SetBrushSize( int brushsize )
 //---------------------------------------------------------------------------
 void ManualPaintPanel::SetRangeMin( int min )
 {
-    if (_manualPaintModel!=NULL)
+    if (_manualPaintControler!=NULL)
     {
-       _manualPaintModel->SetRangeMin( min );
+       _manualPaintControler->GetManualPaintModel()->SetRangeMin( min );
     } else {
        printf("ERROR  in  ManualPaintPanel  _manualPaintModel not set.\n");
     }
@@ -68,9 +68,9 @@ void ManualPaintPanel::SetRangeMin( int min )
 //---------------------------------------------------------------------------
 void ManualPaintPanel::SetRangeMax( int max )
 {
-    if (_manualPaintModel!=NULL)
+    if (_manualPaintControler!=NULL)
     {
-       _manualPaintModel->SetRangeMax( max );
+       _manualPaintControler->GetManualPaintModel()->SetRangeMax( max );
     } else {
        printf("ERROR  in  ManualPaintPanel  _manualPaintModel not set.\n");
     }
@@ -79,9 +79,9 @@ void ManualPaintPanel::SetRangeMax( int max )
 //---------------------------------------------------------------------------
 void ManualPaintPanel::SetGrayLevel( double graylevel )
 {
-    if (_manualPaintModel!=NULL)
+    if (_manualPaintControler!=NULL)
     {
-        _manualPaintModel->SetGrayLevel( graylevel );
+        _manualPaintControler->GetManualPaintModel()->SetGrayLevel( graylevel );
     } else {
        printf("ERROR  in  ManualPaintPanel  _manualPaintModel not set.\n");
     }
@@ -90,9 +90,9 @@ void ManualPaintPanel::SetGrayLevel( double graylevel )
 //---------------------------------------------------------------------------
 void ManualPaintPanel::SetTool(int tool)
 {
-    if (_manualPaintModel!=NULL)
+    if (_manualPaintControler!=NULL)
     {
-        _manualPaintModel->SetTool( tool );
+        _manualPaintControler->GetManualPaintModel()->SetTool( tool );
     } else {
        printf("ERROR  in  ManualPaintPanel  _manualPaintModel not set.\n");
     }
@@ -101,9 +101,9 @@ void ManualPaintPanel::SetTool(int tool)
 //---------------------------------------------------------------------------
 void ManualPaintPanel::Set2D3D(int dim2D3D)
 {
-    if (_manualPaintModel!=NULL)
+    if (_manualPaintControler!=NULL)
     {
-        _manualPaintModel->Set2D3D( dim2D3D );
+        _manualPaintControler->GetManualPaintModel()->Set2D3D( dim2D3D );
     } else {
        printf("ERROR  in  ManualPaintPanel  _manualPaintModel not set.\n");
     }
@@ -112,9 +112,9 @@ void ManualPaintPanel::Set2D3D(int dim2D3D)
 //---------------------------------------------------------------------------
 void ManualPaintPanel::SetBrushForm(int brushform)
 {
-    if (_manualPaintModel!=NULL)
+    if (_manualPaintControler!=NULL)
     {
-        _manualPaintModel->SetBrushForm( brushform );
+        _manualPaintControler->GetManualPaintModel()->SetBrushForm( brushform );
     } else {
        printf("ERROR  in  ManualPaintPanel  _manualPaintModel not set.\n");
     }
@@ -123,9 +123,9 @@ void ManualPaintPanel::SetBrushForm(int brushform)
 //---------------------------------------------------------------------------
 void ManualPaintPanel::SetToleranceFill(double tolerancefill)
 {
-    if (_manualPaintModel!=NULL)
+    if (_manualPaintControler!=NULL)
     {
-        _manualPaintModel->SetToleranceFill( tolerancefill );
+        _manualPaintControler->GetManualPaintModel()->SetToleranceFill( tolerancefill );
     } else {
        printf("ERROR  in  ManualPaintPanel  _manualPaintModel not set.\n");
     }
@@ -134,9 +134,9 @@ void ManualPaintPanel::SetToleranceFill(double tolerancefill)
 //---------------------------------------------------------------------------
 void ManualPaintPanel::SetDistanceFill(int distancefill)
 {
-    if (_manualPaintModel!=NULL)
+    if (_manualPaintControler!=NULL)
     {
-        _manualPaintModel->SetDistanceFill( distancefill );
+        _manualPaintControler->GetManualPaintModel()->SetDistanceFill( distancefill );
     } else {
        printf("ERROR  in  ManualPaintPanel  _manualPaintModel not set.\n");
     }
@@ -145,9 +145,9 @@ void ManualPaintPanel::SetDistanceFill(int distancefill)
 //---------------------------------------------------------------------------
 void ManualPaintPanel::GetScalarRange( double * range )
 {
-       if (_manualPaintModel!=NULL)
+       if (_manualPaintControler!=NULL)
        {
-           _manualPaintModel->GetScalarRange( range );
+           _manualPaintControler->GetManualPaintModel()->GetScalarRange( range );
        } else {
           printf("ERROR  in  ManualPaintPanel  _manualPaintModel not set.\n");
        }
@@ -156,9 +156,9 @@ void ManualPaintPanel::GetScalarRange( double * range )
 //---------------------------------------------------------------------------
 void ManualPaintPanel::SetActive( bool active )
 {
-       if (_manualPaintModel!=NULL)
+       if (_manualPaintControler!=NULL)
        {
-           _manualPaintModel->SetActive( active );
+           _manualPaintControler->GetManualPaintModel()->SetActive( active );
        } else {
           printf("ERROR  in  ManualPaintPanel  _manualPaintModel not set.\n");
        }