X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=appli%2FwxContourGUIExample%2FwxContourGUIExample.cxx;h=9e8d5e5f54e0ce404fb66f1e5271fd2e73bbe989;hb=4d5574beaa0d2f56951b00a9fcca5dd945506e13;hp=39e109f67753a40681b0e66549e33cdef3ab33a2;hpb=192dfdf774a06066eff90e9c50916723c8592706;p=creaContours.git diff --git a/appli/wxContourGUIExample/wxContourGUIExample.cxx b/appli/wxContourGUIExample/wxContourGUIExample.cxx index 39e109f..9e8d5e5 100644 --- a/appli/wxContourGUIExample/wxContourGUIExample.cxx +++ b/appli/wxContourGUIExample/wxContourGUIExample.cxx @@ -5,67 +5,100 @@ #include "wxContourGUIExample.h" #include "wxContourMainFrame.h" -#include "OutlineModelManager.h" -#include "wxContourEventHandler.h" +//#include "OutlineModelManager.h" +//#include "wxContourEventHandler.h" -#include "wxContourMainPanel.h" + +#include + +#include +//#include "wxContourMainPanel.h" #include "vtkMetaImageReader.h" #include -#include "vtkImageData.h" -#include "OutlineModelBuilder.h" -#include "ContourThing.h" -#include "AxeThing.h" -#include "ImageSourceThing.h" -#include "ImageSectionThing.h" -#include "SomeEnvironment.h" -#include "ReaderEnvironment.h" +#include "vtkImageData.h"mb_ #include "wx/artprov.h" #include +//#include "OutlineModelBuilder.h" +//#include "ContourThing.h" +//#include "AxeThing.h" +//#include "ImageSourceThing.h" +//#include "ImageSectionThing.h" +//#include "SomeEnvironment.h" +//#include "ReaderEnvironment.h" -#include "interfMainPanel.h" -#include -#include +//#include "interfMainPanel.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 +wxString getExecutablePath() +{ + char buf[512]; + char* slash; + +#if defined(WIN32) + GetModuleFileName(NULL, buf, 511); + slash = strrchr(buf, '\\'); + if (slash) + { + *slash = 0; + } +#elif defined(__LINUX__) + int res; + res = readlink("/proc/self/exe", buf, 512); + if (res == -1) + return _T(""); + buf[res] = 0; + slash = strrchr(buf, '/'); + if (slash) + { + *slash = 0; + } +#else + return ""; +#endif + + return wxString(buf, wxConvUTF8 ); +} + + + + + + IMPLEMENT_APP( wxTheApplication ); +/* wxContourGUIExample :: wxContourGUIExample(const wxString& title, const wxPoint& pos, const wxSize& size) : wxFrame((wxFrame *) NULL, -1, title, pos, size) { } +*/ + +#ifdef _DEBUG +void wxAppConsole::OnAssert(char const *,int,char const *,char const *) +{ +} + +void wxAppConsole::OnAssertFailure(char const *,int,char const *,char const *,char const *) +{ +} +#endif bool wxTheApplication :: OnInit() { - -//------------------------------------------------------------- -// 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();*/ wxInitAllImageHandlers(); @@ -81,7 +114,8 @@ bool wxTheApplication :: OnInit() threads); w.ShowModal(); - vtkImageData* selectedimage=NULL; + //vtkImageData* selectedimage=NULL; + std::vector images; if(w.GetReturnCode() == wxID_OK){ std::vector s; @@ -92,115 +126,39 @@ bool wxTheApplication :: OnInit() } std::cout << "$$$$ "< images; w.GetSelectedImages(images); - selectedimage = images[0]; + //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" ); + wxString filename= getExecutablePath()+ wxString( _T("/data/hola.mhd") , wxConvUTF8 ); + reader->SetFileName( (const char*)(filename.mb_str()) ); reader->Update(); - selectedimage = reader->GetOutput(); - }else{ - return TRUE; + images.push_back(reader->GetOutput()); + }else{ + return -1; } - std::string conceptsFN = "data/holaConceptsFile.cf"; - std::string imageSourcesFN = "data/holaImagesInstantsFile.of"; - std::string imageSectionsFN = ""; - std::string axeThingsFN = ""; - std::map * sourcesMap = new std::map(); - std::map* sectionsMap = new std::map(); - std::map* axesMap = new std::map(); - std::map* outlinesMap = new std::map(); + wxFrame* frame1 = new wxFrame(NULL, wxID_ANY, wxT("ROI Application - Evaluation version, 09 Feb 2009 "), wxPoint(400,50), wxSize(800, 600) ); - ImageSourceThing * thing = new ImageSourceThing(selectedimage); - sourcesMap->insert(std::pair( "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);*/ - - //Creating the evtHandler of the panels - wxContourEventHandler * eventHandler = new wxContourEventHandler(); - - //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(""), 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) ); + //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,(const char*)( getExecutablePath().mb_str() ) ); 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); - }*/ - -// 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 return TRUE; } +#if(WIN32) int main(int argc, char* argv[]) { return WinMain(::GetModuleHandle(NULL), NULL, ::GetCommandLine(), SW_SHOWNORMAL); } +#else +#endif