Restore selection after dock updates. Re #8032

mantidproject · Sep 27, 2013 · ec1ade8 · ec1ade8
1 parent 6c63a94
commit ec1ade8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/Code/Mantid/MantidPlot/src/Mantid/MantidDock.cpp b/Code/Mantid/MantidPlot/src/Mantid/MantidDock.cpp
@@ -286,6 +286,7 @@ void MantidDockWidget::populateChildData(QTreeWidgetItem* item)
       auto ws = group->getItem(i);
       auto * node = addTreeEntry(std::make_pair(ws->name(), ws), item);
       excludeItemFromSort(node);
+      if(m_selectedNames.contains(node->text(0))) node->setSelected(true);
     }
   }
   else
@@ -378,13 +379,24 @@ void MantidDockWidget::setTreeUpdating(const bool state)
 void MantidDockWidget::populateTopLevel(const std::map<std::string,Mantid::API::Workspace_sptr> & topLevelItems,
                                         const QStringList & expanded)
 {
+  // collect names of selected workspaces
+  QList<QTreeWidgetItem *> selected = m_tree->selectedItems();
+  m_selectedNames.clear(); // just in case
+  foreach( QTreeWidgetItem *item, selected)
+  {
+      m_selectedNames << item->text(0);
+  }
+
+  // populate the tree from scratch
   m_tree->clear();
   auto iend = topLevelItems.end();
   for(auto it = topLevelItems.begin(); it != iend; ++it)
   {
     auto *node = addTreeEntry(*it);
     if(expanded.contains(node->text(0))) node->setExpanded(true);
+    if(m_selectedNames.contains(node->text(0))) node->setSelected(true);
   }
+  m_selectedNames.clear();
 }
 
 /**

diff --git a/Code/Mantid/MantidPlot/src/Mantid/MantidDock.h b/Code/Mantid/MantidPlot/src/Mantid/MantidDock.h
@@ -134,6 +134,9 @@ private slots:
   QAtomicInt m_updateCount;
   bool m_treeUpdating;
   Mantid::API::AnalysisDataServiceImpl & m_ads;
+  /// Temporarily keeps names of selected workspaces during tree update
+  /// in order to restore selection after update
+  QStringList m_selectedNames;
 
   static Mantid::Kernel::Logger& logObject;
 };