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

diff --git a/appli/wxContourGUIExample/wxContourGUIExample.cxx b/appli/wxContourGUIExample/wxContourGUIExample.cxx
index a679b72..fd48714 100644
--- a/appli/wxContourGUIExample/wxContourGUIExample.cxx
+++ b/appli/wxContourGUIExample/wxContourGUIExample.cxx
@@ -1,14 +1,16 @@
 //----------------------------------------------------------------------------------------------------------------
 // Class definition include
 //----------------------------------------------------------------------------------------------------------------
-
+ 
 #include "wxContourGUIExample.h"
 #include "wxContourMainFrame.h"
 //#include "OutlineModelManager.h"
 //#include "wxContourEventHandler.h"
 
 //#include <creaImageIOWxGimmickDialog.h>
-#include <creaImageIOWxGimmickReaderDialog.h>
+//#include <creaImageIOWxGimmickReaderDialog.h>
+#include <creaImageIOWxSimpleDlg.h>
+
 #include <creaImageIOSystem.h>
 
 #include <creaVtkBasicSlicer.h>
@@ -20,6 +22,9 @@
 
 #include "wx/artprov.h"
 #include <wx/filedlg.h>
+
+
+/* EED EraseMe
 //#include "OutlineModelBuilder.h"
 //#include "ContourThing.h"
 //#include "AxeThing.h"
@@ -38,7 +43,8 @@
 #  define PATH_MAX MAXPATHLEN
 # endif
 #endif // MACOSX
-
+*/
+ 
 #ifndef PATH_MAX // If not defined yet : do it 
 #  define PATH_MAX 2048
 #endif
@@ -57,190 +63,10 @@ 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 );
-}
-*/
-
-//=========================================================================  
-// From http://www.fltk.org/newsgroups.php?gfltk.general+v:22083
-//
-int get_app_path (char *pname, size_t pathsize)
-{
-#ifdef LINUX	
-    /* Oddly, the readlink(2) man page says no NULL is appended. */
-    /* So you have to do it yourself, based on the return value: */
-    pathsize --; /* Preserve a space to add the trailing NULL */
-    long result = readlink("/proc/self/exe", pname, pathsize);
-    if (result > 0)
-	{
-		pname[result] = 0; /* add the #@!%ing NULL */
-		
-		if ((access(pname, 0) == 0))
-			return 0; /* file exists, return OK */
-		/*else name doesn't seem to exist, return FAIL (falls
-		 through) */
-	}
-#endif /* LINUX */
-    
-#ifdef WIN32
-    long result = GetModuleFileName(NULL, pname, pathsize);
-    if (result > 0)
-	{
-		/* fix up the dir slashes... */
-		int len = strlen(pname);
-		int idx;
-		for (idx = 0; idx < len; idx++)
-		{
-			if (pname[idx] == '\\') pname[idx] = '/';
-		}
-		
-		for (idx = len-1; idx >=0 ; idx--)
-		{
-			if (pname[idx] == '/')
-			{ 
-				pname[idx+1] = '\0';
-				idx = -1;
-			}
-		}
-		
-		if ((access(pname, 0) == 0))
-			return 0; /* file exists, return OK */
-		/*else name doesn't seem to exist, return FAIL (falls
-		 through) */
-	}
-#endif /* WIN32 */
-    
-#ifdef SOLARIS
-    char *p = getexecname();
-    if (p)
-	{
-		/* According to the Sun manpages, getexecname will
-		 "normally" return an */
-		/* absolute path - BUT might not... AND that IF it is not,
-		 pre-pending */
-		/* getcwd() will "usually" be the correct thing... Urgh!
-		 */
-		
-		/* check pathname is absolute (begins with a / ???) */
-		if (p[0] == '/') /* assume this means we have an
-		 absolute path */
-		{
-			strncpy(pname, p, pathsize);
-			if ((access(pname, 0) == 0))
-				return 0; /* file exists, return OK */
-		}
-		else /* if not, prepend getcwd() then check if file
-		 exists */
-		{
-			getcwd(pname, pathsize);
-			long result = strlen(pname);
-			strncat(pname, "/", (pathsize - result));
-			result ++;
-			strncat(pname, p, (pathsize - result));
-			
-			if ((access(pname, 0) == 0))
-				return 0; /* file exists, return OK */
-			/*else name doesn't seem to exist, return FAIL
-			 (falls through) */
-		}
-	}
-#endif /* SOLARIS */
-    
-#ifdef MACOSX /* assume this is OSX */
-    /*
-	 from http://www.hmug.org/man/3/NSModule.html
-	 
-	 extern int _NSGetExecutablePath(char *buf, unsigned long
-	 *bufsize);
-	 
-	 _NSGetExecutablePath  copies  the  path  of the executable
-	 into the buffer and returns 0 if the path was successfully
-	 copied  in the provided buffer. If the buffer is not large
-	 enough, -1 is returned and the  expected  buffer  size  is
-	 copied  in  *bufsize.  Note that _NSGetExecutablePath will
-	 return "a path" to the executable not a "real path" to the
-	 executable.  That  is  the path may be a symbolic link and
-	 not the real file. And with  deep  directories  the  total
-	 bufsize needed could be more than MAXPATHLEN.
-	 */
-	
-    int status = -1;
-    char *given_path = (char*)malloc(MAXPATHLEN * 2);
-    if (!given_path) return status;
-    
-    uint32_t npathsize = MAXPATHLEN * 2;
-    long result = _NSGetExecutablePath(given_path, &npathsize);
-    if (result == 0)
-	{ /* OK, we got something - now try and resolve the real path...
-	 */
-		if (realpath(given_path, pname) != NULL)
-		{
-			if ((access(pname, 0) == 0))
-				status = 0; /* file exists, return OK */
-		}
-	}
-    free (given_path);
-    return status;
-#endif /* MACOSX */
-    
-    return -1; /* Path Lookup Failed */
-} 
-//=========================================================================
 
-#if defined(_WIN32)
-#define CREACONTOUR_VALID_FILE_SEPARATOR_CHAR '\\'
-#else
-#define CREACONTOUR_VALID_FILE_SEPARATOR_CHAR '/'
-#endif
 
-//=========================================================================
-std::string GetExecutablePath()
-{
-    char name[PATH_MAX];
-    int err = get_app_path(name, PATH_MAX);
-    if (err) 
-	{
-		printf("Could not determine current executable path ?  ");  
-	}    
-    // remove the exe name
-    char *slash;		
-    slash = strrchr(name, CREACONTOUR_VALID_FILE_SEPARATOR_CHAR);
-    if (slash)
-	{
-		*slash = 0;
-	}
-    return name;
-}
 
 //=========================================================================
 //=========================================================================
@@ -266,52 +92,86 @@ bool wxTheApplication :: OnInit()
 {
 	wxInitAllImageHandlers();
 
-	int min_image_type = GIMMICK_2D_IMAGE_SELECTION;
-	int max_image_type = GIMMICK_3D_IMAGE_SELECTION;
-	int output_dim = NATIVE;
-	int threads = 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;
 
-	std::vector<vtkImageData*> images;
 
-	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);
+//EED 1Juin2010
+      creaImageIO::WxSimpleDlg w(0,_T("Select your image"),"creaContours_Descriptor.dscp","creatisContours DB"); 
+      w.ShowModal(); 
   
-	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(  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+"/../../..";
+			datadir=datadir+"/../../../../share/creaContours";
 		#endif // MACOSX	
 		
 		
-			if(w.GetReturnCode() == wxID_OK)
-			{
+		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;
+//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);
-				w.GetSelectedImages(images,output_dim);
-			}
-			else if (w.GetReturnCode() == wxID_CANCEL)
-			{
+
+//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() );