Fix wxString vs std::string

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / OpenImageDialog.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx
index f80bc74d6682c1b9af3630d478746123a8e43ff9..88ebdd363493988a80a2a33ca16b8ad48f556e05 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx
@@ -1,55 +1,49 @@
 
 #include "OpenImageDialog.h"
+#include "creaWx.h"
 
 typedef vtkImageData* (*GETIMAGEDATADIALOG)();
 
 namespace creaMaracasVisuKernel{
        OpenImageDialog::OpenImageDialog()
        {
-
-
                img = NULL;
                bool gimmicknotfound = true;
-               
+
        #ifdef WIN32
-               HINSTANCE gimmickhandle; 
-               gimmickhandle = LoadLibrary(TEXT("creaImageIO2.dll"));  
+               HINSTANCE gimmickhandle;
+               gimmickhandle = LoadLibrary(TEXT("creaImageIO2.dll"));
                std::cout<<"imagehandle "<<gimmickhandle<<std::endl;
-               if(gimmickhandle!=NULL){        
+               if(gimmickhandle!=NULL){
 
-                       
                        GETIMAGEDATADIALOG getImageDataDialog;
 
                        getImageDataDialog = (GETIMAGEDATADIALOG)GetProcAddress(gimmickhandle, "getImageDataDialog");
 
-                       
                        std::cout<<"imagedatadialog "<<getImageDataDialog<<std::endl;
 
                        if(getImageDataDialog!=NULL){
                                img = getImageDataDialog();
                                gimmicknotfound = false;
                        }
-               }       
+               }
 
        #endif
 
                if(gimmicknotfound){
 
-                       wxFileDialog* FD = 
+                       wxFileDialog* FD =
                          new wxFileDialog( 0, _T("Read Image"),wxEmptyString,wxEmptyString, _T("*.mhd"));
-                       
+
                        if (FD->ShowModal()==wxID_OK)
                        {
-                               std::string  path= FD->GetPath();
+                               std::string  path= crea::wx2std(FD->GetPath());
 
-                               vtkMetaImageReader *reader =  vtkMetaImageReader::New();        
-                               reader->SetFileName(path.c_str());              
-                               img = reader->GetOutput();              
-                       }               
-               }       
-
-
-               
+                               vtkMetaImageReader *reader =  vtkMetaImageReader::New();
+                               reader->SetFileName(path.c_str());
+                               img = reader->GetOutput();
+                       }
+               }
        }
 
        //-------------------------------------------------------------------
@@ -61,4 +55,3 @@ namespace creaMaracasVisuKernel{
                return img;
        }
 }
-