From: Juan Prieto <Juan.Prieto@creatis.insa-lyon.fr>
Date: Wed, 29 Apr 2009 08:19:38 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: EED.02Oct2009~34
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=9955fb3731ee66893494ccc86f895ae18e62bb4c;p=creaContours.git

*** empty log message ***
---

diff --git a/bbtk/src/bbCreaContournDimensions.cxx b/bbtk/src/bbCreaContournDimensions.cxx
index d881443..f9764d2 100644
--- 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 60a8d17..14f0f5a 100644
--- 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 ddcb703..c28928b 100644
--- 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 d16860f..e391f7c 100644
--- 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 9d3660a..5733100 100644
--- 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 );