diff --git a/qt/scientific_interfaces/Muon/MuonAnalysis.cpp b/qt/scientific_interfaces/Muon/MuonAnalysis.cpp index 2396643e05f3afbedde0767512e2e513890519e1..58b8f1ca4f34a51fa581b4f51ab11a831447a975 100644 --- a/qt/scientific_interfaces/Muon/MuonAnalysis.cpp +++ b/qt/scientific_interfaces/Muon/MuonAnalysis.cpp @@ -1387,13 +1387,13 @@ void MuonAnalysis::inputFileChanged(const QStringList &files) { size_t numPeriods = MuonAnalysisHelper::numPeriods(loadResult->loadedWorkspace); if (instrumentChanged || numPeriods != m_numPeriods) { - // if some data has been loaded, update the run number - // before updating the periods (stops errors) - if (m_currentDataName != NOT_AVAILABLE) { - const boost::optional<QString> filePath = - m_uiForm.mwRunFiles->getUserInput().toString(); - m_fitDataPresenter->setSelectedWorkspace(m_currentDataName, filePath); - } + // if some data has been loaded, update the run number + // before updating the periods (stops errors) + if (m_currentDataName != NOT_AVAILABLE) { + const boost::optional<QString> filePath = + m_uiForm.mwRunFiles->getUserInput().toString(); + m_fitDataPresenter->setSelectedWorkspace(m_currentDataName, filePath); + } updatePeriodWidgets(numPeriods); } @@ -1646,7 +1646,6 @@ void MuonAnalysis::updatePeriodWidgets(size_t numPeriods) { // cache number of periods m_numPeriods = numPeriods; m_uiForm.fitBrowser->setNumPeriods(m_numPeriods); - } /** diff --git a/qt/widgets/common/src/MuonFitPropertyBrowser.cpp b/qt/widgets/common/src/MuonFitPropertyBrowser.cpp index 3b5c1cc8cc7ce75e4c1e2052d17482f86e1dc7e5..fc87833100107b096e7e224bd8c595ba8fd42750 100644 --- a/qt/widgets/common/src/MuonFitPropertyBrowser.cpp +++ b/qt/widgets/common/src/MuonFitPropertyBrowser.cpp @@ -408,8 +408,8 @@ void MuonFitPropertyBrowser::enumChanged(QtProperty *prop) { } else if (prop == m_workspace) { int j = m_enumManager->value(m_workspace); std::string option = m_workspaceNames[j].toStdString(); - //update plot - emit workspaceNameChanged(QString::fromStdString(option)); + // update plot + emit workspaceNameChanged(QString::fromStdString(option)); setOutputName(option); // only do this if in single fit mode @@ -430,26 +430,26 @@ void MuonFitPropertyBrowser::enumChanged(QtProperty *prop) { m_boolManager->setValue(iter.value(), selectedPeriod == iter.key()); } } - if (!m_browser->isItemVisible(m_multiFitSettingsGroup)) { - size_t end = 0; - // assumed structure of name - // isolate the group/pair - for (int k = 0; k < 2; k++) { - end = option.find_first_of(";"); - option = option.substr(end + 1, option.size()); - } - end = option.find_first_of(";"); - - boost::erase_all(option, " "); - - auto tmp = option.substr(0, end-1); - QString selectedGroup = QString::fromStdString(tmp); - // turn on only the relevant box - for (auto iter = m_groupBoxes.constBegin(); - iter != m_groupBoxes.constEnd(); ++iter) { - m_boolManager->setValue(iter.value(), selectedGroup == iter.key()); - } - } + if (!m_browser->isItemVisible(m_multiFitSettingsGroup)) { + size_t end = 0; + // assumed structure of name + // isolate the group/pair + for (int k = 0; k < 2; k++) { + end = option.find_first_of(";"); + option = option.substr(end + 1, option.size()); + } + end = option.find_first_of(";"); + + boost::erase_all(option, " "); + + auto tmp = option.substr(0, end - 1); + QString selectedGroup = QString::fromStdString(tmp); + // turn on only the relevant box + for (auto iter = m_groupBoxes.constBegin(); + iter != m_groupBoxes.constEnd(); ++iter) { + m_boolManager->setValue(iter.value(), selectedGroup == iter.key()); + } + } } else { FitPropertyBrowser::enumChanged(prop);