VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-08-14 23:43:43 -04:00
Code Issues Projects Releases Wiki Activity

Renamed ScopeVisNG to ScopeVis

Browse Source
This commit is contained in:
f4exb
2018-08-12 17:18:58 +02:00
parent 4a733cae51
commit aa6f2e9f2f
12 changed files with 142 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/channelrx/chanalyzer/chanalyzergui.cpp
+1 -1
View File
@@ -386,7 +386,7 @@ ChannelAnalyzerGUI::ChannelAnalyzerGUI(PluginAPI* pluginAPI, DeviceUISet *device
connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(onMenuDialogCalled(const QPoint &)));
m_spectrumVis = new SpectrumVis(SDR_RX_SCALEF, ui->glSpectrum);
m_scopeVis = new ScopeVisNG(ui->glScope);
m_scopeVis = new ScopeVis(ui->glScope);
m_spectrumScopeComboVis = new SpectrumScopeComboVis(m_spectrumVis, m_scopeVis);
m_channelAnalyzer = (ChannelAnalyzer*) rxChannel; //new ChannelAnalyzer(m_deviceUISet->m_deviceSourceAPI);
m_channelAnalyzer->setSampleSink(m_spectrumScopeComboVis);
plugins/channelrx/chanalyzer/chanalyzergui.h
+2 -2
View File
@@ -32,7 +32,7 @@ class BasebandSampleSink;
class ChannelAnalyzer;
class SpectrumScopeComboVis;
class SpectrumVis;
class ScopeVisNG;
class ScopeVis;
namespace Ui {
class ChannelAnalyzerGUI;
@@ -73,7 +73,7 @@ private:
ChannelAnalyzer* m_channelAnalyzer;
SpectrumScopeComboVis* m_spectrumScopeComboVis;
SpectrumVis* m_spectrumVis;
ScopeVisNG* m_scopeVis;
ScopeVis* m_scopeVis;
MessageQueue m_inputMessageQueue;
explicit ChannelAnalyzerGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent = 0);
plugins/channelrx/demodatv/atvdemodgui.cpp
+3 -3
View File
@@ -282,7 +282,7 @@ ATVDemodGUI::ATVDemodGUI(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, Base
setAttribute(Qt::WA_DeleteOnClose, true);
connect(this, SIGNAL(widgetRolled(QWidget*,bool)), this, SLOT(onWidgetRolled(QWidget*,bool)));
m_scopeVis = new ScopeVisNG(ui->glScope);
m_scopeVis = new ScopeVis(ui->glScope);
m_atvDemod = (ATVDemod*) rxChannel; //new ATVDemod(m_deviceUISet->m_deviceSourceAPI);
m_atvDemod->setMessageQueueToGUI(getInputMessageQueue());
m_atvDemod->setScopeSink(m_scopeVis);
@@ -313,14 +313,14 @@ ATVDemodGUI::ATVDemodGUI(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, Base
resetToDefaults(); // does applySettings()
ui->scopeGUI->setPreTrigger(1);
ScopeVisNG::TraceData traceData;
ScopeVis::TraceData traceData;
traceData.m_amp = 2.0; // amplification factor
traceData.m_ampIndex = 1; // this is second step
traceData.m_ofs = 0.5; // direct offset
traceData.m_ofsCoarse = 50; // this is 50 coarse steps
ui->scopeGUI->changeTrace(0, traceData);
ui->scopeGUI->focusOnTrace(0); // re-focus to take changes into account in the GUI
ScopeVisNG::TriggerData triggerData;
ScopeVis::TriggerData triggerData;
triggerData.m_triggerLevel = 0.1;
triggerData.m_triggerLevelCoarse = 10;
triggerData.m_triggerPositiveEdge = false;
plugins/channelrx/demodatv/atvdemodgui.h
+2 -2
View File
@@ -28,7 +28,7 @@ class PluginAPI;
class DeviceUISet;
class BasebandSampleSink;
class ATVDemod;
class ScopeVisNG;
class ScopeVis;
namespace Ui
{
@@ -70,7 +70,7 @@ private:
MovingAverageUtil<double, double, 4> m_objMagSqAverage;
int m_intTickCount;
ScopeVisNG* m_scopeVis;
ScopeVis* m_scopeVis;
float m_fltLineTimeMultiplier;
float m_fltTopTimeMultiplier;