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

diff --git a/bbtk/src/bbcreaMaracasVisuManualPaint.cxx b/bbtk/src/bbcreaMaracasVisuManualPaint.cxx
index ea86236..e463b82 100644
--- a/bbtk/src/bbcreaMaracasVisuManualPaint.cxx
+++ b/bbtk/src/bbcreaMaracasVisuManualPaint.cxx
@@ -52,83 +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 (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;
-
-        ManualPaintModel        *mpModel			= new ManualPaintModel();
+        ManualPaintModel        *mpModel		= new ManualPaintModel();
+        ManualPaintControler    *mpControler    = new ManualPaintControler();
         mpModel->SetImages( bbGetInputIn() , bbGetInputIn2() );
-
+        mpControler->SetManualPaintModel(mpModel);
+        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();
-
-        if (bbGetInputWxVtkBaseView1()!=NULL)
-        {
-            ManualPaintControler    *mpControler    = new ManualPaintControler();
-            mpControler->SetManualPaintModel(mpModel);
-//            mpControler->SetManualPaintPanel(mpPanel);
-            mpControler->SetWxVtk2DBaseView( (wxVtk2DBaseView*)bbGetInputWxVtkBaseView1() );
-            mpControler->Config();
-	        mpPanel->SetManualPaintControler(mpControler);
-        }
-
-        if (bbGetInputWxVtkBaseView2()!=NULL)
-        {
-            ManualPaintControler    *mpControler    = new ManualPaintControler();
-            mpControler->SetManualPaintModel(mpModel);
-//            mpControler->SetManualPaintPanel(mpPanel);
-            mpControler->SetWxVtk2DBaseView( (wxVtk2DBaseView*)bbGetInputWxVtkBaseView2() );
-            mpControler->Config();
-	        mpPanel->SetManualPaintControler(mpControler);
-        }
-
-        if (bbGetInputWxVtkBaseView3()!=NULL)
-        {
-            ManualPaintControler    *mpControler    = new ManualPaintControler();
-            mpControler->SetManualPaintModel(mpModel);
-//            mpControler->SetManualPaintPanel(mpPanel);
-            mpControler->SetWxVtk2DBaseView( (wxVtk2DBaseView*)bbGetInputWxVtkBaseView3() );
-            mpControler->Config();
-	        mpPanel->SetManualPaintControler(mpControler);
-        }
-
-        if (bbGetInputWxVtkBaseView4()!=NULL)
-        {
-            ManualPaintControler    *mpControler    = new ManualPaintControler();
-            mpControler->SetManualPaintModel(mpModel);
-//            mpControler->SetManualPaintPanel(mpPanel);
-            mpControler->SetWxVtk2DBaseView( (wxVtk2DBaseView*)bbGetInputWxVtkBaseView4() );
-            mpControler->Config();
-	        mpPanel->SetManualPaintControler(mpControler);
-        }
-
+	    mpPanel->SetManualPaintControler(mpControler);
     } // firsttime
-
 }
+
 //=====
 // Don't edit this file. This file is generated from xml description..
 //=====
@@ -142,7 +90,7 @@ void ManualPaint::CreateWidget(wxWindow* parent)
 //=====
 void ManualPaint::bbUserSetDefaultValues()
 {
-    firsttime=true;
+    firsttime = true;
     bbSetInputIn(NULL);
     bbSetInputWxVtkBaseView1(NULL);
     bbSetInputWxVtkBaseView2(NULL);