X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=appli%2FTestWxGimmickDialog%2Fmain.cxx;h=ccc2cc1388fda5d9f7f366038e7fccc2dcb34bac;hb=2d7aa89cbd749ab0de479f9e966397441261deb3;hp=63b001ccc2345b5f17d3e91d6b3d17af19bf3cb2;hpb=684add23b4f64cb3c6e39e12a4af20d2c2500df6;p=creaImageIO.git

diff --git a/appli/TestWxGimmickDialog/main.cxx b/appli/TestWxGimmickDialog/main.cxx
index 63b001c..ccc2cc1 100644
--- a/appli/TestWxGimmickDialog/main.cxx
+++ b/appli/TestWxGimmickDialog/main.cxx
@@ -1,6 +1,33 @@
+/*
+	# ---------------------------------------------------------------------
+	#
+	# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+	#                        pour la Santé)
+	# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+	# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+	# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+	#
+	#  This software is governed by the CeCILL-B license under French law and 
+	#  abiding by the rules of distribution of free software. You can  use, 
+	#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+	#  license as circulated by CEA, CNRS and INRIA at the following URL 
+	#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+	#  or in the file LICENSE.txt.
+	#
+	#  As a counterpart to the access to the source code and  rights to copy,
+	#  modify and redistribute granted by the license, users are provided only
+	#  with a limited warranty  and the software's author,  the holder of the
+	#  economic rights,  and the successive licensors  have only  limited
+	#  liability. 
+	#
+	#  The fact that you are presently reading this means that you have had
+	#  knowledge of the CeCILL-B license and that you accept its terms.
+	# ------------------------------------------------------------------------
+*/
 #include <creaImageIOSystem.h>
 #include <creaWx.h>
 #include <creaImageIOWxGimmickDialog.h>
+#include <creaVtkBasicSlicer.h>
 
 class myApp : public wxApp
 {
@@ -11,20 +38,7 @@ public:
 
 IMPLEMENT_APP(myApp);
 
-#if defined(_WIN32) 
-
-//  How to have a Console and wxWidgets
-//  http://www.wxwidgets.org/wiki/index.php/MSVC_Setup_Guide
-//   In Visual C++ 6 (7 should be similar), to create an application that is both a console application 
-//  (cout's to the console are visible) and has a wxWidgets GUI, 
-//  you need to use the linker option "/subsystem:console" and the following code:
-int main(int argc, char* argv[])
-{
-	return WinMain(::GetModuleHandle(NULL), NULL, ::GetCommandLine(), SW_SHOWNORMAL);
-}
-
-#endif // defined(_WIN32) 
-
+CREA_WXMAIN_WITH_CONSOLE
 
 bool myApp::OnInit( )
 {	 
@@ -35,28 +49,37 @@ bool myApp::OnInit( )
 #endif
    wxInitAllImageHandlers();
 
+   int image_type = GIMMICK_3D_IMAGE_SELECTION;
    int threads = 1;
 
    creaImageIO::WxGimmickDialog w(0,
-			   -1,
-			   _T("WxGimmickDialog test"),
-			   wxDefaultPosition,
-			   wxSize(1200,800),
-			   threads);
+				  -1,
+				  _T("Select image(s)        - Gimmick! (c) CREATIS-LRMN 2008"),
+				  wxDefaultPosition,
+				  wxSize(1200,800),
+				  image_type,
+				  threads);
    w.ShowModal();
    
    if (w.GetReturnCode() == wxID_OK)
      {
+
        std::cout << "$$$$ main : user clicked 'OK' $$$$"<<std::endl;
        std::cout << "$$$$ selected files : "<<std::endl;
        std::vector<std::string> s;
-       w.GetSelectedImages(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;
+
+       std::vector<vtkImageData*> images;
+       w.GetSelectedImages(images);
+       crea::VtkBasicSlicer(images.front());
+       images.front()->Delete();
+   
      }
    else if (w.GetReturnCode() == wxID_CANCEL)
      {
@@ -68,7 +91,7 @@ bool myApp::OnInit( )
 		  <<std::endl;
       
      }
-
+  
    //   std::cout << "$$$$ main : deleting dialog"<<std::endl;
    //   delete w;
    std::cout << "$$$$$$$$$$$$$$$$$$$$ main ended "<<std::endl;