]> Creatis software - creaContours.git/commitdiff
*** empty log message ***
authorEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Wed, 1 Sep 2010 23:11:04 +0000 (23:11 +0000)
committerEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Wed, 1 Sep 2010 23:11:04 +0000 (23:11 +0000)
appli/wxContourGUIExample/wxContourGUIExample.cxx

index fd48714364c1e224174cb93a028761999186f9c6..7232e9929441ba1d04e02c2b4444d0d0d468b2ee 100644 (file)
@@ -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 );