X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FManualPaintPanel.cpp;h=d943678eb3e23c244eee8c0b8f97628931ed60c5;hb=b90d2dce776b27c95bd59251ee83d10a42b0cae5;hp=6a108da966827c2dedfca729a4fb6605dfb95484;hpb=1e74c6a806cb7f396fd6c5016c6803c391c466d7;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 6a108da..d943678 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintPanel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintPanel.cpp
@@ -1,3 +1,27 @@
+/*# ---------------------------------------------------------------------
+#
+# 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"
 
@@ -15,7 +39,6 @@ ManualPaintPanel::~ManualPaintPanel()
 //---------------------------------------------------------------------------
 void ManualPaintPanel::SetManualPaintModel(ManualPaintModel* manualPaintModel)
 {
-    printf("EED %p ManualPaintPanel::SetManualPaintModel manualPaintModel=%p\n", this, manualPaintModel);
     _manualPaintModel = manualPaintModel;
 }
 
@@ -23,7 +46,6 @@ void ManualPaintPanel::SetManualPaintModel(ManualPaintModel* manualPaintModel)
 //---------------------------------------------------------------------------
 void ManualPaintPanel::SetBrushSize( int brushsize )
 {
-    printf("EED %p ManualPaintPanel::SetBrushSize manualPaintModel=%p\n", this, _manualPaintModel);
     if (_manualPaintModel!=NULL)
     {
         _manualPaintModel->SetBrushSize( brushsize );
@@ -33,22 +55,22 @@ void ManualPaintPanel::SetBrushSize( int brushsize )
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintPanel::SetRangeMin( unsigned int min )
+void ManualPaintPanel::SetRangeMin( int min )
 {
     if (_manualPaintModel!=NULL)
     {
-    	SetRangeMin( min );
+    	_manualPaintModel->SetRangeMin( min );
     } else {
        printf("ERROR  in  ManualPaintPanel  _manualPaintModel not set.\n");
     }
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintPanel::SetRangeMax( unsigned int max )
+void ManualPaintPanel::SetRangeMax( int max )
 {
     if (_manualPaintModel!=NULL)
     {
-    	SetRangeMax( max );
+    	_manualPaintModel->SetRangeMax( max );
     } else {
        printf("ERROR  in  ManualPaintPanel  _manualPaintModel not set.\n");
     }
@@ -120,3 +142,25 @@ void ManualPaintPanel::SetDistanceFill(int distancefill)
     }
 }
 
+//---------------------------------------------------------------------------
+void ManualPaintPanel::GetScalarRange( double * range )
+{
+	if (_manualPaintModel!=NULL)
+	{
+	    _manualPaintModel->GetScalarRange( range );
+	} else {
+	   printf("ERROR  in  ManualPaintPanel  _manualPaintModel not set.\n");
+	}
+}
+
+//---------------------------------------------------------------------------
+void ManualPaintPanel::SetActive( bool active )
+{
+	if (_manualPaintModel!=NULL)
+	{
+	    _manualPaintModel->SetActive( active );
+	} else {
+	   printf("ERROR  in  ManualPaintPanel  _manualPaintModel not set.\n");
+	}
+}
+