Loading osirix files, problem when installed version

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

diff --git a/appli/wxContourGUIExample/wxContourGUIExample.cxx b/appli/wxContourGUIExample/wxContourGUIExample.cxx
index 1e93eb1be2e629390a8dd341c4a6e4af1d80c637..19bccf399d1128f7a4dcf34680d7310738d1d775 100644 (file)
--- a/appli/wxContourGUIExample/wxContourGUIExample.cxx
+++ b/appli/wxContourGUIExample/wxContourGUIExample.cxx
@@ -35,24 +35,24 @@
 
 //#include "interfMainPanel.h"
 
-#if defined(MACOSX) // assume this is OSX 
+#if defined(MACOSX) // assume this is OSX
 # include <sys/param.h>
-# include <mach-o/dyld.h> // _NSGetExecutablePath : must add -framework CoreFoundation to link line 
+# include <mach-o/dyld.h> // _NSGetExecutablePath : must add -framework CoreFoundation to link line
 # include <string.h>
 # ifndef PATH_MAX
 #  define PATH_MAX MAXPATHLEN
 # endif
 #endif // MACOSX
 */
- 
-#ifndef PATH_MAX // If not defined yet : do it 
+
+#ifndef PATH_MAX // If not defined yet : do it
 #  define PATH_MAX 2048
 #endif
 
 #if defined(WIN32)
   #include <direct.h>
 #else
-   #include <dirent.h>  
+   #include <dirent.h>
 #endif
 
 #include <stdlib.h>
@@ -90,6 +90,7 @@ void wxAppConsole::OnAssertFailure(char const *,int,char const *,char const *,ch
 
 bool wxTheApplication :: OnInit()
 {
+       wxString infoImage;
        wxInitAllImageHandlers();
 
 //EED01Juin2010        int min_image_type = GIMMICK_2D_IMAGE_SELECTION;
@@ -99,38 +100,38 @@ bool wxTheApplication :: OnInit()
 
 
 //EED 1Juin2010
-      creaImageIO::WxSimpleDlg w(0,_T("Select your image"),"creaContours_Descriptor.dscp","creatisContours DB"); 
-      w.ShowModal(); 
-  
+      creaImageIO::WxSimpleDlg w(0,_T("Select your image"),"creaContours_Descriptor.dscp","creatisContours DB");
+      w.ShowModal();
+
        std::vector<vtkImageData*> images;
 //EED 1Juin2010
 //     creaImageIO::WxGimmickReaderDialog w(0,
 //                                                                             -1,
 //                                                                             "creaContours_Descriptor.dscp",
-//                                                                             "creatisContours DB", 
+//                                                                             "creatisContours DB",
 //                                                                             _T("WxGimmickDialog test"),
 //                                                                             wxDefaultPosition,wxSize(1200,800)
 //                                                                             ,min_image_type,
 //                                                                             max_image_type,
 //                                                                             output_dim,
-//                                                                             threads);  
+//                                                                             threads);
 //     w.ShowModal();
 
 
 //JCP
-       //std::string datadir(  crea::wx2std(GetExecutablePath()) );    
+       //std::string datadir(  crea::wx2std(GetExecutablePath()) );
        std::string datadir(  crea::System::GetExecutablePath() );
 //JCP
 
            #ifdef LINUX /* assume this is OSX */
-                  datadir=datadir+"/../share/creaContours";
-           #endif // MACOSX    
-       
+                   datadir=datadir+"/../share/creaContours";
+           #endif // MACOSX
+
                #ifdef MACOSX /* assume this is OSX */
                        datadir=datadir+"/../../../../share/creaContours";
-               #endif // MACOSX        
-               
-               
+               #endif // MACOSX
+
+
                if(w.GetReturnCode() == wxID_OK)
                {
                                std::vector<std::string> s;
@@ -165,28 +166,30 @@ bool wxTheApplication :: OnInit()
 //                             }
 
 //EED 1Juin2010
-                               printf("EED creaContours wxTheApplication :: OnInit  %d\n", w.getImagesSelected().size() );
-                               images=w.getImagesSelected(); 
-                               printf("EED creaContours wxTheApplication :: OnInit  %d\n", images.size() );
+//                             printf("EED creaContours wxTheApplication :: OnInit  %d\n", w.getImagesSelected().size() );
+                               images    = w.getImagesSelected();
+                               infoImage = w.getInfoImage();
+//                             printf("EED creaContours wxTheApplication :: OnInit  %d\n", images.size() );
 
                }
                else if (w.GetReturnCode() == wxID_CANCEL)
                {
                                vtkMetaImageReader *reader = vtkMetaImageReader::New();
-                               std::string filename= datadir + "/data/hola.mhd";          
+                               std::string filename= datadir + "/data/hola.mhd";
+                               infoImage=_T("DEFAULT-Image:")+crea::std2wx(filename);
                                reader->SetFileName( filename.c_str() );
                                reader->Update();
                                images.push_back(reader->GetOutput());
                        }
                        else
-                       {        
+                       {
                                return -1;
-                       }   
+                       }
 
 
-       wxFrame* frame1 = new wxFrame(NULL, wxID_ANY, wxT("ROI Application  -    Evaluation version, 09 Feb 2009 "), wxPoint(400,50), wxSize(800, 600) );
+       wxFrame* frame1 = new wxFrame(NULL, wxID_ANY, wxT("Creatis- ROI Application- Evaluation version,01 Agost 2010 ")+infoImage, wxPoint(400,50), wxSize(800, 600) );
 
-       //frame = new wxContourMainFrame( frame1, wxID_ANY, wxString(_T("")), wxPoint(50,50), wxSize(800, 600), images ); 
+       //frame = new wxContourMainFrame( frame1, wxID_ANY, wxString(_T("")), wxPoint(50,50), wxSize(800, 600), images );
        frame = wxContourMainFrame::getInstance(frame1, wxID_ANY, wxString(_T("")), wxPoint(200,50), wxSize(800, 600), images,  wxDEFAULT_FRAME_STYLE | wxSUNKEN_BORDER,datadir );
        frame1->CreateStatusBar();
        frame1->Show(TRUE);
@@ -195,11 +198,11 @@ bool wxTheApplication :: OnInit()
 }
 
 #if(WIN32)
-int main(int argc, char* argv[])                                       
-  {                                                                    
-    return WinMain(::GetModuleHandle(NULL), NULL,                      
-                  ::GetCommandLine(), SW_SHOWNORMAL);                  
-  }            
+int main(int argc, char* argv[])
+  {
+    return WinMain(::GetModuleHandle(NULL), NULL,
+                  ::GetCommandLine(), SW_SHOWNORMAL);
+  }
 #else
 #endif