X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbcreaMaracasVisuCutModule2.cxx;h=8360b44926892f9de3eacca97bc790c51cdf2218;hb=8eebd53dcbe07edf0569621003178ee37d69a39b;hp=3934593ad6b22f07c496e4e703b8f0fe846bc0c3;hpb=d2fc2645728a4aea4f0aa0febfa1d7a894ab3ff1;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbcreaMaracasVisuCutModule2.cxx b/bbtk/src/bbcreaMaracasVisuCutModule2.cxx
index 3934593..8360b44 100644
--- a/bbtk/src/bbcreaMaracasVisuCutModule2.cxx
+++ b/bbtk/src/bbcreaMaracasVisuCutModule2.cxx
@@ -1,12 +1,37 @@
+/*# ---------------------------------------------------------------------
+#
+# 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 "bbcreaMaracasVisuCutModule2.h"
 #include "bbcreaMaracasVisuPackage.h"
 #include "creaSystem.h"
 
 namespace bbcreaMaracasVisu
 {
-
 	BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,CutModule2)
 	BBTK_BLACK_BOX_IMPLEMENTATION(CutModule2,bbtk::WxBlackBox);
+
 	void CutModule2::Process()
 	{
 		vtkImageData* img = bbGetInputIn();
@@ -14,43 +39,46 @@ namespace bbcreaMaracasVisu
 		vtkRenderer* render = bbGetInputRenderer();
 
 		if(img != NULL && interactor != NULL && render != NULL && _mainpanel!=NULL){
-
 			if(_currentimage!=img){
 				_currentimage=img;
 				_mainpanel->setImageData(img);
 			}
-			
+
 			_mainpanel->setInteractor(interactor);
 			_mainpanel->setRenderer(render);
 			bbSetOutputOut(_mainpanel->GetResultImage());
 		}   
 	}
+
 	void CutModule2::CreateWidget(wxWindow* parent)
 	{
-
-		std::string path = crea::System::GetDllAppPath("bbcreaMaracasVisu.dll");
-		_mainpanel = CutModel2MainPanel::getInstance(parent, path);
+	   std::string lastname("bbcreaMaracasVisu.dll");    // JPR
+		std::string path = crea::System::GetDllAppPath(lastname);
 		
-	   bbSetOutputWidget( _mainpanel); 
-	   Process(); 
+           _mainpanel = CutModelMainPanel::getInstance(parent, path);
+           _mainpanel->SetType(1);
+		
+           bbSetOutputWidget( _mainpanel); 
+           Process(); 
 	  
 	}
+
 	void CutModule2::bbUserSetDefaultValues()
 	{	
 		_mainpanel = NULL;
 		_currentimage=NULL;
 	}
+
 	void CutModule2::bbUserInitializeProcessing()
 	{
 		bbSetInputIn(0);
 		bbSetInputInteractor(0);
 		bbSetInputRenderer(0);	
 	}
+
 	void CutModule2::bbUserFinalizeProcessing()
 	{
 
 	}
 }
 // EO namespace bbcreaMaracasVisu
-
-