VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-26 17:58:43 -05:00
Code Issues Projects Releases Wiki Activity

LibbladeRF2: migrate UI from bladerf to bladerf1

Browse Source
This commit is contained in:
f4exb 2018-09-19 06:27:40 +02:00
parent 94837dbd51
commit e130c2213f
8 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/samplesink/bladerfoutput/CMakeLists.txt
View File

@ -19,7 +19,7 @@ set(bladerfoutput_HEADERS
)
set(bladerfoutput_FORMS
bladerfoutputgui.ui
bladerf1outputgui.ui
)
if (BUILD_DEBIAN)

6
plugins/samplesink/bladerfoutput/bladerfoutputgui.ui → plugins/samplesink/bladerfoutput/bladerf1outputgui.ui
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>BladerfOutputGui</class>
<widget class="QWidget" name="BladerfOutputGui">
<class>Bladerf1OutputGui</class>
<widget class="QWidget" name="Bladerf1OutputGui">
<property name="geometry">
<rect>
<x>0</x>
@ -29,7 +29,7 @@
</font>
</property>
<property name="windowTitle">
<string>BladeRF</string>
<string>BladeRF1</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">

6
plugins/samplesink/bladerfoutput/bladerfoutputgui.cpp
View File

@ -19,7 +19,7 @@
#include <libbladeRF.h>
#include "ui_bladerfoutputgui.h"
#include "ui_bladerf1outputgui.h"
#include "gui/colormapper.h"
#include "gui/glspectrum.h"
#include "dsp/dspengine.h"
@ -28,11 +28,9 @@
#include "device/deviceuiset.h"
#include "bladerfoutputgui.h"
#include "../../../devices/bladerf1/devicebladerf1values.h"
BladerfOutputGui::BladerfOutputGui(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
ui(new Ui::BladerfOutputGui),
ui(new Ui::Bladerf1OutputGui),
m_deviceUISet(deviceUISet),
m_doApplySettings(true),
m_forceSettings(true),

4
plugins/samplesink/bladerfoutput/bladerfoutputgui.h
View File

@ -29,7 +29,7 @@ class DeviceSampleSink;
class DeviceUISet;
namespace Ui {
class BladerfOutputGui;
class Bladerf1OutputGui;
}
class BladerfOutputGui : public QWidget, public PluginInstanceGUI {
@ -52,7 +52,7 @@ public:
virtual bool handleMessage(const Message& message);
private:
Ui::BladerfOutputGui* ui;
Ui::Bladerf1OutputGui* ui;
DeviceUISet* m_deviceUISet;
bool m_doApplySettings;

2
plugins/samplesource/bladerfinput/CMakeLists.txt
View File

@ -19,7 +19,7 @@ set(bladerfinput_HEADERS
)
set(bladerfinput_FORMS
bladerfinputgui.ui
bladerf1inputgui.ui
)
if (BUILD_DEBIAN)

6
plugins/samplesource/bladerfinput/bladerfinputgui.ui → plugins/samplesource/bladerfinput/bladerf1inputgui.ui
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>BladerfInputGui</class>
<widget class="QWidget" name="BladerfInputGui">
<class>Bladerf1InputGui</class>
<widget class="QWidget" name="Bladerf1InputGui">
<property name="geometry">
<rect>
<x>0</x>
@ -29,7 +29,7 @@
</font>
</property>
<property name="windowTitle">
<string>BladeRF</string>
<string>BladeRF1</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">

6
plugins/samplesource/bladerfinput/bladerfinputgui.cpp
View File

@ -14,14 +14,14 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////
#include "../bladerfinput/bladerfinputgui.h"
#include "bladerfinputgui.h"
#include <QDebug>
#include <QMessageBox>
#include <libbladeRF.h>
#include "ui_bladerfinputgui.h"
#include "ui_bladerf1inputgui.h"
#include "gui/colormapper.h"
#include "gui/glspectrum.h"
#include "dsp/dspengine.h"
@ -31,7 +31,7 @@
BladerfInputGui::BladerfInputGui(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
ui(new Ui::BladerfInputGui),
ui(new Ui::Bladerf1InputGui),
m_deviceUISet(deviceUISet),
m_forceSettings(true),
m_doApplySettings(true),

4
plugins/samplesource/bladerfinput/bladerfinputgui.h
View File

@ -28,7 +28,7 @@
class DeviceUISet;
namespace Ui {
class BladerfInputGui;
class Bladerf1InputGui;
}
class BladerfInputGui : public QWidget, public PluginInstanceGUI {
@ -51,7 +51,7 @@ public:
virtual bool handleMessage(const Message& message);
private:
Ui::BladerfInputGui* ui;
Ui::Bladerf1InputGui* ui;
DeviceUISet* m_deviceUISet;
bool m_forceSettings;