From: jean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Date: Tue, 20 Apr 2010 12:25:23 +0000 (+0000)
Subject: char * vs std::string
X-Git-Tag: CREATOOLS.2-0-3~30
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=92683a169f4ecce96ecd62d6b84f2f25d59df6d2;p=creaMaracasVisu.git

char * vs std::string
---

diff --git a/bbtk/src/bbcreaMaracasVisuCutModule.cxx b/bbtk/src/bbcreaMaracasVisuCutModule.cxx
index 3364770..cd7f22f 100644
--- a/bbtk/src/bbcreaMaracasVisuCutModule.cxx
+++ b/bbtk/src/bbcreaMaracasVisuCutModule.cxx
@@ -7,6 +7,7 @@ namespace bbcreaMaracasVisu
 
 BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,CutModule)
 BBTK_BLACK_BOX_IMPLEMENTATION(CutModule,bbtk::WxBlackBox);
+
 void CutModule::Process()
 {
 	vtkImageData* img = bbGetInputIn();
@@ -14,30 +15,28 @@ void CutModule::Process()
 	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());
-
-	}   
-  
+           if(_currentimage!=img){
+             _currentimage=img;
+             _mainpanel->setImageData(img);
+           }
+
+           _mainpanel->setInteractor(interactor);
+           _mainpanel->setRenderer(render);
+           bbSetOutputOut(_mainpanel->GetResultImage());
+	}
 }
+
 void CutModule::CreateWidget(wxWindow* parent)
 {
-
-	std::string path = crea::System::GetDllAppPath("bbcreaMaracasVisu.dll");
-	_mainpanel = CutModelMainPanel::getInstance(parent, path);
-	_mainpanel->SetType(0);
+   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;
@@ -47,10 +46,12 @@ void CutModule::bbUserSetDefaultValues()
 	bbSetInputRenderer(0);	
 	bbSetOutputOut(0);
 }
+
 void CutModule::bbUserInitializeProcessing()
 {
 	
 }
+
 void CutModule::bbUserFinalizeProcessing()
 {
 
@@ -58,4 +59,3 @@ void CutModule::bbUserFinalizeProcessing()
 }
 // EO namespace bbcreaMaracasVisu
 
-
diff --git a/bbtk/src/bbcreaMaracasVisuCutModule2.cxx b/bbtk/src/bbcreaMaracasVisuCutModule2.cxx
index ae894ae..8bd85f4 100644
--- a/bbtk/src/bbcreaMaracasVisuCutModule2.cxx
+++ b/bbtk/src/bbcreaMaracasVisuCutModule2.cxx
@@ -4,7 +4,6 @@
 
 namespace bbcreaMaracasVisu
 {
-
 	BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,CutModule2)
 	BBTK_BLACK_BOX_IMPLEMENTATION(CutModule2,bbtk::WxBlackBox);
 	void CutModule2::Process()
@@ -14,12 +13,11 @@ 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());
@@ -27,13 +25,13 @@ namespace bbcreaMaracasVisu
 	}
 	void CutModule2::CreateWidget(wxWindow* parent)
 	{
-
-		std::string path = crea::System::GetDllAppPath("bbcreaMaracasVisu.dll");
-		_mainpanel = CutModelMainPanel::getInstance(parent, path);
-		_mainpanel->SetType(1);
+	   std::string lastname("bbcreaMaracasVisu.dll");    // JPR
+           std::string path = crea::System::GetDllAppPath(lastname);
+           _mainpanel = CutModelMainPanel::getInstance(parent, path);
+           _mainpanel->SetType(1);
 		
-	   bbSetOutputWidget( _mainpanel); 
-	   Process(); 
+           bbSetOutputWidget( _mainpanel); 
+           Process(); 
 	  
 	}
 	void CutModule2::bbUserSetDefaultValues()
@@ -41,6 +39,7 @@ namespace bbcreaMaracasVisu
 		_mainpanel = NULL;
 		_currentimage=NULL;
 	}
+
 	void CutModule2::bbUserInitializeProcessing()
 	{
 		bbSetInputIn(0);
@@ -53,5 +52,3 @@ namespace bbcreaMaracasVisu
 	}
 }
 // EO namespace bbcreaMaracasVisu
-
-