VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-04 16:01:14 -05:00
Code Issues Projects Releases Wiki Activity

DSD demod: update My Position from the GUI with the value stored in the main window

Browse Source
This commit is contained in:
f4exb 2016-09-28 17:58:29 +02:00
parent 88f76c5a61
commit a670c03f46
5 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/channel/demoddsd/dsddecoder.h
View File

@ -67,6 +67,7 @@ public:
const DSDcc::DSDdPMR& getDPMRDecoder() const { return m_decoder.getDPMRDecoder(); }
const DSDcc::DSDYSF& getYSFDecoder() const { return m_decoder.getYSFDecoder(); }
void setMyPoint(float lat, float lon) { m_decoder.setMyPoint(lat, lon); }
void setAudioGain(float gain) { m_decoder.setAudioGain(gain); }
void setBaudRate(int baudRate);

13
plugins/channel/demoddsd/dsddemod.cpp
View File

@ -29,6 +29,7 @@
static const Real afSqTones[2] = {1200.0, 6400.0}; // {1200.0, 8000.0};
MESSAGE_CLASS_DEFINITION(DSDDemod::MsgConfigureDSDDemod, Message)
MESSAGE_CLASS_DEFINITION(DSDDemod::MsgConfigureMyPosition, Message)
DSDDemod::DSDDemod(SampleSink* sampleSink) :
m_sampleCount(0),
@ -109,6 +110,12 @@ void DSDDemod::configure(MessageQueue* messageQueue,
messageQueue->push(cmd);
}
void DSDDemod::configureMyPosition(MessageQueue* messageQueue, float myLatitude, float myLongitude)
{
Message* cmd = MsgConfigureMyPosition::create(myLatitude, myLongitude);
messageQueue->push(cmd);
}
void DSDDemod::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool firstOfBurst)
{
Complex ci;
@ -363,6 +370,12 @@ bool DSDDemod::handleMessage(const Message& cmd)
return true;
}
else if (MsgConfigureMyPosition::match(cmd))
{
MsgConfigureMyPosition& cfg = (MsgConfigureMyPosition&) cmd;
m_dsdDecoder.setMyPoint(cfg.getMyLatitude(), cfg.getMyLongitude());
return true;
}
else
{
return false;

24
plugins/channel/demoddsd/dsddemod.h
View File

@ -55,6 +55,8 @@ public:
bool slot2On,
bool tdmaStereo);
void configureMyPosition(MessageQueue* messageQueue, float myLatitude, float myLongitude);
virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);
virtual void start();
virtual void stop();
@ -70,6 +72,28 @@ public:
const DSDDecoder& getDecoder() const { return m_dsdDecoder; }
private:
class MsgConfigureMyPosition : public Message {
MESSAGE_CLASS_DECLARATION
public:
float getMyLatitude() const { return m_myLatitude; }
float getMyLongitude() const { return m_myLongitude; }
static MsgConfigureMyPosition* create(float myLatitude, float myLongitude)
{
return new MsgConfigureMyPosition(myLatitude, myLongitude);
}
private:
float m_myLatitude;
float m_myLongitude;
MsgConfigureMyPosition(float myLatitude, float myLongitude) :
m_myLatitude(myLatitude),
m_myLongitude(myLongitude)
{}
};
class MsgConfigureDSDDemod : public Message {
MESSAGE_CLASS_DECLARATION

15
plugins/channel/demoddsd/dsddemodgui.cpp
View File

@ -196,6 +196,7 @@ bool DSDDemodGUI::deserialize(const QByteArray& data)
blockApplySettings(false);
m_channelMarker.blockSignals(false);
updateMyPosition(); // we do it also here to be able to refresh with latest settings
applySettings();
return true;
}
@ -386,6 +387,7 @@ DSDDemodGUI::DSDDemodGUI(PluginAPI* pluginAPI, DeviceAPI *deviceAPI, QWidget* pa
ui->scopeGUI->setBuddies(m_scopeVis->getInputMessageQueue(), m_scopeVis, ui->glScope);
updateMyPosition();
applySettings();
}
@ -400,6 +402,19 @@ DSDDemodGUI::~DSDDemodGUI()
delete ui;
}
void DSDDemodGUI::updateMyPosition()
{
float latitude = m_pluginAPI->getMainWindow()->getMainSettings().getLatitude();
float longitude = m_pluginAPI->getMainWindow()->getMainSettings().getLongitude();
if ((m_myLatitude != latitude) || (m_myLongitude != longitude))
{
m_dsdDemod->configureMyPosition(m_dsdDemod->getInputMessageQueue(), latitude, longitude);
m_myLatitude = latitude;
m_myLongitude = longitude;
}
}
void DSDDemodGUI::applySettings()
{
if (m_doApplySettings)

4
plugins/channel/demoddsd/dsddemodgui.h
View File

@ -112,6 +112,9 @@ private:
MovingAverage<Real> m_channelPowerDbAvg;
int m_tickCount;
float m_myLatitude;
float m_myLongitude;
static char m_dpmrFrameTypes[9][3];
static const char *m_ysfChannelTypeText[4];
static const char *m_ysfDataTypeText[4];
@ -123,6 +126,7 @@ private:
void blockApplySettings(bool block);
void applySettings();
void updateMyPosition();
void leaveEvent(QEvent*);
void enterEvent(QEvent*);