X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FManualPaintPanel.cpp;h=0ff7e2a13f672c66a29332adb84ad21863394766;hb=15112ae15da4222831b0e8e7c9be87daf9e99a1c;hp=dc1cf3e4919d8ad048aae3465930b2d7acde0055;hpb=e4ef2b5df5aac431ff3b806f83b7dd5e55e89d86;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintPanel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintPanel.cpp
index dc1cf3e..0ff7e2a 100644
--- 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,20 +37,18 @@ ManualPaintPanel::~ManualPaintPanel()
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintPanel::SetManualPaintModel(ManualPaintModel* manualPaintModel)
+void ManualPaintPanel::SetManualPaintControler(ManualPaintControler* manualPaintControler)
 {
-    printf("EED %p ManualPaintPanel::SetManualPaintModel manualPaintModel=%p\n", this, manualPaintModel);
-    _manualPaintModel = manualPaintModel;
+    _manualPaintControler = manualPaintControler;
 }
 
 
 //---------------------------------------------------------------------------
 void ManualPaintPanel::SetBrushSize( int brushsize )
 {
-    printf("EED %p ManualPaintPanel::SetBrushSize manualPaintModel=%p\n", this, _manualPaintModel);
-    if (_manualPaintModel!=NULL)
+    if (_manualPaintControler!=NULL)
     {
-        _manualPaintModel->SetBrushSize( brushsize );
+        _manualPaintControler->GetManualPaintModel()->SetBrushSize( brushsize );
     } else {
        printf("ERROR  in  ManualPaintPanel  _manualPaintModel not set.\n");
     }
@@ -59,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");
     }
@@ -70,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");
     }
@@ -81,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");
     }
@@ -92,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");
     }
@@ -103,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");
     }
@@ -114,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");
     }
@@ -125,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");
     }
@@ -136,19 +134,31 @@ 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");
     }
 }
 
+//---------------------------------------------------------------------------
 void ManualPaintPanel::GetScalarRange( double * range )
 {
-	if (_manualPaintModel!=NULL)
+	if (_manualPaintControler!=NULL)
+	{
+	    _manualPaintControler->GetManualPaintModel()->GetScalarRange( range );
+	} else {
+	   printf("ERROR  in  ManualPaintPanel  _manualPaintModel not set.\n");
+	}
+}
+
+//---------------------------------------------------------------------------
+void ManualPaintPanel::SetActive( bool active )
+{
+	if (_manualPaintControler!=NULL)
 	{
-	    _manualPaintModel->GetScalarRange( range );
+	    _manualPaintControler->GetManualPaintModel()->SetActive( active );
 	} else {
 	   printf("ERROR  in  ManualPaintPanel  _manualPaintModel not set.\n");
 	}