#3145 creaContours Bug New Normal - changeWx28to30

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

diff --git a/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx b/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx
index 796b2f320880173e1c6e828649a3e338a08d7106..dc5ff99eb7cf1d09a2a3191d81985c4ac104b350 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 //----------------------------------------------------------------------------------------------------------------
 // Class definition include
 //----------------------------------------------------------------------------------------------------------------
@@ -71,7 +96,12 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHOOSER_CHANGE )
                setVerticalMaxSelectedNums( groupConfig );
                
                SetSize(size);
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
                _outSizer = new wxFlexGridSizer ( 1, 10, 10);
+#else
+               _outSizer = new wxFlexGridSizer ( 10);
+#endif
                _orientation = theOrientation;
                initializeResolutionSlider();
                _actualInstant=new std::map<std::string,int>();
@@ -113,11 +143,15 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHOOSER_CHANGE )
        */
        void wxInstantChooserPanel :: addConcept(std::string aConceptName, int minV, int maxV, int actualV)
        {
+printf("EED wxInstantChooserPanel :: addConcept  Start\n");
                wxConceptControl * nwConcept = new wxConceptControl(this, _orientation, minV, maxV, actualV, aConceptName, _configuration);
                _concepts->push_back( nwConcept );
                _lastConceptUpdated = nwConcept;
+printf("EED wxInstantChooserPanel :: addConcept  1\n");
                _outSizer->Add(nwConcept, wxEXPAND);
+printf("EED wxInstantChooserPanel :: addConcept  2\n");
                Connect(nwConcept->GetId(), wxEVT_CONCEPT_RELEASE, (wxObjectEventFunction) (wxCommandEventFunction)  &wxInstantChooserPanel::onConceptRelease );
+printf("EED wxInstantChooserPanel :: addConcept  End\n");
        }
 
        void wxInstantChooserPanel :: setWxEventHandler( wxEvtHandler * theEventHandler )
@@ -130,13 +164,13 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHOOSER_CHANGE )
        //------------------------------------------------------------------------------------------------------------
        void wxInstantChooserPanel :: onResolutionSlider(wxScrollEvent& event)
        {
-               std::string lasConcept = _lastConceptUpdated->getName();
-               int value = _lastConceptUpdated->getActualValue();
-               int min = _lastConceptUpdated->getMinValue();
-               int max = _lastConceptUpdated->getMaxValue();
-               int delta = (int) (pow((double) 2, _resolutionSlider->GetValue() ));
-               int minTmp   = value - delta/2;
-               int maxTmp   = value + delta/2;
+               std::string lasConcept  = _lastConceptUpdated->getName();
+               int value                               = _lastConceptUpdated->getActualValue();
+               int min                                 = _lastConceptUpdated->getMinValue();
+               int max                                 = _lastConceptUpdated->getMaxValue();
+               int delta                               = (int) (pow((double) 2, _resolutionSlider->GetValue() ));
+               int minTmp                      = value - delta/2;
+               int maxTmp                      = value + delta/2;
                if (minTmp<min)
                        {
                                minTmp = min;