diff --git a/plugins/feature/gs232controller/gs232controller.cpp b/plugins/feature/gs232controller/gs232controller.cpp index 9487561bd..9697d81b0 100644 --- a/plugins/feature/gs232controller/gs232controller.cpp +++ b/plugins/feature/gs232controller/gs232controller.cpp @@ -329,15 +329,9 @@ void GS232Controller::applySettings(const GS232ControllerSettings& settings, con for (const auto& oval : m_availableChannelOrFeatures) { - QString itemText = tr("%1%2:%3 %4") - .arg(oval.m_kind) - .arg(oval.m_superIndex) - .arg(oval.m_index) - .arg(oval.m_type); - - if (settings.m_source == itemText) + if (settings.m_source == oval.getLongId()) { - object = m_availableChannelOrFeatures.key(oval); + object = oval.m_object; break; } } @@ -771,52 +765,7 @@ void GS232Controller::networkManagerFinished(QNetworkReply *reply) void GS232Controller::scanAvailableChannelsAndFeatures() { - qDebug("GS232Controller::scanAvailableChannelsAndFeatures"); - MainCore *mainCore = MainCore::instance(); - std::vector& featureSets = mainCore->getFeatureeSets(); - m_availableChannelOrFeatures.clear(); - - for (const auto& featureSet : featureSets) - { - for (int fei = 0; fei < featureSet->getNumberOfFeatures(); fei++) - { - Feature *feature = featureSet->getFeatureAt(fei); - - if (GS232ControllerSettings::m_pipeURIs.contains(feature->getURI()) && !m_availableChannelOrFeatures.contains(feature)) - { - qDebug("GS232Controller::scanAvailableChannelsAndFeatures: store feature %d:%d %s (%p)", - featureSet->getIndex(), fei, qPrintable(feature->getURI()), feature); - GS232ControllerSettings::AvailableChannelOrFeature availableItem = - GS232ControllerSettings::AvailableChannelOrFeature{"F", featureSet->getIndex(), fei, feature->getIdentifier()}; - m_availableChannelOrFeatures[feature] = availableItem; - } - } - } - - std::vector& deviceSets = mainCore->getDeviceSets(); - - for (const auto& deviceSet : deviceSets) - { - DSPDeviceSourceEngine *deviceSourceEngine = deviceSet->m_deviceSourceEngine; - - if (deviceSourceEngine) - { - for (int chi = 0; chi < deviceSet->getNumberOfChannels(); chi++) - { - ChannelAPI *channel = deviceSet->getChannelAt(chi); - - if (GS232ControllerSettings::m_pipeURIs.contains(channel->getURI()) && !m_availableChannelOrFeatures.contains(channel)) - { - qDebug("GS232Controller::scanAvailableChannelsAndFeatures: store channel %d:%d %s (%p)", - deviceSet->getIndex(), chi, qPrintable(channel->getURI()), channel); - GS232ControllerSettings::AvailableChannelOrFeature availableItem = - GS232ControllerSettings::AvailableChannelOrFeature{"R", deviceSet->getIndex(), chi, channel->getIdentifier()}; - m_availableChannelOrFeatures[channel] = availableItem; - } - } - } - } - + m_availableChannelOrFeatures = MainCore::instance()->getAvailableChannelsAndFeatures(GS232ControllerSettings::m_pipeURIs); notifyUpdate(); } @@ -825,74 +774,41 @@ void GS232Controller::notifyUpdate() if (getMessageQueueToGUI()) { MsgReportAvailableChannelOrFeatures *msg = MsgReportAvailableChannelOrFeatures::create(); - msg->getItems() = m_availableChannelOrFeatures.values(); + msg->getItems() = m_availableChannelOrFeatures; getMessageQueueToGUI()->push(msg); } } void GS232Controller::handleFeatureAdded(int featureSetIndex, Feature *feature) { - qDebug("GS232Controller::handleFeatureAdded: featureSetIndex: %d:%d feature: %s (%p)", - featureSetIndex, feature->getIndexInFeatureSet(), qPrintable(feature->getURI()), feature); - FeatureSet *featureSet = MainCore::instance()->getFeatureeSets()[featureSetIndex]; + (void) featureSetIndex; + (void) feature; - if (GS232ControllerSettings::m_pipeURIs.contains(feature->getURI())) - { - GS232ControllerSettings::AvailableChannelOrFeature availableItem = - GS232ControllerSettings::AvailableChannelOrFeature{ - "F", - featureSet->getIndex(), - feature->getIndexInFeatureSet(), - feature->getIdentifier() - }; - m_availableChannelOrFeatures[feature] = availableItem; - - notifyUpdate(); - } + scanAvailableChannelsAndFeatures(); } void GS232Controller::handleFeatureRemoved(int featureSetIndex, Feature *feature) { - qDebug("GS232Controller::handleFeatureRemoved: featureSetIndex: %d (%p)", featureSetIndex, feature); + (void) featureSetIndex; + (void) feature; - if (m_availableChannelOrFeatures.contains(feature)) - { - m_availableChannelOrFeatures.remove(feature); - notifyUpdate(); - } + scanAvailableChannelsAndFeatures(); } void GS232Controller::handleChannelAdded(int deviceSetIndex, ChannelAPI *channel) { - qDebug("GS232Controller::handleChannelAdded: deviceSetIndex: %d:%d channel: %s (%p)", - deviceSetIndex, channel->getIndexInDeviceSet(), qPrintable(channel->getURI()), channel); - DeviceSet *deviceSet = MainCore::instance()->getDeviceSets()[deviceSetIndex]; - DSPDeviceSourceEngine *deviceSourceEngine = deviceSet->m_deviceSourceEngine; + (void) deviceSetIndex; + (void) channel; - if (deviceSourceEngine && GS232ControllerSettings::m_pipeURIs.contains(channel->getURI())) - { - GS232ControllerSettings::AvailableChannelOrFeature availableItem = - GS232ControllerSettings::AvailableChannelOrFeature{ - "R", - deviceSet->getIndex(), - channel->getIndexInDeviceSet(), - channel->getIdentifier() - }; - m_availableChannelOrFeatures[channel] = availableItem; - - notifyUpdate(); - } + scanAvailableChannelsAndFeatures(); } void GS232Controller::handleChannelRemoved(int deviceSetIndex, ChannelAPI *channel) { - qDebug("GS232Controller::handleChannelRemoved: deviceSetIndex: %d (%p)", deviceSetIndex, channel); + (void) deviceSetIndex; + (void) channel; - if (m_availableChannelOrFeatures.contains(channel)) - { - m_availableChannelOrFeatures.remove(channel); - notifyUpdate(); - } + scanAvailableChannelsAndFeatures(); } void GS232Controller::registerPipe(QObject *object) @@ -908,22 +824,6 @@ void GS232Controller::registerPipe(QObject *object) [=](){ this->handlePipeMessageQueue(messageQueue); }, Qt::QueuedConnection ); - QObject::connect( - pipe, - &ObjectPipe::toBeDeleted, - this, - &GS232Controller::handleMessagePipeToBeDeleted - ); -} - -void GS232Controller::handleMessagePipeToBeDeleted(int reason, QObject* object) -{ - if ((reason == 0) && m_availableChannelOrFeatures.contains(object)) // producer - { - qDebug("GS232Controller::handleMessagePipeToBeDeleted: removing channel or feature at (%p)", object); - m_availableChannelOrFeatures.remove(object); - notifyUpdate(); - } } void GS232Controller::handlePipeMessageQueue(MessageQueue* messageQueue) diff --git a/plugins/feature/gs232controller/gs232controller.h b/plugins/feature/gs232controller/gs232controller.h index 79f2ac9db..5972ee23b 100644 --- a/plugins/feature/gs232controller/gs232controller.h +++ b/plugins/feature/gs232controller/gs232controller.h @@ -27,6 +27,7 @@ #include "feature/feature.h" #include "util/message.h" +#include "maincore.h" #include "gs232controllersettings.h" @@ -110,14 +111,14 @@ public: MESSAGE_CLASS_DECLARATION public: - QList& getItems() { return m_availableChannelOrFeatures; } + QList& getItems() { return m_availableChannelOrFeatures; } static MsgReportAvailableChannelOrFeatures* create() { return new MsgReportAvailableChannelOrFeatures(); } private: - QList m_availableChannelOrFeatures; + QList m_availableChannelOrFeatures; MsgReportAvailableChannelOrFeatures() : Message() @@ -212,7 +213,8 @@ private: QThread *m_thread; GS232ControllerWorker *m_worker; GS232ControllerSettings m_settings; - QHash m_availableChannelOrFeatures; + //QHash m_availableChannelOrFeatures; + QList m_availableChannelOrFeatures; QObject *m_selectedPipe; QTimer m_timer; @@ -239,7 +241,7 @@ private slots: void handleChannelAdded(int deviceSetIndex, ChannelAPI *channel); void handleFeatureRemoved(int featureSetIndex, Feature *feature); void handleChannelRemoved(int deviceSetIndex, ChannelAPI *feature); - void handleMessagePipeToBeDeleted(int reason, QObject* object); + //void handleMessagePipeToBeDeleted(int reason, QObject* object); void handlePipeMessageQueue(MessageQueue* messageQueue); void scanSerialPorts(); }; diff --git a/plugins/feature/gs232controller/gs232controllergui.cpp b/plugins/feature/gs232controller/gs232controllergui.cpp index 8f04a8ef2..7a32ab0c5 100644 --- a/plugins/feature/gs232controller/gs232controllergui.cpp +++ b/plugins/feature/gs232controller/gs232controllergui.cpp @@ -546,21 +546,15 @@ void GS232ControllerGUI::updateSerialPortList(const QStringList& serialPorts) ui->serialPort->blockSignals(false); } -void GS232ControllerGUI::updatePipeList(const QList& sources) +void GS232ControllerGUI::updatePipeList(const QList& sources) { QString currentText = ui->sources->currentText(); QString newText; ui->sources->blockSignals(true); ui->sources->clear(); - for (const auto& source : sources) - { - QString name = tr("%1%2:%3 %4") - .arg(source.m_kind) - .arg(source.m_superIndex) - .arg(source.m_index) - .arg(source.m_type); - ui->sources->addItem(name); + for (const auto& source : sources) { + ui->sources->addItem(source.getLongId()); } int index = ui->sources->findText(m_settings.m_source); diff --git a/plugins/feature/gs232controller/gs232controllergui.h b/plugins/feature/gs232controller/gs232controllergui.h index 6c89f29eb..5d5e93b6f 100644 --- a/plugins/feature/gs232controller/gs232controllergui.h +++ b/plugins/feature/gs232controller/gs232controllergui.h @@ -90,7 +90,7 @@ private: void setProtocol(GS232ControllerSettings::Protocol protocol); void setPrecision(); void updateConnectionWidgets(); - void updatePipeList(const QList& sources); + void updatePipeList(const QList& sources); void updateSerialPortList(); void updateSerialPortList(const QStringList& serialPorts); bool handleMessage(const Message& message); diff --git a/plugins/feature/gs232controller/gs232controllersettings.h b/plugins/feature/gs232controller/gs232controllersettings.h index 8b61dd478..57cddff25 100644 --- a/plugins/feature/gs232controller/gs232controllersettings.h +++ b/plugins/feature/gs232controller/gs232controllersettings.h @@ -31,21 +31,6 @@ class Serializable; struct GS232ControllerSettings { - struct AvailableChannelOrFeature - { - QString m_kind; //!< "R" for channel, "F" for feature - int m_superIndex; - int m_index; - QString m_type; - - AvailableChannelOrFeature() = default; - AvailableChannelOrFeature(const AvailableChannelOrFeature&) = default; - AvailableChannelOrFeature& operator=(const AvailableChannelOrFeature&) = default; - bool operator==(const AvailableChannelOrFeature& a) const { - return (m_kind == a.m_kind) && (m_superIndex == a.m_superIndex) && (m_index == a.m_index) && (m_type == a.m_type); - } - }; - float m_azimuth; float m_elevation; QString m_serialPort; diff --git a/plugins/feature/skymap/skymapgui.cpp b/plugins/feature/skymap/skymapgui.cpp index 72ba4d145..1135ca08f 100644 --- a/plugins/feature/skymap/skymapgui.cpp +++ b/plugins/feature/skymap/skymapgui.cpp @@ -345,6 +345,7 @@ void SkyMapGUI::on_source_currentIndexChanged(int index) } else { + ui->track->setChecked(false); ui->track->setEnabled(false); } } @@ -413,6 +414,7 @@ void SkyMapGUI::displaySettings() } else { + ui->track->setChecked(false); ui->track->setEnabled(false); } initSkyMap(); @@ -1047,6 +1049,7 @@ void SkyMapGUI::updateSourceList() else { ui->source->setCurrentIndex(-1); + ui->track->setChecked(false); ui->track->setEnabled(false); }