no message

diff --git a/appli/wxContourGUIExample/wxContourGUIExample.cxx b/appli/wxContourGUIExample/wxContourGUIExample.cxx
index 8fb4a1002810a2d846f516b2f3297bc841255e2d..fb162fe85278086ead1ec9ccc33882e1e796d77d 100644 (file)
--- a/appli/wxContourGUIExample/wxContourGUIExample.cxx
+++ b/appli/wxContourGUIExample/wxContourGUIExample.cxx
@@ -64,31 +64,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;
-}
 
 //=========================================================================
 //=========================================================================
@@ -136,7 +112,7 @@ bool wxTheApplication :: OnInit()
 
 //JCP
        //std::string datadir(  crea::wx2std(GetExecutablePath()) );    
-       std::string datadir(  GetExecutablePath() );
+       std::string datadir(  crea::System::GetExecutablePath() );
 //JCP
 
            #ifdef LINUX /* assume this is OSX */

diff --git a/bbtk/src/bbCreaContournDimensions.cxx b/bbtk/src/bbCreaContournDimensions.cxx
index a3077cd784192c5d5ef4fda6c2fbaf3b171fce1d..55eab4384847dea30748e6a4391b70619bd78afd 100644 (file)
--- a/bbtk/src/bbCreaContournDimensions.cxx
+++ b/bbtk/src/bbCreaContournDimensions.cxx
@@ -1,5 +1,7 @@
 #include "bbCreaContournDimensions.h"
 #include "bbcreaContoursPackage.h"
+
+#include "creaSystem.h"
 namespace bbcreaContours
 {
 
@@ -7,6 +9,7 @@ BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaContours,nDimensions)
 BBTK_BLACK_BOX_IMPLEMENTATION(nDimensions,bbtk::WxBlackBox);
 void nDimensions::Process()
 {
+printf("EED nDimensions::Process 01\n");       
        double **vectx = 0, **vecty = 0, **vectz = 0;
 
        std::vector< void * > vectortemp;
@@ -18,24 +21,34 @@ void nDimensions::Process()
        std::vector<vtkImageData*> selectedimages;
        if(img!=NULL && currentimg!=img){
 
+               printf("EED nDimensions::Process 02\n");        
                wxContourMainFrame::getInstance()->ShowToolsPanel(true);
                currentimg=img;
                selectedimages.push_back(img);
                wxContourMainFrame::getInstance()->setVectImages(selectedimages);
+               printf("EED nDimensions::Process 03\n");        
        }
 
+       printf("EED nDimensions::Process 04\n");        
        if(currentimg != NULL){
                int contourtype = bbGetInputContourType();
                //wxContourMainFrame::getInstance()->getValuesXYZ(vectx, vecty, vectz, &size);
                //wxContourMainFrame::getInstance()->getMaskValue(mask, value, contourtype);
        }
 
+       printf("EED nDimensions::Process 05\n");        
        bbSetOutputX(vectx);
+       printf("EED nDimensions::Process 05.1\n");      
        bbSetOutputY(vecty);
+       printf("EED nDimensions::Process 05.2\n");      
        bbSetOutputZ(vectz);
+       printf("EED nDimensions::Process 05.3\n");      
        bbSetOutputSizeContour(size);
+       printf("EED nDimensions::Process 05.4\n");      
        bbSetOutputMask(*mask);
+       printf("EED nDimensions::Process 05.5\n");      
        bbSetOutputValue(*value);
+       printf("EED nDimensions::Process 06\n");        
 }
 
 //-----------------------------------------------------------------
@@ -51,21 +64,29 @@ void nDimensions::CreateWidget(wxWindow* parent)
        //new wxContourMainFrame( frame1, wxID_ANY, _T(""), wxPoint(50,50), wxSize(800, 600),selectedimages );
        //frame1->CreateStatusBar();
        //bbSetOutputWidget( frame1 );
-std::string path=".";
+std::string datadir=".";
 #ifdef WIN32
-       char currentPath[_MAX_PATH];
-       HMODULE hand = GetModuleHandle("bbcreaContours");
-       GetModuleFileName(hand, currentPath, _MAX_PATH);
-
-       path = currentPath;
-
-       path = path.substr(0,path.find_last_of("\\"));
+       datadir = crea::System::GetDllAppPath();
+#else
+       datadir= crea::System::GetExecutablePath();
 #endif
-
-       wxPanel* panel = wxContourMainFrame::getInstance(parent, wxID_ANY, wxString(_T("")), wxPoint(100,50), wxSize(800, 600), selectedimages,wxDEFAULT_FRAME_STYLE | wxSUNKEN_BORDER,path );
+       
+       
+#ifdef LINUX /* assume this is OSX */
+       datadir=datadir+"/../share/creaContours";
+#endif // MACOSX       
+       
+#ifdef MACOSX /* assume this is OSX */
+       datadir=datadir+"/../../../../share/creaContours";
+#endif // MACOSX       
+       
+       
+       printf("EED nDimensions::CreateWidget path=%s\n",datadir.c_str() );
+
+       wxPanel* panel = wxContourMainFrame::getInstance(parent, wxID_ANY, wxString(_T("")), wxPoint(100,50), wxSize(800, 600), selectedimages,wxDEFAULT_FRAME_STYLE | wxSUNKEN_BORDER,datadir );
        wxContourMainFrame::getInstance()->ShowToolsPanel(false);
-       //std::cout<<"creaContours = "<<panel<<std::endl;
-       bbSetOutputWidget( panel );
+//EED  bbSetOutputWidget( panel );
+               bbSetOutputWidget( new wxPanel(parent,-1) );
 }
 
 //-----------------------------------------------------------------

diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index cfe309da1b6eb03a6ff015f9c06c58f8039ab28b..3938c30fddf006aabbb4f82b74228a95f30bdf74 100644 (file)
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -51,13 +51,16 @@ FOREACH( iLST  ${DATA_FILES} )
 ENDFOREACH(iLST)
 
 
+
+#-- data/gimmick --
+
 IF (WIN32)
   SET(INSTALL_DATA_DIR "bin/share/gimmick")
 ELSE (WIN32)
   SET(INSTALL_DATA_DIR "share/gimmick/")
 ENDIF (WIN32)
 
-#-- data/gimmick --
+
 SET(DATA_DIR ${PROJECT_SOURCE_DIR}/data/gimmick )
 FILE(GLOB DATA_FILES "${DATA_DIR}/*.*")
 FOREACH( iLST  ${DATA_FILES} )