Re #5496. Disconnect the recorder after it finishes

mantidproject · Jul 12, 2012 · fa5c42b · fa5c42b
1 parent 1713814
commit fa5c42b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/AlgorithmObserver.h b/Code/Mantid/Framework/API/inc/MantidAPI/AlgorithmObserver.h
@@ -137,6 +137,14 @@ class MANTID_API_DLL AlgorithmObserver
         alg->removeObserver(m_errorObserver);
     }
 
+    /**
+     * Disconnect from the algorithm manager.
+     */
+    void stopObservingManager()
+    {
+        AlgorithmManager::Instance().notificationCenter.removeObserver(m_startingObserver);
+    }
+
 /// @cond Doxygen cannot handle the macro around the argument name
 
     /** Handler of the progress notifications. Must be overriden in inherited classes.

diff --git a/Code/Mantid/Framework/Algorithms/src/RecordPythonScript.cpp b/Code/Mantid/Framework/Algorithms/src/RecordPythonScript.cpp
@@ -85,22 +85,16 @@ void RecordPythonScript::exec()
   file << m_generatedScript;
   file.flush();
   file.close();
+
+  stopObservingManager();
 }
 
 /** Handler of the start notifications. Adds an algorithm call to the script.
  * @param alg :: Shared pointer to the starting algorithm.
  */
 void RecordPythonScript::startingHandle(API::IAlgorithm_sptr alg)
 {
-  std::cerr << "Started " << alg->name() << std::endl;
   auto props= alg->getProperties();
-  for( auto p = props.begin(); p != props.end(); ++p)
-  {
-    std::cerr << (**p).name() << '=' << (**p).value() << std::endl;
-  }
-  // Get the details of this algorithm history.
-  const std::string name = alg->name();
-  const int version = alg->version();
 
   std::string algString;
   for(auto p = props.begin() ; p != props.end(); ++p)
@@ -118,7 +112,7 @@ void RecordPythonScript::startingHandle(API::IAlgorithm_sptr alg)
     }
   }
 
-  m_generatedScript +=  name + "(" + algString + ")\n";
+  m_generatedScript +=  alg->name() + "(" + algString + ")\n";
 }