New scope: added trace and trigger number display methods

This commit is contained in:
f4exb 2017-02-09 18:44:20 +01:00
parent d74e7d87d7
commit c56f852a85
2 changed files with 12 additions and 0 deletions

View File

@ -384,6 +384,11 @@ void GLScopeNGGUI::on_freerun_toggled(bool checked)
ui->freerun->isChecked()); // TODO: implement one shot feature ui->freerun->isChecked()); // TODO: implement one shot feature
} }
void GLScopeNGGUI::setTraceIndexDisplay()
{
ui->traceText->setText(tr("%1").arg(ui->trace->value()));
}
void GLScopeNGGUI::setTimeScaleDisplay() void GLScopeNGGUI::setTimeScaleDisplay()
{ {
m_sampleRate = m_glScope->getSampleRate(); m_sampleRate = m_glScope->getSampleRate();
@ -514,6 +519,11 @@ void GLScopeNGGUI::setAmpOfsDisplay()
} }
} }
void GLScopeNGGUI::setTrigIndexDisplay()
{
ui->trigText->setText(tr("%1").arg(ui->trig->value()));
}
void GLScopeNGGUI::setTrigLevelDisplay() void GLScopeNGGUI::setTrigLevelDisplay()
{ {
double t = (ui->trigLevelCoarse->value() / 100.0f) + (ui->trigLevelFine->value() / 20000.0f); double t = (ui->trigLevelCoarse->value() / 100.0f) + (ui->trigLevelFine->value() / 20000.0f);

View File

@ -65,6 +65,7 @@ private:
void applySettings(); void applySettings();
// First row // First row
void setTraceIndexDisplay();
void setTimeScaleDisplay(); void setTimeScaleDisplay();
void setTraceLenDisplay(); void setTraceLenDisplay();
void setTimeOfsDisplay(); void setTimeOfsDisplay();
@ -72,6 +73,7 @@ private:
void setAmpScaleDisplay(); void setAmpScaleDisplay();
void setAmpOfsDisplay(); void setAmpOfsDisplay();
// Third row // Third row
void setTrigIndexDisplay();
void setTrigLevelDisplay(); void setTrigLevelDisplay();
void setTrigDelayDisplay(); void setTrigDelayDisplay();
void setTrigPreDisplay(); void setTrigPreDisplay();