diff --git a/openhantek/ChangeLog b/openhantek/ChangeLog index d5c2919..7949fe3 100644 --- a/openhantek/ChangeLog +++ b/openhantek/ChangeLog @@ -112,5 +112,6 @@ * Added submenu to show/hide docking windows and toolbars to the View menu 2011-01-22 Oliver Haag -* Fixed bug with wrong pretrigger position when using a DSO-2090 +* Bugfix: Wrong pretrigger position when using a DSO-2090 * Improved timing of the Hantek DSO sampling routine +* Bugfix: Wrong misc field in measurement table after enabling a channel diff --git a/openhantek/src/dsowidget.cpp b/openhantek/src/dsowidget.cpp index 75093b5..c89da54 100644 --- a/openhantek/src/dsowidget.cpp +++ b/openhantek/src/dsowidget.cpp @@ -390,14 +390,12 @@ void DsoWidget::updateVoltageCoupling(unsigned int channel) { if(channel >= (unsigned int) this->settings->scope.voltage.count()) return; - if(this->settings->scope.voltage[channel].used || this->settings->scope.spectrum[channel].used) - this->measurementMiscLabel[channel]->setText(Dso::couplingString((Dso::Coupling) this->settings->scope.voltage[channel].misc)); + this->measurementMiscLabel[channel]->setText(Dso::couplingString((Dso::Coupling) this->settings->scope.voltage[channel].misc)); } /// \brief Handles modeChanged signal from the voltage dock. void DsoWidget::updateMathMode() { - if(this->settings->scope.voltage[this->settings->scope.physicalChannels].used || this->settings->scope.spectrum[this->settings->scope.physicalChannels].used) - this->measurementMiscLabel[this->settings->scope.physicalChannels]->setText(Dso::mathModeString((Dso::MathMode) this->settings->scope.voltage[this->settings->scope.physicalChannels].misc)); + this->measurementMiscLabel[this->settings->scope.physicalChannels]->setText(Dso::mathModeString((Dso::MathMode) this->settings->scope.voltage[this->settings->scope.physicalChannels].misc)); } /// \brief Handles gainChanged signal from the voltage dock.