X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbcreaMaracasVisuManualPaint.cxx;h=e463b82b86cf00d719d17a80e3956fcef47483d2;hb=4b2a99534d79424c7892e09160a1488604741064;hp=f84fe8fd3cdf5dcf3e5b2d9043917a2bbc76188e;hpb=6f6bee2cea80e5a1508597acad9085c39f6fd383;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbcreaMaracasVisuManualPaint.cxx b/bbtk/src/bbcreaMaracasVisuManualPaint.cxx
index f84fe8f..e463b82 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..
 //=====
@@ -27,60 +52,31 @@ BBTK_BLACK_BOX_IMPLEMENTATION(ManualPaint,bbtk::WxBlackBox);
 //=====
 void ManualPaint::Process()
 {
-
-/*
-   std::string msg;
-    if (bbGetInputTitle()!="")
-      {
-	msg = bbGetInputTitle()+": " + bbGetInputIn();
-      }
-    else
-      {
-	msg = bbGetInputIn();
-      }
-   ((wxStaticText*)bbGetOutputWidget())->SetLabel( bbtk::std2wx( msg ) );
-  */
-
-    if (bbGetInputWxVtkBaseView()==NULL)
+    if (bbGetInputWxVtkBaseView1()==NULL)
     {
       wxMessageDialog(NULL,  bbtk::std2wx("(ManualPaint) Input 'WxVtkBaseView' is not set"),  bbtk::std2wx(bbGetFullName()) ).ShowModal();
     }
-
     if (bbGetInputIn()==NULL)
     {
       wxMessageDialog(NULL,  bbtk::std2wx("(ManualPaint) Input 'vtkImageData' is not set"),  bbtk::std2wx(bbGetFullName()) ).ShowModal();
     }
-
-
     if (firsttime==true)
     {
         firsttime=false;
-
-        ManualPaintPanel        *mpPanel        = (ManualPaintPanel*)bbGetOutputWidget();
-
-        ManualPaintModel        *mpModel        = new ManualPaintModel();
-        mpModel->SetImage( bbGetInputIn() );
-
-
+        ManualPaintModel        *mpModel		= new ManualPaintModel();
         ManualPaintControler    *mpControler    = new ManualPaintControler();
+        mpModel->SetImages( bbGetInputIn() , bbGetInputIn2() );
         mpControler->SetManualPaintModel(mpModel);
-        mpControler->SetManualPaintPanel(mpPanel);
-        mpControler->SetWxVtkBaseView( bbGetInputWxVtkBaseView() );
-        mpControler->Config();
-    }
-
-
-/*
-    if (_imp==NULL)
-    {
-        _imp=new vtkInteractorManualPaint();
-        _imp->SetImage( bbGetInputIn() );
-        vtkInteractorStyleBaseView *isbv = (vtkInteractorStyleBaseView*)(bbGetInputWxVtkBaseView()->GetInteractorStyleBaseView());
-        isbv->AddInteractorStyleMaracas(_imp);
-    }
-*/
-
+        mpControler->SetWxVtk2DBaseView( 1, (wxVtk2DBaseView*)bbGetInputWxVtkBaseView1() );
+        mpControler->SetWxVtk2DBaseView( 2, (wxVtk2DBaseView*)bbGetInputWxVtkBaseView2() );
+        mpControler->SetWxVtk2DBaseView( 3, (wxVtk2DBaseView*)bbGetInputWxVtkBaseView3() );
+        mpControler->SetWxVtk2DBaseView( 4, (wxVtk2DBaseView*)bbGetInputWxVtkBaseView4() );
+		mpControler->Config();
+        wxManualPaintPanel       *mpPanel			= (wxManualPaintPanel*)bbGetOutputWidget();
+	    mpPanel->SetManualPaintControler(mpControler);
+    } // firsttime
 }
+
 //=====
 // Don't edit this file. This file is generated from xml description..
 //=====
@@ -94,8 +90,12 @@ void ManualPaint::CreateWidget(wxWindow* parent)
 //=====
 void ManualPaint::bbUserSetDefaultValues()
 {
-    firsttime=true;
+    firsttime = true;
     bbSetInputIn(NULL);
+    bbSetInputWxVtkBaseView1(NULL);
+    bbSetInputWxVtkBaseView2(NULL);
+    bbSetInputWxVtkBaseView3(NULL);
+    bbSetInputWxVtkBaseView4(NULL);
 }
 //=====
 // Don't edit this file. This file is generated from xml description..