X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxInstantChooserPanel.cxx;h=796b2f320880173e1c6e828649a3e338a08d7106;hb=6aefbb5961fe348605e42445066f6c7933af32f6;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..796b2f3 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx
@@ -134,7 +134,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 +153,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 +188,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 +264,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 +388,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 +473,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 +498,5 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHOOSER_CHANGE )
 				addConcept( conceptNameVect[i], 1, conceptSizeVect[i], 1);
 			} // if
 		}
-	}
\ No newline at end of file
+	}
+