X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=bbtk%2Fsrc%2FbbCreaContournDimensions.cxx;h=8aad345e44e55ce97664e87428f594a742ee1ae9;hb=5379fd694b086240e72872f2237cae1b67bc7ced;hp=143cd5e471bf1174c66cce88cab4ab1737d5baa0;hpb=28671ae02163f2b674da599a98a128f58dfead88;p=creaContours.git

diff --git a/bbtk/src/bbCreaContournDimensions.cxx b/bbtk/src/bbCreaContournDimensions.cxx
index 143cd5e..8aad345 100644
--- a/bbtk/src/bbCreaContournDimensions.cxx
+++ b/bbtk/src/bbCreaContournDimensions.cxx
@@ -32,42 +32,43 @@ namespace bbcreaContours
 
 BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaContours,nDimensions)
 BBTK_BLACK_BOX_IMPLEMENTATION(nDimensions,bbtk::WxBlackBox);
+
 void nDimensions::Process()
 {
 	double **vectx = 0, **vecty = 0, **vectz = 0;
-
 	std::vector< void * > vectortemp;
 	std::vector<int> size;
 	vtkImageData **mask = 0, **value = 0;
-
 	vtkImageData* img = bbGetInputIn();
-
 	std::vector<vtkImageData*> selectedimages;
 	if(img!=NULL && currentimg!=img)
 	{
-		wxContourMainFrame::getInstance()->ShowToolsPanel(true);
+        wxContourMainFrame::getInstance()->ShowToolsPanel(true);
 		currentimg=img;
 		selectedimages.push_back(img);
 		wxContourMainFrame::getInstance()->setVectImages(selectedimages);
-	}
+	} // if img
 
-	if(currentimg != NULL){
+	if(currentimg != NULL)
+   {
 		int contourtype = bbGetInputContourType();
 		//wxContourMainFrame::getInstance()->getValuesXYZ(vectx, vecty, vectz, &size);
 		//wxContourMainFrame::getInstance()->getMaskValue(mask, value, contourtype);
-	}
-
-	bbSetOutputX(vectx);
-	bbSetOutputY(vecty);
-	bbSetOutputZ(vectz);
-	bbSetOutputSizeContour(size);
-	bbSetOutputMask(*mask);
-	bbSetOutputValue(*value);
+	} // if currentimg
+    wxContourMainFrame::getInstance()->RefreshInterface();
+    bbSetOutputwxContourMainFrame( wxContourMainFrame::getInstance() );
+//	bbSetOutputX(vectx);
+//	bbSetOutputY(vecty);
+//	bbSetOutputZ(vectz);
+//	bbSetOutputSizeContour(size);
+//	bbSetOutputMask(*mask);
+//	bbSetOutputValue(*value);
 }
 
 //-----------------------------------------------------------------
 void nDimensions::CreateWidget(wxWindow* parent)
 {
+    printf("EED nDimensions::CreateWidget Start \n");
 	//vtkImageData* img = bbGetInputIn();
 
 	std::vector<vtkImageData*> selectedimages;
@@ -96,17 +97,20 @@ printf("EED WARNING Verify that GetDllAppPath in  nDimensions::CreateWidget bbCr
 #endif // MACOSX	
 	
 	
-	printf("EED nDimensions::CreateWidget path=%s\n",datadir.c_str() );
+//printf("EED nDimensions::CreateWidget path=%s\n",datadir.c_str() );
 
-	wxPanel* panel = wxContourMainFrame::getInstance(parent, wxID_ANY, wxString(_T("")), wxPoint(100,50), wxSize(800, 600), selectedimages,wxDEFAULT_FRAME_STYLE | wxSUNKEN_BORDER,datadir );
+	wxContourMainFrame* wxcontourmainframe = wxContourMainFrame::getInstance(parent, wxID_ANY, wxString(_T("")), wxPoint(100,50), wxSize(800, 600), selectedimages,wxDEFAULT_FRAME_STYLE | wxSUNKEN_BORDER,datadir );
 	wxContourMainFrame::getInstance()->ShowToolsPanel(false);
-//EED	bbSetOutputWidget( panel );
-		bbSetOutputWidget( new wxPanel(parent,-1) );
+
+		bbSetOutputWidget( wxcontourmainframe	 );
+    printf("EED nDimensions::CreateWidget End %p\n", wxcontourmainframe);
+
 }
 
 //-----------------------------------------------------------------
 void nDimensions::bbUserSetDefaultValues()
 {
+    currentimg=NULL;
 	bbSetInputContourType(0);
 	bbSetInputIn(NULL);
 }