*** empty log message ***

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

diff --git a/appli/wxContourGUIExample/wxContourGUIExample.cxx b/appli/wxContourGUIExample/wxContourGUIExample.cxx
index 307361e8c2b596df4e5d0308f6c632e8d5687421..1fc7f77c75f1151ac1ce0ce4168ea3e51ad2835c 100644 (file)
--- a/appli/wxContourGUIExample/wxContourGUIExample.cxx
+++ b/appli/wxContourGUIExample/wxContourGUIExample.cxx
@@ -2,14 +2,14 @@
 // Class definition include
 //----------------------------------------------------------------------------------------------------------------
 
-
 #include "wxContourGUIExample.h"
 #include "wxContourMainFrame.h"
 //#include "OutlineModelManager.h"
 //#include "wxContourEventHandler.h"
 
-
-#include <creaImageIOWxGimmickDialog.h>
+//#include <creaImageIOWxGimmickDialog.h>
+#include <creaImageIOWxGimmickReaderDialog.h>
+#include <creaImageIOSystem.h>
 
 #include <creaVtkBasicSlicer.h>
 //#include "wxContourMainPanel.h"
@@ -28,12 +28,8 @@
 //#include "SomeEnvironment.h"
 //#include "ReaderEnvironment.h"
 
-
-
-
 //#include "interfMainPanel.h"
 
-
 #if defined(MACOSX) // assume this is OSX 
 # include <sys/param.h>
 # include <mach-o/dyld.h> // _NSGetExecutablePath : must add -framework CoreFoundation to link line 
@@ -55,13 +51,12 @@
 
 #include <stdlib.h>
 
-
 wxContourMainFrame* wxTheApplication::frame = 0;
+
 //----------------------------------------------------------------------------------------------------------------
 // This macro implements the entry point (main function) for the application
 //----------------------------------------------------------------------------------------------------------------
 
-
 /*
 //EED
 // http://lists.wxwidgets.org/archive/wx-dev/msg30449.html
@@ -228,7 +223,6 @@ int get_app_path (char *pname, size_t pathsize)
 #define CREACONTOUR_VALID_FILE_SEPARATOR_CHAR '/'
 #endif
 
-
 //=========================================================================
 std::string GetExecutablePath()
 {
@@ -237,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);
@@ -248,23 +241,14 @@ std::string GetExecutablePath()
        }
     return name;
 }
-//=========================================================================
-
-
-
-
-
-
-
-
 
+//=========================================================================
+//=========================================================================
 IMPLEMENT_APP( wxTheApplication );
-
 /*
 wxContourGUIExample :: wxContourGUIExample(const wxString& title, const wxPoint& pos, const wxSize& size)
 : wxFrame((wxFrame *) NULL, -1, title, pos, size)
 {
-       
 }
 */
 
@@ -280,57 +264,58 @@ void wxAppConsole::OnAssertFailure(char const *,int,char const *,char const *,ch
 
 bool wxTheApplication :: OnInit()
 {
+       wxInitAllImageHandlers();
 
+       int min_image_type = GIMMICK_2D_IMAGE_SELECTION;
+       int max_image_type = GIMMICK_3D_IMAGE_SELECTION;
+       int output_dim = NATIVE;
+       int threads = 1;
 
-       
-       
+       std::vector<vtkImageData*> images;
 
-       wxInitAllImageHandlers();
+       //creaImageIO::WxGimmickDialog w(0,-1,_T("WxGimmickDialog test"),wxDefaultPosition,wxSize(1200,800),max_image_type,threads);
 
-   int image_type = GIMMICK_3D_IMAGE_SELECTION;
-   int threads = 1;
+       creaImageIO::WxGimmickReaderDialog w(0,-1,_T("WxGimmickDialog test"),wxDefaultPosition,wxSize(1200,800),min_image_type,max_image_type,output_dim,threads);
+       w.ShowModal();
 
-   creaImageIO::WxGimmickDialog w(0,
-                                 -1,
-                                 _T("WxGimmickDialog test"),
-                                 wxDefaultPosition,
-                                 wxSize(1200,800),
-                                 image_type,
-                                 threads);
-   w.ShowModal();
 
-       std::string datadir(  GetExecutablePath() ) ;
+//JCP
+       //std::string datadir(  crea::wx2std(GetExecutablePath()) );    
+       std::string datadir(  GetExecutablePath() );
+//JCP
        
-#ifdef MACOSX /* assume this is OSX */
-       datadir=datadir+"/../../..";
-#endif // MACOSX       
-       
-   //vtkImageData* selectedimage=NULL;
-   std::vector<vtkImageData*> images;
-       if(w.GetReturnCode() == wxID_OK){
-
-       std::vector<std::string> s;
-       w.GetSelectedFiles(s);
-       std::vector<std::string>::iterator i;
-          for (i=s.begin();i!=s.end();++i){
-                  std::cout << *i << std::endl;
-          }
-               
-          std::cout << "$$$$ "<<std::endl;
-       w.GetSelectedImages(images);
-          //selectedimage = images[0];
-       //crea::VtkBasicSlicer(images.front());
-       //images.front()->Delete();
-
-       }else if (w.GetReturnCode() == wxID_CANCEL){
-          vtkMetaImageReader *reader = vtkMetaImageReader::New();
-               std::string filename= datadir + "/data/hola.mhd";          
-          reader->SetFileName( filename.c_str() );
-          reader->Update();
-          images.push_back(reader->GetOutput());
-       }else{        
-               return -1;
-       }   
+               #ifdef MACOSX /* assume this is OSX */
+                       datadir=datadir+"/../../..";
+               #endif // MACOSX        
+               
+               
+
+                       if(w.GetReturnCode() == wxID_OK)
+                       {
+                               std::vector<std::string> s;
+                               w.GetSelectedFiles(s);
+                               std::vector<std::string>::iterator i;
+                               for (i=s.begin();i!=s.end();++i)
+                               {
+                                       std::cout << *i << std::endl;
+                               }
+                               std::cout << "$$$$ "<<std::endl;
+                               //w.GetSelectedImages(images);
+                               w.GetSelectedImages(images,output_dim);
+                       }
+                       else if (w.GetReturnCode() == wxID_CANCEL)
+                       {
+                               vtkMetaImageReader *reader = vtkMetaImageReader::New();
+                               std::string filename= datadir + "/data/hola.mhd";          
+                               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) );