diff --git a/dev/osx/Info_valid.plist b/dev/osx/Info_valid.plist index 2b54e6f2..a0c45ab5 100644 --- a/dev/osx/Info_valid.plist +++ b/dev/osx/Info_valid.plist @@ -13,9 +13,9 @@ CFBundleExecutable Engauge Digitizer CFBundleVersion - 11.1 + 11.2 CFBundleShortVersionString - 11.1 + 11.2 LSMinimumSystemVersion 10.10.0 LSApplicationCategoryType diff --git a/dev/snapcraft/snapcraft.yaml b/dev/snapcraft/snapcraft.yaml index ec0dde6a..dcb51dfa 100644 --- a/dev/snapcraft/snapcraft.yaml +++ b/dev/snapcraft/snapcraft.yaml @@ -1,5 +1,5 @@ name: engauge-digitizer -version: '11.1' +version: '11.2' summary: Interactively convert a bitmap graph or map into numbers. description: Software tool for extracting numbers from images of graphs and maps. grade: stable diff --git a/dev/windows/engauge.wxs b/dev/windows/engauge.wxs index 4c2be369..2c58e709 100644 --- a/dev/windows/engauge.wxs +++ b/dev/windows/engauge.wxs @@ -2,10 +2,10 @@ + Version='11.2'> diff --git a/dev/windows/engauge_64.wxs b/dev/windows/engauge_64.wxs index 2a96c116..880a9024 100644 --- a/dev/windows/engauge_64.wxs +++ b/dev/windows/engauge_64.wxs @@ -2,10 +2,10 @@ + Version='11.2'> diff --git a/src/Export/ExportFileFunctions.cpp b/src/Export/ExportFileFunctions.cpp index 2a30f063..97f334ac 100644 --- a/src/Export/ExportFileFunctions.cpp +++ b/src/Export/ExportFileFunctions.cpp @@ -538,25 +538,28 @@ void ExportFileFunctions::loadYRadiusValuesForCurveInterpolatedStraight (const D double xTheta = xThetaValues.at (row); - double yRadius = linearlyInterpolate (points, - xTheta, - transformation); + // Interpolation on curve with no points will trigger an assert so check the point count + *(yRadiusValues [row]) = ""; + if (points.count () > 0) { - // Save y/radius value for this row into yRadiusValues, after appropriate formatting - if (xThetaIsNotOutOfBounds (xTheta, - curveName, - curveLimitsMin, - curveLimitsMax)) { - format.unformattedToFormatted (xTheta, - yRadius, - modelCoords, - modelGeneral, - modelMainWindow, - dummyXThetaOut, - *(yRadiusValues [row]), - transformation); - } else { - *(yRadiusValues [row]) = ""; + double yRadius = linearlyInterpolate (points, + xTheta, + transformation); + + // Save y/radius value for this row into yRadiusValues, after appropriate formatting + if (xThetaIsNotOutOfBounds (xTheta, + curveName, + curveLimitsMin, + curveLimitsMax)) { + format.unformattedToFormatted (xTheta, + yRadius, + modelCoords, + modelGeneral, + modelMainWindow, + dummyXThetaOut, + *(yRadiusValues [row]), + transformation); + } } } } diff --git a/src/util/Version.cpp b/src/util/Version.cpp index 7bcc52e6..8f335c7a 100644 --- a/src/util/Version.cpp +++ b/src/util/Version.cpp @@ -6,7 +6,7 @@ #include "Version.h" -const char *VERSION_NUMBER = "11.1"; +const char *VERSION_NUMBER = "11.2"; QString engaugeWindowTitle() {