Skip to content

Commit

Permalink
Remove SignalChannel that is now superfluous. Refs #6202
Browse files Browse the repository at this point in the history
  • Loading branch information
martyngigg committed Apr 15, 2013
1 parent 04b296c commit d5d03da
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 204 deletions.
3 changes: 0 additions & 3 deletions Code/Mantid/Framework/Kernel/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ set ( SRC_FILES
src/ReadLock.cpp
src/RebinParamsValidator.cpp
src/RegexStrings.cpp
src/SignalChannel.cpp
src/SingletonHolder.cpp
src/SobolSequence.cpp
src/StartsWithValidator.cpp
Expand Down Expand Up @@ -191,7 +190,6 @@ set ( INC_FILES
inc/MantidKernel/RebinParamsValidator.h
inc/MantidKernel/RegexStrings.h
inc/MantidKernel/RegistrationHelper.h
inc/MantidKernel/SignalChannel.h
inc/MantidKernel/SingletonHolder.h
inc/MantidKernel/SobolSequence.h
inc/MantidKernel/StartsWithValidator.h
Expand Down Expand Up @@ -291,7 +289,6 @@ set ( TEST_FILES
RebinHistogramTest.h
RebinParamsValidatorTest.h
RegexStringsTest.h
SignalChannelTest.h
SobolSequenceTest.h
StartsWithValidatorTest.h
StatisticsTest.h
Expand Down
75 changes: 0 additions & 75 deletions Code/Mantid/Framework/Kernel/inc/MantidKernel/SignalChannel.h

This file was deleted.

10 changes: 1 addition & 9 deletions Code/Mantid/Framework/Kernel/src/ConfigService.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include "MantidKernel/Strings.h"
#include "MantidKernel/Logger.h"
#include "MantidKernel/FilterChannel.h"
#include "MantidKernel/SignalChannel.h"
#include "MantidKernel/Exception.h"
#include "MantidKernel/FacilityInfo.h"

Expand Down Expand Up @@ -184,10 +183,6 @@ ConfigServiceImpl::ConfigServiceImpl() :
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>);

// Define the directory to search for the Mantid.properties file.
Poco::File f;

Expand Down Expand Up @@ -682,7 +677,6 @@ std::string ConfigServiceImpl::defaultConfig() const
"logging.loggers.root.channel.class = SplitterChannel"
"logging.loggers.root.channel.channel1 = consoleChannel"
"logging.loggers.root.channel.channel2 = fileFilterChannel"
"logging.loggers.root.channel.channel3 = signalChannel"
"# output to the console - primarily for console based apps"
"logging.channels.consoleChannel.class = ConsoleChannel"
"logging.channels.consoleChannel.formatter = f1"
Expand All @@ -697,9 +691,7 @@ std::string ConfigServiceImpl::defaultConfig() const
"logging.channels.fileChannel.formatter.pattern = %Y-%m-%d %H:%M:%S,%i [%I] %p %s - %t"
"logging.formatters.f1.class = PatternFormatter"
"logging.formatters.f1.pattern = %s-[%p] %t"
"logging.formatters.f1.times = UTC;"
"# SignalChannel - Passes messages to the MantidPlot User interface"
"logging.channels.signalChannel.class = SignalChannel";
"logging.formatters.f1.times = UTC";
return propFile;
}

Expand Down
46 changes: 0 additions & 46 deletions Code/Mantid/Framework/Kernel/src/SignalChannel.cpp

This file was deleted.

68 changes: 0 additions & 68 deletions Code/Mantid/Framework/Kernel/test/SignalChannelTest.h

This file was deleted.

3 changes: 0 additions & 3 deletions Code/Mantid/Framework/Properties/Mantid.properties.template
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ logging.loggers.root.level = notice
logging.loggers.root.channel.class = SplitterChannel
logging.loggers.root.channel.channel1 = consoleChannel
logging.loggers.root.channel.channel2 = fileFilterChannel
logging.loggers.root.channel.channel3 = signalChannel
# output to the console - primarily for console based apps
logging.channels.consoleChannel.class = ConsoleChannel
logging.channels.consoleChannel.formatter = f1
Expand All @@ -167,8 +166,6 @@ logging.formatters.f1.class = PatternFormatter
logging.formatters.f1.pattern = @CONSOLEPATTERN@
logging.formatters.f1.times = local
logging.channels.fileChannel.formatter.times = local
# SignalChannel - Passes messages to the MantidPlot User interface
logging.channels.signalChannel.class = SignalChannel

workspace.sendto.SansView.arguments=[file]
workspace.sendto.SansView.saveusing=SaveCanSAS1D
Expand Down

0 comments on commit d5d03da

Please sign in to comment.