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=c2e57a128c43a7f3009e46de605492ae50db1799;hpb=23b33a3a7e3f42eacbaad218510fb77e27aa9c2f;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 c2e57a1..0ff7e2a 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintPanel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintPanel.cpp
@@ -1,10 +1,34 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
 
 #include "ManualPaintPanel.h"
 
 
 ManualPaintPanel::ManualPaintPanel()
 {
-    _manualPaintModel=NULL;
+    _manualPaintControler=NULL;
 }
 
 //---------------------------------------------------------------------------
@@ -13,20 +37,40 @@ 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");
+    }
+}
+
+//---------------------------------------------------------------------------
+void ManualPaintPanel::SetRangeMin( int min )
+{
+    if (_manualPaintControler!=NULL)
+    {
+    	_manualPaintControler->GetManualPaintModel()->SetRangeMin( min );
+    } else {
+       printf("ERROR  in  ManualPaintPanel  _manualPaintModel not set.\n");
+    }
+}
+
+//---------------------------------------------------------------------------
+void ManualPaintPanel::SetRangeMax( int max )
+{
+    if (_manualPaintControler!=NULL)
+    {
+    	_manualPaintControler->GetManualPaintModel()->SetRangeMax( max );
     } else {
        printf("ERROR  in  ManualPaintPanel  _manualPaintModel not set.\n");
     }
@@ -35,20 +79,20 @@ void ManualPaintPanel::SetBrushSize( int brushsize )
 //---------------------------------------------------------------------------
 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");
     }
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintPanel::SetBrushTool(int brushtool)
+void ManualPaintPanel::SetTool(int tool)
 {
-    if (_manualPaintModel!=NULL)
+    if (_manualPaintControler!=NULL)
     {
-        _manualPaintModel->SetBrushTool( brushtool );
+        _manualPaintControler->GetManualPaintModel()->SetTool( tool );
     } else {
        printf("ERROR  in  ManualPaintPanel  _manualPaintModel not set.\n");
     }
@@ -57,9 +101,9 @@ void ManualPaintPanel::SetBrushTool(int brushtool)
 //---------------------------------------------------------------------------
 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");
     }
@@ -68,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");
     }
@@ -79,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");
     }
@@ -90,11 +134,33 @@ 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 (_manualPaintControler!=NULL)
+	{
+	    _manualPaintControler->GetManualPaintModel()->GetScalarRange( range );
+	} else {
+	   printf("ERROR  in  ManualPaintPanel  _manualPaintModel not set.\n");
+	}
+}
+
+//---------------------------------------------------------------------------
+void ManualPaintPanel::SetActive( bool active )
+{
+	if (_manualPaintControler!=NULL)
+	{
+	    _manualPaintControler->GetManualPaintModel()->SetActive( active );
+	} else {
+	   printf("ERROR  in  ManualPaintPanel  _manualPaintModel not set.\n");
+	}
+}
+