VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-02-21 04:58:38 -05:00
Code Issues Projects Releases Wiki Activity

On sample source confirm clicked delete old UI with the plugin interface

Browse Source
This commit is contained in:
f4exb 2017-09-15 08:23:04 +02:00
parent 3606ab2cf2
commit e2f15792ad
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sdrbase/device/devicesourceapi.cpp
View File

@ -153,6 +153,11 @@ void DeviceSourceAPI::setSampleSourceId(const QString& id)
m_sampleSourceId = id; m_sampleSourceId = id;
} }
void DeviceSourceAPI::resetSampleSourceId()
{
m_sampleSourceId.clear();
}
void DeviceSourceAPI::setSampleSourceSerial(const QString& serial) void DeviceSourceAPI::setSampleSourceSerial(const QString& serial)
{ {
m_sampleSourceSerial = serial; m_sampleSourceSerial = serial;
@ -176,12 +181,6 @@ void DeviceSourceAPI::setSampleSourcePluginInterface(PluginInterface *interface)
void DeviceSourceAPI::setSampleSourcePluginInstanceUI(PluginInstanceUI *gui) void DeviceSourceAPI::setSampleSourcePluginInstanceUI(PluginInstanceUI *gui)
{ {
if (m_sampleSourcePluginInstanceUI != 0)
{
m_sampleSourcePluginInstanceUI->destroy();
m_sampleSourceId.clear();
}
m_sampleSourcePluginInstanceUI = gui; m_sampleSourcePluginInstanceUI = gui;
} }

2
sdrbase/device/devicesourceapi.h
View File

@ -69,6 +69,7 @@ public:
void setHardwareId(const QString& id); void setHardwareId(const QString& id);
void setSampleSourceId(const QString& id); void setSampleSourceId(const QString& id);
void resetSampleSourceId();
void setSampleSourceSerial(const QString& serial); void setSampleSourceSerial(const QString& serial);
void setSampleSourceDisplayName(const QString& serial); void setSampleSourceDisplayName(const QString& serial);
void setSampleSourceSequence(int sequence); void setSampleSourceSequence(int sequence);
@ -81,6 +82,7 @@ public:
const QString& getSampleSourceDisplayName() const { return m_sampleSourceDisplayName; } const QString& getSampleSourceDisplayName() const { return m_sampleSourceDisplayName; }
PluginInterface *getPluginInterface() { return m_pluginInterface; } PluginInterface *getPluginInterface() { return m_pluginInterface; }
uint32_t getSampleSourceSequence() const { return m_sampleSourceSequence; } uint32_t getSampleSourceSequence() const { return m_sampleSourceSequence; }
PluginInstanceUI *getSampleSourcePluginInstanceUI() { return m_sampleSourcePluginInstanceUI; }
void registerChannelInstance(const QString& channelName, PluginInstanceUI* pluginGUI); void registerChannelInstance(const QString& channelName, PluginInstanceUI* pluginGUI);
void removeChannelInstance(PluginInstanceUI* pluginGUI); void removeChannelInstance(PluginInstanceUI* pluginGUI);

4
sdrbase/mainwindow.cpp
View File

@ -817,7 +817,9 @@ void MainWindow::on_sampleSource_confirmClicked(bool checked __attribute__((unus
void *devicePtr = deviceUI->m_samplingDeviceControl->getDeviceSelector()->itemData(selectedComboIndex).value<void *>(); void *devicePtr = deviceUI->m_samplingDeviceControl->getDeviceSelector()->itemData(selectedComboIndex).value<void *>();
deviceUI->m_deviceSourceAPI->stopAcquisition(); deviceUI->m_deviceSourceAPI->stopAcquisition();
deviceUI->m_deviceSourceAPI->setSampleSourcePluginInstanceUI(0); // deletes old UI and input object // deletes old UI and input object
deviceUI->m_deviceSourceAPI->getPluginInterface()->deleteSampleSourcePluginInstanceGUI(deviceUI->m_deviceSourceAPI->getSampleSourcePluginInstanceUI());
deviceUI->m_deviceSourceAPI->resetSampleSourceId();
deviceUI->m_deviceSourceAPI->clearBuddiesLists(); // clear old API buddies lists deviceUI->m_deviceSourceAPI->clearBuddiesLists(); // clear old API buddies lists
m_pluginManager->selectSampleSourceByDevice(devicePtr, deviceUI->m_deviceSourceAPI); // sets the new API m_pluginManager->selectSampleSourceByDevice(devicePtr, deviceUI->m_deviceSourceAPI); // sets the new API