+/*# ---------------------------------------------------------------------
+#
+# 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
//----------------------------------------------------------------------------------------------------------------
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>();
//------------------------------------------------------------------------------------------------------------
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;
}
else
{
- for(int i=0; i<_concepts->size(); i++)
+ for(int i=0; i< (int)(_concepts->size()); i++)
{
changeResolutionAtConceptControl( (*_concepts)[i] );
}
}
}*/
- 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){
aConcept->clearCheckAt( groupID );
}
}
- }
-
+ }
}
}
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)
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)
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 )
addConcept( conceptNameVect[i], 1, conceptSizeVect[i], 1);
} // if
}
- }
\ No newline at end of file
+ }
+