[Orxonox-commit 4160] r8831 - in code/branches/output/src/libraries: core core/command util/output

[landauf at orxonox.net]

Author: landauf
Date: 2011-08-08 22:19:09 +0200 (Mon, 08 Aug 2011)
New Revision: 8831

Modified:
   code/branches/output/src/libraries/core/ConfigFileManager.cc
   code/branches/output/src/libraries/core/command/Shell.cc
   code/branches/output/src/libraries/util/output/BaseWriter.cc
   code/branches/output/src/libraries/util/output/LogWriter.cc
   code/branches/output/src/libraries/util/output/OutputDefinitions.h
Log:
fixed wrong config value callback in Shell
fixed bug in ConfigFileManager: if a vector contained only one element at index 0, size 0 instead of 1 was returned
removed output context "output"
the configurable vector of output contexts now contains "example" as default to make the config vector visible in the config file

Modified: code/branches/output/src/libraries/core/ConfigFileManager.cc
===================================================================
--- code/branches/output/src/libraries/core/ConfigFileManager.cc	2011-08-07 20:51:54 UTC (rev 8830)
+++ code/branches/output/src/libraries/core/ConfigFileManager.cc	2011-08-08 20:19:09 UTC (rev 8831)
@@ -122,12 +122,9 @@
         unsigned int size = 0;
         for (std::list<ConfigFileEntry*>::const_iterator it = this->entries_.begin(); it != this->entries_.end(); ++it)
             if ((*it)->getName() == name)
-                if ((*it)->getIndex() > size)
-                    size = (*it)->getIndex();
-        if (size == 0)
-            return 0;
-        else
-            return (size + 1);
+                if ((*it)->getIndex() >= size)
+                    size = (*it)->getIndex() + 1;
+        return size;
     }
 
     /**

Modified: code/branches/output/src/libraries/core/command/Shell.cc
===================================================================
--- code/branches/output/src/libraries/core/command/Shell.cc	2011-08-07 20:51:54 UTC (rev 8830)
+++ code/branches/output/src/libraries/core/command/Shell.cc	2011-08-08 20:19:09 UTC (rev 8831)
@@ -134,7 +134,7 @@
                                this->getConfigurableContextsName(),
                                this->configurableContexts_)
             .description("Additional output contexts shown in the " + this->getName())
-            .callback(static_cast<BaseWriter*>(this), &BaseWriter::changedConfigurableLevels);
+            .callback(static_cast<BaseWriter*>(this), &BaseWriter::changedConfigurableContexts);
     }
 
     /**

Modified: code/branches/output/src/libraries/util/output/BaseWriter.cc
===================================================================
--- code/branches/output/src/libraries/util/output/BaseWriter.cc	2011-08-07 20:51:54 UTC (rev 8830)
+++ code/branches/output/src/libraries/util/output/BaseWriter.cc	2011-08-08 20:19:09 UTC (rev 8831)
@@ -38,6 +38,8 @@
 
         this->configurableMaxLevel_ = level::none;
         this->configurableContextsMaxLevel_ = level::verbose;
+        this->configurableContexts_.push_back("example");
+        this->changedConfigurableLevels();
     }
 
     BaseWriter::~BaseWriter()

Modified: code/branches/output/src/libraries/util/output/LogWriter.cc
===================================================================
--- code/branches/output/src/libraries/util/output/LogWriter.cc	2011-08-07 20:51:54 UTC (rev 8830)
+++ code/branches/output/src/libraries/util/output/LogWriter.cc	2011-08-08 20:19:09 UTC (rev 8831)
@@ -68,14 +68,14 @@
         std::string name = this->path_ + '/' + this->filename_;
 
         if (this->bDefaultPath_)
-            OutputManager::getInstance().pushMessage(level::user_info, context::output(), "Opening log file " + name);
+            OutputManager::getInstance().pushMessage(level::user_info, context::undefined(), "Opening log file " + name);
 
         this->file_.open(name.c_str(), std::fstream::out);
 
         if (this->file_.is_open())
             this->printLine("Log file opened", level::none);
         else
-            OutputManager::getInstance().pushMessage(level::user_warning, context::output(), "Failed to open log file. File logging disabled.");
+            OutputManager::getInstance().pushMessage(level::user_warning, context::undefined(), "Failed to open log file. File logging disabled.");
     }
 
     void LogWriter::closeFile()
@@ -89,7 +89,7 @@
 
     void LogWriter::setLogPath(const std::string& path)
     {
-        OutputManager::getInstance().pushMessage(level::internal_info, context::output(), "Migrating log file from " + this->path_ + "\nto " + path);
+        OutputManager::getInstance().pushMessage(level::internal_info, context::undefined(), "Migrating log file from " + this->path_ + "\nto " + path);
 
         this->closeFile();
         this->path_ = path;

Modified: code/branches/output/src/libraries/util/output/OutputDefinitions.h
===================================================================
--- code/branches/output/src/libraries/util/output/OutputDefinitions.h	2011-08-07 20:51:54 UTC (rev 8830)
+++ code/branches/output/src/libraries/util/output/OutputDefinitions.h	2011-08-08 20:19:09 UTC (rev 8831)
@@ -84,7 +84,6 @@
             REGISTER_OUTPUT_CONTEXT(object_list);
             REGISTER_OUTPUT_CONTEXT(super);
             REGISTER_OUTPUT_CONTEXT(language);
-            REGISTER_OUTPUT_CONTEXT(output);
             REGISTER_OUTPUT_CONTEXT(commands);
             REGISTER_OUTPUT_CONTEXT(executor);
             REGISTER_OUTPUT_CONTEXT(input);