X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxInstantChooserPanel.cxx;h=dc5ff99eb7cf1d09a2a3191d81985c4ac104b350;hb=393af49c04fb77e019068f0f184b3b65e894f2a3;hp=b40caf42caf7c3af1c31a7f6a1f748b01d83960b;hpb=6e3c929c883c405e0075fa8df10b12a935979367;p=creaContours.git diff --git a/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx b/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx index b40caf4..dc5ff99 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(); @@ -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( 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 (minTmpsize(); i++) + for(int i=0; i< (int)(_concepts->size()); i++) { changeResolutionAtConceptControl( (*_concepts)[i] ); } @@ -188,13 +222,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){ @@ -211,8 +245,7 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHOOSER_CHANGE ) aConcept->clearCheckAt( groupID ); } } - } - + } } } @@ -265,7 +298,7 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHOOSER_CHANGE ) void wxInstantChooserPanel :: setInstant(std::vector choiceInstant) { int max = _concepts->size(); - if( choiceInstant.size() == max ) + if( (int)(choiceInstant.size()) == max ) { int i = 0; while(i< max) @@ -389,7 +422,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 (minTmpsize(); - wxConceptControl * aConcept = NULL; +// wxConceptControl * aConcept = NULL; for ( i=0; igetName().compare( theConceptName ) == 0 ) @@ -499,4 +532,5 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHOOSER_CHANGE ) addConcept( conceptNameVect[i], 1, conceptSizeVect[i], 1); } // if } - } \ No newline at end of file + } +