3332 creaContours Feature New Normal - DialogBox confirmation for Delete All contours

[creaContours.git] / lib / Interface_ManagerContour_NDimensions / wxContourMainFrame.cxx

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
index b3016751b1236497c2ca80c87f35646a5dc85885..9d4319ef7b5f15853dbb424816eaf581188ab312 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
@@ -52,7 +52,7 @@ using namespace std;
        // Constructors & Destructors
        //------------------------------------------------------------------------------------------------------------
 
-wxContourMainFrame* wxContourMainFrame:: instance = NULL;
+wxContourMainFrame* wxContourMainFrame::instance=NULL;
 char wxContourMainFrame::COPY = 'C';
 
        wxContourMainFrame :: wxContourMainFrame(wxWindow* parent, wxWindowID id,const wxString& title,const wxPoint& pos,const wxSize& size,long style)
@@ -94,7 +94,6 @@ char wxContourMainFrame::COPY = 'C';
                _viewThresholdImage                     = NULL;
                _viewThresholdImagePanel        = NULL;
                _viewColorLayerImagePanel       = NULL;
-
                _frameShowResultImages          = NULL;
        }
 
@@ -162,28 +161,29 @@ void wxContourMainFrame::setVectImages(std::vector<vtkImageData*> imgs)
 
        wxContourMainFrame* wxContourMainFrame :: getInstance(wxWindow* parent, wxWindowID id,const wxString& title,const wxPoint& pos,const wxSize& size,std::vector<vtkImageData*> images, long style,std::string datadir )
        {
-               if(instance == NULL){
-                       instance = new wxContourMainFrame(parent, id, title, pos, size, images, style,datadir);
+               if(instance == NULL)
+               {
+                       instance=new wxContourMainFrame(parent, id, title, pos, size, images, style,datadir);
                }
                return instance;
        }
 
-       std::vector<vtkImageData*> wxContourMainFrame ::getVectImages()
+       std::vector<vtkImageData*> wxContourMainFrame::getVectImages()
        {
                return kernelManager->getVectImages();
        }
 
-       wxContourMainFrame* wxContourMainFrame :: getInstance()
+       wxContourMainFrame* wxContourMainFrame::getInstance()
        {
                return instance;
        }
 
-       void wxContourMainFrame :: resetInstance()
+       void wxContourMainFrame::resetInstance()
        {
                instance->Destroy();
        }
 
-       wxContourMainFrame :: ~wxContourMainFrame()
+       wxContourMainFrame::~wxContourMainFrame()
        {
                delete _contourextractdata;
                deleteAllContours();
@@ -212,7 +212,7 @@ void wxContourMainFrame::setVectImages(std::vector<vtkImageData*> imgs)
        // Creational and initialization methods using WxAui
        //------------------------------------------------------------------------------------------------------------
        //
-       wxAuiNotebook * wxContourMainFrame :: createNotebook()
+       wxAuiNotebook * wxContourMainFrame::createNotebook()
        {
                wxSize client_size = GetClientSize();
                wxAuiNotebook* noteBook = new wxAuiNotebook(this, -1, wxPoint(client_size.x, client_size.y), wxSize(430,200), m_notebook_style);
@@ -224,7 +224,7 @@ void wxContourMainFrame::setVectImages(std::vector<vtkImageData*> imgs)
        //------------------------------------------------------------------------------------------------------------
        // Creational and initialization methods
        //------------------------------------------------------------------------------------------------------------
-       bool wxContourMainFrame :: configurePanels( )
+       bool wxContourMainFrame::configurePanels( )
        {
                bool configured = _theViewPanel!=NULL;
 
@@ -852,7 +852,7 @@ void wxContourMainFrame :: createMirrorContourOf ( std::string anExistingKName,
                mp->SetPointX( vecOut[0] );
                mp->SetPointY( vecOut[1] );
                mp->SetPointZ( vecOut[2] );
-       }
+       } // for i
 
        _theViewPanel->getSceneManager()->createCopyContourOf( anExistingKName, cloneName, manualModel , append );
 }
@@ -1174,12 +1174,13 @@ void wxContourMainFrame::readDimSpc(FILE *pFile, bool interactiveOption)
                {
                        wxDialog* dial = new wxDialog (this,-1,_T("Tools"),wxDefaultPosition, wxSize(460,360));
                        wxSizer* buttonsSizer = dial->CreateSeparatedButtonSizer(wxOK|wxCANCEL);
-                       wxBoxSizer *dialSizer = new wxBoxSizer(wxVERTICAL);
+//                     wxBoxSizer              *dialSizer = new wxBoxSizer(wxVERTICAL);
+                       wxFlexGridSizer *dialSizer = new wxFlexGridSizer(1);
 
                        wxString lstOptOperation[2];
                        lstOptOperation[0]=_T("By Dimension");
                        lstOptOperation[1]=_T("By Spacing");
-                       wxRadioBox * radioOpts = new wxRadioBox(dial, -1, _T("Type of Transformation"), wxDefaultPosition, wxSize(270,45), 2 , lstOptOperation,  2, wxRA_SPECIFY_COLS);
+                       wxRadioBox * radioOpts = new wxRadioBox(dial, -1, _T("Type of Transformation"), wxDefaultPosition, wxSize(270,90), 2 , lstOptOperation,  2, wxRA_SPECIFY_COLS);
 
                        dialSizer->Add( new wxStaticText(dial,-1,_T("The image resolution is not compatible with the "))  , 0, wxGROW );
                        dialSizer->Add( new wxStaticText(dial,-1,_T("selected Roi file. Do you want to tranform it?"))  , 0, wxGROW );
@@ -3238,7 +3239,9 @@ void wxContourMainFrame::onSnakePressed(){
 
 }
 
-void wxContourMainFrame::saveFileWithContoursAutomatique(){
+void wxContourMainFrame::saveFileWithContoursAutomatique()
+{
+printf("EED wxContourMainFrame::saveFileWithContoursAutomatique \n");
        std::string filename = kernelManager->getCurrentFileName();
        if(filename.compare("")!=0){
                saveFileWithContours(filename);
@@ -3246,7 +3249,8 @@ void wxContourMainFrame::saveFileWithContoursAutomatique(){
                onSave();
        }
 }
-void wxContourMainFrame::ShowToolsPanel(bool show){
+void wxContourMainFrame::ShowToolsPanel(bool show)
+{
        _pannew->Show(show);
 }
 
@@ -3451,6 +3455,9 @@ void wxContourMainFrame::SetFileLocation(std::string newFileLocation)
 {
        _fileLocation = newFileLocation;
        std::cout<<"GETFILELOCATION:"<<_fileLocation<<std::endl;
+
+//EED 2019-12-17
+       kernelManager->setCurrentFileName(_fileLocation);
 }
 //------------------------------------------------------------------------------------------------------------