*** empty log message ***

[creaContours.git] / appli / wxContourGUIExample / wxContourGUIExample.cxx

diff --git a/appli/wxContourGUIExample/wxContourGUIExample.cxx b/appli/wxContourGUIExample/wxContourGUIExample.cxx
index ee8c36703b40264df6944f5358c9476edffffdea..1e93eb1be2e629390a8dd341c4a6e4af1d80c637 100644 (file)
--- a/appli/wxContourGUIExample/wxContourGUIExample.cxx
+++ b/appli/wxContourGUIExample/wxContourGUIExample.cxx
@@ -8,7 +8,9 @@
 //#include "wxContourEventHandler.h"
 
 //#include <creaImageIOWxGimmickDialog.h>
-#include <creaImageIOWxGimmickReaderDialog.h>
+//#include <creaImageIOWxGimmickReaderDialog.h>
+#include <creaImageIOWxSimpleDlg.h>
+
 #include <creaImageIOSystem.h>
 
 #include <creaVtkBasicSlicer.h>
@@ -64,31 +66,7 @@ wxContourMainFrame* wxTheApplication::frame = 0;
 
 
 
-#if defined(_WIN32)
-#define CREACONTOUR_VALID_FILE_SEPARATOR_CHAR '\\'
-#else
-#define CREACONTOUR_VALID_FILE_SEPARATOR_CHAR '/'
-#endif
 
-//=========================================================================
-std::string GetExecutablePath()
-{
-    char name[PATH_MAX];
-       //EED    int err = get_app_path(name, PATH_MAX);
-       int err = crea::System::GetAppPath(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;
-}
 
 //=========================================================================
 //=========================================================================
@@ -114,53 +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;
-       printf("EED wxContourGUIExample:OnInit 1\n");
-       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();
-       printf("EED wxContourGUIExample:OnInit 2\n");
+       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() );