X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=appli%2FwxContourGUIExample%2FwxContourGUIExample.cxx;h=680976430b23750464569d472ffacdc433109505;hb=6807fedd64a42da907c05d683eca9d3f63572cdd;hp=7232e9929441ba1d04e02c2b4444d0d0d468b2ee;hpb=51925120414ab3fe69aa8d3fbab7851bbf83874a;p=creaContours.git diff --git a/appli/wxContourGUIExample/wxContourGUIExample.cxx b/appli/wxContourGUIExample/wxContourGUIExample.cxx index 7232e99..6809764 100644 --- a/appli/wxContourGUIExample/wxContourGUIExample.cxx +++ b/appli/wxContourGUIExample/wxContourGUIExample.cxx @@ -1,60 +1,56 @@ +/*# --------------------------------------------------------------------- +# +# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image +# pour la Sant�) +# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton +# Previous Authors : Laurent Guigues, Jean-Pierre Roux +# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil +# +# This software is governed by the CeCILL-B license under French law and +# abiding by the rules of distribution of free software. You can use, +# modify and/ or redistribute the software under the terms of the CeCILL-B +# license as circulated by CEA, CNRS and INRIA at the following URL +# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +# or in the file LICENSE.txt. +# +# As a counterpart to the access to the source code and rights to copy, +# modify and redistribute granted by the license, users are provided only +# with a limited warranty and the software's author, the holder of the +# economic rights, and the successive licensors have only limited +# liability. +# +# The fact that you are presently reading this means that you have had +# knowledge of the CeCILL-B license and that you accept its terms. +# ------------------------------------------------------------------------ */ + //---------------------------------------------------------------------------------------------------------------- // Class definition include //---------------------------------------------------------------------------------------------------------------- - + #include "wxContourGUIExample.h" #include "wxContourMainFrame.h" //#include "OutlineModelManager.h" //#include "wxContourEventHandler.h" - //#include //#include #include - #include - #include //#include "wxContourMainPanel.h" - #include "vtkMetaImageReader.h" #include #include "vtkImageData.h" - #include "wx/artprov.h" #include - -/* 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 -# include // _NSGetExecutablePath : must add -framework CoreFoundation to link line -# include -# ifndef PATH_MAX -# define PATH_MAX MAXPATHLEN -# endif -#endif // MACOSX -*/ - -#ifndef PATH_MAX // If not defined yet : do it +#ifndef PATH_MAX // If not defined yet : do it # define PATH_MAX 2048 #endif - #if defined(WIN32) #include #else - #include + #include #endif - #include wxContourMainFrame* wxTheApplication::frame = 0; @@ -63,11 +59,6 @@ wxContourMainFrame* wxTheApplication::frame = 0; // This macro implements the entry point (main function) for the application //---------------------------------------------------------------------------------------------------------------- - - - - - //========================================================================= //========================================================================= IMPLEMENT_APP( wxTheApplication ); @@ -79,17 +70,20 @@ wxContourGUIExample :: wxContourGUIExample(const wxString& title, const wxPoint& */ #ifdef _DEBUG -void wxAppConsole::OnAssert(char const *,int,char const *,char const *) -{ -} +//void wxAppConsole::OnAssert(char const *,int,char const *,char const *) +//{ +//} -void wxAppConsole::OnAssertFailure(char const *,int,char const *,char const *,char const *) -{ -} +//void wxAppConsole::OnAssertFailure(char const *,int,char const *,char const *,char const *) +//{ +//} #endif -bool wxTheApplication :: OnInit() +bool wxTheApplication::OnInit() { + vtkOutputWindowCreaContour *outputWindowCreaContour= vtkOutputWindowCreaContour::New(); + vtkOutputWindow::SetInstance( outputWindowCreaContour ); + outputWindowCreaContour->Delete(); wxString infoImage; wxInitAllImageHandlers(); @@ -98,98 +92,53 @@ 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(); - + creaImageIO::WxSimpleDlg w(0,_T("Select your image"),"creaContours_Descriptor.dscp","creatisContours DB"); + w.ShowModal(); + std::vector images; //EED 1Juin2010 // creaImageIO::WxGimmickReaderDialog w(0, // -1, // "creaContours_Descriptor.dscp", -// "creatisContours DB", +// "creatisContours DB", // _T("WxGimmickDialog test"), // wxDefaultPosition,wxSize(1200,800) // ,min_image_type, // max_image_type, // output_dim, -// threads); +// threads); // w.ShowModal(); - //JCP - //std::string datadir( crea::wx2std(GetExecutablePath()) ); + //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 - + datadir=datadir+"/../share/creaContours"; + #endif // MACOSX #ifdef MACOSX /* assume this is OSX */ datadir=datadir+"/../../../../share/creaContours"; - #endif // MACOSX - - + #endif // MACOSX if(w.GetReturnCode() == wxID_OK) { - std::vector s; -//EED 01Juin2010 w.GetSelectedFiles(s); - - -//EED std::vector::iterator i; -// for (i=s.begin();i!=s.end();++i) -// { -// std::cout << *i << std::endl; -// } -// std::cout << "$$$$ "< out; -// std::vector attr; -//// attr.push_back("D0028_0010"); -//// attr.push_back("D0008_0023"); -//// attr.push_back("D0008_1070"); -// w.getSelected(out, attr,true,""); -//// std::cout< 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 = 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(); frame1->Show(TRUE); @@ -198,11 +147,13 @@ bool wxTheApplication :: OnInit() } #if(WIN32) -int main(int argc, char* argv[]) - { - return WinMain(::GetModuleHandle(NULL), NULL, - ::GetCommandLine(), SW_SHOWNORMAL); - } +int main(int argc, char* argv[]) + { + char buffer[500]; + wcstombs(buffer, ::GetCommandLine(), 500); + return WinMain(::GetModuleHandle(NULL), NULL, buffer, SW_SHOWNORMAL); +// return WinMain(::GetModuleHandle(NULL), NULL, ::GetCommandLine(), SW_SHOWNORMAL); + } #else #endif