X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_Icons_NDimensions%2FinterfMainPanel.cxx;h=4aeacae0a2034e9e341c9cd3ab4c7e5ed30b3f27;hb=c86e56d7883a16ec6734f64b61b3d87e49527a43;hp=51196954b6e3b6c8abf9c1fbfe0e1cbfd30c7bbb;hpb=6afda9ffe8fc5ee4fd7d6fa2ae006a0c78b5b1d8;p=creaContours.git diff --git a/lib/Interface_Icons_NDimensions/interfMainPanel.cxx b/lib/Interface_Icons_NDimensions/interfMainPanel.cxx index 5119695..4aeacae 100644 --- a/lib/Interface_Icons_NDimensions/interfMainPanel.cxx +++ b/lib/Interface_Icons_NDimensions/interfMainPanel.cxx @@ -23,8 +23,9 @@ # knowledge of the CeCILL-B license and that you accept its terms. # ------------------------------------------------------------------------ */ -#include "interfMainPanel.h" +#include +#include "interfMainPanel.h" interfMainPanel *interfMainPanel::interfmainpanel = NULL; wxFrame *interfMainPanel::_newframe = NULL; @@ -146,10 +147,11 @@ interfMainPanel::~interfMainPanel(void) interfMainPanel* interfMainPanel::getInstance(wxWindow* parent, std::string datadir, wxEvtHandler * evtHandler) { - _newframe = new wxFrame(parent, -1, wxT(" Contour Tools "), wxPoint(25,50), wxSize(350,900),wxFRAME_TOOL_WINDOW|wxSYSTEM_MENU | wxCAPTION | wxCLIP_CHILDREN |wxFRAME_FLOAT_ON_PARENT); + _newframe = new wxFrame(parent, -1, wxT(" Contour Tools "), wxPoint(25,50), wxSize(450,900),wxFRAME_TOOL_WINDOW|wxSYSTEM_MENU | wxCAPTION | wxCLIP_CHILDREN |wxFRAME_FLOAT_ON_PARENT | wxRESIZE_BORDER); + _newframe->SetMinSize( wxSize(200,200) ); if(interfmainpanel == NULL) { - interfmainpanel = new interfMainPanel(_newframe, 350, 900, evtHandler, datadir); + interfmainpanel = new interfMainPanel(_newframe, 450, 900, evtHandler, datadir); } _newframe->Show(TRUE); return interfmainpanel; @@ -157,10 +159,11 @@ interfMainPanel* interfMainPanel::getInstance(wxWindow* parent, std::string data interfMainPanel* interfMainPanel::getInstance(wxWindow* parent, wxEvtHandler * evtHandler) { - _newframe = new wxFrame(parent, -1, wxT(" Contour Tools "), wxPoint(25,50), wxSize(350,900),wxFRAME_TOOL_WINDOW|wxSYSTEM_MENU | wxCAPTION | wxCLIP_CHILDREN |wxFRAME_FLOAT_ON_PARENT ); + _newframe = new wxFrame(parent, -1, wxT(" Contour Tools "), wxPoint(25,50), wxSize(450,900),wxFRAME_TOOL_WINDOW|wxSYSTEM_MENU | wxCAPTION | wxCLIP_CHILDREN |wxFRAME_FLOAT_ON_PARENT | wxRESIZE_BORDER); + _newframe->SetMinSize( wxSize(200,200) ); if(interfmainpanel == NULL) { - interfmainpanel = new interfMainPanel(_newframe, 350, 900, evtHandler); + interfmainpanel = new interfMainPanel(_newframe, 450, 900, evtHandler); } _newframe->Show(TRUE); return interfmainpanel; @@ -403,22 +406,30 @@ void interfMainPanel::onCreateContoursBullEye(wxPanel* panBull) wxContourMainFrame::getInstance()->onCreateContourBullEye(panBull); } -void interfMainPanel::onDeleteContour() +void interfMainPanel::onDeleteContoursActSlice() { wxContourMainFrame::getInstance()->showAxis(false); - wxContourMainFrame::getInstance()->onDeleteContour(); + wxContourMainFrame::getInstance()->onDeleteContoursActSlice(); } -void interfMainPanel::onDeleteContoursActSlice() +void interfMainPanel::onDeleteContour() { wxContourMainFrame::getInstance()->showAxis(false); - wxContourMainFrame::getInstance()->onDeleteContoursActSlice(); + wxContourMainFrame::getInstance()->onDeleteContour(); } void interfMainPanel::onDeleteAllContours() { - wxContourMainFrame::getInstance()->showAxis(false); - wxContourMainFrame::getInstance()->onDeleteAllContours(); + wxMessageDialog *dial; + dial=new wxMessageDialog( NULL, + wxT("Delete all contours of the system?"), + wxT("Warnning!"), + wxOK | wxCANCEL | wxICON_QUESTION ); + if (dial->ShowModal()==wxID_OK) + { + wxContourMainFrame::getInstance()->showAxis(false); + wxContourMainFrame::getInstance()->onDeleteAllContours(); + } // if OK } void interfMainPanel::onCopy()