*** empty log message ***

[creaContours.git] / appli / wxContourGUIExample / wxContourGUIExample.cxx

diff --git a/appli/wxContourGUIExample/wxContourGUIExample.cxx b/appli/wxContourGUIExample/wxContourGUIExample.cxx
index e80ea04efae462a647b4697549e094097db81ebc..62d9125ff7c15c2bbfbbfbb15bee5cdb73f48ed3 100644 (file)
--- a/appli/wxContourGUIExample/wxContourGUIExample.cxx
+++ b/appli/wxContourGUIExample/wxContourGUIExample.cxx
@@ -231,8 +231,7 @@ std::string GetExecutablePath()
     if (err) 
        {
                printf("Could not determine current executable path ?  ");  
-       }
-    
+       }    
     // remove the exe name
     char *slash;               
     slash = strrchr(name, CREACONTOUR_VALID_FILE_SEPARATOR_CHAR);
@@ -272,19 +271,23 @@ bool wxTheApplication :: OnInit()
        int output_dim = NATIVE;
        int threads = 1;
 
+       std::vector<vtkImageData*> images;
+
        //creaImageIO::WxGimmickDialog w(0,-1,_T("WxGimmickDialog test"),wxDefaultPosition,wxSize(1200,800),max_image_type,threads);
+
        creaImageIO::WxGimmickReaderDialog w(0,-1,_T("WxGimmickDialog test"),wxDefaultPosition,wxSize(1200,800),min_image_type,max_image_type,output_dim,threads);
        w.ShowModal();
 
-       std::string datadir(  crea::wx2std(GetExecutablePath()) );
+//JCP
+       //std::string datadir(  crea::wx2std(GetExecutablePath()) );    
+       std::string datadir(  GetExecutablePath() );
+//JCP
        
                #ifdef MACOSX /* assume this is OSX */
                        datadir=datadir+"/../../..";
                #endif // MACOSX        
                
                
-               std::vector<vtkImageData*> images;
-
                        if(w.GetReturnCode() == wxID_OK)
                        {
                                std::vector<std::string> s;
@@ -311,6 +314,7 @@ bool wxTheApplication :: OnInit()
                                return -1;
                        }   
 
+
        wxFrame* frame1 = new wxFrame(NULL, wxID_ANY, wxT("ROI Application  -    Evaluation version, 09 Feb 2009 "), wxPoint(400,50), wxSize(800, 600) );
 
        //frame = new wxContourMainFrame( frame1, wxID_ANY, wxString(_T("")), wxPoint(50,50), wxSize(800, 600), images );