Re #6002. This should fix the workspace group.

mantidproject · Oct 26, 2012 · 4088754 · 4088754
1 parent 8e8f579
commit 4088754
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/WorkspaceGroup.h b/Code/Mantid/Framework/API/inc/MantidAPI/WorkspaceGroup.h
@@ -106,10 +106,10 @@ class MANTID_API_DLL WorkspaceGroup : public Workspace
   void workspaceDeleteHandle(Mantid::API::WorkspacePostDeleteNotification_ptr notice);
   /// Observer for workspace delete notfications
   Poco::NObserver<WorkspaceGroup, Mantid::API::WorkspacePostDeleteNotification> m_deleteObserver;
-  /// Callback when a after-replace notification is received
-  void workspaceReplaceHandle(Mantid::API::WorkspaceAfterReplaceNotification_ptr notice);
-  /// Observer for workspace after-replace notfications
-  Poco::NObserver<WorkspaceGroup, Mantid::API::WorkspaceAfterReplaceNotification> m_replaceObserver;
+  /// Callback when a before-replace notification is received
+  void workspaceReplaceHandle(Mantid::API::WorkspaceBeforeReplaceNotification_ptr notice);
+  /// Observer for workspace before-replace notfications
+  Poco::NObserver<WorkspaceGroup, Mantid::API::WorkspaceBeforeReplaceNotification> m_replaceObserver;
   /// The list of workspace pointers in the group
   std::vector<Workspace_sptr> m_workspaces;
   /// Flag as to whether the observers have been added to the ADS

diff --git a/Code/Mantid/Framework/API/src/WorkspaceGroup.cpp b/Code/Mantid/Framework/API/src/WorkspaceGroup.cpp
@@ -205,6 +205,7 @@ void WorkspaceGroup::print() const
  */
 void WorkspaceGroup::workspaceDeleteHandle(Mantid::API::WorkspacePostDeleteNotification_ptr notice)
 {
+  Poco::Mutex::ScopedLock _lock(m_mutex);
   const std::string deletedName = notice->object_name();
   if( !this->contains(deletedName)) return;
 
@@ -225,20 +226,23 @@ void WorkspaceGroup::workspaceDeleteHandle(Mantid::API::WorkspacePostDeleteNotif
  * Replaces a member if it was replaced in the ADS.
  * @param notice :: A pointer to a workspace after-replace notificiation object
  */
-void WorkspaceGroup::workspaceReplaceHandle(Mantid::API::WorkspaceAfterReplaceNotification_ptr notice)
+void WorkspaceGroup::workspaceReplaceHandle(Mantid::API::WorkspaceBeforeReplaceNotification_ptr notice)
 {
   Poco::Mutex::ScopedLock _lock(m_mutex);
-  observeADSNotifications(false);
+  bool isObserving = m_observingADS;
+  if ( isObserving )
+    observeADSNotifications( false );
   const std::string replacedName = notice->object_name();
   for(auto citr=m_workspaces.begin(); citr!=m_workspaces.end(); ++citr)
   {
     if ( (**citr).name() == replacedName )
     {
-      *citr = notice->object();
+      *citr = notice->new_object();
       break;
     }
   }
-  observeADSNotifications(true);
+  if ( isObserving )
+    observeADSNotifications( true );
 }
 
 /**
@@ -247,6 +251,7 @@ void WorkspaceGroup::workspaceReplaceHandle(Mantid::API::WorkspaceAfterReplaceNo
  */
 bool WorkspaceGroup::isEmpty() const
 {
+  Poco::Mutex::ScopedLock _lock(m_mutex);
 	return m_workspaces.empty();
 }
 
@@ -259,6 +264,7 @@ bool WorkspaceGroup::isEmpty() const
  */
 bool WorkspaceGroup::areNamesSimilar() const
 {
+  Poco::Mutex::ScopedLock _lock(m_mutex);
   if(m_workspaces.empty()) return false;
 
   //Check all the members are of similar names
@@ -285,6 +291,7 @@ bool WorkspaceGroup::areNamesSimilar() const
  */
 void WorkspaceGroup::updated() const
 {
+  Poco::Mutex::ScopedLock _lock(m_mutex);
   if ( m_observingADS )
   {
     try

diff --git a/Code/Mantid/MantidPlot/src/Mantid/MantidDock.cpp b/Code/Mantid/MantidPlot/src/Mantid/MantidDock.cpp
@@ -786,7 +786,9 @@ void MantidDockWidget::populateWorkspaceGroupData(Mantid::API::WorkspaceGroup_sp
     else
     {
       QString itemName = QString("Unnamed_%1").arg(unnamedCount);
-      MantidTreeWidgetItem *ws_item = new MantidTreeWidgetItem(QStringList(itemName), m_tree);
+      MantidTreeWidgetItem *item = new MantidTreeWidgetItem(QStringList(itemName), m_tree);
+      setItemIcon(item, member_ws);
+      ws_item->addChild(item);
       ++unnamedCount;
     }
   }
@@ -869,6 +871,8 @@ void MantidDockWidget::removeWorkspaceEntry(const QString & ws_name)
  */
 void MantidDockWidget::renameWorkspaceEntry(const QString & ws_name, const QString& new_name)
 {
+  (void)ws_name;
+  (void)new_name;
   scheduleFindAbandonedWorkspaces();
 }
 
@@ -878,6 +882,7 @@ void MantidDockWidget::renameWorkspaceEntry(const QString & ws_name, const QStri
  */
 void MantidDockWidget::updateWorkspaceGroup(const QString & group_name)
 {
+  (void)group_name;
   scheduleFindAbandonedWorkspaces();
 }