*** empty log message ***

[creaContours.git] / appli / wxContourGUIExample / wxContourGUIExample.cxx

diff --git a/appli/wxContourGUIExample/wxContourGUIExample.cxx b/appli/wxContourGUIExample/wxContourGUIExample.cxx
index 39dcc2d0cdf31c15bc4182242c1166fdad4ec628..7232e9929441ba1d04e02c2b4444d0d0d468b2ee 100644 (file)
--- a/appli/wxContourGUIExample/wxContourGUIExample.cxx
+++ b/appli/wxContourGUIExample/wxContourGUIExample.cxx
@@ -1,14 +1,16 @@
 //----------------------------------------------------------------------------------------------------------------
 // Class definition include
 //----------------------------------------------------------------------------------------------------------------
-
+ 
 #include "wxContourGUIExample.h"
 #include "wxContourMainFrame.h"
 //#include "OutlineModelManager.h"
 //#include "wxContourEventHandler.h"
 
 //#include <creaImageIOWxGimmickDialog.h>
-#include <creaImageIOWxGimmickReaderDialog.h>
+//#include <creaImageIOWxGimmickReaderDialog.h>
+#include <creaImageIOWxSimpleDlg.h>
+
 #include <creaImageIOSystem.h>
 
 #include <creaVtkBasicSlicer.h>
@@ -88,26 +90,32 @@ void wxAppConsole::OnAssertFailure(char const *,int,char const *,char const *,ch
 
 bool wxTheApplication :: OnInit()
 {
+       wxString infoImage;
        wxInitAllImageHandlers();
 
-       int min_image_type = GIMMICK_2D_IMAGE_SELECTION;
-       int max_image_type = GIMMICK_3D_IMAGE_SELECTION;
-       int output_dim = NATIVE;
-       int threads = 1;
+//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;
 
-       std::vector<vtkImageData*> images;
-       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);
+
+//EED 1Juin2010
+      creaImageIO::WxSimpleDlg w(0,_T("Select your image"),"creaContours_Descriptor.dscp","creatisContours DB"); 
+      w.ShowModal(); 
   
-       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
@@ -127,7 +135,7 @@ bool wxTheApplication :: OnInit()
                if(w.GetReturnCode() == wxID_OK)
                {
                                std::vector<std::string> s;
-                               w.GetSelectedFiles(s);
+//EED 01Juin2010                               w.GetSelectedFiles(s);
 
 
 //EED                  std::vector<std::string>::iterator i;
@@ -140,27 +148,35 @@ bool wxTheApplication :: OnInit()
 
 //EED31mai2010                         w.GetSelectedImages(images,output_dim);
 
-                               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
+//                             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());
@@ -171,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 );