#3216 creaContours Feature New Normal - vtk8itk4wx3-mingw64

diff --cc lib/Interface_Icons_NDimensions/interfMainPanel.cxx
index b9123cb266b4ed54ae2d6af1d12faeb5c7a7b91b,d1dd92247c4b9b43bb1287db150bc2a07678445d..293100824fc8faa5a3d5b56397aa861c7e27a4fe
--- 1/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
--- 2/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
+++ b/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
@@@ -669,33 -696,24 +669,32 @@@ void interfMainPanel::setStringSpread(s
  
  void interfMainPanel::onInformationPressed()
  {
- printf("EED interfMainPanel::onInformationPressed Start\n");
        // Statistics frame
 -      if(infoWin ==NULL){
 +      if(infoWin ==NULL)
 +      {
 +printf("EED interfMainPanel::onInformationPressed 0.1\n");
                infoWin                 = new wxFrame (this, -1,_T("  Statistics  "), wxDefaultPosition, wxDefaultSize, wxFRAME_TOOL_WINDOW|wxSYSTEM_MENU | wxCAPTION |  wxCLIP_CHILDREN |wxFRAME_FLOAT_ON_PARENT | wxRESIZE_BORDER  );
 +printf("EED interfMainPanel::onInformationPressed 0.2\n");
                infoWin->SetSize( wxSize(825,650) );
  
                wxSize sizepanel(825,675);
 +printf("EED interfMainPanel::onInformationPressed 0.3\n");
                informationPanel        = new interfInformationPanel(infoWin);//contourevent->getInformationPanel(infoWin);
 +printf("EED interfMainPanel::onInformationPressed 0.3a\n");
  
-               wxBoxSizer * sizerPanel = new wxBoxSizer(wxHORIZONTAL);
+ // Borrame            wxBoxSizer * sizerPanel = new wxBoxSizer(wxHORIZONTAL);
+               wxFlexGridSizer * sizerPanel            = new wxFlexGridSizer(1);
+ 
                sizerPanel -> Add( informationPanel, 1, wxEXPAND ,0);
 +printf("EED interfMainPanel::onInformationPressed 0.4\n");
  
                infoWin->SetSizer( sizerPanel );
- printf("EED interfMainPanel::onInformationPressed 0.41\n");
 -//            infoWin->SetAutoLayout( true );
 +              infoWin->SetAutoLayout( true );
- printf("EED interfMainPanel::onInformationPressed 0.42\n");
                infoWin->Layout();
 +printf("EED interfMainPanel::onInformationPressed 0.43\n");
                infoWin->Show();
        }else {
 +printf("EED interfMainPanel::onInformationPressed 0.5\n");
  
                if (infoWin->IsShown()==true)
                {

diff --cc lib/Interface_Icons_NDimensions/interfToolsPanels.cxx
index d2505d571232b1567926022f810977ba9b4c1d16,32284ec4b05e0528c3df47c9b400992f9386df50..263d4e7078c0bc46d438b0c3ee2fc13a7252e1e5
--- 1/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx
--- 2/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx
+++ b/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx
@@@ -221,9 -212,9 +220,10 @@@ void interfSpreadPanel::setStringSpread
  ** Begin of information panel
  **/
  interfInformationPanel::interfInformationPanel(wxWindow * parent)
- : wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN)
+ //: wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN)
+ : wxPanel(parent, -1)
  {
 +printf("EED interfInformationPanel::interfInformationPanel Start\n");
        //wxPanel *panel                                                                        = new wxPanel(parent,-1,wxDefaultPosition, wxDefaultSize,wxTAB_TRAVERSAL);
        wxString lstOptions[4];
        lstOptions[0]=_T("Current Slice");
@@@ -338,7 -309,9 +338,7 @@@ printf("EED interfInformationPanel::int
        _grid = new wxGrid( this,
                  wxID_ANY,
                  wxPoint( 0, 0 ),
-                 wxSize( 200, 500 ) );
+                 wxSize( 200, 250 ) );
 -
        int i,gridCol=10,gridRow=sizeZ+2;
        _grid->CreateGrid( 0, 0 );
        _grid->AppendRows(gridRow);
@@@ -386,42 -344,22 +386,36 @@@ printf("EED interfInformationPanel::int
        sizerB->Add( showResultImagesBtn,         1, wxALL, 2 );
        sizerB->Add( saveResultsBtn,              1, wxALL, 2 );
  
 +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
 +#if wxMAJOR_VERSION <= 2
        wxFlexGridSizer * sizer         = new wxFlexGridSizer(1,8);
 +#else
 +      wxFlexGridSizer * sizer         = new wxFlexGridSizer(20,1,0,0);
 +#endif
 +printf("EED interfInformationPanel::interfInformationPanel 5\n");
        sizer->Add( sizerA                     , 1, wxALL               , 0 );
 -      sizer->Add( new wxStaticText(this      ,-1,_T("Slice Range"))   , 1, wxALL , 0 );
 +printf("EED interfInformationPanel::interfInformationPanel 5.1\n");
 +      sizer->Add( new wxStaticText(this      ,1,_T("Slice Range"))    , 1, wxALL , 0 );
 +printf("EED interfInformationPanel::interfInformationPanel 5.2\n");
        sizer->Add( _mbarrangeSliceInformation , 1, wxALL|wxGROW        , 2 );
 -      sizer->Add( new wxStaticText(this      ,-1,_T("Gray Range"))    , 1, wxALL , 0 );
 +printf("EED interfInformationPanel::interfInformationPanel 5.3\n");
 +      sizer->Add( new wxStaticText(this      ,1,_T("Gray Range"))     , 1, wxALL , 0 );
 +printf("EED interfInformationPanel::interfInformationPanel 5.4\n");
        sizer->Add( _mbarrangeRangeInformation , 1, wxALL|wxGROW        , 2 );
- printf("EED interfInformationPanel::interfInformationPanel 5.5\n");
- 
 -      sizer->Add( sizerB                     , 1, wxALL|wxGROW                , 0 );
 -      sizer->Add( _staticTextInformation     , 1, wxALL|wxGROW                , 0 );
++      
++      
 +      sizer->Add( sizerB                     , 1, wxEXPAND            , 0 );
- 
- printf("EED interfInformationPanel::interfInformationPanel 5.6\n");
 +      sizer->Add( _staticTextInformation     , 1, wxEXPAND            , 0 );
- printf("EED interfInformationPanel::interfInformationPanel 5.7\n");
        sizer->Add( _grid                      , 1, wxEXPAND            , 0 );
- printf("EED interfInformationPanel::interfInformationPanel 5.8\n");
 -
        this->SetSizer( sizer );
- printf("EED interfInformationPanel::interfInformationPanel 5.9\n");
 -//    this->SetSize( wxSize(1500,1500) );
 -//  this->SetBackgroundColour( wxColour(100,100,100) );
 +      this->SetSize( wxSize(1500,1500) );
-       //this->SetBackgroundColour( wxColour(100,100,100) );
        this->SetAutoLayout( true );
 +printf("EED interfInformationPanel::interfInformationPanel 5.10\n");
        this->Layout();
        //return panel;
 +
 +printf("EED interfInformationPanel::interfInformationPanel End\n");
 +
  }
  
  interfInformationPanel::~interfInformationPanel()

diff --cc lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
index ca8e2bcb7a8d23cd7001794051aa9003adbdf498,2077380295561cc75bb6d6ec772a039e30ee2a51..548195cb526aaa76c34da97695a741f0980e1a7d
--- 1/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
--- 2/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
@@@ -94,9 -94,10 +94,11 @@@ char wxContourMainFrame::COPY = 'C'
                _viewThresholdImage                     = NULL;
                _viewThresholdImagePanel        = NULL;
                _viewColorLayerImagePanel       = NULL;
++
+               _frameShowResultImages          = NULL;
        }
  
 -      wxContourMainFrame :: wxContourMainFrame(wxWindow* parent, wxWindowID id,const wxString& title,const wxPoint& pos,const wxSize& size,std::vector<vtkImageData*> images, long style,std::string datadir)
 +      wxContourMainFrame::wxContourMainFrame(wxWindow* parent, wxWindowID id,const wxString& title,const wxPoint& pos,const wxSize& size,std::vector<vtkImageData*> images, long style,std::string datadir)
                : wxPanel(parent, id, pos, size, style)
        {
                m_mgr.SetManagedWindow(this);
@@@ -123,7 -123,7 +124,7 @@@
                inredo                                          = 0;
                inundo                                          = 0;
                _pannew = interfMainPanel::getInstance(this,datadir+"/data/Icons");//, eventHandler);
-               _performingOperation            = new PerformingOperation();
 -              _performingOperation = new PerformingOperation();
++              _performingOperation        = new PerformingOperation();
                if(images.size() > 0)
                {
                        this->setVectImages(images);

diff --cc lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
Simple merge

diff --cc lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx
Simple merge