Add zooming to the named component when selecting a component

from python. Re #3784.
mantidproject · Jan 13, 2012 · 2a7e2ca · 2a7e2ca
1 parent eadd04b
commit 2a7e2ca
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentTreeWidget.h b/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentTreeWidget.h
@@ -25,7 +25,7 @@ class InstrumentTreeWidget:public QTreeView
   void getSelectedBoundingBox(const QModelIndex& index,double &xmax, double &ymax, double &zmax, double &xmin, double &ymin, double &zmin);
   //Mantid::Kernel::V3D getSamplePos()const;
   QModelIndex findComponentByName(const QString & name) const;
-protected slots:
+public slots:
   void sendComponentSelectedSignal(const QModelIndex);
 signals:
   void componentSelected(const Mantid::Geometry::ComponentID);

diff --git a/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindow.cpp b/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindow.cpp
@@ -40,6 +40,7 @@
 
 #include <numeric>
 #include <fstream>
+#include <stdexcept>
 
 using namespace Mantid::API;
 using namespace Mantid::Geometry;
@@ -590,16 +591,22 @@ void InstrumentWindow::setViewDirection(const QString& input)
   repaint();
 }
 
-/**
- * For the scripting API
+/** For the scripting API. Selects a omponent in the tree and zooms to it.
+ *  @param name The name of the component
+ *  @throw std::invalid_argument If the component name given does not exist in the tree
  */
 void InstrumentWindow::selectComponent(const QString & name)
 {
   QModelIndex component = mInstrumentTree->findComponentByName(name);
-  if( !component.isValid() ) return;
+  if( !component.isValid() )
+  {
+    throw std::invalid_argument("No component named \'"+name.toStdString()+"\' found");
+  }
 
+  mInstrumentTree->clearSelection();
   mInstrumentTree->scrollTo(component, QAbstractItemView::EnsureVisible );
   mInstrumentTree->selectionModel()->select(component, QItemSelectionModel::Select);
+  mInstrumentTree->sendComponentSelectedSignal(component);
 }
 
 /**