- //Creating the window that will show the panels
-//JCP 21 - 10 - 08
- //wxFrame* frame1 = new wxFrame(NULL, wxID_ANY, wxT("ROI Application - Evaluation version, 23 Oct 2008 - Use limited to the research team (Creatis-LRMN)"), wxPoint(50,50), wxSize(800, 600) );
- wxFrame* frame1 = new wxFrame(NULL, wxID_ANY, wxT("ROI Application - Evaluation version, 23 Oct 2008 "), wxPoint(50,50), wxSize(800, 600) );
- frame = new wxContourMainFrame( frame1, wxID_ANY, wxString(_T("")), wxPoint(50,50), wxSize(800, 600) );
-
- //frame = new wxContourMainFrame( NULL, wxID_ANY, wxT("ROI Application - Evaluation version, 17 Oct 2008 - Use limited to the research team (Creatis-LRMN)"), wxPoint(50,50), wxSize(800, 600) );
+//EED01Juin2010 int min_image_type = GIMMICK_2D_IMAGE_SELECTION;
+//EED01Juin2010 int max_image_type = GIMMICK_3D_IMAGE_SELECTION;
+//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();
+
+ std::vector<vtkImageData*> images;
+//EED 1Juin2010
+// creaImageIO::WxGimmickReaderDialog w(0,
+// -1,
+// "creaContours_Descriptor.dscp",
+// "creatisContours DB",
+// _T("WxGimmickDialog test"),
+// wxDefaultPosition,wxSize(1200,800)
+// ,min_image_type,
+// max_image_type,
+// output_dim,
+// 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;
+ 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;
+ }
+ 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 );