For the new BBTK Version

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

diff --git a/bbtk/src/bbCreaContournDimensions.cxx b/bbtk/src/bbCreaContournDimensions.cxx
index 52aeb2882d3a524ae491283d12666f4ff74fa558..dde333b68011e0c931ca2f1a2a810574761fb5d2 100644 (file)
--- a/bbtk/src/bbCreaContournDimensions.cxx
+++ b/bbtk/src/bbCreaContournDimensions.cxx
@@ -9,6 +9,8 @@ void nDimensions::Process()
 {
  
        double **vectx, **vecty, **vectz;
+
+       std::vector< void * > vectortemp;
        std::vector<int> size;
        vtkImageData *mask, *value;
 
@@ -17,18 +19,18 @@ void nDimensions::Process()
        std::vector<vtkImageData*> selectedimages;
        if(img!=NULL && currentimg!=img){
 
+               wxContourMainFrame::getInstance()->ShowToolsPanel(true);
                currentimg=img;
                selectedimages.push_back(img);
-               frame->setVectImages(selectedimages);
+               wxContourMainFrame::getInstance()->setVectImages(selectedimages);
        }
 
 
 
-       if(bbGetInputGet()==1){
-               bbSetInputGet(0);               
-               //eventHandler->checkInformationPanel();
-               //eventHandler->getValuesXYZ(vectx, vecty, vectz, &size);       
-               //eventHandler->getMaskValue(mask, value);
+       if(currentimg != NULL){
+               int contourtype = bbGetInputContourType();              
+               //wxContourMainFrame::getInstance()->getValuesXYZ(vectx, vecty, vectz, &size);
+               wxContourMainFrame::getInstance()->getMaskValue(mask, value, contourtype);              
        }
 
     bbSetOutputX(vectx);
@@ -51,28 +53,42 @@ void nDimensions::CreateWidget(wxWindow* parent)
        //new wxContourMainFrame( frame1, wxID_ANY, _T(""), wxPoint(50,50), wxSize(800, 600),selectedimages ); 
        //frame1->CreateStatusBar();
        //bbSetOutputWidget( frame1 ); 
-       frame = wxContourMainFrame::getInstance(parent, wxID_ANY, wxString(_T("")), wxPoint(100,50), wxSize(800, 600), selectedimages );
-       bbSetOutputWidget( frame ); 
+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 ); 
        
    
 
     
   
 }
-void nDimensions::bbUserConstructor()
+//-----------------------------------------------------------------    
+void nDimensions::bbUserSetDefaultValues()
 {
-
-       bbSetInputGet(0);
-       bbSetInputIn(NULL);
-
+       bbSetInputContourType(0);
+       bbSetInputIn(NULL);   
 }
-void nDimensions::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
-{
 
-}
-void nDimensions::bbUserDestructor()
+//-----------------------------------------------------------------    
+void nDimensions::bbUserInitializeProcessing()
 {
+}
 
+//-----------------------------------------------------------------    
+void nDimensions::bbUserFinalizeProcessing()
+{
 }
 }
 // EO namespace bbCreaContour