VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-25 09:18:54 -05:00
Code Issues Projects Releases Wiki Activity

Removed scope from main window entirely as scope is now supported in the channel analyzer

Browse Source
This commit is contained in:
f4exb 2015-07-12 09:48:17 +02:00
parent c624ad0e13
commit 7924ed204a
4 changed files with 0 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -88,7 +88,6 @@ set(sdrbase_SOURCES
sdrbase/gui/rollupwidget.cpp
sdrbase/gui/scale.cpp
sdrbase/gui/scaleengine.cpp
sdrbase/gui/scopewindow.cpp
sdrbase/gui/valuedial.cpp
sdrbase/dsp/samplesource/samplesource.cpp
@ -160,7 +159,6 @@ set(sdrbase_HEADERS
include/gui/rollupwidget.h
include-gpl/gui/scale.h
include-gpl/gui/scaleengine.h
include-gpl/gui/scopewindow.h
include-gpl/gui/valuedial.h
include/dsp/samplesource/samplesource.h
@ -197,7 +195,6 @@ set(sdrbase_FORMS
sdrbase/gui/glspectrumgui.ui
sdrbase/gui/pluginsdialog.ui
sdrbase/gui/preferencesdialog.ui
sdrbase/gui/scopewindow.ui
)
set(sdrbase_RESOURCES

4
include-gpl/mainwindow.h
View File

@ -30,7 +30,6 @@ class QDir;
class AudioDeviceInfo;
class DSPEngine;
class Indicator;
class ScopeWindow;
class SpectrumVis;
class SampleSource;
class PluginAPI;
@ -90,7 +89,6 @@ private:
bool m_startOsmoSDRUpdateAfterStop;
ScopeWindow* m_scopeWindow;
QWidget* m_inputGUI;
int m_sampleRate;
@ -114,7 +112,6 @@ private:
private slots:
void handleMessages();
void updateStatus();
void scopeWindowDestroyed();
void on_action_Start_triggered();
void on_action_Stop_triggered();
void on_dcOffset_toggled(bool checked);
@ -127,7 +124,6 @@ private slots:
void on_presetDelete_clicked();
void on_presetTree_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous);
void on_presetTree_itemActivated(QTreeWidgetItem *item, int column);
void on_action_Oscilloscope_triggered();
void on_action_Loaded_Plugins_triggered();
void on_action_Preferences_triggered();
void on_sampleSource_currentIndexChanged(int index);

52
sdrbase/mainwindow.cpp
View File

@ -23,7 +23,6 @@
#include "audio/audiodeviceinfo.h"
#include "gui/indicator.h"
#include "gui/presetitem.h"
#include "gui/scopewindow.h"
#include "gui/addpresetdialog.h"
#include "gui/pluginsdialog.h"
#include "gui/preferencesdialog.h"
@ -47,7 +46,6 @@ MainWindow::MainWindow(QWidget* parent) :
m_dspEngine(new DSPEngine(m_messageQueue)),
m_lastEngineState((DSPEngine::State)-1),
m_startOsmoSDRUpdateAfterStop(false),
m_scopeWindow(0),
m_inputGUI(0),
m_sampleRate(0),
m_centerFrequency(0),
@ -123,12 +121,6 @@ MainWindow::~MainWindow()
m_dspEngine->removeSink(m_spectrumVis);
delete m_spectrumVis;
if(m_scopeWindow != 0) {
delete m_scopeWindow;
m_scopeWindow = 0;
}
delete m_pluginManager;
m_dspEngine->stop();
@ -193,12 +185,6 @@ void MainWindow::loadSettings(const Preset* preset)
{
std::cerr << "MainWindow::loadSettings(preset): " << preset->getSource().toStdString() << std::endl;
if(preset->getShowScope())
{
on_action_Oscilloscope_triggered();
m_scopeWindow->deserialize(preset->getScopeConfig());
}
ui->glSpectrumGUI->deserialize(preset->getSpectrumConfig());
ui->dcOffset->setChecked(preset->getDCOffsetCorrection());
ui->iqImbalance->setChecked(preset->getIQImbalanceCorrection());
@ -223,16 +209,6 @@ void MainWindow::saveSettings(Preset* preset)
std::cerr << "MainWindow::saveSettings(preset): " << preset->getSource().toStdString() << std::endl;
preset->setSpectrumConfig(ui->glSpectrumGUI->serialize());
if(preset->getShowScope())
{
preset->setScopeConfig(m_scopeWindow->serialize());
}
else
{
preset->setScopeConfig(QByteArray());
}
preset->clearChannels();
m_pluginManager->saveSettings(preset);
@ -271,8 +247,6 @@ void MainWindow::updateSampleRate()
{
ui->glSpectrum->setSampleRate(m_sampleRate);
m_sampleRateWidget->setText(tr("Rate: %1 kHz").arg((float)m_sampleRate / 1000));
if(m_scopeWindow != 0)
m_scopeWindow->setSampleRate(m_sampleRate);
}
void MainWindow::updatePresets()
@ -379,13 +353,6 @@ void MainWindow::updateStatus()
}
}
void MainWindow::scopeWindowDestroyed()
{
ui->action_Oscilloscope->setChecked(false);
m_settings.getCurrent()->setShowScope(false);
m_scopeWindow = 0;
}
void MainWindow::on_action_Start_triggered()
{
m_dspEngine->startAcquisition();
@ -511,25 +478,6 @@ void MainWindow::on_presetTree_itemActivated(QTreeWidgetItem *item, int column)
on_presetLoad_clicked();
}
void MainWindow::on_action_Oscilloscope_triggered()
{
if(m_scopeWindow != 0) {
((QWidget*)m_scopeWindow->parent())->raise();
return;
}
QDockWidget* dock = new QDockWidget(tr("Signalscope"), this);
dock->setObjectName(QString::fromUtf8("scopeDock"));
m_scopeWindow = new ScopeWindow(m_dspEngine);
connect(m_scopeWindow, SIGNAL(destroyed()), this, SLOT(scopeWindowDestroyed()));
m_scopeWindow->setSampleRate(m_sampleRate);
dock->setWidget(m_scopeWindow);
dock->setAllowedAreas(Qt::AllDockWidgetAreas);
addDockWidget(Qt::BottomDockWidgetArea, dock);
dock->setAttribute(Qt::WA_DeleteOnClose);
m_settings.getCurrent()->setShowScope(true);
}
void MainWindow::on_action_Loaded_Plugins_triggered()
{
PluginsDialog pluginsDialog(m_pluginManager, this);

2
sdrbase/mainwindow.ui
View File

@ -81,8 +81,6 @@
<string>&amp;View</string>
</property>
<addaction name="action_View_Fullscreen"/>
<addaction name="separator"/>
<addaction name="action_Oscilloscope"/>
</widget>
<widget class="QMenu" name="menu_Help">
<property name="title">