diff --git a/openhantek/src/dsowidget.cpp b/openhantek/src/dsowidget.cpp index 051c09d..759b96e 100644 --- a/openhantek/src/dsowidget.cpp +++ b/openhantek/src/dsowidget.cpp @@ -115,6 +115,7 @@ DsoWidget::DsoWidget(DsoSettings *settings, DataAnalyzer *dataAnalyzer, QWidget this->markerSlider->setStep(marker, 0.2); this->markerSlider->setValue(marker, this->settings->scope.horizontal.marker[marker]); this->markerSlider->setVisible(marker, true); + this->settings->scope.horizontal.marker_visible[marker] = true; } // The table for the settings diff --git a/openhantek/src/glscope.cpp b/openhantek/src/glscope.cpp index d5a0277..5cbc3d1 100644 --- a/openhantek/src/glscope.cpp +++ b/openhantek/src/glscope.cpp @@ -156,6 +156,8 @@ void GlScope::paintGL() { this->qglColor(this->settings->view.color.screen.markers); for(int marker = 0; marker < MARKER_COUNT; ++marker) { + if (!this->settings->scope.horizontal.marker_visible[marker]) + continue; if(this->vaMarker[marker].size() != 4) { this->vaMarker[marker].resize(2 * 2); this->vaMarker[marker][1] = -DIVS_VOLTAGE; diff --git a/openhantek/src/settings.h b/openhantek/src/settings.h index 0191cc5..528c4d9 100644 --- a/openhantek/src/settings.h +++ b/openhantek/src/settings.h @@ -91,7 +91,8 @@ struct DsoSettingsOptions { struct DsoSettingsScopeHorizontal { Dso::GraphFormat format; ///< Graph drawing mode of the scope double frequencybase; ///< Frequencybase in Hz/div - double marker[2]; ///< Marker positions in div + double marker[MARKER_COUNT]; ///< Marker positions in div + bool marker_visible[MARKER_COUNT]; double timebase; ///< Timebase in s/div unsigned int recordLength; ///< Sample count double samplerate; ///< The samplerate of the oscilloscope in S