Merge remote-tracking branch 'origin/vtk8itk5wx3-mingw64' into vtk8itk5wx3-macos

[creaContours.git] / bbtk / src / bbCreaContournDimensions.cxx

diff --git a/bbtk/src/bbCreaContournDimensions.cxx b/bbtk/src/bbCreaContournDimensions.cxx
index 143cd5e471bf1174c66cce88cab4ab1737d5baa0..6d8890d131b6ac676bbd9fce8acaf3a9dad45cdd 100644 (file)
--- a/bbtk/src/bbCreaContournDimensions.cxx
+++ b/bbtk/src/bbCreaContournDimensions.cxx
@@ -32,16 +32,14 @@ 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)
        {
@@ -49,20 +47,25 @@ void nDimensions::Process()
                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);
 }
 
 //-----------------------------------------------------------------
@@ -96,12 +99,13 @@ 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( new wxPanel(parent,-1) );
+               bbSetOutputWidget( wxcontourmainframe    );
 }
 
 //-----------------------------------------------------------------