*** empty log message ***

[creaContours.git] / bbtk / src / bbCreaContournDimensions.cxx

diff --git a/bbtk/src/bbCreaContournDimensions.cxx b/bbtk/src/bbCreaContournDimensions.cxx
index 875ba21b3c338e6b4d87d64faf6883aa9f6f65d9..89164e52d06c37c73940e50c3fe0dbd3826e579b 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,7 +9,7 @@ BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaContours,nDimensions)
 BBTK_BLACK_BOX_IMPLEMENTATION(nDimensions,bbtk::WxBlackBox);
 void nDimensions::Process()
 {
-       double **vectx = 0, **vecty = 0, **vectz = O;
+       double **vectx = 0, **vecty = 0, **vectz = 0;
 
        std::vector< void * > vectortemp;
        std::vector<int> size;
@@ -18,10 +20,12 @@ 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");        
        }
 
        if(currentimg != NULL){
@@ -51,21 +55,30 @@ 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("\\"));
+printf("EED WARNING Verify that GetDllAppPath in  nDimensions::CreateWidget bbCreaContournDimensions is working.. \n");
+       datadir = crea::System::GetDllAppPath("bbCreaContours.dll");
+#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) );
 }
 
 //-----------------------------------------------------------------