Massive UI revamping (v7): devices basic

plugins/samplesource/localinput/localinputgui.cpp

@@ -70,16 +70,20 @@ LocalInputGui::LocalInputGui(DeviceUISet *deviceUISet, QWidget* parent) :
     m_doApplySettings(true),
     m_forceSettings(true)
 {
+    setAttribute(Qt::WA_DeleteOnClose, true);
     m_paletteGreenText.setColor(QPalette::WindowText, Qt::green);
     m_paletteWhiteText.setColor(QPalette::WindowText, Qt::white);
 
 	m_startingTimeStampms = 0;
-	ui->setupUi(this);
+    ui->setupUi(getContents());
+    getContents()->setStyleSheet("#LocalInputGui { border: 1px solid #C06900 }");
+    m_helpURL = "plugins/samplesource/localinput/readme.md";
 
     CRightClickEnabler *startStopRightClickEnabler = new CRightClickEnabler(ui->startStop);
     connect(startStopRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(openDeviceSettingsDialog(const QPoint &)));
 
 	displaySettings();
+    makeUIConnections();
 
 	connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus()));
 	m_statusTimer.start(500);
@@ -321,3 +325,10 @@ void LocalInputGui::openDeviceSettingsDialog(const QPoint& p)
 
     sendSettings();
 }
+
+void LocalInputGui::makeUIConnections()
+{
+    QObject::connect(ui->dcOffset, &ButtonSwitch::toggled, this, &LocalInputGui::on_dcOffset_toggled);
+    QObject::connect(ui->iqImbalance, &ButtonSwitch::toggled, this, &LocalInputGui::on_iqImbalance_toggled);
+    QObject::connect(ui->startStop, &ButtonSwitch::toggled, this, &LocalInputGui::on_startStop_toggled);
+}

plugins/samplesource/localinput/localinputgui.h

@@ -46,6 +46,10 @@ public:
 	QByteArray serialize() const;
 	bool deserialize(const QByteArray& data);
 	virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
+    virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; }
+    virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; }
+    virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; }
+    virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }
 
 private:
 	Ui::LocalInputGui* ui;
@@ -100,6 +104,7 @@ private:
     void sendSettings();
 	void updateSampleRateAndFrequency();
 	bool handleMessage(const Message& message);
+    void makeUIConnections();
 
 private slots:
     void handleInputMessages();

plugins/samplesource/localinput/localinputsettings.cpp

@@ -31,6 +31,7 @@ void LocalInputSettings::resetToDefaults()
     m_reverseAPIAddress = "127.0.0.1";
     m_reverseAPIPort = 8888;
     m_reverseAPIDeviceIndex = 0;
+    m_workspaceIndex = 0;
 }
 
 QByteArray LocalInputSettings::serialize() const
@@ -43,6 +44,8 @@ QByteArray LocalInputSettings::serialize() const
     s.writeString(4, m_reverseAPIAddress);
     s.writeU32(5, m_reverseAPIPort);
     s.writeU32(6, m_reverseAPIDeviceIndex);
+    s.writeS32(7, m_workspaceIndex);
+    s.writeBlob(8, m_geometryBytes);
 
     return s.final();
 }
@@ -75,6 +78,9 @@ bool LocalInputSettings::deserialize(const QByteArray& data)
 
         d.readU32(6, &uintval, 0);
         m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval;
+        d.readS32(7, &m_workspaceIndex, 0);
+        d.readBlob(8, &m_geometryBytes);
+
         return true;
     }
     else

plugins/samplesource/localinput/localinputsettings.h

@@ -28,6 +28,8 @@ struct LocalInputSettings {
     QString  m_reverseAPIAddress;
     uint16_t m_reverseAPIPort;
     uint16_t m_reverseAPIDeviceIndex;
+    int m_workspaceIndex;
+    QByteArray m_geometryBytes;
 
     LocalInputSettings();
     void resetToDefaults();