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

diff --git a/bbtk/src/bbCreaContournDimensions.cxx b/bbtk/src/bbCreaContournDimensions.cxx
index 85b23a0..dde333b 100644
--- a/bbtk/src/bbCreaContournDimensions.cxx
+++ b/bbtk/src/bbCreaContournDimensions.cxx
@@ -9,14 +9,28 @@ void nDimensions::Process()
 {
  
 	double **vectx, **vecty, **vectz;
+
+	std::vector< void * > vectortemp;
 	std::vector<int> size;
 	vtkImageData *mask, *value;
 
-	if(bbGetInputGet()==1){
-		bbSetInputGet(0);
-		//eventHandler->checkInformationPanel();
-		//eventHandler->getValuesXYZ(vectx, vecty, vectz, &size);	
-		//eventHandler->getMaskValue(mask, value);
+	vtkImageData* img = bbGetInputIn();
+
+	std::vector<vtkImageData*> selectedimages;
+	if(img!=NULL && currentimg!=img){
+
+		wxContourMainFrame::getInstance()->ShowToolsPanel(true);
+		currentimg=img;
+		selectedimages.push_back(img);
+		wxContourMainFrame::getInstance()->setVectImages(selectedimages);
+	}
+
+
+
+	if(currentimg != NULL){
+		int contourtype = bbGetInputContourType();		
+		//wxContourMainFrame::getInstance()->getValuesXYZ(vectx, vecty, vectz, &size);
+		wxContourMainFrame::getInstance()->getMaskValue(mask, value, contourtype);		
 	}
 
     bbSetOutputX(vectx);
@@ -34,30 +48,47 @@ void nDimensions::CreateWidget(wxWindow* parent)
 	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 );
+	//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 ); 
-	frame1->CreateStatusBar();
+	//frame1->CreateStatusBar();
+	//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 ); 
 	
-   bbSetOutputWidget( frame1 ); 
+   
 
     
   
 }
-void nDimensions::bbUserConstructor()
+//-----------------------------------------------------------------	
+void nDimensions::bbUserSetDefaultValues()
 {
-
-	bbSetInputGet(0);
-
+	bbSetInputContourType(0);
+	bbSetInputIn(NULL);   
 }
-void nDimensions::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
-{
 
-}
-void nDimensions::bbUserDestructor()
+//-----------------------------------------------------------------	
+void nDimensions::bbUserInitializeProcessing()
 {
+}
 
+//-----------------------------------------------------------------	
+void nDimensions::bbUserFinalizeProcessing()
+{
 }
 }
 // EO namespace bbCreaContour