X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=appli%2FTestWxGimmickReaderDialog%2Fmain.cxx;h=a8265ec119a03b02d40c1f43987a136965ba6839;hb=HEAD;hp=797f46ed9920b28796376add7c74be1bb2c104af;hpb=bf3660569b1baa8be10fc708f595efc66afe3334;p=creaImageIO.git

diff --git a/appli/TestWxGimmickReaderDialog/main.cxx b/appli/TestWxGimmickReaderDialog/main.cxx
index 797f46e..a8265ec 100644
--- a/appli/TestWxGimmickReaderDialog/main.cxx
+++ b/appli/TestWxGimmickReaderDialog/main.cxx
@@ -1,3 +1,29 @@
+/*
+	# ---------------------------------------------------------------------
+	#
+	# 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 <creaImageIOWxGimmickReaderDialog.h>
@@ -7,6 +33,7 @@
 
 
 
+
 //#pragma comment(lib, "creaImageIO.lib")
 //#pragma comment(lib, "DelayImp.lib")
 //
@@ -29,6 +56,8 @@ IMPLEMENT_APP(myApp);
 
 CREA_WXMAIN_WITH_CONSOLE
 
+
+
 bool myApp::OnInit( )
 {
   wxApp::OnInit();
@@ -55,7 +84,7 @@ bool myApp::OnInit( )
                    -1, 
 				   "localdatabase_Descriptor.dscp",
 				   "Local Database",
-                   _T("Select image(s)        - Gimmick! (c) CREATIS-LRMN 2008"),
+                   _T("Select image(s)        - creaImageIOApp  (c) CREATIS ( cnrs)"),
                    wxDefaultPosition,
                    wxSize(810,750),
                    min_dim,
@@ -83,19 +112,43 @@ bool myApp::OnInit( )
        std::cout << "$$$$ "<<std::endl;
 
        //Puts images
-       std::vector<vtkImageData*> images;
-	   w.GetSelectedImages(images,3);
+    /*   std::vector<vtkImageData*> images;
+	   w.GetSelectedImages(images,3);*/
 
 	
-
-
-
+	// First Exemple:
+	// We take all attributes from database
+	// but only for the first selected file.
+    // For the moment, no output model file (XML)
+	//  std::vector<creaImageIO::OutStrGimmick> out;
+	//  std::vector<std::string> attr;
+	//  attr.push_back("ALL");
+	//  w.getSelected(out, attr, false,"");
+
+
+    // Second Exemple:
+	// We take all attributes from database
+	// but for all selected file.
+    // For the moment, no output model file (XML)
+	//  std::vector<creaImageIO::OutStrGimmick> out;
+	//  std::vector<std::string> attr;
+	//  attr.push_back("ALL");
+	//  w.getSelected(out, attr,true,"");
+
+    // Third Exemple:
+	// We take attributes from database and others
+	// but for all selected file.
+    // For the moment, no output model file (XML)
 	   std::vector<creaImageIO::OutStrGimmick> out;
-		std::vector<std::string> attr;
-		//attr.push_back("ALL");
-		attr.push_back("D0008_1070");
-		w.getSelected(out, attr,true,"");
-
+       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);
+       out.front().img->Delete();
+       w.OnExit();
 
 
 // images[1]->UpdateInformation();
@@ -121,12 +174,10 @@ bool myApp::OnInit( )
 
 
 
-       //w.GetSelectedImages(images,output_dim);
-       std::cout<<images.size()<<std::endl;
 
-       crea::VtkBasicSlicer(images.front());
-       images.front()->Delete();
-       w.OnExit();
+	   //crea::VtkBasicSlicer(out.front().img);
+    //   images.front()->Delete();
+    //   w.OnExit();
 
      }
    else if (w.GetReturnCode() == wxID_CANCEL)