From 76b7bf77224f4389f5613e1778e0967a0355b23f Mon Sep 17 00:00:00 2001 From: Juan Prieto Date: Wed, 3 Jun 2009 12:21:40 +0000 Subject: [PATCH] *** empty log message *** --- .project | 11 +++++++++++ appli/wxContourGUIExample/wxContourGUIExample.cxx | 8 +++++--- bbtk/src/bbCreaContournDimensions.cxx | 6 +++--- 3 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 .project diff --git a/.project b/.project new file mode 100644 index 0000000..f7abc1d --- /dev/null +++ b/.project @@ -0,0 +1,11 @@ + + + creaContours + + + + + + + + diff --git a/appli/wxContourGUIExample/wxContourGUIExample.cxx b/appli/wxContourGUIExample/wxContourGUIExample.cxx index e80ea04..5ba7580 100644 --- a/appli/wxContourGUIExample/wxContourGUIExample.cxx +++ b/appli/wxContourGUIExample/wxContourGUIExample.cxx @@ -231,8 +231,7 @@ std::string GetExecutablePath() if (err) { printf("Could not determine current executable path ? "); - } - + } // remove the exe name char *slash; slash = strrchr(name, CREACONTOUR_VALID_FILE_SEPARATOR_CHAR); @@ -276,7 +275,10 @@ bool wxTheApplication :: OnInit() creaImageIO::WxGimmickReaderDialog w(0,-1,_T("WxGimmickDialog test"),wxDefaultPosition,wxSize(1200,800),min_image_type,max_image_type,output_dim,threads); w.ShowModal(); - std::string datadir( crea::wx2std(GetExecutablePath()) ); +//JCP + //std::string datadir( crea::wx2std(GetExecutablePath()) ); + std::string datadir( GetExecutablePath() ); +//JCP #ifdef MACOSX /* assume this is OSX */ datadir=datadir+"/../../.."; diff --git a/bbtk/src/bbCreaContournDimensions.cxx b/bbtk/src/bbCreaContournDimensions.cxx index dde333b..80c5189 100644 --- a/bbtk/src/bbCreaContournDimensions.cxx +++ b/bbtk/src/bbCreaContournDimensions.cxx @@ -12,7 +12,7 @@ void nDimensions::Process() std::vector< void * > vectortemp; std::vector size; - vtkImageData *mask, *value; + vtkImageData **mask, **value; vtkImageData* img = bbGetInputIn(); @@ -37,8 +37,8 @@ void nDimensions::Process() bbSetOutputY(vecty); bbSetOutputZ(vectz); bbSetOutputSizeContour(size); - bbSetOutputMask(mask); - bbSetOutputValue(value); + bbSetOutputMask(*mask); + bbSetOutputValue(*value); } void nDimensions::CreateWidget(wxWindow* parent) { -- 2.45.1