From efeee19c307c2120472580a74c12f0071a62d66a Mon Sep 17 00:00:00 2001 From: Martyn Gigg <martyn.gigg@gmail.com> Date: Tue, 10 Oct 2017 09:56:26 +0100 Subject: [PATCH] Fix custom interface help links All were pointing at non-existent pages after a clean up in #19855 --- MantidPlot/src/ScriptingWindow.cpp | 2 +- .../DynamicPDF/DPDFBackgroundRemover.cpp | 2 +- qt/scientific_interfaces/DynamicPDF/SliceSelector.cpp | 2 +- .../EnggDiffraction/EnggDiffractionViewQtGUI.cpp | 2 +- qt/scientific_interfaces/General/SampleTransmission.cpp | 2 +- qt/scientific_interfaces/Indirect/IndirectBayes.cpp | 2 +- qt/scientific_interfaces/Indirect/IndirectCorrections.cpp | 2 +- qt/scientific_interfaces/Indirect/IndirectDataAnalysis.cpp | 2 +- qt/scientific_interfaces/Indirect/IndirectDataReduction.cpp | 2 +- .../Indirect/IndirectDiffractionReduction.cpp | 2 +- qt/scientific_interfaces/Indirect/IndirectSimulation.cpp | 2 +- qt/scientific_interfaces/Indirect/IndirectTools.cpp | 2 +- qt/scientific_interfaces/Muon/ALCBaselineModellingView.cpp | 2 +- qt/scientific_interfaces/Muon/ALCDataLoadingView.cpp | 2 +- qt/scientific_interfaces/Muon/ALCPeakFittingView.cpp | 2 +- qt/scientific_interfaces/Muon/MuonAnalysis.cpp | 6 +++--- qt/scientific_interfaces/Muon/MuonAnalysisFitDataTab.cpp | 2 +- qt/scientific_interfaces/Muon/MuonAnalysisOptionTab.cpp | 4 ++-- .../Muon/MuonAnalysisResultTableTab.cpp | 2 +- qt/widgets/spectrumviewer/src/SVConnections.cpp | 2 +- scripts/DGSPlanner/DGSPlannerGUI.py | 2 +- scripts/FilterEvents/eventFilterGUI.py | 2 +- scripts/QECoverage.py | 2 +- scripts/TofConverter/converterGUI.py | 2 +- 24 files changed, 27 insertions(+), 27 deletions(-) diff --git a/MantidPlot/src/ScriptingWindow.cpp b/MantidPlot/src/ScriptingWindow.cpp index 4759ede0fdd..3e87ebf3629 100644 --- a/MantidPlot/src/ScriptingWindow.cpp +++ b/MantidPlot/src/ScriptingWindow.cpp @@ -425,7 +425,7 @@ void ScriptingWindow::clearScriptVariables() { */ void ScriptingWindow::showHelp() { MantidQt::API::HelpWindow::showCustomInterface(NULL, - QString("ScriptingWindow")); + QString("Scripting Window")); } /** diff --git a/qt/scientific_interfaces/DynamicPDF/DPDFBackgroundRemover.cpp b/qt/scientific_interfaces/DynamicPDF/DPDFBackgroundRemover.cpp index 63fcd25f67c..fbf6a9f5b70 100644 --- a/qt/scientific_interfaces/DynamicPDF/DPDFBackgroundRemover.cpp +++ b/qt/scientific_interfaces/DynamicPDF/DPDFBackgroundRemover.cpp @@ -71,7 +71,7 @@ void BackgroundRemover::initLayout() { */ void BackgroundRemover::showHelp() { MantidQt::API::HelpWindow::showCustomInterface( - NULL, QString("DPDFBackgroundRemover")); + NULL, QString("Dynamic PDF Background Remover")); } /** diff --git a/qt/scientific_interfaces/DynamicPDF/SliceSelector.cpp b/qt/scientific_interfaces/DynamicPDF/SliceSelector.cpp index c5fd6288796..484309aeb9c 100644 --- a/qt/scientific_interfaces/DynamicPDF/SliceSelector.cpp +++ b/qt/scientific_interfaces/DynamicPDF/SliceSelector.cpp @@ -220,7 +220,7 @@ void SliceSelector::selectSliceForFitting() { */ void SliceSelector::showHelp() { MantidQt::API::HelpWindow::showCustomInterface( - NULL, QString("DPDFBackgroundRemover")); + NULL, QString("Dynamic PDF Background Remover")); } /* *********************** diff --git a/qt/scientific_interfaces/EnggDiffraction/EnggDiffractionViewQtGUI.cpp b/qt/scientific_interfaces/EnggDiffraction/EnggDiffractionViewQtGUI.cpp index 7dac4bbd337..d80cf5bc2f9 100644 --- a/qt/scientific_interfaces/EnggDiffraction/EnggDiffractionViewQtGUI.cpp +++ b/qt/scientific_interfaces/EnggDiffraction/EnggDiffractionViewQtGUI.cpp @@ -1114,7 +1114,7 @@ void EnggDiffractionViewQtGUI::closeEvent(QCloseEvent *event) { void EnggDiffractionViewQtGUI::openHelpWin() { MantidQt::API::HelpWindow::showCustomInterface( - nullptr, QString("Engineering_Diffraction")); + nullptr, QString("Engineering Diffraction")); } void EnggDiffractionViewQtGUI::updateTabsInstrument( diff --git a/qt/scientific_interfaces/General/SampleTransmission.cpp b/qt/scientific_interfaces/General/SampleTransmission.cpp index b7f6b795731..df90a242b2b 100644 --- a/qt/scientific_interfaces/General/SampleTransmission.cpp +++ b/qt/scientific_interfaces/General/SampleTransmission.cpp @@ -48,7 +48,7 @@ void SampleTransmission::initLayout() { */ void SampleTransmission::showHelp() { MantidQt::API::HelpWindow::showCustomInterface( - NULL, QString("SampleTransmissionCalculator")); + NULL, QString("Sample Transmission Calculator")); } /** diff --git a/qt/scientific_interfaces/Indirect/IndirectBayes.cpp b/qt/scientific_interfaces/Indirect/IndirectBayes.cpp index ad50fd0f010..cd1a9c05324 100644 --- a/qt/scientific_interfaces/Indirect/IndirectBayes.cpp +++ b/qt/scientific_interfaces/Indirect/IndirectBayes.cpp @@ -116,7 +116,7 @@ void IndirectBayes::runClicked() { */ void IndirectBayes::helpClicked() { MantidQt::API::HelpWindow::showCustomInterface(NULL, - QString("Indirect_Bayes")); + QString("Indirect Bayes")); } /** diff --git a/qt/scientific_interfaces/Indirect/IndirectCorrections.cpp b/qt/scientific_interfaces/Indirect/IndirectCorrections.cpp index 9b2a76f80d6..d97b412bc6d 100644 --- a/qt/scientific_interfaces/Indirect/IndirectCorrections.cpp +++ b/qt/scientific_interfaces/Indirect/IndirectCorrections.cpp @@ -141,7 +141,7 @@ void IndirectCorrections::openDirectoryDialog() { */ void IndirectCorrections::help() { MantidQt::API::HelpWindow::showCustomInterface( - NULL, QString("Indirect_Corrections")); + NULL, QString("Indirect Corrections")); } /** diff --git a/qt/scientific_interfaces/Indirect/IndirectDataAnalysis.cpp b/qt/scientific_interfaces/Indirect/IndirectDataAnalysis.cpp index 8e4a1146628..6a3094182de 100644 --- a/qt/scientific_interfaces/Indirect/IndirectDataAnalysis.cpp +++ b/qt/scientific_interfaces/Indirect/IndirectDataAnalysis.cpp @@ -140,7 +140,7 @@ void IndirectDataAnalysis::openDirectoryDialog() { */ void IndirectDataAnalysis::help() { MantidQt::API::HelpWindow::showCustomInterface( - NULL, QString("Indirect_DataAnalysis")); + NULL, QString("Indirect Data Analysis")); } /** diff --git a/qt/scientific_interfaces/Indirect/IndirectDataReduction.cpp b/qt/scientific_interfaces/Indirect/IndirectDataReduction.cpp index 860a3869f71..bc36eb9532a 100644 --- a/qt/scientific_interfaces/Indirect/IndirectDataReduction.cpp +++ b/qt/scientific_interfaces/Indirect/IndirectDataReduction.cpp @@ -76,7 +76,7 @@ IndirectDataReduction::~IndirectDataReduction() { */ void IndirectDataReduction::helpClicked() { MantidQt::API::HelpWindow::showCustomInterface( - NULL, QString("Indirect_DataReduction")); + NULL, QString("Indirect Data Reduction")); } /** diff --git a/qt/scientific_interfaces/Indirect/IndirectDiffractionReduction.cpp b/qt/scientific_interfaces/Indirect/IndirectDiffractionReduction.cpp index 60cbd3a4379..d7b48abd5e8 100644 --- a/qt/scientific_interfaces/Indirect/IndirectDiffractionReduction.cpp +++ b/qt/scientific_interfaces/Indirect/IndirectDiffractionReduction.cpp @@ -729,7 +729,7 @@ void IndirectDiffractionReduction::openDirectoryDialog() { */ void IndirectDiffractionReduction::help() { MantidQt::API::HelpWindow::showCustomInterface( - NULL, QString("Indirect_Diffraction")); + NULL, QString("Indirect Diffraction")); } void IndirectDiffractionReduction::initLocalPython() {} diff --git a/qt/scientific_interfaces/Indirect/IndirectSimulation.cpp b/qt/scientific_interfaces/Indirect/IndirectSimulation.cpp index 75e5c0503f2..b340a715de4 100644 --- a/qt/scientific_interfaces/Indirect/IndirectSimulation.cpp +++ b/qt/scientific_interfaces/Indirect/IndirectSimulation.cpp @@ -122,7 +122,7 @@ void IndirectSimulation::runClicked() { */ void IndirectSimulation::helpClicked() { MantidQt::API::HelpWindow::showCustomInterface( - NULL, QString("Indirect_Simulation")); + NULL, QString("Indirect Simulation")); } /** diff --git a/qt/scientific_interfaces/Indirect/IndirectTools.cpp b/qt/scientific_interfaces/Indirect/IndirectTools.cpp index be736e1090f..0a28310be3d 100644 --- a/qt/scientific_interfaces/Indirect/IndirectTools.cpp +++ b/qt/scientific_interfaces/Indirect/IndirectTools.cpp @@ -115,7 +115,7 @@ void IndirectTools::runClicked() { */ void IndirectTools::helpClicked() { MantidQt::API::HelpWindow::showCustomInterface(NULL, - QString("Indirect_Tools")); + QString("Indirect Tools")); } /** diff --git a/qt/scientific_interfaces/Muon/ALCBaselineModellingView.cpp b/qt/scientific_interfaces/Muon/ALCBaselineModellingView.cpp index b67b1f84a7c..8583d737324 100644 --- a/qt/scientific_interfaces/Muon/ALCBaselineModellingView.cpp +++ b/qt/scientific_interfaces/Muon/ALCBaselineModellingView.cpp @@ -257,7 +257,7 @@ void ALCBaselineModellingView::setSelectorValues( } void ALCBaselineModellingView::help() { - MantidQt::API::HelpWindow::showCustomInterface(NULL, QString("Muon_ALC")); + MantidQt::API::HelpWindow::showCustomInterface(NULL, QString("Muon ALC")); } void ALCBaselineModellingView::emitFitRequested() { emit fitRequested(); } diff --git a/qt/scientific_interfaces/Muon/ALCDataLoadingView.cpp b/qt/scientific_interfaces/Muon/ALCDataLoadingView.cpp index bfd8d1d5e2b..26238359994 100644 --- a/qt/scientific_interfaces/Muon/ALCDataLoadingView.cpp +++ b/qt/scientific_interfaces/Muon/ALCDataLoadingView.cpp @@ -252,7 +252,7 @@ void ALCDataLoadingView::setTimeRange(double tMin, double tMax) { } void ALCDataLoadingView::help() { - MantidQt::API::HelpWindow::showCustomInterface(NULL, QString("Muon_ALC")); + MantidQt::API::HelpWindow::showCustomInterface(NULL, QString("Muon ALC")); } void ALCDataLoadingView::disableAll() { diff --git a/qt/scientific_interfaces/Muon/ALCPeakFittingView.cpp b/qt/scientific_interfaces/Muon/ALCPeakFittingView.cpp index e69c1364c08..1567599dfde 100644 --- a/qt/scientific_interfaces/Muon/ALCPeakFittingView.cpp +++ b/qt/scientific_interfaces/Muon/ALCPeakFittingView.cpp @@ -130,7 +130,7 @@ void ALCPeakFittingView::setPeakPicker(const IPeakFunction_const_sptr &peak) { } void ALCPeakFittingView::help() { - MantidQt::API::HelpWindow::showCustomInterface(NULL, QString("Muon_ALC")); + MantidQt::API::HelpWindow::showCustomInterface(NULL, QString("Muon ALC")); } void ALCPeakFittingView::displayError(const QString &message) { diff --git a/qt/scientific_interfaces/Muon/MuonAnalysis.cpp b/qt/scientific_interfaces/Muon/MuonAnalysis.cpp index 0d8f53693d8..20f61b8f579 100644 --- a/qt/scientific_interfaces/Muon/MuonAnalysis.cpp +++ b/qt/scientific_interfaces/Muon/MuonAnalysis.cpp @@ -340,7 +340,7 @@ void MuonAnalysis::setChosenGroupAndPeriods(const QString &wsName) { */ void MuonAnalysis::muonAnalysisHelpClicked() { MantidQt::API::HelpWindow::showCustomInterface(nullptr, - QString("Muon_Analysis")); + QString("Muon Analysis")); } /** @@ -348,7 +348,7 @@ void MuonAnalysis::muonAnalysisHelpClicked() { */ void MuonAnalysis::muonAnalysisHelpGroupingClicked() { MantidQt::API::HelpWindow::showCustomInterface( - nullptr, QString("Muon_Analysis"), QString("grouping-options")); + nullptr, QString("Muon Analysis"), QString("grouping-options")); } /** @@ -1718,7 +1718,7 @@ void MuonAnalysis::plotSpectrum(const QString &wsName, bool logScale) { s << " w = plotSpectrum(source = ws_name," "indices = 0," "distribution = mantidqtpython.MantidQt.DistributionFalse," - "error_bars = errors," + "error_bars = errors," "type = connect," "window = window_to_use)"; // clang-format on diff --git a/qt/scientific_interfaces/Muon/MuonAnalysisFitDataTab.cpp b/qt/scientific_interfaces/Muon/MuonAnalysisFitDataTab.cpp index b3fa2bb308b..7ce616c68a9 100644 --- a/qt/scientific_interfaces/Muon/MuonAnalysisFitDataTab.cpp +++ b/qt/scientific_interfaces/Muon/MuonAnalysisFitDataTab.cpp @@ -31,7 +31,7 @@ void MuonAnalysisFitDataTab::init() { */ void MuonAnalysisFitDataTab::muonAnalysisHelpDataAnalysisClicked() { MantidQt::API::HelpWindow::showCustomInterface( - nullptr, QString("Muon_Analysis"), QString("data-analysis")); + nullptr, QString("Muon Analysis"), QString("data-analysis")); } /** diff --git a/qt/scientific_interfaces/Muon/MuonAnalysisOptionTab.cpp b/qt/scientific_interfaces/Muon/MuonAnalysisOptionTab.cpp index 656a20964eb..b0b4d2f076a 100644 --- a/qt/scientific_interfaces/Muon/MuonAnalysisOptionTab.cpp +++ b/qt/scientific_interfaces/Muon/MuonAnalysisOptionTab.cpp @@ -141,7 +141,7 @@ void MuonAnalysisOptionTab::initLayout() { */ void MuonAnalysisOptionTab::muonAnalysisHelpSettingsClicked() { MantidQt::API::HelpWindow::showCustomInterface( - nullptr, QString("Muon_Analysis"), QString("settings")); + nullptr, QString("Muon Analysis"), QString("settings")); } /* @@ -149,7 +149,7 @@ void MuonAnalysisOptionTab::muonAnalysisHelpSettingsClicked() { */ void MuonAnalysisOptionTab::rebinHelpClicked() { MantidQt::API::HelpWindow::showCustomInterface( - nullptr, QString("Muon_Analysis"), QString("data-binning")); + nullptr, QString("Muon Analysis"), QString("data-binning")); } /** diff --git a/qt/scientific_interfaces/Muon/MuonAnalysisResultTableTab.cpp b/qt/scientific_interfaces/Muon/MuonAnalysisResultTableTab.cpp index 397bb84e1a0..35503fb7717 100644 --- a/qt/scientific_interfaces/Muon/MuonAnalysisResultTableTab.cpp +++ b/qt/scientific_interfaces/Muon/MuonAnalysisResultTableTab.cpp @@ -90,7 +90,7 @@ MuonAnalysisResultTableTab::MuonAnalysisResultTableTab(Ui::MuonAnalysis &uiForm) */ void MuonAnalysisResultTableTab::helpResultsClicked() { MantidQt::API::HelpWindow::showCustomInterface( - nullptr, QString("Muon_Analysis"), QString("results-table")); + nullptr, QString("Muon Analysis"), QString("results-table")); } /** diff --git a/qt/widgets/spectrumviewer/src/SVConnections.cpp b/qt/widgets/spectrumviewer/src/SVConnections.cpp index e340e8771f6..e94101d9023 100644 --- a/qt/widgets/spectrumviewer/src/SVConnections.cpp +++ b/qt/widgets/spectrumviewer/src/SVConnections.cpp @@ -602,7 +602,7 @@ void SVConnections::showColorScale(std::vector<QRgb> &positiveColorTable, */ void SVConnections::openOnlineHelp() { MantidQt::API::HelpWindow::showCustomInterface(NULL, - QString("SpectrumViewer")); + QString("Spectrum Viewer")); } /// Set the display which is currently visible diff --git a/scripts/DGSPlanner/DGSPlannerGUI.py b/scripts/DGSPlanner/DGSPlannerGUI.py index f5d1ea86b22..4a63b6579b1 100644 --- a/scripts/DGSPlanner/DGSPlannerGUI.py +++ b/scripts/DGSPlanner/DGSPlannerGUI.py @@ -132,7 +132,7 @@ class DGSPlannerGUI(QtGui.QWidget): def help(self): try: import pymantidplot - pymantidplot.proxies.showCustomInterfaceHelp('DGSPlanner') + pymantidplot.proxies.showCustomInterfaceHelp('DGS Planner') except ImportError: self.assistantProcess.close() self.assistantProcess.waitForFinished() diff --git a/scripts/FilterEvents/eventFilterGUI.py b/scripts/FilterEvents/eventFilterGUI.py index 5464002a4cb..69a519c6c86 100644 --- a/scripts/FilterEvents/eventFilterGUI.py +++ b/scripts/FilterEvents/eventFilterGUI.py @@ -1187,7 +1187,7 @@ class MainWindow(QtGui.QMainWindow): def helpClicked(self): from pymantidplot.proxies import showCustomInterfaceHelp - showCustomInterfaceHelp("FilterEventUI") + showCustomInterfaceHelp("Filter Events") def _resetGUI(self, resetfilerun=False): """ Reset GUI including all text edits and etc. diff --git a/scripts/QECoverage.py b/scripts/QECoverage.py index 0906172dfc8..db18f5425f0 100644 --- a/scripts/QECoverage.py +++ b/scripts/QECoverage.py @@ -204,7 +204,7 @@ class QECoverageGUI(QtGui.QWidget): def onHelp(self): from pymantidplot.proxies import showCustomInterfaceHelp - showCustomInterfaceHelp("QECoverage") + showCustomInterfaceHelp("QE Coverage") def onDirectPlotOverChanged(self, state): self.indirect_plotover.setCheckState(state) diff --git a/scripts/TofConverter/converterGUI.py b/scripts/TofConverter/converterGUI.py index e29fd109515..e4dff743db7 100644 --- a/scripts/TofConverter/converterGUI.py +++ b/scripts/TofConverter/converterGUI.py @@ -73,7 +73,7 @@ class MainWindow(QtGui.QMainWindow): def helpClicked(self): # Temporary import while method is in the wrong place from pymantidplot.proxies import showCustomInterfaceHelp - showCustomInterfaceHelp("TOF_Converter") + showCustomInterfaceHelp("TOF Converter") def convert(self): #Always reset these values before conversion. -- GitLab