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

diff --git a/bbtk/src/bbCreaContournDimensions.cxx b/bbtk/src/bbCreaContournDimensions.cxx
index ca0821c..52aeb28 100644
--- a/bbtk/src/bbCreaContournDimensions.cxx
+++ b/bbtk/src/bbCreaContournDimensions.cxx
@@ -12,8 +12,20 @@ void nDimensions::Process()
 	std::vector<int> size;
 	vtkImageData *mask, *value;
 
+	vtkImageData* img = bbGetInputIn();
+
+	std::vector<vtkImageData*> selectedimages;
+	if(img!=NULL && currentimg!=img){
+
+		currentimg=img;
+		selectedimages.push_back(img);
+		frame->setVectImages(selectedimages);
+	}
+
+
+
 	if(bbGetInputGet()==1){
-		bbSetInputGet(0);
+		bbSetInputGet(0);		
 		//eventHandler->checkInformationPanel();
 		//eventHandler->getValuesXYZ(vectx, vecty, vectz, &size);	
 		//eventHandler->getMaskValue(mask, value);
@@ -26,21 +38,23 @@ void nDimensions::Process()
 	bbSetOutputMask(mask);
 	bbSetOutputValue(value);
 }
-void nDimensions::CreateWidget()
+void nDimensions::CreateWidget(wxWindow* parent)
 {
 	
-	vtkImageData* img = bbGetInputIn();
+	//vtkImageData* img = bbGetInputIn();
 
 	std::vector<vtkImageData*> selectedimages;
-	selectedimages.push_back(img);
+	//selectedimages.push_back(img);
 
-	wxFrame* frame1 = new wxFrame(bbGetWxParent(), 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 ); 
+	frame = wxContourMainFrame::getInstance(parent, wxID_ANY, wxString(_T("")), wxPoint(100,50), wxSize(800, 600), selectedimages );
+	bbSetOutputWidget( frame ); 
 	
-   bbSetOutputWidget( frame1 ); 
+   
 
     
   
@@ -49,9 +63,10 @@ void nDimensions::bbUserConstructor()
 {
 
 	bbSetInputGet(0);
+	bbSetInputIn(NULL);
 
 }
-void nDimensions::bbUserCopyConstructor()
+void nDimensions::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
 {
 
 }