VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-06-14 20:42:28 -04:00
Code Issues Projects Releases Wiki Activity

Fixed getURI method in channels and features

Browse Source
This commit is contained in:
f4exb 2020-11-22 19:29:27 +01:00
parent 82973a4deb
commit 89a901e383
38 changed files with 12 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.h
View File

@ -98,7 +98,6 @@ public:
virtual bool handleMessage(const Message& cmd); //!< Processing of a message. Returns true if message has actually been processed
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = "BeamSteeringCWMod"; }
virtual qint64 getCenterFrequency() const { return m_frequencyOffset; }
uint32_t getBasebandSampleRate() const { return m_basebandSampleRate; }

1
plugins/channelmimo/interferometer/interferometer.h
View File

@ -99,7 +99,6 @@ public:
virtual bool handleMessage(const Message& cmd); //!< Processing of a message. Returns true if message has actually been processed
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = "Interferometer"; }
virtual qint64 getCenterFrequency() const { return m_frequencyOffset; }
uint32_t getDeviceSampleRate() const { return m_deviceSampleRate; }

1
plugins/channelrx/chanalyzer/chanalyzer.h
View File

@ -78,7 +78,6 @@ public:
virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = objectName(); }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }

1
plugins/channelrx/demodadsb/adsbdemod.h
View File

@ -74,7 +74,6 @@ public:
virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }

1
plugins/channelrx/demodam/amdemod.h
View File

@ -72,7 +72,6 @@ public:
virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }

1
plugins/channelrx/demodatv/atvdemod.h
View File

@ -71,7 +71,6 @@ public:
virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = objectName(); }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }

1
plugins/channelrx/demodbfm/bfmdemod.h
View File

@ -80,7 +80,6 @@ public:
virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }

1
plugins/channelrx/demodchirpchat/chirpchatdemod.h
View File

@ -210,7 +210,6 @@ public:
virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return 0; }

1
plugins/channelrx/demoddatv/datvdemod.h
View File

@ -42,7 +42,6 @@ public:
virtual void destroy() { delete this; }
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = objectName(); }
virtual qint64 getCenterFrequency() const { return m_settings.m_centerFrequency; }

1
plugins/channelrx/demoddsd/dsddemod.h
View File

@ -73,7 +73,6 @@ public:
virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }

1
plugins/channelrx/demodfreedv/freedvdemod.h
View File

@ -86,7 +86,6 @@ public:
virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }

1
plugins/channelrx/demodnfm/nfmdemod.h
View File

@ -72,7 +72,6 @@ public:
virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }

1
plugins/channelrx/demodssb/ssbdemod.h
View File

@ -75,7 +75,6 @@ public:
virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }

1
plugins/channelrx/demodwfm/wfmdemod.h
View File

@ -71,7 +71,6 @@ public:
virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }

1
plugins/channelrx/filesink/filesink.h
View File

@ -73,7 +73,6 @@ public:
virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = "File Sink"; }
virtual qint64 getCenterFrequency() const { return m_frequencyOffset; }

1
plugins/channelrx/freqtracker/freqtracker.h
View File

@ -71,7 +71,6 @@ public:
virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }

1
plugins/channelrx/localsink/localsink.h
View File

@ -93,7 +93,6 @@ public:
virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = "Local Sink"; }
virtual qint64 getCenterFrequency() const { return m_frequencyOffset; }

1
plugins/channelrx/remotesink/remotesink.h
View File

@ -72,7 +72,6 @@ public:
virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = "Remote Sink"; }
virtual qint64 getCenterFrequency() const { return m_frequencyOffset; }

1
plugins/channelrx/sigmffilesink/sigmffilesink.h
View File

@ -73,7 +73,6 @@ public:
virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = "SigMF File Sink"; }
virtual qint64 getCenterFrequency() const { return m_frequencyOffset; }

1
plugins/channelrx/udpsink/udpsink.h
View File

@ -79,7 +79,6 @@ public:
virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }

1
plugins/channeltx/filesource/filesource.h
View File

@ -175,7 +175,6 @@ public:
virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return 0; }

1
plugins/channeltx/localsource/localsource.h
View File

@ -90,7 +90,6 @@ public:
virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = "Local Sink"; }
virtual qint64 getCenterFrequency() const { return m_frequencyOffset; }

1
plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.h
View File

@ -97,7 +97,6 @@ public:
virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }

1
plugins/channeltx/modam/ammod.h
View File

@ -182,7 +182,6 @@ public:
virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }

1
plugins/channeltx/modatv/atvmod.h
View File

@ -254,7 +254,6 @@ public:
virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }

1
plugins/channeltx/modchirpchat/chirpchatmod.h
View File

@ -96,7 +96,6 @@ public:
virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }

1
plugins/channeltx/modfreedv/freedvmod.h
View File

@ -186,7 +186,6 @@ public:
virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }

1
plugins/channeltx/modnfm/nfmmod.h
View File

@ -182,7 +182,6 @@ public:
virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }

1
plugins/channeltx/modpacket/packetmod.h
View File

@ -103,7 +103,6 @@ public:
virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }

1
plugins/channeltx/modssb/ssbmod.h
View File

@ -184,7 +184,6 @@ public:
virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }

1
plugins/channeltx/modwfm/wfmmod.h
View File

@ -182,7 +182,6 @@ public:
virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }

1
plugins/channeltx/remotesource/remotesource.h
View File

@ -165,7 +165,6 @@ public:
virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return 0; }

1
plugins/channeltx/udpsource/udpsource.h
View File

@ -103,7 +103,6 @@ public:
virtual bool handleMessage(const Message& cmd);
virtual void getIdentifier(QString& id) { id = objectName(); }
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }

1
plugins/feature/simpleptt/simpleptt.h
View File

@ -104,7 +104,6 @@ public:
virtual void destroy() { delete this; }
virtual bool handleMessage(const Message& cmd);
virtual const QString& getURI() const { return getName(); }
virtual void getIdentifier(QString& id) const { id = objectName(); }
virtual void getTitle(QString& title) const { title = m_settings.m_title; }

5
sdrbase/channel/channelapi.cpp
View File

@ -20,10 +20,11 @@
#include "util/uid.h"
#include "channelapi.h"
ChannelAPI::ChannelAPI(const QString& name, StreamType streamType) :
ChannelAPI::ChannelAPI(const QString& uri, StreamType streamType) :
m_featuresSettingsFeedbackBlockCount(0),
m_streamType(streamType),
m_name(name),
m_name(uri),
m_uri(uri),
m_indexInDeviceSet(-1),
m_deviceSetIndex(0),
m_deviceAPI(0),

4
sdrbase/channel/channelapi.h
View File

@ -52,7 +52,7 @@ public:
virtual void destroy() = 0;
virtual void getIdentifier(QString& id) = 0;
virtual const QString& getURI() const = 0;
const QString& getURI() const { return m_uri; }
virtual void getTitle(QString& title) = 0;
virtual void setName(const QString& name) { m_name = name; }
virtual const QString& getName() const { return m_name; }
@ -140,6 +140,8 @@ private:
* In GUI version it is supported by GUI object name accessed through ChannelGUI.
*/
QString m_name;
/** Unique identifier attached to channel type */
QString m_uri;
int m_indexInDeviceSet;
int m_deviceSetIndex;

5
sdrbase/feature/feature.cpp
View File

@ -26,9 +26,10 @@
MESSAGE_CLASS_DEFINITION(Feature::MsgChannelSettings, Message)
Feature::Feature(const QString& name, WebAPIAdapterInterface *webAPIAdapterInterface) :
Feature::Feature(const QString& uri, WebAPIAdapterInterface *webAPIAdapterInterface) :
m_webAPIAdapterInterface(webAPIAdapterInterface),
m_name(name),
m_name(uri),
m_uri(uri),
m_uid(UidCalculator::getNewObjectId())
{
connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()));

5
sdrbase/feature/feature.h
View File

@ -93,7 +93,7 @@ public:
virtual void destroy() = 0;
virtual bool handleMessage(const Message& cmd) = 0; //!< Processing of a message. Returns true if message has actually been processed
virtual const QString& getURI() const = 0;
const QString& getURI() const { return m_uri; }
virtual void getIdentifier(QString& id) const = 0;
virtual void getTitle(QString& title) const = 0;
virtual void setName(const QString& name) { m_name = name; }
@ -195,7 +195,8 @@ protected slots:
void handleInputMessages();
private:
QString m_name;
QString m_name; //!< Unique identifier in a device set used for sorting may change depending on relative position in device set
QString m_uri; //!< Unique non modifiable identifier attached to channel type
uint64_t m_uid;
int m_indexInFeatureSet;
};