From f07496dc628588128898f9a6dff688d90d06c696 Mon Sep 17 00:00:00 2001
From: Shahroz Ahmed <shahroz.ahmed@stfc.ac.uk>
Date: Tue, 4 Aug 2015 16:45:44 +0100
Subject: [PATCH] Instrument View Python control error msg updates Refs #11766
---
.../InstrumentWidget/InstrumentWindow.cpp | 24 +++++++++++++++----
.../InstrumentWindowTreeTab.cpp | 8 +++----
2 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindow.cpp b/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindow.cpp
index 74c9c604178..565bf7039ec 100644
--- a/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindow.cpp
+++ b/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindow.cpp
@@ -1071,8 +1071,25 @@ void InstrumentWindow::setColorMapAutoscaling(bool on)
bool InstrumentWindow::overlay(const QString & wsName)
{
using namespace Mantid::API;
- auto pws = boost::dynamic_pointer_cast<IPeaksWorkspace>(AnalysisDataService::Instance().retrieve(wsName.toStdString()));
+ Workspace_sptr workspace;
+ try {
+ workspace = AnalysisDataService::Instance().retrieve(wsName.toStdString());
+ } catch(std::runtime_error &re) {
+ QMessageBox::warning(this, "MantidPlot - Warning", "No workspace called '" + wsName + "' found. ");
+ return workspace;
+ }
+ auto pws = boost::dynamic_pointer_cast<IPeaksWorkspace>(workspace);
+ if (!pws) {
+ QMessageBox::warning(this, "MantidPlot - Warning", "Work space called '" +wsName+ "' is not suitable."
+ " Please select another workspace. ");
+ return pws;
+ }
auto surface = boost::dynamic_pointer_cast<UnwrappedSurface>( getSurface() );
+ if (!surface) {
+ QMessageBox::warning(this, "MantidPlot - Warning","Please change to an unwrapped view to see peak labels.");
+ return surface;
+ }
+
bool success(false);
if (pws && surface)
{
@@ -1080,10 +1097,7 @@ bool InstrumentWindow::overlay(const QString & wsName)
updateInstrumentView();
success = true;
}
- else if (pws && !surface)
- {
- QMessageBox::warning(this,"MantidPlot - Warning","Please change to an unwrapped view to see peak labels.");
- }
+
return success;
}
diff --git a/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowTreeTab.cpp b/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowTreeTab.cpp
index ca109e0c6be..c3d6f015d50 100644
--- a/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowTreeTab.cpp
+++ b/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowTreeTab.cpp
@@ -36,11 +36,11 @@ void InstrumentWindowTreeTab::selectComponentByName(const QString &name)
QModelIndex component = m_instrumentTree->findComponentByName(name);
if( !component.isValid() )
{
- QMessageBox::critical(this,"Instrument Window - Tree Tab - Error",
- "No component named '" + name + "' was found in the instrument. "
- "Please use the name of a component from the instrument tree.");
+ QMessageBox::warning(this,"Instrument Window - Tree Tab - Error",
+ "No component named '" + name + "' was found. "
+ "Please use a valid component name ");
return;
- }
+ }
m_instrumentTree->clearSelection();
m_instrumentTree->scrollTo(component, QAbstractItemView::EnsureVisible );
--
GitLab