From: Juan Prieto Date: Mon, 5 Oct 2009 19:42:30 +0000 (+0000) Subject: Works with Visual Studio 2009 X-Git-Tag: CREATOOLS.2-0-3~46 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=creaContours.git;a=commitdiff_plain;h=74b501a27c4c1a94330cdc79677b850f0777209b Works with Visual Studio 2009 --- diff --git a/appli/wxContourGUIExample/CMakeLists.txt b/appli/wxContourGUIExample/CMakeLists.txt index f893d2c..6ba1b98 100644 --- a/appli/wxContourGUIExample/CMakeLists.txt +++ b/appli/wxContourGUIExample/CMakeLists.txt @@ -8,6 +8,7 @@ ELSE(WIN32) ENDIF(WIN32) INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) +INCLUDE_DIRECTORIES(${creaImageIO2_INCLUDE_DIRS}) TARGET_LINK_LIBRARIES( wxContourGUIExample # ${WXWIDGETS_LIBRARIES} diff --git a/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx b/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx index ea1cfea..8f5894e 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,(double) _resolutionSlider->GetValue() )); int minTmp = value - delta/2; int maxTmp = value + delta/2; if (minTmpgetActualValue(); int min = theConceptToUpdate->getMinValue(); int max = theConceptToUpdate->getMaxValue(); - int delta = (int) (pow( 2, _resolutionSlider->GetValue() )); + int delta = (int) (pow( (double)2, (double)_resolutionSlider->GetValue() )); int minTmp = value - delta/2; int maxTmp = value + delta/2; if (minTmp