#3145 creaContours Bug New Normal - changeWx28to30

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

diff --git a/appli/wxContourGUIExample/wxContourGUIExample.cxx b/appli/wxContourGUIExample/wxContourGUIExample.cxx
index 46c896e3b8c4c41e118a0938c7dcf7e8d53bff83..72c91300216936db650430cdac00e7294f64370d 100644 (file)
--- a/appli/wxContourGUIExample/wxContourGUIExample.cxx
+++ b/appli/wxContourGUIExample/wxContourGUIExample.cxx
@@ -31,70 +31,34 @@
 #include "wxContourMainFrame.h"
 //#include "OutlineModelManager.h"
 //#include "wxContourEventHandler.h"
-
 //#include <creaImageIOWxGimmickDialog.h>
 //#include <creaImageIOWxGimmickReaderDialog.h>
 #include <creaImageIOWxSimpleDlg.h>
-
 #include <creaImageIOSystem.h>
-
 #include <creaVtkBasicSlicer.h>
 //#include "wxContourMainPanel.h"
-
 #include "vtkMetaImageReader.h"
 #include <map>
 #include "vtkImageData.h"
-
 #include "wx/artprov.h"
 #include <wx/filedlg.h>
 
-
-/* EED EraseMe
-//#include "OutlineModelBuilder.h"
-//#include "ContourThing.h"
-//#include "AxeThing.h"
-//#include "ImageSourceThing.h"
-//#include "ImageSectionThing.h"
-//#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
-# include <string.h>
-# ifndef PATH_MAX
-#  define PATH_MAX MAXPATHLEN
-# endif
-#endif // MACOSX
-*/
-
 #ifndef PATH_MAX // If not defined yet : do it
 #  define PATH_MAX 2048
 #endif
-
 #if defined(WIN32)
   #include <direct.h>
 #else
    #include <dirent.h>
 #endif
-
 #include <stdlib.h>
 
-
-
 wxContourMainFrame* wxTheApplication::frame = 0;
 
 //----------------------------------------------------------------------------------------------------------------
 // This macro implements the entry point (main function) for the application
 //----------------------------------------------------------------------------------------------------------------
 
-
-
-
-
-
 //=========================================================================
 //=========================================================================
 IMPLEMENT_APP( wxTheApplication );
@@ -115,14 +79,11 @@ void wxAppConsole::OnAssertFailure(char const *,int,char const *,char const *,ch
 }
 #endif
 
-
-
-bool wxTheApplication :: OnInit()
+bool wxTheApplication::OnInit()
 {
        vtkOutputWindowCreaContour *outputWindowCreaContour= vtkOutputWindowCreaContour::New();
        vtkOutputWindow::SetInstance( outputWindowCreaContour );
        outputWindowCreaContour->Delete();
-
        wxString infoImage;
        wxInitAllImageHandlers();
 
@@ -131,7 +92,6 @@ bool wxTheApplication :: OnInit()
 //EED01Juin2010        int output_dim = NATIVE;
 //EED01Juin2010        int threads = 1;
 
-
 //EED 1Juin2010
       creaImageIO::WxSimpleDlg w(0,_T("Select your image"),"creaContours_Descriptor.dscp","creatisContours DB");
       w.ShowModal();
@@ -150,78 +110,33 @@ bool wxTheApplication :: OnInit()
 //                                                                             threads);
 //     w.ShowModal();
 
-
 //JCP
        //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
-
                #ifdef MACOSX /* assume this is OSX */
                        datadir=datadir+"/../../../../share/creaContours";
                #endif // MACOSX
-
-
                if(w.GetReturnCode() == wxID_OK)
                {
-                               std::vector<std::string> s;
-//EED 01Juin2010                               w.GetSelectedFiles(s);
-
-
-//EED                  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);
-
-//EED31mai2010                         w.GetSelectedImages(images,output_dim);
-
-
-//EED 1Juin2010
-//                             std::vector<creaImageIO::OutStrGimmick> out;
-//                             std::vector<std::string> attr;
-////                           attr.push_back("D0028_0010");
-////                           attr.push_back("D0008_0023");
-////                           attr.push_back("D0008_1070");
-//                             w.getSelected(out, attr,true,"");
-////                           std::cout<<out.size()<<std::endl;
-////                           crea::VtkBasicSlicer(out.front().img);
-//                             int size=out.size();
-//                             int ii;
-//                             for (ii=0;ii<size;ii++)
-//                             {
-//                                     images.push_back(out[ii].img);
-//                             }
-
-//EED 1Juin2010
-//                             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)
+                       std::vector<std::string> s;
+                       images    = w.getImagesSelected();
+                       infoImage = w.getInfoImage();
+               } else if (w.GetReturnCode() == wxID_CANCEL)
                {
-                               vtkMetaImageReader *reader = vtkMetaImageReader::New();
-                               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;
-                       }
-
-
+                       vtkMetaImageReader *reader = vtkMetaImageReader::New();
+                       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("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 = wxContourMainFrame::getInstance(frame1, wxID_ANY, wxString(_T("")), wxPoint(200,50), wxSize(800, 600), images,  wxDEFAULT_FRAME_STYLE | wxSUNKEN_BORDER,datadir );
        frame1->CreateStatusBar();