X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=bbtk%2Fsrc%2FbbCreaContournDimensions.cxx;h=89164e52d06c37c73940e50c3fe0dbd3826e579b;hb=refs%2Ftags%2FCreatools2-0-3.creaContour1-2-3.17Feb2011;hp=536f1bfff4e83ac11077d6633548fb0e461ceaa8;hpb=45d51a63a5ac0bc99466d9df185b079884c7d6f6;p=creaContours.git diff --git a/bbtk/src/bbCreaContournDimensions.cxx b/bbtk/src/bbCreaContournDimensions.cxx index 536f1bf..89164e5 100644 --- 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,42 +9,42 @@ BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaContours,nDimensions) BBTK_BLACK_BOX_IMPLEMENTATION(nDimensions,bbtk::WxBlackBox); void nDimensions::Process() { - - double **vectx, **vecty, **vectz; + double **vectx = 0, **vecty = 0, **vectz = 0; std::vector< void * > vectortemp; std::vector size; - vtkImageData **mask, **value; + vtkImageData **mask = 0, **value = 0; vtkImageData* img = bbGetInputIn(); std::vector 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){ int contourtype = bbGetInputContourType(); //wxContourMainFrame::getInstance()->getValuesXYZ(vectx, vecty, vectz, &size); - wxContourMainFrame::getInstance()->getMaskValue(mask, value, contourtype); + //wxContourMainFrame::getInstance()->getMaskValue(mask, value, contourtype); } - bbSetOutputX(vectx); + bbSetOutputX(vectx); bbSetOutputY(vecty); bbSetOutputZ(vectz); bbSetOutputSizeContour(size); bbSetOutputMask(*mask); bbSetOutputValue(*value); } + +//----------------------------------------------------------------- void nDimensions::CreateWidget(wxWindow* parent) { - //vtkImageData* img = bbGetInputIn(); std::vector selectedimages; @@ -53,27 +55,32 @@ 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 = "<