X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbCreaContournDimensions.cxx;h=a3077cd784192c5d5ef4fda6c2fbaf3b171fce1d;hb=7d61ec98f760736e883639ad6f71b0c88e35a1a2;hp=52aeb2882d3a524ae491283d12666f4ff74fa558;hpb=fce8424fdb8d78a343ccc1dd9551bbded44ab5fe;p=creaContours.git

diff --git a/bbtk/src/bbCreaContournDimensions.cxx b/bbtk/src/bbCreaContournDimensions.cxx
index 52aeb28..a3077cd 100644
--- a/bbtk/src/bbCreaContournDimensions.cxx
+++ b/bbtk/src/bbCreaContournDimensions.cxx
@@ -7,74 +7,82 @@ 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<int> size;
-	vtkImageData *mask, *value;
+	vtkImageData **mask = 0, **value = 0;
 
 	vtkImageData* img = bbGetInputIn();
 
 	std::vector<vtkImageData*> selectedimages;
 	if(img!=NULL && currentimg!=img){
 
+		wxContourMainFrame::getInstance()->ShowToolsPanel(true);
 		currentimg=img;
 		selectedimages.push_back(img);
-		frame->setVectImages(selectedimages);
+		wxContourMainFrame::getInstance()->setVectImages(selectedimages);
 	}
 
-
-
-	if(bbGetInputGet()==1){
-		bbSetInputGet(0);		
-		//eventHandler->checkInformationPanel();
-		//eventHandler->getValuesXYZ(vectx, vecty, vectz, &size);	
-		//eventHandler->getMaskValue(mask, value);
+	if(currentimg != NULL){
+		int contourtype = bbGetInputContourType();
+		//wxContourMainFrame::getInstance()->getValuesXYZ(vectx, vecty, vectz, &size);
+		//wxContourMainFrame::getInstance()->getMaskValue(mask, value, contourtype);
 	}
 
-    bbSetOutputX(vectx);
+	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 ); 
-	frame = wxContourMainFrame::getInstance(parent, wxID_ANY, wxString(_T("")), wxPoint(100,50), wxSize(800, 600), selectedimages );
-	bbSetOutputWidget( frame ); 
-	
-   
-
-    
-  
+	//bbSetOutputWidget( frame1 );
+std::string path=".";
+#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("\\"));
+#endif
+
+	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 );
 }
-void nDimensions::bbUserConstructor()
-{
 
-	bbSetInputGet(0);
+//-----------------------------------------------------------------
+void nDimensions::bbUserSetDefaultValues()
+{
+	bbSetInputContourType(0);
 	bbSetInputIn(NULL);
-
 }
-void nDimensions::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
-{
 
-}
-void nDimensions::bbUserDestructor()
+//-----------------------------------------------------------------
+void nDimensions::bbUserInitializeProcessing()
 {
-
 }
-}
-// EO namespace bbCreaContour
 
+//-----------------------------------------------------------------
+void nDimensions::bbUserFinalizeProcessing()
+{
+}
 
+}  // EO namespace bbCreaContour