X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbcreaMaracasVisuCutModule.cxx;h=56b4006eddcee4f00a7700af64a14a9290c89427;hb=a7017a8ade695bd14a4c7ee70b197d63b5e76765;hp=b5e9e2dafa2bd2e04e4f3d5d746d645fd8f00764;hpb=2d5984d688d7b149aa7706a0a0bf8c4b4556d788;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbcreaMaracasVisuCutModule.cxx b/bbtk/src/bbcreaMaracasVisuCutModule.cxx
index b5e9e2d..56b4006 100644
--- a/bbtk/src/bbcreaMaracasVisuCutModule.cxx
+++ b/bbtk/src/bbcreaMaracasVisuCutModule.cxx
@@ -1,50 +1,82 @@
+/*# ---------------------------------------------------------------------
+#
+# 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 "bbcreaMaracasVisuCutModule.h"
 #include "bbcreaMaracasVisuPackage.h"
+#include "creaSystem.h"
+
 namespace bbcreaMaracasVisu
 {
 
 BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,CutModule)
 BBTK_BLACK_BOX_IMPLEMENTATION(CutModule,bbtk::WxBlackBox);
+
 void CutModule::Process()
 {
- 
 	vtkImageData* img = bbGetInputIn();
 	vtkRenderWindowInteractor* interactor = bbGetInputInteractor();
 	vtkRenderer* render = bbGetInputRenderer();
 
 	if(img != NULL && interactor != NULL && render != NULL && _mainpanel!=NULL){
+           if(_currentimage!=img){
+             _currentimage=img;
+             _mainpanel->setImageData(img);
+           }
 
-		if(_currentimage!=img){
-            _currentimage=img;
-			_mainpanel->setImageData(img);
-		}
-		
-		_mainpanel->setInteractor(interactor);
-		_mainpanel->setRenderer(render);
-		bbSetOutputOut(_mainpanel->GetResultImage());
-
-	}   
-  
+           _mainpanel->setInteractor(interactor);
+           _mainpanel->setRenderer(render);
+           bbSetOutputOut(_mainpanel->GetResultImage());
+	}
 }
+
 void CutModule::CreateWidget(wxWindow* parent)
 {
- 
-	_mainpanel = CutModelMainPanel::getInstance(parent);
+   std::string lastname("bbcreaMaracasVisu.dll"); // JPR
+   std::string path = crea::System::GetDllAppPath(lastname);
+   _mainpanel = CutModelMainPanel::getInstance(parent, path);
+   _mainpanel->SetType(0);
+	
    bbSetOutputWidget( _mainpanel); 
-   Process(); 
-  
+   Process();   
 }
+
 void CutModule::bbUserSetDefaultValues()
 {	
 	_mainpanel = NULL;
 	_currentimage=NULL;
-}
-void CutModule::bbUserInitializeProcessing()
-{
 	bbSetInputIn(0);
 	bbSetInputInteractor(0);
 	bbSetInputRenderer(0);	
+	bbSetOutputOut(0);
 }
+
+void CutModule::bbUserInitializeProcessing()
+{
+	
+}
+
 void CutModule::bbUserFinalizeProcessing()
 {
 
@@ -52,4 +84,3 @@ void CutModule::bbUserFinalizeProcessing()
 }
 // EO namespace bbcreaMaracasVisu
 
-