//----------------------------------------------------------------------------------------------------------------
// Class definition include
//----------------------------------------------------------------------------------------------------------------
-
-
+
#include "wxContourGUIExample.h"
#include "wxContourMainFrame.h"
//#include "OutlineModelManager.h"
//#include "wxContourEventHandler.h"
+//#include <creaImageIOWxGimmickDialog.h>
+//#include <creaImageIOWxGimmickReaderDialog.h>
+#include <creaImageIOWxSimpleDlg.h>
-#include <creaImageIOWxGimmickDialog.h>
+#include <creaImageIOSystem.h>
#include <creaVtkBasicSlicer.h>
//#include "wxContourMainPanel.h"
#include "wx/artprov.h"
#include <wx/filedlg.h>
+
+
+/* EED EraseMe
//#include "OutlineModelBuilder.h"
//#include "ContourThing.h"
//#include "AxeThing.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 "interfMainPanel.h"
-
+#include <stdlib.h>
wxContourMainFrame* wxTheApplication::frame = 0;
+
//----------------------------------------------------------------------------------------------------------------
// This macro implements the entry point (main function) for the application
//----------------------------------------------------------------------------------------------------------------
-IMPLEMENT_APP( wxTheApplication );
+
+
+
+
+//=========================================================================
+//=========================================================================
+IMPLEMENT_APP( wxTheApplication );
+/*
wxContourGUIExample :: wxContourGUIExample(const wxString& title, const wxPoint& pos, const wxSize& size)
: wxFrame((wxFrame *) NULL, -1, title, pos, size)
{
-
}
+*/
-bool wxTheApplication :: OnInit()
+#ifdef _DEBUG
+void wxAppConsole::OnAssert(char const *,int,char const *,char const *)
{
-
-//-------------------------------------------------------------
-// Doing what is done by the bbtk boxes
- //vtkMetaImageReader *reader = vtkMetaImageReader::New();
-// reader->SetFileName( "data\\hola.mhd" );
-// reader->SetFileName( "C:/Program Files/bbtk-1.0/data/vtk/img02.maracas.mhd" );
-// reader->SetFileName( "C:/Program Files/bbtk-1.0/data/vtk/test01.maracas.mhd" );
-// reader->SetFileName( "C:/download/Elise/Elise_IRM_Helium/A/test01b.maracas.mhd" );
-
- //wxFileDialog dialog(NULL, _T("Choose a file"), _T(""), _T(""), _T("*.mhd"), wxOPEN );
- //if (dialog.ShowModal() == wxID_OK)
- //{
- // std::string filename = (const char *)(dialog.GetPath().mb_str());
- // reader->SetFileName( filename.c_str() );
- //} else {
- // reader->SetFileName( "data\\hola.mhd" );
-// Halt(0);
- //}
-
- //reader->Update();
-/*JCP 17-10-2008
- wxInitAllImageHandlers();
-
- int image_type = GIMMICK_3D_IMAGE_SELECTION;
- int threads = 1;
-
- creaImageIO::WxGimmickDialog w(0,
- -1,
- _T("WxGimmickDialog test"),
- wxDefaultPosition,
- wxSize(1200,800),
- image_type,
- threads);
- w.ShowModal();
-
- vtkImageData* selectedimage=NULL;
- 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;
- std::vector<vtkImageData*> images;
- w.GetSelectedImages(images);
- selectedimage = images[0];
- //crea::VtkBasicSlicer(images.front());
- //images.front()->Delete();
-
- }else if (w.GetReturnCode() == wxID_CANCEL){
- vtkMetaImageReader *reader = vtkMetaImageReader::New();
- reader->SetFileName( "data/hola.mhd" );
- reader->Update();
- selectedimage = reader->GetOutput();
- }else{
- return TRUE;
- }
-
- std::string conceptsFN = "data/holaConceptsFile.cf";
- std::string imageSourcesFN = "data/holaImagesInstantsFile.of";
- std::string imageSectionsFN = "";
- std::string axeThingsFN = "";
-
- std::map<std::string, ImageSourceThing *> * sourcesMap = new std::map<std::string, ImageSourceThing *>();
- std::map<std::string, ImageSectionThing *>* sectionsMap = new std::map<std::string, ImageSectionThing *>();
- std::map<std::string, AxeThing *>* axesMap = new std::map<std::string, AxeThing *>();
- std::map<std::string, ContourThing *>* outlinesMap = new std::map<std::string, ContourThing *>();
-
- ImageSourceThing * thing = new ImageSourceThing(selectedimage);
- sourcesMap->insert(std::pair<std::string, ImageSourceThing *>( "Source Image 1", thing));
-
- OutlineModelBuilder * _builder = new OutlineModelBuilder( conceptsFN );
- _builder->buildImageSource_Envornment( imageSourcesFN, sourcesMap );
- _builder->buildImageSection_Envornment( imageSectionsFN, sectionsMap );
- _builder->buildAxe_Envornment(axeThingsFN, axesMap );
- _builder->buildCountour_Envornment( imageSectionsFN, outlinesMap );
-
-//-------------------------------------------------------------
+}
- //frame = new wxContourMainFrame(_builder->getImSourceEnv(), _builder->getImSectionEnv(), _builder->getAxesEnv(), _builder->getContourEnv(),NULL, wxID_ANY, wxT("ROI Application Sample"), wxPoint(50,50), wxSize(800, 600));
- //frame->Show(TRUE);
+void wxAppConsole::OnAssertFailure(char const *,int,char const *,char const *,char const *)
+{
+}
+#endif
- //Creating the evtHandler of the panels
- wxContourEventHandler * eventHandler = new wxContourEventHandler();
+bool wxTheApplication :: OnInit()
+{
+ wxString infoImage;
+ wxInitAllImageHandlers();
- //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) );
- frame1->CreateStatusBar();
-//JCP 21 - 10 - 08
- //Getting the parent for the panels ( using aui )
- wxAuiNotebook * parent = frame->createNotebook();
-
- //Creating the objects to manage
- OutlineModelManager * modelManager = new OutlineModelManager( _builder->getImSourceEnv(), _builder->getImSectionEnv(), _builder->getAxesEnv(), _builder->getContourEnv() );
-
- wxInstantChooserPanel * instantPanel = new wxInstantChooserPanel( parent, "Instant Chooser", true );
- ImageSourceThing * imageSource = modelManager->getImageSourceThingByKeyName( "Source Image 1" );
- wxContourViewPanel * theViewPanel = new wxContourViewPanel( imageSource->getSourceImage(), parent );
- //wxContour_ButtonsBar * buttons = new wxContour_ButtonsBar(frame, -1, wxDefaultPosition, wxDefaultSize);
-
- eventHandler->setModelManager( modelManager );
- eventHandler->setViewPanel( theViewPanel );
- eventHandler->setInstantChooserPanel( instantPanel );
- //eventHandler->setButtonsBar( buttons );
- //JCP 17 - 10 - 08
- //buttons->Show(false);
- //JCP 17 - 10 - 08
- bool successConfiuration = eventHandler->configureEventsHandling();
-
- frame->setViewPanel( theViewPanel );
- frame->setInstantChooserPanel( instantPanel );
- //JCP 17 - 10 - 08
-// frame->setButtonsBar( buttons );
- //JCP 17 - 10 - 08
- successConfiuration &= frame->configurePanels( parent );
-
- //JCP 17 - 10 - 08
- //buttons->Show(false);
- //JCP 17 - 10 - 08
-
-
- //frame->Show(TRUE);
- frame1->Show(TRUE);
- //JCP 17 - 10 - 08
- //if ( successConfiuration )
- //{
- // frame->Show(TRUE);
- //}
+//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
-// SetTopWindow(frame);
-
-//JCP -- new Interface
- interfMainPanel* pannew = interfMainPanel::getInstance(frame1, eventHandler);
-
- //pannew->addContourCheckBox("contour1");
- //pannew->addContourCheckBox("contour3");
- //pannew->addContourCheckBox("contour2");
- //pannew->addContourCheckBox("contour4");
-//JCP -- new Interface
-
-JCP 17-10-2008*/
+ #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)
+ {
+ 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) );
-
- wxInitAllImageHandlers();
-
- int image_type = GIMMICK_3D_IMAGE_SELECTION;
- int threads = 1;
-
- creaImageIO::WxGimmickDialog w(0,
- -1,
- _T("WxGimmickDialog test"),
- wxDefaultPosition,
- wxSize(1200,800),
- image_type,
- threads);
- w.ShowModal();
-
- //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();
- reader->SetFileName( "data/hola.mhd" );
- reader->Update();
- images.push_back(reader->GetOutput());
- }else{
- return -1;
- }
-
-
- wxFrame* frame1 = new wxFrame(NULL, wxID_ANY, wxT("ROI Application - Evaluation version, 23 Oct 2008 "), 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 );
+ 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);
-
-
+ frame->RefreshInterface();
return TRUE;
}
git://git.creatis.insa-lyon.fr / creaContours.git / blobdiff