enables each instance has different max length

fkanehiro · Jan 14, 2015 · f9caa7a · f9caa7a
1 parent 5f0b350
commit f9caa7a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/rtc/DataLogger/DataLogger.cpp b/rtc/DataLogger/DataLogger.cpp
@@ -33,9 +33,6 @@ static const char* nullcomponent_spec[] =
  };
 // </rtc-template>
 
-#define DEFAULT_MAX_LOG_LENGTH (200*20)
-
-unsigned int LoggerPortBase::m_maxLength = DEFAULT_MAX_LOG_LENGTH;
 
 void printData(std::ostream& os, const RTC::Acceleration3D& data)
 {
@@ -450,6 +447,15 @@ void DataLogger::resumeLogging()
  m_suspendFlag = false;
 }
 
+void DataLogger::maxLength(unsigned int len)
+{
+ suspendLogging();
+ for (unsigned int i=0; i<m_ports.size(); i++){
+ m_ports[i]->maxLength(len);
+ }
+ resumeLogging();
+}
+
 extern "C"
 {
 

diff --git a/rtc/DataLogger/DataLogger.h b/rtc/DataLogger/DataLogger.h
@@ -35,14 +35,19 @@
 
 using namespace RTC;
 
+#define DEFAULT_MAX_LOG_LENGTH (200*20)
+
 class LoggerPortBase
 {
 public:
+ LoggerPortBase() : m_maxLength(DEFAULT_MAX_LOG_LENGTH) {}
  virtual const char *name() = 0;
  virtual void clear() = 0;
  virtual void dumpLog(std::ostream& os) = 0;
  virtual void log() = 0;
- static unsigned int m_maxLength;
+ void maxLength(unsigned int len) { m_maxLength = len; }
+protected:
+ unsigned int m_maxLength;
 };
 
 /**
@@ -114,6 +119,7 @@ class DataLogger
  bool clear();
  void suspendLogging();
  void resumeLogging();
+ void maxLength(unsigned int len);
 
  std::vector<LoggerPortBase *> m_ports;
 

diff --git a/rtc/DataLogger/DataLoggerService_impl.cpp b/rtc/DataLogger/DataLoggerService_impl.cpp
@@ -26,7 +26,7 @@ CORBA::Boolean DataLoggerService_impl::clear()
 
 void DataLoggerService_impl::maxLength(CORBA::ULong len)
 {
- LoggerPortBase::m_maxLength = len;
+ m_logger->maxLength(len);
 }