X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxContourEventHandler.cxx;fp=lib%2FInterface_ManagerContour_NDimensions%2FwxContourEventHandler.cxx;h=0bf6536690eb233c03ce3018a47fc44741e38e1b;hb=7e39ed1fa75cd57dfea770353f5286bdcee23c24;hp=6121c56f7e56f34b897b7a23b8bc4a0580000d36;hpb=28ef036731a2758d1c2efcf4de582d063b4129ec;p=creaContours.git diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.cxx index 6121c56..0bf6536 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.cxx +++ b/lib/Interface_ManagerContour_NDimensions/wxContourEventHandler.cxx @@ -436,12 +436,12 @@ double PanelBullEyeOptions::GetAngDeltaOfCrownSection(int nCrown) else { dataConcept = _instantPanel->getLastConceptData(); - if( dataConcept->getName().compare( _theViewPanel->getVerticalConceptName() ) ) + if( dataConcept->getName().compare( _theViewPanel->getVerticalConceptName() ) == 0) { _theViewPanel->setActualVertical( dataConcept->getActualValue()); //_theViewPanel->setVerticalConcept( dataConcept->getName(), dataConcept->getMinShowedValue()/*dataConcept->getMinValue()*/, /*dataConcept->getMaxValue()*/ dataConcept->getMaxShowedValue(), dataConcept->getMinShowedValue(), dataConcept->getMaxShowedValue(), dataConcept->getActualValue()); } - else if( dataConcept->getName().compare( _theViewPanel->getHorizontalConceptName() ) || _instantPanel->getIfConceptCheckedAt( dataConcept->getName(), 0 ) ) + else if( dataConcept->getName().compare( _theViewPanel->getHorizontalConceptName() ) == 0|| _instantPanel->getIfConceptCheckedAt( dataConcept->getName(), 0 ) ) { _theViewPanel->setHorizontalConcept( dataConcept->getName(), dataConcept->getMinShowedValue()/*dataConcept->getMinValue()*/, /*dataConcept->getMaxValue()*/ dataConcept->getMaxShowedValue(), dataConcept->getMinShowedValue(), dataConcept->getMaxShowedValue(), dataConcept->getActualValue()); } @@ -2613,7 +2613,7 @@ myfile.close(); _instantPanel = theInstantChooserPanel; _instantPanel->setWxEventHandler( this ); - Connect( _instantPanel->GetId(), wxINSTANT_CHOOSER_CHANGE, (wxObjectEventFunction) (wxCommandEventFunction) &wxContourEventHandler::onChangeInstant ); + //Connect( _instantPanel->GetId(), wxINSTANT_CHOOSER_CHANGE, (wxObjectEventFunction) (wxCommandEventFunction) &wxContourEventHandler::onChangeInstant ); std::vector vect; _instantPanel->getInstant( vect );