VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-10-31 04:50:29 -04:00
Code Issues Projects Releases Wiki Activity

New scope: use finer delay division (base trace length / 100)

Browse Source
This commit is contained in:
f4exb 2017-02-11 12:07:07 +01:00
parent c8aa0dc4b8
commit 804497c282
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sdrbase/gui/glscopenggui.cpp
View File

@ -36,6 +36,7 @@ GLScopeNGGUI::GLScopeNGGUI(QWidget* parent) :
qDebug("GLScopeNGGUI::GLScopeNGGUI"); qDebug("GLScopeNGGUI::GLScopeNGGUI");
setEnabled(false); setEnabled(false);
ui->setupUi(this); ui->setupUi(this);
ui->trigDelayFine->setMaximum(ScopeVisNG::m_traceChunkSize / 10.0);
} }
GLScopeNGGUI::~GLScopeNGGUI() GLScopeNGGUI::~GLScopeNGGUI()
@ -255,6 +256,8 @@ void GLScopeNGGUI::on_traceLen_valueChanged(int value)
setTraceLenDisplay(); setTraceLenDisplay();
setTimeScaleDisplay(); setTimeScaleDisplay();
setTimeOfsDisplay(); setTimeOfsDisplay();
setTrigDelayDisplay();
setTrigPreDisplay();
} }
void GLScopeNGGUI::on_trig_valueChanged(int value) void GLScopeNGGUI::on_trig_valueChanged(int value)
@ -608,7 +611,7 @@ void GLScopeNGGUI::setTrigLevelDisplay()
void GLScopeNGGUI::setTrigDelayDisplay() void GLScopeNGGUI::setTrigDelayDisplay()
{ {
double delayMult = ui->trigDelayCoarse->value() + ui->trigDelayFine->value() / 100.0; double delayMult = ui->trigDelayCoarse->value() + ui->trigDelayFine->value() / (ScopeVisNG::m_traceChunkSize / 10.0);
unsigned int n_samples_delay = m_traceLenMult * ScopeVisNG::m_traceChunkSize * delayMult; unsigned int n_samples_delay = m_traceLenMult * ScopeVisNG::m_traceChunkSize * delayMult;
if (n_samples_delay < 1000) { if (n_samples_delay < 1000) {
@ -625,13 +628,13 @@ void GLScopeNGGUI::setTrigDelayDisplay()
double t = (n_samples_delay * 1.0f / m_sampleRate); double t = (n_samples_delay * 1.0f / m_sampleRate);
if(t < 0.000001) if(t < 0.000001)
ui->trigDelayText->setText(tr("%1\nns").arg(t * 1000000000.0)); ui->trigDelayText->setText(tr("%1\nns").arg(t * 1000000000.0, 0, 'f', 1));
else if(t < 0.001) else if(t < 0.001)
ui->trigDelayText->setText(tr("%1\nµs").arg(t * 1000000.0)); ui->trigDelayText->setText(tr("%1\nµs").arg(t * 1000000.0, 0, 'f', 1));
else if(t < 1.0) else if(t < 1.0)
ui->trigDelayText->setText(tr("%1\nms").arg(t * 1000.0)); ui->trigDelayText->setText(tr("%1\nms").arg(t * 1000.0, 0, 'f', 1));
else else
ui->trigDelayText->setText(tr("%1\ns").arg(t * 1.0)); ui->trigDelayText->setText(tr("%1\ns").arg(t * 1.0, 0, 'f', 1));
} }
void GLScopeNGGUI::setTrigPreDisplay() void GLScopeNGGUI::setTrigPreDisplay()
@ -698,7 +701,7 @@ void GLScopeNGGUI::fillTriggerData(ScopeVisNG::TriggerData& triggerData)
triggerData.m_triggerPositiveEdge = ui->trigPos->isChecked(); triggerData.m_triggerPositiveEdge = ui->trigPos->isChecked();
triggerData.m_triggerBothEdges = ui->trigBoth->isChecked(); triggerData.m_triggerBothEdges = ui->trigBoth->isChecked();
triggerData.m_triggerRepeat = ui->trigCount->value(); triggerData.m_triggerRepeat = ui->trigCount->value();
triggerData.m_triggerDelayMult = ui->trigDelayCoarse->value() + ui->trigDelayFine->value() / 100.0; triggerData.m_triggerDelayMult = ui->trigDelayCoarse->value() + ui->trigDelayFine->value() / (ScopeVisNG::m_traceChunkSize / 10.0);
triggerData.m_triggerDelay = (int) (m_traceLenMult * ScopeVisNG::m_traceChunkSize * triggerData.m_triggerDelayMult); triggerData.m_triggerDelay = (int) (m_traceLenMult * ScopeVisNG::m_traceChunkSize * triggerData.m_triggerDelayMult);
triggerData.m_triggerDelayCoarse = ui->trigDelayCoarse->value(); triggerData.m_triggerDelayCoarse = ui->trigDelayCoarse->value();
triggerData.m_triggerDelayFine = ui->trigDelayFine->value(); triggerData.m_triggerDelayFine = ui->trigDelayFine->value();

2
sdrbase/gui/glscopenggui.ui
View File

@ -1424,7 +1424,7 @@ kS/s</string>
<string>Trigger delay fine (trace length divider)</string> <string>Trigger delay fine (trace length divider)</string>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>100</number> <number>480</number>
</property> </property>
<property name="pageStep"> <property name="pageStep">
<number>1</number> <number>1</number>