From 51925120414ab3fe69aa8d3fbab7851bbf83874a Mon Sep 17 00:00:00 2001 From: Eduardo Davila Date: Wed, 1 Sep 2010 23:11:04 +0000 Subject: [PATCH] *** empty log message *** --- appli/wxContourGUIExample/wxContourGUIExample.cxx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/appli/wxContourGUIExample/wxContourGUIExample.cxx b/appli/wxContourGUIExample/wxContourGUIExample.cxx index fd48714..7232e99 100644 --- a/appli/wxContourGUIExample/wxContourGUIExample.cxx +++ b/appli/wxContourGUIExample/wxContourGUIExample.cxx @@ -90,6 +90,7 @@ void wxAppConsole::OnAssertFailure(char const *,int,char const *,char const *,ch bool wxTheApplication :: OnInit() { + wxString infoImage; wxInitAllImageHandlers(); //EED01Juin2010 int min_image_type = GIMMICK_2D_IMAGE_SELECTION; @@ -165,15 +166,17 @@ bool wxTheApplication :: OnInit() // } //EED 1Juin2010 - printf("EED creaContours wxTheApplication :: OnInit %d\n", w.getImagesSelected().size() ); - images=w.getImagesSelected(); - printf("EED creaContours wxTheApplication :: OnInit %d\n", images.size() ); +// 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()); @@ -184,7 +187,7 @@ bool wxTheApplication :: OnInit() } - wxFrame* frame1 = new wxFrame(NULL, wxID_ANY, wxT("ROI Application - Evaluation version, 09 Feb 2009 "), wxPoint(400,50), wxSize(800, 600) ); + 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 ); -- 2.47.1