From: Juan Prieto <Juan.Prieto@creatis.insa-lyon.fr>
Date: Fri, 27 Nov 2009 20:03:20 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: CREATOOLS.2-0-3~84
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=011c2f926836abae60e9a525f819f9a66f03fac1;p=creaImageIO.git

*** empty log message ***
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5532c13..857728b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,6 +19,7 @@ SET(USE_GDCM_VTK ON)
 SET(USE_VTK ON)
 SET(USE_ITK OFF)
 SET(USE_BOOST ON)
+SET(USE_WXWIDGETS ON)
 
 CREA_FIND_AND_USE_LIBRARIES()
 
diff --git a/appli/TestGimmickReaderDialog/main.cxx b/appli/TestGimmickReaderDialog/main.cxx
index 7cb25b5..4aa1c84 100644
--- a/appli/TestGimmickReaderDialog/main.cxx
+++ b/appli/TestGimmickReaderDialog/main.cxx
@@ -13,7 +13,7 @@ int main(int argc, char* argv[])
       creaImageIO::SetGimmickMessageLevel(l);
     }
 
-  std::vector<vtkImageData*> images;
+  std::vector<vtkImageData*> images;  
   bool r = creaImageIO::GimmickReaderDialog(images,
 					    "GimmickReaderDialog test",
 						"localdatabase_Descriptor.dscp",
diff --git a/src2/CMakeLists.txt b/src2/CMakeLists.txt
index cf4b820..602e0bf 100644
--- a/src2/CMakeLists.txt
+++ b/src2/CMakeLists.txt
@@ -21,7 +21,7 @@ FILE(GLOB SOURCES_CREAIMAGEIO
   creaImageIOWxViewer.cpp
   creaImageIOGimmickView.cpp
   creaImageIOListener.cpp
-
+)
  
  # Attributed tree data structure
 FILE(GLOB SOURCES_CREAIMAGEIO_TREE
diff --git a/src2/creaImageIOGimmickReaderDialog.cpp b/src2/creaImageIOGimmickReaderDialog.cpp
index f2c18d9..3bf6f22 100644
--- a/src2/creaImageIOGimmickReaderDialog.cpp
+++ b/src2/creaImageIOGimmickReaderDialog.cpp
@@ -5,8 +5,87 @@
 #define new DEBUG_NEW
 #endif
 
+
+
+CREAIMAGEIO_EXPORT vtkImageData* getImageDataDialog() {
+	//	wxApp::OnInit();
+	#ifdef __WXGTK__
+	  //See http://www.wxwindows.org/faqgtk.htm#locale
+	  setlocale(LC_NUMERIC, "C");
+	#endif
+	   wxInitAllImageHandlers();
+
+	   creaImageIO::SetGimmickMessageLevel(5);
+	   creaImageIO::SetGimmickDebugMessageLevel(0);
+
+	   int min_dim = GIMMICK_2D_IMAGE_SELECTION;
+	   int max_dim = GIMMICK_3D_IMAGE_SELECTION;
+	   int output_dim = NATIVE;
+	   int threads = 1;
+
+	   creaImageIO::WxGimmickReaderDialog w(
+						0,
+					   -1, 
+					   "localdatabase_Descriptor.dscp",
+					   "Local Database",
+					   _T("Select image(s)        - Gimmick! (c) CREATIS-LRMN 2008"),
+					   wxDefaultPosition,
+					   wxSize(810,750),
+					   min_dim,
+					   max_dim,
+					   output_dim,
+					   threads);
+	   w.ShowModal();
+
+	   if (w.GetReturnCode() == wxID_OK)
+		 {
+		   std::cout << "$$$$ main : user clicked 'OK' $$$$"<<std::endl;
+		   std::cout << "$$$$ selected files : "<<std::endl;
+		   //Puts filenames
+		   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;
+
+		   //Puts images
+		   std::vector<vtkImageData*> images;
+		   w.GetSelectedImages(images,output_dim);
+		   std::cout<<images.size()<<std::endl;
+
+		   w.OnExit();
+		   return images[0];
+
+		   //crea::VtkBasicSlicer(images.front());
+		   //images.front()->Delete();
+		   
+
+		 }
+	   else if (w.GetReturnCode() == wxID_CANCEL)
+		 {
+		   w.OnExit();
+		   std::cout << "$$$$ main : user clicked 'CANCEL' $$$$"<<std::endl;
+		 }
+	   else 
+		 {
+		   w.OnExit();
+		   std::cout << "$$$$ main : dialog ended without return code ! $$$$"
+					 <<std::endl;    
+		 }
+
+	   //   std::cout << "$$$$ main : deleting dialog"<<std::endl;
+	   //   delete w;
+	   std::cout << "$$$$$$$$$$$$$$$$$$$$ main ended "<<std::endl;
+	   return NULL;
+	}
+//		
+
 namespace creaImageIO
 {
+	
 
   bool GimmickReaderDialog(std::vector<vtkImageData*>& images,
 			   const std::string i_namedescp , 
@@ -21,8 +100,7 @@ namespace creaImageIO
 			   int image_out_dim,
 			   int nb_threads)
   {
-
-    
+	  
     creaImageIO::WxGimmickReaderDialog w(0,
 					 -1,
 					 i_namedescp,
diff --git a/src2/creaImageIOGimmickReaderDialog.h b/src2/creaImageIOGimmickReaderDialog.h
index b5a86ab..a9fdf0a 100644
--- a/src2/creaImageIOGimmickReaderDialog.h
+++ b/src2/creaImageIOGimmickReaderDialog.h
@@ -6,6 +6,8 @@
 #include <vector>
 
 
+CREAIMAGEIO_EXPORT vtkImageData* getImageDataDialog();
+
 namespace creaImageIO
 {
   /**
diff --git a/src2/creaImageIOGimmickView.cpp b/src2/creaImageIOGimmickView.cpp
index 4cf4cb5..643ede9 100644
--- a/src2/creaImageIOGimmickView.cpp
+++ b/src2/creaImageIOGimmickView.cpp
@@ -209,7 +209,7 @@ namespace creaImageIO
 									""));
 	if(mImageExtent==0)
 	{
-		mImageExtent=ie;
+		mImageExtent=ie;		
 		if((mImageExtent->Get(min_dim-1)<2)||(mImageExtent->Get(max_dim)>1))
 		{
 			valid=false;
@@ -224,7 +224,7 @@ namespace creaImageIO
 		}
 	}
 	else
-	{
+	{		
 		if(mImageExtent->IsCompatible(*ie))
 		{
 			if(mImageExtent->GetDimension()==max_dim && mImageExtent->Get(max_dim)>2)
diff --git a/src2/creaImageIOWxGimmickReaderDialog.cpp b/src2/creaImageIOWxGimmickReaderDialog.cpp
index bdf1f66..82c728d 100644
--- a/src2/creaImageIOWxGimmickReaderDialog.cpp
+++ b/src2/creaImageIOWxGimmickReaderDialog.cpp
@@ -23,7 +23,7 @@ namespace creaImageIO
 					       int max_dim,
 					       int output_dim,  // never used ?!? // JPR
 					       int threads)
- :   wxDialog( parent, 
+ : wxDialog( parent, 
 		  id, 
 		  title,
 		  pos,
diff --git a/src2/creaImageIOWxGimmickReaderDialog.h b/src2/creaImageIOWxGimmickReaderDialog.h
index 1755be8..069b6a0 100644
--- a/src2/creaImageIOWxGimmickReaderDialog.h
+++ b/src2/creaImageIOWxGimmickReaderDialog.h
@@ -6,17 +6,16 @@
 #include <creaImageIOWxGimmickView.h>
 #include <creaWx.h>
 #include "wx/wx.h"
+
+
+
 namespace creaImageIO
 {
-  /**
-   * \ingroup GUI
-   */
-
-  //=====================================================================
+    //=====================================================================
  //=====================================================================
   class CREAIMAGEIO_EXPORT  WxGimmickReaderDialog : public wxDialog
   {
-  public:
+  public:	
     WxGimmickReaderDialog();
     WxGimmickReaderDialog(wxWindow *parent,
 			  const wxWindowID id,