From 9676c169ceb2f52ae2d9060c8b24d99002e44468 Mon Sep 17 00:00:00 2001 From: Klemens Schölhorn Date: Thu, 21 Dec 2017 20:13:45 +0100 Subject: [PATCH] Do not invert the offset when inverting a channel --- openhantek/src/glgenerator.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openhantek/src/glgenerator.cpp b/openhantek/src/glgenerator.cpp index 8bff676..d32dcca 100644 --- a/openhantek/src/glgenerator.cpp +++ b/openhantek/src/glgenerator.cpp @@ -238,7 +238,7 @@ void GlGenerator::generateGraphs(const DataAnalyzerResult *result) { for (unsigned int position = 0; position < sampleCount; ++position) { *(glIterator++) = position * horizontalFactor - DIVS_TIME / 2; - *(glIterator++) = invert * (*(dataIterator++) / gain + offset); + *(glIterator++) = *(dataIterator++) / gain * invert + offset; } } else { std::vector::const_iterator dataIterator = @@ -297,8 +297,8 @@ void GlGenerator::generateGraphs(const DataAnalyzerResult *result) { const double yInvert = settings->voltage[yChannel].inverted ? -1.0 : 1.0; for (unsigned int position = 0; position < sampleCount; ++position) { - *(glIterator++) = xInvert * (*(xIterator++) / xGain + xOffset); - *(glIterator++) = yInvert * (*(yIterator++) / yGain + yOffset); + *(glIterator++) = *(xIterator++) / xGain * xInvert + xOffset; + *(glIterator++) = *(yIterator++) / yGain * yInvert + yOffset; } } else { // Delete all vector arrays -- libgit2 0.21.4