X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbCreaContournDimensions.cxx;h=336a7637b53964296a4f5c239c662f6fe72dc369;hb=50ec6e619f4affc65949b22b79662ba283818bc3;hp=251d4ff5d12186ed4bcfe4e58ac9612358d96712;hpb=9c3e9dac7175adc08659330ec8b10233b467bd2d;p=creaContours.git

diff --git a/bbtk/src/bbCreaContournDimensions.cxx b/bbtk/src/bbCreaContournDimensions.cxx
index 251d4ff..336a763 100644
--- a/bbtk/src/bbCreaContournDimensions.cxx
+++ b/bbtk/src/bbCreaContournDimensions.cxx
@@ -32,35 +32,39 @@ 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);
-		currentimg=img;
-		selectedimages.push_back(img);
-		wxContourMainFrame::getInstance()->setVectImages(selectedimages);
-	} // if img
-
-	if(currentimg != NULL)
-   {
-		int contourtype = bbGetInputContourType();
-		//wxContourMainFrame::getInstance()->getValuesXYZ(vectx, vecty, vectz, &size);
-		//wxContourMainFrame::getInstance()->getMaskValue(mask, value, contourtype);
-	} // if currentimg
-
+//    double **vectx = 0, **vecty = 0, **vectz = 0;
+//        std::vector< void * > vectortemp;
+//        std::vector<int> size;
+//        vtkImageData **mask = 0, **value = 0;
+
+    if (firsttime==true)
+    {
+        firsttime=false;
+        std::vector<vtkImageData*> selectedimages;
+        if(bbGetInputIn()!=NULL)
+        {
+            currentimg = bbGetInputIn();
+            selectedimages.push_back( bbGetInputIn() );
+            wxContourMainFrame::getInstance()->ShowToolsPanel(true);
+            wxContourMainFrame::getInstance()->configure(selectedimages);
+        } // if In
+    } else{
+
+        //wxContourMainFrame::getInstance()->getValuesXYZ(vectx, vecty, vectz, &size);
+        //wxContourMainFrame::getInstance()->getMaskValue(mask, value, contourtype);
+
+        if ( currentimg!=bbGetInputIn() )
+        {
+            wxContourMainFrame::getInstance()->changeImage(0, bbGetInputIn() );
+            currentimg=bbGetInputIn();
+        } // if currentimg!=In
+
+        
+    } // if firsttime
     wxContourMainFrame::getInstance()->RefreshInterface();
-
-
     bbSetOutputwxContourMainFrame( wxContourMainFrame::getInstance() );
 //	bbSetOutputX(vectx);
 //	bbSetOutputY(vecty);
@@ -106,13 +110,15 @@ printf("EED WARNING Verify that GetDllAppPath in  nDimensions::CreateWidget bbCr
 	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);
 
-//		bbSetOutputWidget( new wxPanel(parent,-1) );
 		bbSetOutputWidget( wxcontourmainframe	 );
+
 }
 
 //-----------------------------------------------------------------
 void nDimensions::bbUserSetDefaultValues()
 {
+    firsttime   = true;
+    currentimg  = NULL;
 	bbSetInputContourType(0);
 	bbSetInputIn(NULL);
 }