mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-10-02 09:46:38 -04:00
New scope: removed Z trace stuff
This commit is contained in:
parent
35739cb025
commit
bc2d0f3743
@ -321,6 +321,13 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="Line" name="line">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Vertical</enum>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="lowCutLabel">
|
<widget class="QLabel" name="lowCutLabel">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
|
@ -43,7 +43,7 @@ GLScopeNGGUI::GLScopeNGGUI(QWidget* parent) :
|
|||||||
m_focusedTraceColor.setRgb(255,255,64);
|
m_focusedTraceColor.setRgb(255,255,64);
|
||||||
ui->trigColor->setStyleSheet("QLabel { background-color : rgb(0,255,0); }");
|
ui->trigColor->setStyleSheet("QLabel { background-color : rgb(0,255,0); }");
|
||||||
m_focusedTriggerColor.setRgb(0,255,0);
|
m_focusedTriggerColor.setRgb(0,255,0);
|
||||||
ui->traceText->setText("X"); // TODO: remove when more than 2 traces are supported
|
ui->traceText->setText("X");
|
||||||
ui->mem->setMaximum(ScopeVisNG::m_nbTraceMemories - 1);
|
ui->mem->setMaximum(ScopeVisNG::m_nbTraceMemories - 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -530,7 +530,6 @@ void GLScopeNGGUI::on_traceLen_valueChanged(int value)
|
|||||||
|
|
||||||
void GLScopeNGGUI::on_trace_valueChanged(int value)
|
void GLScopeNGGUI::on_trace_valueChanged(int value)
|
||||||
{
|
{
|
||||||
//ui->traceText->setText(tr("%1").arg(value)); TODO: restore when more than 2 traces are supported
|
|
||||||
ui->traceText->setText(value == 0 ? "X" : QString("Y%1").arg(ui->trace->value()));
|
ui->traceText->setText(value == 0 ? "X" : QString("Y%1").arg(ui->trace->value()));
|
||||||
|
|
||||||
ScopeVisNG::TraceData traceData;
|
ScopeVisNG::TraceData traceData;
|
||||||
@ -549,7 +548,7 @@ void GLScopeNGGUI::on_trace_valueChanged(int value)
|
|||||||
|
|
||||||
void GLScopeNGGUI::on_traceAdd_clicked(bool checked)
|
void GLScopeNGGUI::on_traceAdd_clicked(bool checked)
|
||||||
{
|
{
|
||||||
if (ui->trace->maximum() < 3) // TODO: extend to more traces when 2 traces are fully stable
|
if (ui->trace->maximum() < 3)
|
||||||
{
|
{
|
||||||
if (ui->trace->value() == 0)
|
if (ui->trace->value() == 0)
|
||||||
{
|
{
|
||||||
@ -1348,8 +1347,6 @@ GLScopeNGGUI::TraceUIBlocker::TraceUIBlocker(Ui::GLScopeNGGUI* ui) :
|
|||||||
m_oldStateOfsFine = m_ui->ofsFine->blockSignals(true);
|
m_oldStateOfsFine = m_ui->ofsFine->blockSignals(true);
|
||||||
m_oldStateTraceDelayCoarse = m_ui->traceDelayCoarse->blockSignals(true);
|
m_oldStateTraceDelayCoarse = m_ui->traceDelayCoarse->blockSignals(true);
|
||||||
m_oldStateTraceDelayFine = m_ui->traceDelayFine->blockSignals(true);
|
m_oldStateTraceDelayFine = m_ui->traceDelayFine->blockSignals(true);
|
||||||
m_oldStateZSelect = m_ui->zSelect->blockSignals(true);
|
|
||||||
m_oldStateZTraceMode = m_ui->zTraceMode->blockSignals(true);
|
|
||||||
m_oldStateTraceColor = m_ui->traceColor->blockSignals(true);
|
m_oldStateTraceColor = m_ui->traceColor->blockSignals(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1369,8 +1366,6 @@ void GLScopeNGGUI::TraceUIBlocker::unBlock()
|
|||||||
m_ui->ofsFine->blockSignals(m_oldStateOfsFine);
|
m_ui->ofsFine->blockSignals(m_oldStateOfsFine);
|
||||||
m_ui->traceDelayCoarse->blockSignals(m_oldStateTraceDelayCoarse);
|
m_ui->traceDelayCoarse->blockSignals(m_oldStateTraceDelayCoarse);
|
||||||
m_ui->traceDelayFine->blockSignals(m_oldStateTraceDelayFine);
|
m_ui->traceDelayFine->blockSignals(m_oldStateTraceDelayFine);
|
||||||
m_ui->zSelect->blockSignals(m_oldStateZSelect);
|
|
||||||
m_ui->zTraceMode->blockSignals(m_oldStateZTraceMode);
|
|
||||||
m_ui->traceColor->blockSignals(m_oldStateTraceColor);
|
m_ui->traceColor->blockSignals(m_oldStateTraceColor);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -90,8 +90,6 @@ private:
|
|||||||
bool m_oldStateOfsFine;
|
bool m_oldStateOfsFine;
|
||||||
bool m_oldStateTraceDelayCoarse;
|
bool m_oldStateTraceDelayCoarse;
|
||||||
bool m_oldStateTraceDelayFine;
|
bool m_oldStateTraceDelayFine;
|
||||||
bool m_oldStateZSelect;
|
|
||||||
bool m_oldStateZTraceMode;
|
|
||||||
bool m_oldStateTraceColor;
|
bool m_oldStateTraceColor;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1015,54 +1015,6 @@ kS/s</string>
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
|
||||||
<widget class="QCheckBox" name="zSelect">
|
|
||||||
<property name="toolTip">
|
|
||||||
<string>Select this trace as Z input</string>
|
|
||||||
</property>
|
|
||||||
<property name="layoutDirection">
|
|
||||||
<enum>Qt::RightToLeft</enum>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Z</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QComboBox" name="zTraceMode">
|
|
||||||
<property name="maximumSize">
|
|
||||||
<size>
|
|
||||||
<width>52</width>
|
|
||||||
<height>16777215</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
<property name="toolTip">
|
|
||||||
<string>Trace Z modulation mode (none, luminance, false colors)</string>
|
|
||||||
</property>
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>No</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>Lum</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>Col</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="Line" name="line_15">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Vertical</enum>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
<item>
|
||||||
<spacer name="horizontalSpacer">
|
<spacer name="horizontalSpacer">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
@ -1076,6 +1028,13 @@ kS/s</string>
|
|||||||
</property>
|
</property>
|
||||||
</spacer>
|
</spacer>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="Line" name="line_15">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Vertical</enum>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="memLabel">
|
<widget class="QLabel" name="memLabel">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
|
Loading…
Reference in New Issue
Block a user