From 1ef047d8f352d06e2f13b11af127f0467fc1f326 Mon Sep 17 00:00:00 2001 From: Eduardo Davila Date: Mon, 7 Jun 2010 11:59:28 +0000 Subject: [PATCH] *** empty log message *** --- .../wxContourGUIExample.cxx | 77 +++++++++++-------- 1 file changed, 45 insertions(+), 32 deletions(-) diff --git a/appli/wxContourGUIExample/wxContourGUIExample.cxx b/appli/wxContourGUIExample/wxContourGUIExample.cxx index 39dcc2d..1e93eb1 100644 --- a/appli/wxContourGUIExample/wxContourGUIExample.cxx +++ b/appli/wxContourGUIExample/wxContourGUIExample.cxx @@ -8,7 +8,9 @@ //#include "wxContourEventHandler.h" //#include -#include +//#include +#include + #include #include @@ -90,24 +92,29 @@ bool wxTheApplication :: OnInit() { 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 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 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 +134,7 @@ bool wxTheApplication :: OnInit() if(w.GetReturnCode() == wxID_OK) { std::vector s; - w.GetSelectedFiles(s); +//EED 01Juin2010 w.GetSelectedFiles(s); //EED std::vector::iterator i; @@ -140,21 +147,27 @@ bool wxTheApplication :: OnInit() //EED31mai2010 w.GetSelectedImages(images,output_dim); - std::vector 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< 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<