X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbcreaMaracasVisuManualPaint.cxx;h=d5373bf0cd3b843b3337cffbd9b380dd67744d2a;hb=2a1cde86bf45b8f9b11514a9b04d5834b10af209;hp=1f19f5b157db44914fac4cb4dba016cf37114b11;hpb=1875ac5ea44f35fb7259e847f628bb840e3964a8;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbcreaMaracasVisuManualPaint.cxx b/bbtk/src/bbcreaMaracasVisuManualPaint.cxx
index 1f19f5b..d5373bf 100644
--- a/bbtk/src/bbcreaMaracasVisuManualPaint.cxx
+++ b/bbtk/src/bbcreaMaracasVisuManualPaint.cxx
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------ */
+
 //=====
 // Don't edit this file. This file is generated from xml description..
 //=====
@@ -56,10 +81,10 @@ void ManualPaint::Process()
     {
         firsttime=false;
 
-        ManualPaintModel        *mpModel        = new ManualPaintModel();
-        mpModel->SetImage( bbGetInputIn() );
+        ManualPaintModel        *mpModel			= new ManualPaintModel();
+        mpModel->SetImages( bbGetInputIn() , bbGetInputIn2() );
 
-        wxManualPaintPanel        *mpPanel        = (wxManualPaintPanel*)bbGetOutputWidget();
+        wxManualPaintPanel        *mpPanel			= (wxManualPaintPanel*)bbGetOutputWidget();
         mpPanel->SetManualPaintModel(mpModel);
 
         if (bbGetInputWxVtkBaseView1()!=NULL)
@@ -67,7 +92,7 @@ void ManualPaint::Process()
             ManualPaintControler    *mpControler    = new ManualPaintControler();
             mpControler->SetManualPaintModel(mpModel);
             mpControler->SetManualPaintPanel(mpPanel);
-            mpControler->SetWxVtkBaseView( bbGetInputWxVtkBaseView1() );
+            mpControler->SetWxVtk2DBaseView( (wxVtk2DBaseView*)bbGetInputWxVtkBaseView1() );
             mpControler->Config();
         }
 
@@ -76,7 +101,7 @@ void ManualPaint::Process()
             ManualPaintControler    *mpControler    = new ManualPaintControler();
             mpControler->SetManualPaintModel(mpModel);
             mpControler->SetManualPaintPanel(mpPanel);
-            mpControler->SetWxVtkBaseView( bbGetInputWxVtkBaseView2() );
+            mpControler->SetWxVtk2DBaseView( (wxVtk2DBaseView*)bbGetInputWxVtkBaseView2() );
             mpControler->Config();
         }
 
@@ -85,7 +110,7 @@ void ManualPaint::Process()
             ManualPaintControler    *mpControler    = new ManualPaintControler();
             mpControler->SetManualPaintModel(mpModel);
             mpControler->SetManualPaintPanel(mpPanel);
-            mpControler->SetWxVtkBaseView( bbGetInputWxVtkBaseView3() );
+            mpControler->SetWxVtk2DBaseView( (wxVtk2DBaseView*)bbGetInputWxVtkBaseView3() );
             mpControler->Config();
         }
 
@@ -94,13 +119,11 @@ void ManualPaint::Process()
             ManualPaintControler    *mpControler    = new ManualPaintControler();
             mpControler->SetManualPaintModel(mpModel);
             mpControler->SetManualPaintPanel(mpPanel);
-            mpControler->SetWxVtkBaseView( bbGetInputWxVtkBaseView4() );
+            mpControler->SetWxVtk2DBaseView( (wxVtk2DBaseView*)bbGetInputWxVtkBaseView4() );
             mpControler->Config();
         }
 
-
-
-    }
+    } // firsttime
 
 }
 //=====
@@ -118,6 +141,10 @@ void ManualPaint::bbUserSetDefaultValues()
 {
     firsttime=true;
     bbSetInputIn(NULL);
+    bbSetInputWxVtkBaseView1(NULL);
+    bbSetInputWxVtkBaseView2(NULL);
+    bbSetInputWxVtkBaseView3(NULL);
+    bbSetInputWxVtkBaseView4(NULL);
 }
 //=====
 // Don't edit this file. This file is generated from xml description..