Skip to content
Snippets Groups Projects
Commit f531b9e2 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

clang-format

parent 67f7634e
No related branches found
No related tags found
1 merge request!2263make full use of gDoc being global
Pipeline #124541 passed
......@@ -51,8 +51,8 @@ DatafileEditor::DatafileEditor()
connect(gDoc->multiNotifier(), &MultiInstrumentNotifier::instrumentNameChanged, this,
&DatafileEditor::updateInstrumentComboEntries);
connect(gDoc->linkInstrumentManager(), &LinkInstrumentManager::linkToInstrumentChanged,
this, &DatafileEditor::updateInstrumentComboIndex);
connect(gDoc->linkInstrumentManager(), &LinkInstrumentManager::linkToInstrumentChanged, this,
&DatafileEditor::updateInstrumentComboIndex);
}
void DatafileEditor::setDatafileItem(DatafileItem* realItem)
......
......@@ -79,15 +79,14 @@ JobView::JobView(QProgressBar* progressBar)
connect(m_fitActivityPanel, &FitActivityPanel::showLog, m_jobMessagePanel,
&JobMessagePanel::setLog);
connect(gDoc->jobModel(), &JobModel::globalProgress, [pb=progressBar](int progress)
{
if (progress < 0 || progress >= 100)
pb->hide();
else {
pb->show();
pb->setValue(progress);
}
});
connect(gDoc->jobModel(), &JobModel::globalProgress, [pb = progressBar](int progress) {
if (progress < 0 || progress >= 100)
pb->hide();
else {
pb->show();
pb->setValue(progress);
}
});
}
void JobView::fillViewMenu(QMenu* menu)
......
......@@ -330,11 +330,11 @@ const SampleItem* SimulationView::selectedSampleItem() const
const InstrumentItem* SimulationView::selectedInstrumentItem() const
{
return gDoc->instrumentModel()->instrumentItems().value(m_instrumentCombo->currentIndex(),
nullptr);
nullptr);
}
const DatafileItem* SimulationView::selectedDatafileItem() const
{
return gDoc->realModel()->realItems().value(m_realDataCombo->currentIndex() - 1,
nullptr); // -1: "None"
nullptr); // -1: "None"
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment