Skip to content
Snippets Groups Projects
Commit c6510085 authored by Matthias Puchner's avatar Matthias Puchner
Browse files

use InstrumentsEditController in RealDataPropertiesWidget

parent 805bf48d
No related branches found
No related tags found
1 merge request!613Remove SessionItem signaling from instruments
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include "GUI/Model/Item/InstrumentItems.h" #include "GUI/Model/Item/InstrumentItems.h"
#include "GUI/Model/Item/RealDataItem.h" #include "GUI/Model/Item/RealDataItem.h"
#include "GUI/Model/Model/InstrumentModel.h" #include "GUI/Model/Model/InstrumentModel.h"
#include "GUI/Model/Project/InstrumentsEditController.h"
#include "GUI/Model/Project/LinkInstrumentManager.h" #include "GUI/Model/Project/LinkInstrumentManager.h"
#include "GUI/Model/Project/ProjectDocument.h" #include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/View/Global/Globals.h" #include "GUI/View/Global/Globals.h"
...@@ -48,10 +49,12 @@ RealDataPropertiesWidget::RealDataPropertiesWidget(QWidget* parent, ProjectDocum ...@@ -48,10 +49,12 @@ RealDataPropertiesWidget::RealDataPropertiesWidget(QWidget* parent, ProjectDocum
static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
&RealDataPropertiesWidget::onInstrumentComboIndexChanged); &RealDataPropertiesWidget::onInstrumentComboIndexChanged);
connect(m_document->instrumentModel(), &InstrumentModel::instrumentAddedOrRemoved, this, connect(m_document->instrumentsEditController(),
&InstrumentsEditController::instrumentAddedOrRemoved, this,
&RealDataPropertiesWidget::updateInstrumentComboEntries); &RealDataPropertiesWidget::updateInstrumentComboEntries);
connect(m_document->instrumentModel(), &InstrumentModel::instrumentChanged, this, connect(m_document->instrumentsEditController(),
&InstrumentsEditController::instrumentNameChanged, this,
&RealDataPropertiesWidget::updateInstrumentComboEntries); &RealDataPropertiesWidget::updateInstrumentComboEntries);
updateInstrumentComboEntries(); updateInstrumentComboEntries();
...@@ -114,7 +117,7 @@ void RealDataPropertiesWidget::onInstrumentComboIndexChanged(int /*index*/) ...@@ -114,7 +117,7 @@ void RealDataPropertiesWidget::onInstrumentComboIndexChanged(int /*index*/)
void RealDataPropertiesWidget::updateInstrumentComboEntries() void RealDataPropertiesWidget::updateInstrumentComboEntries()
{ {
QString currentId = m_currentDataItem != nullptr ? m_currentDataItem->instrumentId() : ""; const QString currentId = m_currentDataItem != nullptr ? m_currentDataItem->instrumentId() : "";
QSignalBlocker b(m_instrumentCombo); QSignalBlocker b(m_instrumentCombo);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment