X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbCreaContournDimensions.cxx;h=536f1bfff4e83ac11077d6633548fb0e461ceaa8;hb=45d51a63a5ac0bc99466d9df185b079884c7d6f6;hp=dde333b68011e0c931ca2f1a2a810574761fb5d2;hpb=60b52441cfaace2c530f9d46ce959b84162e674e;p=creaContours.git

diff --git a/bbtk/src/bbCreaContournDimensions.cxx b/bbtk/src/bbCreaContournDimensions.cxx
index dde333b..536f1bf 100644
--- a/bbtk/src/bbCreaContournDimensions.cxx
+++ b/bbtk/src/bbCreaContournDimensions.cxx
@@ -7,12 +7,12 @@ BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaContours,nDimensions)
 BBTK_BLACK_BOX_IMPLEMENTATION(nDimensions,bbtk::WxBlackBox);
 void nDimensions::Process()
 {
- 
+
 	double **vectx, **vecty, **vectz;
 
 	std::vector< void * > vectortemp;
 	std::vector<int> size;
-	vtkImageData *mask, *value;
+	vtkImageData **mask, **value;
 
 	vtkImageData* img = bbGetInputIn();
 
@@ -28,32 +28,32 @@ void nDimensions::Process()
 
 
 	if(currentimg != NULL){
-		int contourtype = bbGetInputContourType();		
+		int contourtype = bbGetInputContourType();
 		//wxContourMainFrame::getInstance()->getValuesXYZ(vectx, vecty, vectz, &size);
-		wxContourMainFrame::getInstance()->getMaskValue(mask, value, contourtype);		
+		wxContourMainFrame::getInstance()->getMaskValue(mask, value, contourtype);
 	}
 
     bbSetOutputX(vectx);
 	bbSetOutputY(vecty);
 	bbSetOutputZ(vectz);
 	bbSetOutputSizeContour(size);
-	bbSetOutputMask(mask);
-	bbSetOutputValue(value);
+	bbSetOutputMask(*mask);
+	bbSetOutputValue(*value);
 }
 void nDimensions::CreateWidget(wxWindow* parent)
 {
-	
+
 	//vtkImageData* img = bbGetInputIn();
 
 	std::vector<vtkImageData*> selectedimages;
 	//selectedimages.push_back(img);
 
 	//wxFrame* frame1 = new wxFrame(parent, wxID_ANY, wxT("ROI Application  -    Evaluation version, 23 Oct 2008 "), wxPoint(400,50), wxSize(800, 600) );
-	//frame = wxContourMainFrame::getInstance(frame1, wxID_ANY, wxString(_T("")), wxPoint(100,50), wxSize(800, 600), selectedimages );	
-	//new wxContourMainFrame( frame1, wxID_ANY, _T(""), wxPoint(50,50), wxSize(800, 600),selectedimages ); 
+	//frame = wxContourMainFrame::getInstance(frame1, wxID_ANY, wxString(_T("")), wxPoint(100,50), wxSize(800, 600), selectedimages );
+	//new wxContourMainFrame( frame1, wxID_ANY, _T(""), wxPoint(50,50), wxSize(800, 600),selectedimages );
 	//frame1->CreateStatusBar();
-	//bbSetOutputWidget( frame1 ); 
-std::string path="";
+	//bbSetOutputWidget( frame1 );
+std::string path=".";
 #ifdef WIN32
 	char currentPath[_MAX_PATH];
 	HMODULE hand = GetModuleHandle("bbcreaContours");
@@ -67,26 +67,26 @@ std::string path="";
 	wxPanel* panel = wxContourMainFrame::getInstance(parent, wxID_ANY, wxString(_T("")), wxPoint(100,50), wxSize(800, 600), selectedimages,wxDEFAULT_FRAME_STYLE | wxSUNKEN_BORDER,path );
 	wxContourMainFrame::getInstance()->ShowToolsPanel(false);
 	//std::cout<<"creaContours = "<<panel<<std::endl;
-	bbSetOutputWidget( panel ); 
-	
-   
+	bbSetOutputWidget( panel );
+
+
+
+
 
-    
-  
 }
-//-----------------------------------------------------------------	
+//-----------------------------------------------------------------
 void nDimensions::bbUserSetDefaultValues()
 {
 	bbSetInputContourType(0);
-	bbSetInputIn(NULL);   
+	bbSetInputIn(NULL);
 }
 
-//-----------------------------------------------------------------	
+//-----------------------------------------------------------------
 void nDimensions::bbUserInitializeProcessing()
 {
 }
 
-//-----------------------------------------------------------------	
+//-----------------------------------------------------------------
 void nDimensions::bbUserFinalizeProcessing()
 {
 }