*** empty log message ***

diff --git a/bbtk/src/bbCreaContournDimensions.cxx b/bbtk/src/bbCreaContournDimensions.cxx
index d881443dbe05a74bfc806cbf0dcca7e0172479e7..f9764d2ca99af92ba4f5b64b1201904cc22748ff 100644 (file)
--- a/bbtk/src/bbCreaContournDimensions.cxx
+++ b/bbtk/src/bbCreaContournDimensions.cxx
@@ -19,6 +19,7 @@ void nDimensions::Process()
        std::vector<vtkImageData*> selectedimages;
        if(img!=NULL && currentimg!=img){
 
+               wxContourMainFrame::getInstance()->ShowToolsPanel(true);
                currentimg=img;
                selectedimages.push_back(img);
                wxContourMainFrame::getInstance()->setVectImages(selectedimages);
@@ -64,6 +65,8 @@ std::string path="";
 #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 ); 
        
    
@@ -84,7 +87,7 @@ void nDimensions::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
 }
 void nDimensions::bbUserDestructor()
 {
-
+       wxContourMainFrame::resetInstance();
 }
 }
 // EO namespace bbCreaContour

diff --git a/lib/Interface_Icons_NDimensions/interfMainPanel.cxx b/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
index 60a8d17c929c0bc164365d0ddceb4f41dd52d1fc..14f0f5acb86fe89480b5eede639feea735b3cfc3 100644 (file)
--- a/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
+++ b/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
@@ -12,6 +12,7 @@
 */
 
 interfMainPanel* interfMainPanel::interfmainpanel=NULL;
+wxFrame* interfMainPanel::_newframe=NULL;
 
 interfMainPanel::interfMainPanel(wxWindow * parent, int sizex, int sizey, wxEvtHandler * evtHandler, std::string datadir)
 : wxPanel(parent, -1, wxDefaultPosition, wxSize(sizex, sizey), wxBORDER_SUNKEN)
@@ -124,29 +125,31 @@ interfMainPanel::~interfMainPanel(void)
 
 interfMainPanel* interfMainPanel::getInstance(wxWindow* parent, std::string datadir, wxEvtHandler * evtHandler){       
 
-       wxFrame* newframe = new wxFrame(parent, -1, wxT(" Contour Tools "), wxPoint(25,50), wxSize(350,850),wxFRAME_TOOL_WINDOW|wxSYSTEM_MENU | wxCAPTION |  wxCLIP_CHILDREN |wxFRAME_FLOAT_ON_PARENT);
+       _newframe = new wxFrame(parent, -1, wxT(" Contour Tools "), wxPoint(25,50), wxSize(350,850),wxFRAME_TOOL_WINDOW|wxSYSTEM_MENU | wxCAPTION |  wxCLIP_CHILDREN |wxFRAME_FLOAT_ON_PARENT);
        
                                                                                                                                                                                
        if(interfmainpanel == NULL){
-               interfmainpanel = new interfMainPanel(newframe, 350, 850, evtHandler, datadir);
+               interfmainpanel = new interfMainPanel(_newframe, 350, 850, evtHandler, datadir);
        }
 
-       newframe->Show(TRUE);
+       _newframe->Show(TRUE);
        return interfmainpanel;
 }
 
 interfMainPanel* interfMainPanel::getInstance(wxWindow* parent, wxEvtHandler * evtHandler){    
 
-       wxFrame* newframe = new wxFrame(parent, -1, wxT(" Contour Tools "), wxPoint(25,50), wxSize(350,850),wxFRAME_TOOL_WINDOW|wxSYSTEM_MENU | wxCAPTION |  wxCLIP_CHILDREN |wxFRAME_FLOAT_ON_PARENT );
+       _newframe = new wxFrame(parent, -1, wxT(" Contour Tools "), wxPoint(25,50), wxSize(350,850),wxFRAME_TOOL_WINDOW|wxSYSTEM_MENU | wxCAPTION |  wxCLIP_CHILDREN |wxFRAME_FLOAT_ON_PARENT );
 
        if(interfmainpanel == NULL){
-               interfmainpanel = new interfMainPanel(newframe, 350, 850, evtHandler);
+               interfmainpanel = new interfMainPanel(_newframe, 350, 850, evtHandler);
        }
 
-       newframe->Show(TRUE);
+       _newframe->Show(TRUE);
        return interfmainpanel;
 }
-
+bool interfMainPanel::Show(bool show){
+       return _newframe->Show(show);
+}
 interfMainPanel* interfMainPanel::getInstance()
 {      
 
@@ -155,7 +158,8 @@ interfMainPanel* interfMainPanel::getInstance()
 
 void interfMainPanel :: resetInstance()
 {
-       delete interfmainpanel;
+       //delete interfmainpanel;
+       delete _newframe;
        interfmainpanel = NULL;
 }
 
@@ -752,3 +756,4 @@ void interfMainPanel::onThresholdPressed()
        }       
        showPanel(thresholdPanel);
 }
+

diff --git a/lib/Interface_Icons_NDimensions/interfMainPanel.h b/lib/Interface_Icons_NDimensions/interfMainPanel.h
index ddcb7038e966dab161e144dc22e23ac4c6975b68..c28928b39e4519d3e97a88293c51f4639b9ab6e3 100644 (file)
--- a/lib/Interface_Icons_NDimensions/interfMainPanel.h
+++ b/lib/Interface_Icons_NDimensions/interfMainPanel.h
@@ -208,12 +208,15 @@ public:
 
        void onSnakePressed();
 
+       virtual bool Show(bool show);
+
 private:
        
 
        static interfMainPanel* interfmainpanel;
 
 
+       static wxFrame* _newframe;
        wxPanel* menubar;
        wxPanel* menubar1;
        wxPanel* menubar2;

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
index d16860f764259305c585d266e8a129a6612b45d7..e391f7c5c4bff9168b51e5f5b314d7ef77fa6c2a 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
@@ -161,8 +161,7 @@ void wxContourMainFrame::setVectImages( std::vector<vtkImageData*> images ){
 
        void wxContourMainFrame :: resetInstance()
        {
-               delete instance;
-               instance = NULL;
+               instance->Destroy();
        }
 
        wxContourMainFrame :: ~wxContourMainFrame()
@@ -170,6 +169,8 @@ void wxContourMainFrame::setVectImages( std::vector<vtkImageData*> images ){
 
                _pannew->Close();
                interfMainPanel::resetInstance();
+               delete kernelManager;
+               instance = NULL;
                //_pannew->Destroy();
                //delete _pannew;
 
@@ -2683,4 +2684,7 @@ void wxContourMainFrame::saveFileWithContoursAutomatique(){
                onSave();
        }
 }
+void wxContourMainFrame::ShowToolsPanel(bool show){
+       _pannew->Show(show);
+}
 

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
index 9d3660a13a28fd120ebc1c42c909b162ef8454b4..5733100aae36feb7e057dbb8b69bb192986886bf 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
@@ -155,6 +155,8 @@ class wxContourMainFrame : public wxPanel {
 
        void SaveImageResult(std::string directory,std::string namefile, vtkImageData* mask,vtkImageData* value);
 
+       void ShowToolsPanel(bool show);
+
 
 //     void setButtonsBar(  wxContour_ButtonsBar * theButtonsBar );
 //     void setGrid(  wxContour_Grid * theGridPanel );