char * vs std::string

diff --git a/bbtk/src/bbcreaMaracasVisuCutModule.cxx b/bbtk/src/bbcreaMaracasVisuCutModule.cxx
index 33647708e89e141a93d11a176522ef297269831c..cd7f22f2e99692ab49803dc6b6bcaaab33804bc0 100644 (file)
--- 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 ae894ae9c709403658defc97d376f271bdd45f71..8bd85f4920a4c3c52672a7624bc7363aac167db1 100644 (file)
--- 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
-
-