X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=appli%2FwxContourGUIExample%2FwxContourGUIExample.cxx;h=46c896e3b8c4c41e118a0938c7dcf7e8d53bff83;hb=26dd3c6c6654b059eaaa1d1af9c7c1bec0e435a5;hp=1e93eb1be2e629390a8dd341c4a6e4af1d80c637;hpb=1ef047d8f352d06e2f13b11af127f0467fc1f326;p=creaContours.git

diff --git a/appli/wxContourGUIExample/wxContourGUIExample.cxx b/appli/wxContourGUIExample/wxContourGUIExample.cxx
index 1e93eb1..46c896e 100644
--- a/appli/wxContourGUIExample/wxContourGUIExample.cxx
+++ b/appli/wxContourGUIExample/wxContourGUIExample.cxx
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------ */
+
 //----------------------------------------------------------------------------------------------------------------
 // Class definition include
 //----------------------------------------------------------------------------------------------------------------
@@ -35,28 +60,30 @@
 
 //#include "interfMainPanel.h"
 
-#if defined(MACOSX) // assume this is OSX 
+#if defined(MACOSX) // assume this is OSX
 # include <sys/param.h>
-# include <mach-o/dyld.h> // _NSGetExecutablePath : must add -framework CoreFoundation to link line 
+# include <mach-o/dyld.h> // _NSGetExecutablePath : must add -framework CoreFoundation to link line
 # include <string.h>
 # ifndef PATH_MAX
 #  define PATH_MAX MAXPATHLEN
 # endif
 #endif // MACOSX
 */
- 
-#ifndef PATH_MAX // If not defined yet : do it 
+
+#ifndef PATH_MAX // If not defined yet : do it
 #  define PATH_MAX 2048
 #endif
 
 #if defined(WIN32)
   #include <direct.h>
 #else
-   #include <dirent.h>  
+   #include <dirent.h>
 #endif
 
 #include <stdlib.h>
 
+
+
 wxContourMainFrame* wxTheApplication::frame = 0;
 
 //----------------------------------------------------------------------------------------------------------------
@@ -88,8 +115,15 @@ void wxAppConsole::OnAssertFailure(char const *,int,char const *,char const *,ch
 }
 #endif
 
+
+
 bool wxTheApplication :: OnInit()
 {
+	vtkOutputWindowCreaContour *outputWindowCreaContour= vtkOutputWindowCreaContour::New();
+	vtkOutputWindow::SetInstance( outputWindowCreaContour );
+	outputWindowCreaContour->Delete();
+
+	wxString infoImage;
 	wxInitAllImageHandlers();
 
 //EED01Juin2010	int min_image_type = GIMMICK_2D_IMAGE_SELECTION;
@@ -99,38 +133,38 @@ bool wxTheApplication :: OnInit()
 
 
 //EED 1Juin2010
-      creaImageIO::WxSimpleDlg w(0,_T("Select your image"),"creaContours_Descriptor.dscp","creatisContours DB"); 
-      w.ShowModal(); 
-  
+      creaImageIO::WxSimpleDlg w(0,_T("Select your image"),"creaContours_Descriptor.dscp","creatisContours DB");
+      w.ShowModal();
+
 	std::vector<vtkImageData*> images;
 //EED 1Juin2010
 //	creaImageIO::WxGimmickReaderDialog w(0,
 //										-1,
 //										"creaContours_Descriptor.dscp",
-//										"creatisContours DB", 
+//										"creatisContours DB",
 //										_T("WxGimmickDialog test"),
 //										wxDefaultPosition,wxSize(1200,800)
 //										,min_image_type,
 //										max_image_type,
 //										output_dim,
-//										threads);  
+//										threads);
 //	w.ShowModal();
 
 
 //JCP
-	//std::string datadir(  crea::wx2std(GetExecutablePath()) );	
+	//std::string datadir(  crea::wx2std(GetExecutablePath()) );
 	std::string datadir(  crea::System::GetExecutablePath() );
 //JCP
 
    	    #ifdef LINUX /* assume this is OSX */
- 		   datadir=datadir+"/../share/creaContours";
-	    #endif // MACOSX	
-	
+                   datadir=datadir+"/../share/creaContours";
+	    #endif // MACOSX
+
 		#ifdef MACOSX /* assume this is OSX */
 			datadir=datadir+"/../../../../share/creaContours";
-		#endif // MACOSX	
-		
-		
+		#endif // MACOSX
+
+
 		if(w.GetReturnCode() == wxID_OK)
 		{
 				std::vector<std::string> s;
@@ -165,28 +199,30 @@ bool wxTheApplication :: OnInit()
 //				}
 
 //EED 1Juin2010
-				printf("EED creaContours wxTheApplication :: OnInit  %d\n", w.getImagesSelected().size() );
-				images=w.getImagesSelected(); 
-				printf("EED creaContours wxTheApplication :: OnInit  %d\n", images.size() );
+//				printf("EED creaContours wxTheApplication :: OnInit  %d\n", w.getImagesSelected().size() );
+				images	  = w.getImagesSelected();
+				infoImage = w.getInfoImage();
+//				printf("EED creaContours wxTheApplication :: OnInit  %d\n", images.size() );
 
 		}
 		else if (w.GetReturnCode() == wxID_CANCEL)
 		{
 				vtkMetaImageReader *reader = vtkMetaImageReader::New();
-				std::string filename= datadir + "/data/hola.mhd";   	   
+				std::string filename= datadir + "/data/hola.mhd";
+				infoImage=_T("DEFAULT-Image:")+crea::std2wx(filename);
 				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) );
+	wxFrame* frame1 = new wxFrame(NULL, wxID_ANY, wxT("Creatis- ROI Application- Evaluation version,01 Agost 2010 ")+infoImage, wxPoint(400,50), wxSize(800, 600) );
 
-	//frame = new wxContourMainFrame( frame1, wxID_ANY, wxString(_T("")), wxPoint(50,50), wxSize(800, 600), images ); 
+	//frame = new wxContourMainFrame( frame1, wxID_ANY, wxString(_T("")), wxPoint(50,50), wxSize(800, 600), images );
 	frame = wxContourMainFrame::getInstance(frame1, wxID_ANY, wxString(_T("")), wxPoint(200,50), wxSize(800, 600), images,  wxDEFAULT_FRAME_STYLE | wxSUNKEN_BORDER,datadir );
 	frame1->CreateStatusBar();
 	frame1->Show(TRUE);
@@ -195,11 +231,11 @@ bool wxTheApplication :: OnInit()
 }
 
 #if(WIN32)
-int main(int argc, char* argv[])					
-  {									
-    return WinMain(::GetModuleHandle(NULL), NULL,			
-		   ::GetCommandLine(), SW_SHOWNORMAL);			
-  }		
+int main(int argc, char* argv[])
+  {
+    return WinMain(::GetModuleHandle(NULL), NULL,
+		   ::GetCommandLine(), SW_SHOWNORMAL);
+  }
 #else
 #endif