kopia lustrzana https://github.com/f4exb/sdrangel
MIMO: dialog to select device stream from channel. Implemented in AM demod
rodzic
b01c4e2477
commit
71de6774c4
|
@ -107,6 +107,11 @@ AMDemod::~AMDemod()
|
||||||
delete SSBFilter;
|
delete SSBFilter;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
uint32_t AMDemod::getNumberOfDeviceStreams() const
|
||||||
|
{
|
||||||
|
return m_deviceAPI->getNbSourceStreams();
|
||||||
|
}
|
||||||
|
|
||||||
void AMDemod::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool firstOfBurst)
|
void AMDemod::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool firstOfBurst)
|
||||||
{
|
{
|
||||||
(void) firstOfBurst;
|
(void) firstOfBurst;
|
||||||
|
|
|
@ -158,6 +158,8 @@ public:
|
||||||
m_magsqCount = 0;
|
m_magsqCount = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
uint32_t getNumberOfDeviceStreams() const;
|
||||||
|
|
||||||
static const QString m_channelIdURI;
|
static const QString m_channelIdURI;
|
||||||
static const QString m_channelId;
|
static const QString m_channelId;
|
||||||
|
|
||||||
|
|
|
@ -31,6 +31,7 @@
|
||||||
#include "util/simpleserializer.h"
|
#include "util/simpleserializer.h"
|
||||||
#include "util/db.h"
|
#include "util/db.h"
|
||||||
#include "gui/basicchannelsettingsdialog.h"
|
#include "gui/basicchannelsettingsdialog.h"
|
||||||
|
#include "gui/devicestreamselectiondialog.h"
|
||||||
#include "dsp/dspengine.h"
|
#include "dsp/dspengine.h"
|
||||||
#include "mainwindow.h"
|
#include "mainwindow.h"
|
||||||
#include "gui/crightclickenabler.h"
|
#include "gui/crightclickenabler.h"
|
||||||
|
@ -232,7 +233,14 @@ void AMDemodGUI::onMenuDialogCalled(const QPoint &p)
|
||||||
}
|
}
|
||||||
else if ((m_contextMenuType == ContextMenuStreamSettings) && (m_deviceUISet->m_deviceMIMOEngine))
|
else if ((m_contextMenuType == ContextMenuStreamSettings) && (m_deviceUISet->m_deviceMIMOEngine))
|
||||||
{
|
{
|
||||||
// TODO: open select MIMO channel dialog
|
DeviceStreamSelectionDialog dialog(this);
|
||||||
|
dialog.setNumberOfStreams(m_amDemod->getNumberOfDeviceStreams());
|
||||||
|
dialog.setStreamIndex(m_settings.m_streamIndex);
|
||||||
|
dialog.move(p);
|
||||||
|
dialog.exec();
|
||||||
|
|
||||||
|
m_settings.m_streamIndex = dialog.getSelectedStreamIndex();
|
||||||
|
applySettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
resetContextMenuType();
|
resetContextMenuType();
|
||||||
|
|
|
@ -20,6 +20,7 @@ set(sdrgui_SOURCES
|
||||||
gui/comboboxnoarrow.cpp
|
gui/comboboxnoarrow.cpp
|
||||||
gui/crightclickenabler.cpp
|
gui/crightclickenabler.cpp
|
||||||
gui/cwkeyergui.cpp
|
gui/cwkeyergui.cpp
|
||||||
|
gui/devicestreamselectiondialog.cpp
|
||||||
gui/editcommanddialog.cpp
|
gui/editcommanddialog.cpp
|
||||||
gui/externalclockbutton.cpp
|
gui/externalclockbutton.cpp
|
||||||
gui/externalclockdialog.cpp
|
gui/externalclockdialog.cpp
|
||||||
|
@ -85,6 +86,7 @@ set(sdrgui_HEADERS
|
||||||
gui/comboboxnoarrow.h
|
gui/comboboxnoarrow.h
|
||||||
gui/crightclickenabler.h
|
gui/crightclickenabler.h
|
||||||
gui/cwkeyergui.h
|
gui/cwkeyergui.h
|
||||||
|
gui/devicestreamselectiondialog.h
|
||||||
gui/editcommanddialog.h
|
gui/editcommanddialog.h
|
||||||
gui/externalclockbutton.h
|
gui/externalclockbutton.h
|
||||||
gui/externalclockdialog.h
|
gui/externalclockdialog.h
|
||||||
|
@ -146,6 +148,7 @@ set(sdrgui_FORMS
|
||||||
gui/basicchannelsettingsdialog.ui
|
gui/basicchannelsettingsdialog.ui
|
||||||
gui/basicdevicesettingsdialog.ui
|
gui/basicdevicesettingsdialog.ui
|
||||||
gui/commandoutputdialog.ui
|
gui/commandoutputdialog.ui
|
||||||
|
gui/devicestreamselectiondialog.ui
|
||||||
gui/cwkeyergui.ui
|
gui/cwkeyergui.ui
|
||||||
gui/editcommanddialog.ui
|
gui/editcommanddialog.ui
|
||||||
gui/externalclockdialog.ui
|
gui/externalclockdialog.ui
|
||||||
|
|
Ładowanie…
Reference in New Issue