re #151

New classes added: SignalChannel to Mantid and MantidLog to QtiPlot. 

FrameworkManager's initialization is moved to the constructor.

Code/Mantid/API/inc/MantidAPI/FrameworkManager.h

@@ -56,7 +56,7 @@ namespace Mantid
 		{
 		public:
 			/// Creates all of the required services
-			void initialize();
+			//void initialize();
 
 			/// Clears all memory associated with the AlgorithmManager 
 			void clear();

Code/Mantid/API/src/FrameworkManager.cpp

@@ -24,8 +24,13 @@ namespace API
 /// Default constructor
 FrameworkManagerImpl::FrameworkManagerImpl() : g_log(Kernel::Logger::get("FrameworkManager"))
 {
-	std::cerr << "Framework Manager created." << std::endl;
-	g_log.debug() << "FrameworkManager created." << std::endl;
+  std::string pluginDir = Kernel::ConfigService::Instance().getString("plugins.directory");
+  if (pluginDir.length() > 0)
+  {
+    Mantid::Kernel::LibraryManager::Instance().OpenAllLibraries(pluginDir, false);
+  }
+  std::cerr << "Framework Manager created." << std::endl;
+  g_log.debug() << "FrameworkManager created." << std::endl;
 }
 
 /// Destructor
@@ -35,17 +40,6 @@ FrameworkManagerImpl::~FrameworkManagerImpl()
 //	g_log.debug() << "FrameworkManager destroyed." << std::endl;
 }
 
-/// Creates all of the required services
-void FrameworkManagerImpl::initialize()
-{ 
-  std::string pluginDir = Kernel::ConfigService::Instance().getString("plugins.directory");
-  if (pluginDir.length() > 0)
-  {
-    Mantid::Kernel::LibraryManager::Instance().OpenAllLibraries(pluginDir, false);
-  }
-  return;
-}
-
 /** At the moment clears all memory associated with AlgorithmManager.
  *  May do more in the future
  */

Code/Mantid/API/test/FrameworkManagerTest.h

@@ -35,11 +35,11 @@ class FrameworkManagerTest : public CxxTest::TestSuite
 {
 public:
 
-  void testInitialize()
-  {
-    // Not really much to test
-    TS_ASSERT_THROWS_NOTHING( FrameworkManager::Instance().initialize() )
-  }
+  //void testInitialize()
+  //{
+  //  // Not really much to test
+  //  TS_ASSERT_THROWS_NOTHING( FrameworkManager::Instance().initialize() )
+  //}
 
   void testcreateAlgorithm()
   {

Code/Mantid/DataHandling/test/LoadInstrumentFromRawTest.h

@@ -28,7 +28,7 @@ public:
   LoadInstrumentFromRawTest()
   {	
 	//initialise framework manager to allow logging
-	Mantid::API::FrameworkManager::Instance().initialize();
+	//Mantid::API::FrameworkManager::Instance().initialize();
   }
   void testInit()
   {

Code/Mantid/DataHandling/test/LoadInstrumentTest.h

@@ -28,7 +28,7 @@ public:
   LoadInstrumentTest()
   {	
 	//initialise framework manager to allow logging
-	Mantid::API::FrameworkManager::Instance().initialize();
+	//Mantid::API::FrameworkManager::Instance().initialize();
   }
   void testInit()
   {

Code/Mantid/DataHandling/test/LoadLogTest.h

@@ -28,7 +28,7 @@ public:
   LoadLogTest()
   {	
 	  //initialise framework manager to allow logging
-	Mantid::API::FrameworkManager::Instance().initialize();
+	//Mantid::API::FrameworkManager::Instance().initialize();
   }
   void testInit()
   {

Code/Mantid/DataHandling/test/LoadRawTest.h

@@ -24,7 +24,7 @@ public:
   LoadRawTest()
   {
     //initialise framework manager to allow logging
-    Mantid::API::FrameworkManager::Instance().initialize();
+    //Mantid::API::FrameworkManager::Instance().initialize();
     // Path to test input file assumes Test directory checked out from SVN
     inputFile = "../../../../Test/Data/HET15869.RAW";
   }

Code/Mantid/DataHandling/test/MarkDeadDetectorsTest.h

@@ -23,7 +23,7 @@ class MarkDeadDetectorsTest : public CxxTest::TestSuite
 public:
   MarkDeadDetectorsTest()
   {
-    FrameworkManager::Instance().initialize();
+    //FrameworkManager::Instance().initialize();
     
     // Set up a small workspace for testing
     Workspace_sptr space = WorkspaceFactory::Instance().create("Workspace2D",5,6,5);

Code/Mantid/Kernel/Kernel.vcproj

@@ -126,7 +126,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="PocoFoundation.lib  PocoUtil.lib"
+				AdditionalDependencies="PocoFoundation.lib  PocoUtil.lib libboost_signals-vc80-mt-1_34_1.lib"
 				OutputFile="$(OutDir)\$(SolutionName)$(ProjectName).dll"
 				AdditionalLibraryDirectories="../../Third_Party/lib/win32"
 			/>
@@ -208,6 +208,10 @@
 				RelativePath=".\src\PropertyWithValue.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\src\SignalChannel.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\src\SingletonHolder.cpp"
 				>
@@ -374,6 +378,14 @@
 				RelativePath=".\test\PropertyWithValueTest.h"
 				>
 			</File>
+			<File
+				RelativePath=".\inc\MantidKernel\Signal.h"
+				>
+			</File>
+			<File
+				RelativePath=".\inc\MantidKernel\SignalChannel.h"
+				>
+			</File>
 			<File
 				RelativePath=".\inc\MantidKernel\SingletonHolder.h"
 				>

Code/Mantid/Kernel/inc/MantidKernel/SignalChannel.h

+//
+// SignalChannel.h
+//
+//
+// Definition of the SignalChannel class. A small extension to the POCO logging.
+//
+// Copyright © 2007 STFC Rutherford Appleton Laboratories
+//
+// This file is part of Mantid.
+//
+// Mantid is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+//
+// Mantid is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+//File change history is stored at: <https://svn.mantidproject.org/mantid/trunk/Code/Mantid>
+//
+
+
+#ifndef Foundation_SignalChannel_INCLUDED
+#define Foundation_SignalChannel_INCLUDED
+
+#include "MantidKernel/System.h"
+
+#include "Poco/Foundation.h"
+#include "Poco/Channel.h"
+//#include "Poco/Mutex.h"
+#include "boost/signal.hpp"
+
+#include <vector>
+
+
+namespace Poco {
+
+/**
+   class SignalChannel passes log messages to slots, connected to it. 
+
+**/
+class DLLExport SignalChannel: public Channel
+    /// This channel sends a message through boost::signal.
+{
+public:
+
+    typedef boost::signal<void (const Message& msg)> signal_t;
+
+    /// Creates the SignalChannel.
+    SignalChannel();
+
+    /// Connects a slot to the channel.
+    void connect(void(const Message& msg));
+
+    /// Sends the given Message. 
+	void log(const Message& msg);
+
+    signal_t& sig(){return _sig;}
+
+private:
+	//mutable FastMutex _mutex;
+    signal_t _sig;
+};
+
+
+} // namespace Poco
+
+
+#endif // Foundation_SignalChannel_INCLUDED

Code/Mantid/Kernel/src/ConfigService.cpp

@@ -5,6 +5,7 @@
 #include "MantidKernel/Support.h"
 #include "MantidKernel/Logger.h"
 #include "MantidKernel/FilterChannel.h"
+#include "MantidKernel/SignalChannel.h"
 #include "Poco/Util/LoggingConfigurator.h"
 #include "Poco/Util/SystemConfiguration.h"
 #include "Poco/Util/PropertyFileConfiguration.h"
@@ -24,11 +25,14 @@ namespace Kernel
 		//getting at system details
 		m_pSysConfig = new WrappedObject<Poco::Util::SystemConfiguration>;
 		m_pConf = 0;
+        
+        //Register the FilterChannel with the Poco logging factory
+        Poco::LoggingFactory::defaultFactory().registerChannelClass("FilterChannel",new Poco::Instantiator<Poco::FilterChannel, Poco::Channel>);
 
-    //Register the FilterChannel with the Poco logging factory
-    Poco::LoggingFactory::defaultFactory().registerChannelClass("FilterChannel",new Poco::Instantiator<Poco::FilterChannel, Poco::Channel>);
+        //Register the SignalChannel with the Poco logging factory
+        Poco::LoggingFactory::defaultFactory().registerChannelClass("SignalChannel",new Poco::Instantiator<Poco::SignalChannel, Poco::Channel>);
 
-		//attempt to load the default properties filename
+        //attempt to load the default properties filename
 		loadConfig("Mantid.properties");
 		g_log.debug() << "ConfigService created." << std::endl;
 	}

Code/Mantid/Kernel/src/SignalChannel.cpp

+
+#include "MantidKernel/SignalChannel.h"
+
+#include "Poco/LoggingRegistry.h"
+#include "Poco/Message.h"
+//#include "boost/bind.hpp"
+
+#include <iostream>
+
+namespace Poco {
+
+    /// Connects a function (slot) to a SignalChannel with name chName. 
+    /// chName must be defined in Mantid.properies file. A slot is a
+    /// function of the type: void slot(const Message& msg).
+    /// Returns true if the connection was successful.
+    bool DLLExport connectSignal(const std::string& chName, void(*slt)(const Message& msg))
+    {
+        try
+        {
+            SignalChannel *pChannel = dynamic_cast<SignalChannel*>(Poco::LoggingRegistry::defaultRegistry().channelForName(chName));
+            if (!pChannel) return false;
+            pChannel->connect(slt);
+        }
+        catch(...)
+        {
+            return false;
+        }
+        return true;
+    }
+
+    SignalChannel::SignalChannel():Channel()
+    {
+    }
+
+    void SignalChannel::log(const Message& msg)
+    {
+        _sig(msg);
+    }
+
+    /// Connects a slot to the channel.
+    void SignalChannel::connect(void(*slt)(const Message& msg))
+    {
+        _sig.connect(slt);
+    }
+
+} // namespace Poco

Code/Mantid/Main/Main.vcproj

@@ -123,7 +123,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(SolutionName)API.lib $(SolutionName)Kernel.lib $(SolutionName)Geometry.lib $(SolutionName)DataObjects.lib"
+				AdditionalDependencies="$(SolutionName)API.lib $(SolutionName)Kernel.lib $(SolutionName)Geometry.lib $(SolutionName)DataObjects.lib $(SolutionName)UserAlgorithms.lib"
 				OutputFile="$(OutDir)\$(SolutionName)$(ProjectName).exe"
 				AdditionalLibraryDirectories="..\Release;..\..\Third_Party\lib\win32"
 			/>

Code/Mantid/PythonAPI/inc/MantidPythonAPI/PythonInterface.h

@@ -51,8 +51,6 @@ public:
 	PythonInterface();
 	~PythonInterface();
 
-	void InitialiseFrameworkManager();
-
 	//Algorithms
 	API::IAlgorithm* CreateAlgorithm(const std::string&);
 	std::vector<std::string> GetAlgorithmNames();

Code/Mantid/PythonAPI/src/PythonInterface.cpp

@@ -23,6 +23,7 @@ namespace PythonAPI
 ///Constructor
 PythonInterface::PythonInterface()
 {
+    FrameworkManager::Instance();
 }
 
 ///Destructor
@@ -30,12 +31,6 @@ PythonInterface::~PythonInterface()
 {
 }
 
-///Initialises the FrameworkManager.
-void PythonInterface::InitialiseFrameworkManager()
-{
-	FrameworkManager::Instance().initialize();
-}
-
 /**
  * Creates a specified algorithm.
  * \param algName :: The name of the algorithm to execute.

Code/Mantid/PythonAPI/src/PythonWrapper.cpp

@@ -128,7 +128,7 @@ BOOST_PYTHON_MODULE(libMantidPythonAPI)
 	//Mantid stuff
 	class_< Mantid::PythonAPI::PythonInterface >("PythonInterface", init<  >())
         .def(init< const Mantid::PythonAPI::PythonInterface& >())
-        .def("InitialiseFrameworkManager", &Mantid::PythonAPI::PythonInterface::InitialiseFrameworkManager)
+//        .def("InitialiseFrameworkManager", &Mantid::PythonAPI::PythonInterface::InitialiseFrameworkManager)
         .def("CreateAlgorithm", &Mantid::PythonAPI::PythonInterface::CreateAlgorithm, return_value_policy< manage_new_object>())
 	.def("GetAlgorithmNames", &Mantid::PythonAPI::PythonInterface::GetAlgorithmNames)
         .def("LoadIsisRawFile", &Mantid::PythonAPI::PythonInterface::LoadIsisRawFile)

Code/Mantid/PythonAPI/test/PythonAPITests.h

@@ -23,10 +23,10 @@ public:
 		inter = new PythonInterface();
 	}
 
-	void testFrameworkInitialise()
-	{
-		TS_ASSERT_THROWS_NOTHING(inter->InitialiseFrameworkManager());
-	}
+	//void testFrameworkInitialise()
+	//{
+	//	TS_ASSERT_THROWS_NOTHING(inter->InitialiseFrameworkManager());
+	//}
 
 	void testCreateAlgorithm()
 	{

Code/Mantid/UserAlgorithms/PropertyAlgorithm.cpp

@@ -7,7 +7,8 @@ namespace Mantid
 namespace Algorithms
 {
 
-DECLARE_ALGORITHM(PropertyAlgorithm);
+//DECLARE_ALGORITHM(PropertyAlgorithm);
+DECLARE_NAMESPACED_ALGORITHM(Mantid::Algorithms,PropertyAlgorithm)
 
 using namespace Kernel;
 

Code/Mantid/UserAlgorithms/UserAlgorithms.vcproj

@@ -113,7 +113,7 @@
 				Optimization="3"
 				AdditionalIncludeDirectories="inc;../API/inc;../Geometry/inc;../Kernel/inc;../DataObjects/inc;../../Third_Party/include"
 				PreprocessorDefinitions="WIN32;_WINDOWS;POCO_DLL;WINVER=0x0500;IN_MANTID_ALGORITHMS=1;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE"
-				RuntimeLibrary="3"
+				RuntimeLibrary="2"
 				DisableSpecificWarnings="4996"
 			/>
 			<Tool

Code/Mantid/release/Mantid.properties

@@ -15,3 +15,6 @@ logging.channels.fileChannel.formatter.pattern = %Y-%m-%d %H:%M:%S,%i [%I] %p %s
 logging.formatters.f1.class = PatternFormatter
 logging.formatters.f1.pattern = %s-[%p] %t
 logging.formatters.f1.times = UTC;
+
+logging.loggers.root.channel.channel3 = signalChannel
+logging.channels.signalChannel.class = SignalChannel