X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxInstantChooserPanel.cxx;h=e47a1ad1563426eeb050887f96eef944aa5cd065;hb=refs%2Fheads%2Fvtk8itk4wx3-mingw64;hp=ea1cfeaf9a1180866d618e6e63f90d2c61e33758;hpb=803877e98b79df963f17d83da7203fd972674d9e;p=creaContours.git

diff --git a/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx b/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx
index ea1cfea..e47a1ad 100644
--- 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>();
@@ -130,13 +160,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( 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;	
@@ -188,7 +218,7 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHOOSER_CHANGE )
 			}					
 		}*/
 
-		int groupID = (int)event.GetClientData();
+		int groupID = *(int*)event.GetClientData();
 		wxConceptControl * eventConcept = (wxConceptControl *)event.GetEventObject();
 		if ( eventConcept->getIfChecked( groupID ) )
 		{
@@ -388,7 +418,7 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHOOSER_CHANGE )
 		int value = theConceptToUpdate->getActualValue();
 		int min = theConceptToUpdate->getMinValue();
 		int max = theConceptToUpdate->getMaxValue();
-		int delta = (int) (pow( 2, _resolutionSlider->GetValue() ));
+		int delta = (int) (pow((double) 2, _resolutionSlider->GetValue() ));
 		int minTmp   = value - delta/2;
 		int maxTmp   = value + delta/2;
 		if (minTmp<min)