VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-12-23 01:55:48 -05:00
Code Issues Projects Releases Wiki Activity

M17 mod: removed scope XY

Browse Source
This commit is contained in:
f4exb 2022-06-29 22:55:17 +02:00
parent 55f49f0398
commit 6015fce33d
6 changed files with 5 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/channeltx/modm17/m17mod.h
View File

@ -38,6 +38,7 @@ class QThread;
class DeviceAPI;
class M17ModBaseband;
class ObjectPipe;
class BasebandSampleSink;
class M17Mod : public BasebandSampleSource, public ChannelAPI {
public:

25
plugins/channeltx/modm17/m17modgui.cpp
View File

@ -438,25 +438,6 @@ M17ModGUI::M17ModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam
connect(rollupContents, SIGNAL(widgetRolled(QWidget*,bool)), this, SLOT(onWidgetRolled(QWidget*,bool)));
connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(onMenuDialogCalled(const QPoint &)));
ui->screenTV->setColor(true);
ui->screenTV->resizeTVScreen(100,100);
m_scopeVisXY = new ScopeVisXY(ui->screenTV);
m_scopeVisXY->setScale(2.0);
m_scopeVisXY->setPixelsPerFrame(4001);
m_scopeVisXY->setPlotRGB(qRgb(0, 220, 250));
m_scopeVisXY->setGridRGB(qRgb(255, 255, 128));
for (float x = -0.84; x < 1.0; x += 0.56)
{
for (float y = -0.84; y < 1.0; y += 0.56)
{
m_scopeVisXY->addGraticulePoint(std::complex<float>(x, y));
}
}
m_scopeVisXY->calculateGraticule(100,100);
m_m17Mod = (M17Mod*) channelTx;
m_m17Mod->setMessageQueueToGUI(getInputMessageQueue());
@ -503,8 +484,6 @@ M17ModGUI::M17ModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam
M17ModGUI::~M17ModGUI()
{
delete m_scopeVisXY;
ui->screenTV->setParent(nullptr); // Prefer memory leak to core dump... ~TVScreen() is buggy
delete ui;
}
@ -578,10 +557,6 @@ void M17ModGUI::displaySettings()
ui->aprsTo->lineEdit()->setText(m_settings.m_aprsTo);
ui->aprsVia->lineEdit()->setText(m_settings.m_aprsVia);
m_scopeVisXY->setPixelsPerFrame(400*960); // 48000 / 50. Chunks of 50 ms.
m_scopeVisXY->setStroke(220);
m_scopeVisXY->setDecay(200);
getRollupContents()->restoreState(m_rollupState);
updateAbsoluteCenterFrequency();
blockApplySettings(false);

1
plugins/channeltx/modm17/m17modgui.h
View File

@ -78,7 +78,6 @@ private:
int m_basebandSampleRate;
bool m_doApplySettings;
bool m_fmAudioMode;
ScopeVisXY* m_scopeVisXY;
M17Mod* m_m17Mod;
MovingAverageUtil<double, double, 20> m_channelPowerDbAvg;

20
plugins/channeltx/modm17/m17modgui.ui
View File

@ -1175,23 +1175,13 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="TVScreen" name="screenTV" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<widget class="QFrame" name="frame">
<property name="minimumSize">
<size>
<width>100</width>
<width>0</width>
<height>100</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="QFrame" name="frame">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
@ -1355,12 +1345,6 @@
<extends>QToolButton</extends>
<header>gui/buttonswitch.h</header>
</customwidget>
<customwidget>
<class>TVScreen</class>
<extends>QWidget</extends>
<header>gui/tvscreen.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>LevelMeterVU</class>
<extends>QWidget</extends>

1
plugins/channeltx/modm17/m17modsource.cpp
View File

@ -18,6 +18,7 @@
#include <QDebug>
#include "dsp/datafifo.h"
#include "dsp/basebandsamplesink.h"
#include "util/messagequeue.h"
#include "maincore.h"

1
plugins/channeltx/modm17/m17modsource.h
View File

@ -39,6 +39,7 @@
class ChannelAPI;
class M17ModProcessor;
class BasebandSampleSink;
class M17ModSource : public QObject, public ChannelSampleSource
{