X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=appli%2FwxContourGUIExample%2FwxContourGUIExample.cxx;h=fd48714364c1e224174cb93a028761999186f9c6;hb=6383d69864c69a97539b59d3e39406c79408577b;hp=9e8d5e5f54e0ce404fb66f1e5271fd2e73bbe989;hpb=51b7c37ebfc9c75253022678c73c7f1780ebfabd;p=creaContours.git

diff --git a/appli/wxContourGUIExample/wxContourGUIExample.cxx b/appli/wxContourGUIExample/wxContourGUIExample.cxx
index 9e8d5e5..fd48714 100644
--- a/appli/wxContourGUIExample/wxContourGUIExample.cxx
+++ b/appli/wxContourGUIExample/wxContourGUIExample.cxx
@@ -1,25 +1,30 @@
 //----------------------------------------------------------------------------------------------------------------
 // Class definition include
 //----------------------------------------------------------------------------------------------------------------
-
-
+ 
 #include "wxContourGUIExample.h"
 #include "wxContourMainFrame.h"
 //#include "OutlineModelManager.h"
 //#include "wxContourEventHandler.h"
 
+//#include <creaImageIOWxGimmickDialog.h>
+//#include <creaImageIOWxGimmickReaderDialog.h>
+#include <creaImageIOWxSimpleDlg.h>
 
-#include <creaImageIOWxGimmickDialog.h>
+#include <creaImageIOSystem.h>
 
 #include <creaVtkBasicSlicer.h>
 //#include "wxContourMainPanel.h"
 
 #include "vtkMetaImageReader.h"
 #include <map>
-#include "vtkImageData.h"mb_
+#include "vtkImageData.h"
 
 #include "wx/artprov.h"
 #include <wx/filedlg.h>
+
+
+/* EED EraseMe
 //#include "OutlineModelBuilder.h"
 //#include "ContourThing.h"
 //#include "AxeThing.h"
@@ -28,62 +33,48 @@
 //#include "SomeEnvironment.h"
 //#include "ReaderEnvironment.h"
 
+//#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 
+# include <string.h>
+# ifndef PATH_MAX
+#  define PATH_MAX MAXPATHLEN
+# endif
+#endif // MACOSX
+*/
+ 
+#ifndef PATH_MAX // If not defined yet : do it 
+#  define PATH_MAX 2048
+#endif
 
+#if defined(WIN32)
+  #include <direct.h>
+#else
+   #include <dirent.h>  
+#endif
 
-//#include "interfMainPanel.h"
-
+#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
-wxString getExecutablePath()
-{
-    char buf[512];
-    char* slash;
-
-#if defined(WIN32)
-    GetModuleFileName(NULL, buf, 511);
-    slash = strrchr(buf, '\\');
-    if (slash)
-    {
-        *slash = 0;
-    }
-#elif defined(__LINUX__)
-    int res;
-    res = readlink("/proc/self/exe", buf, 512);
-    if (res == -1)
-        return _T("");
-    buf[res] = 0;
-    slash = strrchr(buf, '/');
-    if (slash)
-    {
-        *slash = 0;
-    }
-#else
-    return "";
-#endif
-
-    return wxString(buf, wxConvUTF8 );
-}
-
-
 
 
 
 
+//=========================================================================
+//=========================================================================
 IMPLEMENT_APP( wxTheApplication );
-
 /*
 wxContourGUIExample :: wxContourGUIExample(const wxString& title, const wxPoint& pos, const wxSize& size)
 : wxFrame((wxFrame *) NULL, -1, title, pos, size)
 {
-	
 }
 */
 
@@ -99,57 +90,107 @@ 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;
-
-   creaImageIO::WxGimmickDialog w(0,
-				  -1,
-				  _T("WxGimmickDialog test"),
-				  wxDefaultPosition,
-				  wxSize(1200,800),
-				  image_type,
-				  threads);
-   w.ShowModal();
-   
-   //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();
-	   wxString filename= getExecutablePath()+ wxString( _T("/data/hola.mhd") , wxConvUTF8 );   	   
-	   reader->SetFileName( (const char*)(filename.mb_str()) );
-	   reader->Update();
-	   images.push_back(reader->GetOutput());
-  	}else{        
-		return -1;
-	}   
+//EED01Juin2010	int min_image_type = GIMMICK_2D_IMAGE_SELECTION;
+//EED01Juin2010	int max_image_type = GIMMICK_3D_IMAGE_SELECTION;
+//EED01Juin2010	int output_dim = NATIVE;
+//EED01Juin2010	int threads = 1;
+
+
+//EED 1Juin2010
+      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", 
+//										_T("WxGimmickDialog test"),
+//										wxDefaultPosition,wxSize(1200,800)
+//										,min_image_type,
+//										max_image_type,
+//										output_dim,
+//										threads);  
+//	w.ShowModal();
+
+
+//JCP
+	//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	
+	
+		#ifdef MACOSX /* assume this is OSX */
+			datadir=datadir+"/../../../../share/creaContours";
+		#endif // MACOSX	
+		
+		
+		if(w.GetReturnCode() == wxID_OK)
+		{
+				std::vector<std::string> s;
+//EED 01Juin2010				w.GetSelectedFiles(s);
+
+
+//EED			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);
+
+//EED31mai2010				w.GetSelectedImages(images,output_dim);
+
+
+//EED 1Juin2010
+//				std::vector<creaImageIO::OutStrGimmick> out;
+//				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);
+//				int size=out.size();
+//				int ii;
+//				for (ii=0;ii<size;ii++)
+//				{
+//					images.push_back(out[ii].img);
+//				}
+
+//EED 1Juin2010
+				printf("EED creaContours wxTheApplication :: OnInit  %d\n", w.getImagesSelected().size() );
+				images=w.getImagesSelected(); 
+				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";   	   
+				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) );
 
 	//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,(const char*)( getExecutablePath().mb_str() )  );
+	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);
-
-
+    frame->RefreshInterface();
 	return TRUE;
 }