diff --git a/plugins/channelrx/chanalyzer/readme.md b/plugins/channelrx/chanalyzer/readme.md
index e4f069307..17b9f20cb 100644
--- a/plugins/channelrx/chanalyzer/readme.md
+++ b/plugins/channelrx/chanalyzer/readme.md
@@ -381,18 +381,18 @@ This pair of sliders let you adjust the trigger level, The level appears on the
The top slider is a coarse adjustment. Each step moves the trigger level by an amount that depends on the projection type:
- Real, Imag: 0.01
- - Mag: 0.005
- - MagSq: 0.005
+ - Mag: 0.01
+ - MagSq: 0.01
- MagDB: 1 dB
- Phi, dPhi: 0.01
The bottom slider is a fine adjustment. Each step moves the trigger level by an amount that depends on the projection type:
- - Real, Imag: 50.0E-6
- - Mag: 25.0sE-6
- - MagSq: 25.0sE-6
+ - Real, Imag: 20.0E-6
+ - Mag: 20.0sE-6
+ - MagSq: 20.0sE-6
- MagDB: 0.01 dB
- - Phi, dPhi: 50.0E-6
+ - Phi, dPhi: 20.0E-6
10: Trigger delay
diff --git a/sdrgui/dsp/scopevisng.cpp b/sdrgui/dsp/scopevisng.cpp
index ca6377310..92cacf781 100644
--- a/sdrgui/dsp/scopevisng.cpp
+++ b/sdrgui/dsp/scopevisng.cpp
@@ -915,7 +915,7 @@ void ScopeVisNG::computeDisplayTriggerLevels()
float levelPowerdB = (100.0f * (level - 1.0f));
float v;
- if (itData->m_projectionType == Projector::ProjectionMagLin)
+ if ((itData->m_projectionType == Projector::ProjectionMagLin) || (itData->m_projectionType == Projector::ProjectionMagSq))
{
v = (levelPowerLin - itData->m_ofs)*itData->m_amp - 1.0f;
}
diff --git a/sdrgui/gui/glscopenggui.cpp b/sdrgui/gui/glscopenggui.cpp
index 3362ec55f..b03e29f9b 100644
--- a/sdrgui/gui/glscopenggui.cpp
+++ b/sdrgui/gui/glscopenggui.cpp
@@ -22,7 +22,7 @@
#include "ui_glscopenggui.h"
#include "util/simpleserializer.h"
-const double GLScopeNGGUI::amps[11] = { 0.2, 0.1, 0.05, 0.02, 0.01, 0.005, 0.002, 0.001, 0.0005, 0.0002, 0.0001 };
+const double GLScopeNGGUI::amps[14] = { 0.2, 0.1, 0.05, 0.02, 0.01, 0.005, 0.002, 0.001, 0.0005, 0.0002, 0.0001, 0.00005, 0.00002, 0.00001 };
GLScopeNGGUI::GLScopeNGGUI(QWidget* parent) :
QWidget(parent),
@@ -1074,11 +1074,11 @@ void GLScopeNGGUI::setTrigIndexDisplay()
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() / 50000.0f);
Projector::ProjectionType projectionType = (Projector::ProjectionType) ui->trigMode->currentIndex();
ui->trigLevelCoarse->setToolTip(QString("Trigger level coarse: %1 %").arg(ui->trigLevelCoarse->value() / 100.0f));
- ui->trigLevelFine->setToolTip(QString("Trigger level fine: %1 ppm").arg(ui->trigLevelFine->value() * 50));
+ ui->trigLevelFine->setToolTip(QString("Trigger level fine: %1 ppm").arg(ui->trigLevelFine->value() * 20));
if (projectionType == Projector::ProjectionMagDB) {
ui->trigLevelText->setText(tr("%1\ndB").arg(100.0 * (t - 1.0), 0, 'f', 1));
@@ -1243,7 +1243,7 @@ void GLScopeNGGUI::fillTriggerData(ScopeVisNG::TriggerData& triggerData)
{
triggerData.m_projectionType = (Projector::ProjectionType) ui->trigMode->currentIndex();
triggerData.m_inputIndex = 0;
- triggerData.m_triggerLevel = (ui->trigLevelCoarse->value() / 100.0) + (ui->trigLevelFine->value() / 20000.0);
+ triggerData.m_triggerLevel = (ui->trigLevelCoarse->value() / 100.0) + (ui->trigLevelFine->value() / 50000.0);
triggerData.m_triggerLevelCoarse = ui->trigLevelCoarse->value();
triggerData.m_triggerLevelFine = ui->trigLevelFine->value();
triggerData.m_triggerPositiveEdge = ui->trigPos->isChecked();
diff --git a/sdrgui/gui/glscopenggui.h b/sdrgui/gui/glscopenggui.h
index fb98c0c29..e9c1e4cb8 100644
--- a/sdrgui/gui/glscopenggui.h
+++ b/sdrgui/gui/glscopenggui.h
@@ -153,7 +153,7 @@ private:
QColor m_focusedTraceColor;
QColor m_focusedTriggerColor;
- static const double amps[11];
+ static const double amps[14];
void applySettings();
// First row
diff --git a/sdrgui/gui/glscopenggui.ui b/sdrgui/gui/glscopenggui.ui
index 11d47e44a..f611941bd 100644
--- a/sdrgui/gui/glscopenggui.ui
+++ b/sdrgui/gui/glscopenggui.ui
@@ -859,7 +859,7 @@ kS/s
Vertical range
- 10
+ 13
1
@@ -1565,7 +1565,7 @@ kS/s
Trigger level fine
- 200
+ 500
1