Fixed getURI method in channels and features

plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.h

@@ -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; }

plugins/channelmimo/interferometer/interferometer.h

@@ -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; }

plugins/channelrx/chanalyzer/chanalyzer.h

@@ -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; }
 

plugins/channelrx/demodadsb/adsbdemod.h

@@ -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; }
 

plugins/channelrx/demodam/amdemod.h

@@ -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; }
 

plugins/channelrx/demodatv/atvdemod.h

@@ -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; }
 

plugins/channelrx/demodbfm/bfmdemod.h

@@ -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; }
 

plugins/channelrx/demodchirpchat/chirpchatdemod.h

@@ -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; }
 

plugins/channelrx/demoddatv/datvdemod.h

@@ -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; }
 

plugins/channelrx/demoddsd/dsddemod.h

@@ -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; }
 

plugins/channelrx/demodfreedv/freedvdemod.h

@@ -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; }
 

plugins/channelrx/demodnfm/nfmdemod.h

@@ -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; }
 

plugins/channelrx/demodssb/ssbdemod.h

@@ -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; }
 

plugins/channelrx/demodwfm/wfmdemod.h

@@ -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; }
 

plugins/channelrx/filesink/filesink.h

@@ -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; }
 

plugins/channelrx/freqtracker/freqtracker.h

@@ -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; }
 

plugins/channelrx/localsink/localsink.h

@@ -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; }
 

plugins/channelrx/remotesink/remotesink.h

@@ -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; }
 

plugins/channelrx/sigmffilesink/sigmffilesink.h

@@ -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; }
 

plugins/channelrx/udpsink/udpsink.h

@@ -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; }
 

plugins/channeltx/filesource/filesource.h

@@ -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; }
 

plugins/channeltx/localsource/localsource.h

@@ -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; }
 

plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.h

@@ -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; }
 

plugins/channeltx/modam/ammod.h

@@ -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; }
 

plugins/channeltx/modatv/atvmod.h

@@ -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; }
 

plugins/channeltx/modchirpchat/chirpchatmod.h

@@ -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; }
 

plugins/channeltx/modfreedv/freedvmod.h

@@ -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; }
 

plugins/channeltx/modnfm/nfmmod.h

@@ -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; }
 

plugins/channeltx/modpacket/packetmod.h

@@ -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; }
 

plugins/channeltx/modssb/ssbmod.h

@@ -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; }
 

plugins/channeltx/modwfm/wfmmod.h

@@ -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; }
 

plugins/channeltx/remotesource/remotesource.h

@@ -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; }
 

plugins/channeltx/udpsource/udpsource.h

@@ -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; }
 

plugins/feature/simpleptt/simpleptt.h

@@ -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; }
 

sdrbase/channel/channelapi.cpp

@@ -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),

sdrbase/channel/channelapi.h

@@ -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;

sdrbase/feature/feature.cpp

@@ -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()));

sdrbase/feature/feature.h

@@ -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;
 };