X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FInterface_ManagerContour_NDimensions%2FwxInstantChooserPanel.cxx;h=a4de255267091ed5b92f9d2eed094029eda0cf5d;hb=242e4c37e5e22bcba90456327564ea9b3d1d6274;hp=cd697ef36fb8042a3c986eb656c90472cd48ba0d;hpb=3a73ff10fa8904d7aad5df49b1481f58abf829e3;p=creaContours.git

diff --git a/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx b/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx
index cd697ef..a4de255 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
 //----------------------------------------------------------------------------------------------------------------
@@ -134,7 +159,7 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHOOSER_CHANGE )
 		int value = _lastConceptUpdated->getActualValue();
 		int min = _lastConceptUpdated->getMinValue();
 		int max = _lastConceptUpdated->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)
@@ -153,7 +178,7 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHOOSER_CHANGE )
 		}
 		else
 		{
-			for(int i=0; i<_concepts->size(); i++)
+			for(int i=0; i< (int)(_concepts->size()); i++)
 			{
 				changeResolutionAtConceptControl( (*_concepts)[i] );
 			}
@@ -188,13 +213,13 @@ 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 ) )
 		{
 			int size = _concepts->size();
 			wxConceptControl * aConcept = NULL;
-			int accum = 0;
+//			int accum = 0;
 
 			for(int i = 0; i < eventConcept->getNumCheckBox();i++){
 				if(i!=groupID){
@@ -264,7 +289,7 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHOOSER_CHANGE )
 	void wxInstantChooserPanel :: setInstant(std::vector<int> choiceInstant)
 	{		
 		int max = _concepts->size();
-		if( choiceInstant.size() == max )
+		if( (int)(choiceInstant.size()) == max )
 		{
 			int i = 0;
 			while(i< max)
@@ -388,7 +413,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)
@@ -473,7 +498,7 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHOOSER_CHANGE )
 		bool isChecked = false;
 
 		int i,size = _concepts->size();
-		wxConceptControl * aConcept = NULL;			
+//		wxConceptControl * aConcept = NULL;			
 		for ( i=0; i<size && !isChecked; i++ )
 		{	
 			if( (*_concepts)[i]->getName().compare( theConceptName ) == 0 )
@@ -498,4 +523,5 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHOOSER_CHANGE )
 				addConcept( conceptNameVect[i], 1, conceptSizeVect[i], 1);
 			} // if
 		}
-	}
\ No newline at end of file
+	}
+