Peter M. Groen / openhantek

Commit d649f0915358410c80df130fd7e8a659c17f3bd0

Authored by oliverhaag
1 parent 0636ab1c

Fixed bug causing wrong misc field in measurement table

Inline Side-by-side
Showing 2 changed files with 4 additions and 5 deletions
openhantek/ChangeLog
  View file @d649f09
... ... @@ -112,5 +112,6 @@
112 112 * Added submenu to show/hide docking windows and toolbars to the View menu
113 113  
114 114 2011-01-22 Oliver Haag <oliver.haag@gmail.com>
115   -* Fixed bug with wrong pretrigger position when using a DSO-2090
  115 +* Bugfix: Wrong pretrigger position when using a DSO-2090
116 116 * Improved timing of the Hantek DSO sampling routine
  117 +* Bugfix: Wrong misc field in measurement table after enabling a channel
... ...
openhantek/src/dsowidget.cpp
  View file @d649f09
... ... @@ -390,14 +390,12 @@ void DsoWidget::updateVoltageCoupling(unsigned int channel) {
390 390 if(channel >= (unsigned int) this->settings->scope.voltage.count())
391 391 return;
392 392  
393   - if(this->settings->scope.voltage[channel].used || this->settings->scope.spectrum[channel].used)
394   - this->measurementMiscLabel[channel]->setText(Dso::couplingString((Dso::Coupling) this->settings->scope.voltage[channel].misc));
  393 + this->measurementMiscLabel[channel]->setText(Dso::couplingString((Dso::Coupling) this->settings->scope.voltage[channel].misc));
395 394 }
396 395  
397 396 /// \brief Handles modeChanged signal from the voltage dock.
398 397 void DsoWidget::updateMathMode() {
399   - if(this->settings->scope.voltage[this->settings->scope.physicalChannels].used || this->settings->scope.spectrum[this->settings->scope.physicalChannels].used)
400   - this->measurementMiscLabel[this->settings->scope.physicalChannels]->setText(Dso::mathModeString((Dso::MathMode) this->settings->scope.voltage[this->settings->scope.physicalChannels].misc));
  398 + this->measurementMiscLabel[this->settings->scope.physicalChannels]->setText(Dso::mathModeString((Dso::MathMode) this->settings->scope.voltage[this->settings->scope.physicalChannels].misc));
401 399 }
402 400  
403 401 /// \brief Handles gainChanged signal from the voltage dock.
... ...