X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=appli%2FwxContourGUIExample%2FwxContourGUIExample.cxx;h=e80ea04efae462a647b4697549e094097db81ebc;hb=0e89441a8389a384ae45ae73e382edfd6d35b252;hp=abfe141cd044541bd4a006b8f526192b39dd9368;hpb=72ab80e3e7df86ee48ba709d3b445a404120cc2c;p=creaContours.git

diff --git a/appli/wxContourGUIExample/wxContourGUIExample.cxx b/appli/wxContourGUIExample/wxContourGUIExample.cxx
index abfe141..e80ea04 100644
--- a/appli/wxContourGUIExample/wxContourGUIExample.cxx
+++ b/appli/wxContourGUIExample/wxContourGUIExample.cxx
@@ -7,8 +7,9 @@
 //#include "OutlineModelManager.h"
 //#include "wxContourEventHandler.h"
 
- 
-#include <creaImageIOWxGimmickDialog.h>
+//#include <creaImageIOWxGimmickDialog.h>
+#include <creaImageIOWxGimmickReaderDialog.h>
+#include <creaImageIOSystem.h>
 
 #include <creaVtkBasicSlicer.h>
 //#include "wxContourMainPanel.h"
@@ -29,7 +30,6 @@
 
 //#include "interfMainPanel.h"
 
-
 #if defined(MACOSX) // assume this is OSX 
 # include <sys/param.h>
 # include <mach-o/dyld.h> // _NSGetExecutablePath : must add -framework CoreFoundation to link line 
@@ -51,13 +51,12 @@
 
 #include <stdlib.h>
 
-
 wxContourMainFrame* wxTheApplication::frame = 0;
+
 //----------------------------------------------------------------------------------------------------------------
 // This macro implements the entry point (main function) for the application
 //----------------------------------------------------------------------------------------------------------------
 
-
 /*
 //EED
 // http://lists.wxwidgets.org/archive/wx-dev/msg30449.html
@@ -224,7 +223,6 @@ int get_app_path (char *pname, size_t pathsize)
 #define CREACONTOUR_VALID_FILE_SEPARATOR_CHAR '/'
 #endif
 
-
 //=========================================================================
 std::string GetExecutablePath()
 {
@@ -244,23 +242,14 @@ std::string GetExecutablePath()
 	}
     return name;
 }
-//=========================================================================
-
-
-
-
-
-
-
-
 
+//=========================================================================
+//=========================================================================
 IMPLEMENT_APP( wxTheApplication );
-
 /*
 wxContourGUIExample :: wxContourGUIExample(const wxString& title, const wxPoint& pos, const wxSize& size)
 : wxFrame((wxFrame *) NULL, -1, title, pos, size)
 {
-	
 }
 */
 
@@ -276,58 +265,51 @@ void wxAppConsole::OnAssertFailure(char const *,int,char const *,char const *,ch
 
 bool wxTheApplication :: OnInit()
 {
-
-
-	
-	
-
 	wxInitAllImageHandlers();
 
-   int image_type = GIMMICK_3D_IMAGE_SELECTION;
-   int threads = 1;
+	int min_image_type = GIMMICK_2D_IMAGE_SELECTION;
+	int max_image_type = GIMMICK_3D_IMAGE_SELECTION;
+	int output_dim = NATIVE;
+	int threads = 1;
 
-   creaImageIO::WxGimmickDialog w(0,
-				  -1,
-				  _T("WxGimmickDialog test"),
-				  wxDefaultPosition,
-				  wxSize(1200,800),
-				  image_type,
-				  threads);
-   w.ShowModal();
+	//creaImageIO::WxGimmickDialog w(0,-1,_T("WxGimmickDialog test"),wxDefaultPosition,wxSize(1200,800),max_image_type,threads);
+	creaImageIO::WxGimmickReaderDialog w(0,-1,_T("WxGimmickDialog test"),wxDefaultPosition,wxSize(1200,800),min_image_type,max_image_type,output_dim,threads);
+	w.ShowModal();
 
-	std::string datadir(  GetExecutablePath() ) ;
+	std::string datadir(  crea::wx2std(GetExecutablePath()) );
 	
-#ifdef MACOSX /* assume this is OSX */
-	datadir=datadir+"/../../..";
-#endif // MACOSX	
-	
-   //vtkImageData* selectedimage=NULL;
-   std::vector<vtkImageData*> images;
-	if(w.GetReturnCode() == wxID_OK){
-
-       std::vector<std::string> s;
-       w.GetSelectedFiles(s);
-       std::vector<std::string>::iterator i;
-	   for (i=s.begin();i!=s.end();++i){
-		   std::cout << *i << std::endl;
-	   }
-	   	
-	   std::cout << "$$$$ "<<std::endl;
-       w.GetSelectedImages(images);
-	   //selectedimage = images[0];
-       //crea::VtkBasicSlicer(images.front());
-       //images.front()->Delete();
-
-	}else if (w.GetReturnCode() == wxID_CANCEL){
-	   vtkMetaImageReader *reader = vtkMetaImageReader::New();
-		std::string filename= datadir + "/data/hola.mhd";   	   
-	   reader->SetFileName( filename.c_str() );
-	   reader->Update();
-	   images.push_back(reader->GetOutput());
-  	}else{        
-		return -1;
-	}   
-
+		#ifdef MACOSX /* assume this is OSX */
+			datadir=datadir+"/../../..";
+		#endif // MACOSX	
+		
+		
+		std::vector<vtkImageData*> images;
+
+			if(w.GetReturnCode() == wxID_OK)
+			{
+				std::vector<std::string> s;
+				w.GetSelectedFiles(s);
+				std::vector<std::string>::iterator i;
+				for (i=s.begin();i!=s.end();++i)
+				{
+					std::cout << *i << std::endl;
+				}
+				std::cout << "$$$$ "<<std::endl;
+				//w.GetSelectedImages(images);
+				w.GetSelectedImages(images,output_dim);
+			}
+			else if (w.GetReturnCode() == wxID_CANCEL)
+			{
+				vtkMetaImageReader *reader = vtkMetaImageReader::New();
+				std::string filename= datadir + "/data/hola.mhd";   	   
+				reader->SetFileName( filename.c_str() );
+				reader->Update();
+				images.push_back(reader->GetOutput());
+  			}
+			else
+			{        
+				return -1;
+			}   
 
 	wxFrame* frame1 = new wxFrame(NULL, wxID_ANY, wxT("ROI Application  -    Evaluation version, 09 Feb 2009 "), wxPoint(400,50), wxSize(800, 600) );