X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=appli%2FwxContourGUIExample%2FwxContourGUIExample.cxx;h=fd48714364c1e224174cb93a028761999186f9c6;hb=6383d69864c69a97539b59d3e39406c79408577b;hp=7b15059808fafcf320cf7534e537a08ba35268f3;hpb=48f172ee7e9b077528376877269247ad3e517542;p=creaContours.git diff --git a/appli/wxContourGUIExample/wxContourGUIExample.cxx b/appli/wxContourGUIExample/wxContourGUIExample.cxx index 7b15059..fd48714 100644 --- a/appli/wxContourGUIExample/wxContourGUIExample.cxx +++ b/appli/wxContourGUIExample/wxContourGUIExample.cxx @@ -1,13 +1,17 @@ //---------------------------------------------------------------------------------------------------------------- // Class definition include //---------------------------------------------------------------------------------------------------------------- - + #include "wxContourGUIExample.h" #include "wxContourMainFrame.h" //#include "OutlineModelManager.h" //#include "wxContourEventHandler.h" -#include +//#include +//#include +#include + +#include #include //#include "wxContourMainPanel.h" @@ -18,6 +22,9 @@ #include "wx/artprov.h" #include + + +/* EED EraseMe //#include "OutlineModelBuilder.h" //#include "ContourThing.h" //#include "AxeThing.h" @@ -36,7 +43,8 @@ # define PATH_MAX MAXPATHLEN # endif #endif // MACOSX - +*/ + #ifndef PATH_MAX // If not defined yet : do it # define PATH_MAX 2048 #endif @@ -55,191 +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; -} //========================================================================= //========================================================================= @@ -265,50 +92,97 @@ bool wxTheApplication :: OnInit() { wxInitAllImageHandlers(); - int image_type = GIMMICK_3D_IMAGE_SELECTION; - 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; + + +//EED 1Juin2010 + creaImageIO::WxSimpleDlg w(0,_T("Select your image"),"creaContours_Descriptor.dscp","creatisContours DB"); + w.ShowModal(); + + std::vector 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 s; +//EED 01Juin2010 w.GetSelectedFiles(s); + + +//EED std::vector::iterator i; +// for (i=s.begin();i!=s.end();++i) +// { +// std::cout << *i << std::endl; +// } +// std::cout << "$$$$ "< out; +// std::vector attr; +//// attr.push_back("D0028_0010"); +//// attr.push_back("D0008_0023"); +//// attr.push_back("D0008_1070"); +// w.getSelected(out, attr,true,""); +//// std::cout<SetFileName( filename.c_str() ); + reader->Update(); + images.push_back(reader->GetOutput()); + } + else + { + return -1; + } - std::string datadir( GetExecutablePath() ) ; - -#ifdef MACOSX /* assume this is OSX */ - datadir=datadir+"/../../.."; -#endif // MACOSX - - //vtkImageData* selectedimage=NULL; - std::vector images; - if(w.GetReturnCode() == wxID_OK){ - - std::vector s; - w.GetSelectedFiles(s); - std::vector::iterator i; - for (i=s.begin();i!=s.end();++i){ - std::cout << *i << std::endl; - } - - std::cout << "$$$$ "<Delete(); - - }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) );