Changeset 1023 for code/branches/core2/src/orxonox

Timestamp:

Apr 10, 2008, 5:35:20 PM (17 years ago)

Author:

landauf

Message:

fixed bug, removed some debug output

Location:

code/branches/core2/src/orxonox/core

Files:

• ConfigFileManager.cc (modified) (12 diffs)
• ConfigFileManager.h (modified) (1 diff)
• ConfigValueContainer.cc (modified) (2 diffs)
• DebugLevel.cc (modified) (1 diff)
• Language.cc (modified) (1 diff)

code/branches/core2/src/orxonox/core/ConfigFileManager.cc

@@ -111 +111 @@
     std::list<ConfigFileEntry*>::iterator ConfigFileSection::getEntryIterator(const std::string& name, const std::string& fallback)
     {
-std::cout << "a33333333333333333333333333\n";
         for (std::list<ConfigFileEntry*>::iterator it = this->entries_.begin(); it != this->entries_.end(); ++it)
             if ((*it)->getName() == name)
@@ -123 +122 @@
     std::list<ConfigFileEntry*>::iterator ConfigFileSection::getEntryIterator(const std::string& name, unsigned int index, const std::string& fallback)
     {
-std::cout << "b3333333333333333333333333\n";
         for (std::list<ConfigFileEntry*>::iterator it = this->entries_.begin(); it != this->entries_.end(); ++it)
             if (((*it)->getName() == name) && ((*it)->getIndex() == index))
@@ -197 +195 @@
                 if (isComment(line))
                 {
-std::cout << "1_7\n";
                     // New comment
                     newsection->getEntries().insert(newsection->getEntries().end(), new ConfigFileEntryComment(removeTrailingWhitespaces(line)));
@@ -204 +201 @@
                 else
                 {
-std::cout << "1_8\n";
                     unsigned int pos1 = line.find('=');
 
                     if (pos1 != std::string::npos && pos1 > 0)
                     {
-std::cout << "1_9\n";
                         // New entry
                         unsigned int pos2 = line.find('[');
@@ -220 +215 @@
                         if (value.size() > 0 && value[0] == '"' && betweenQuotes != "" && betweenQuotes.size() > 0)
                         {
-std::cout << "1_10\n";
                             value = betweenQuotes;
                             if (line.size() > pos1 + 1 + betweenQuotes.size() + 2)
@@ -227 +221 @@
                         else
                         {
-std::cout << "1_11\n";
                             unsigned int pos4 = getCommentPosition(line);
-std::cout << "a\n";
-std::cout << line << std::endl;
-std::cout << line.substr(pos1 + 1, pos4 - pos1 - 1) << std::endl;
                             value = removeTrailingWhitespaces(line.substr(pos1 + 1, pos4 - pos1 - 1));
-std::cout << value << std::endl;
-std::cout << "b\n";
                             if (pos4 != std::string::npos)
                                 comment = removeTrailingWhitespaces(line.substr(pos4));
-std::cout << comment << std::endl;
-std::cout << "c\n";
                         }
 
-std::cout << "1_12\n";
                         if (pos2 != std::string::npos && pos3 != std::string::npos && pos3 > pos2 + 1)
                         {
-std::cout << "1_13\n";
                             // There might be an array index
                             unsigned int index = 0;
@@ -251 +235 @@
                                 // New array
                                 newsection->getEntries().insert(newsection->getEntries().end(), new ConfigFileEntryArrayValue(getStripped(line.substr(0, pos2)), index, value, comment));
-std::cout << "1_14\n";
                                 continue;
                             }
@@ -258 +241 @@
                         // New value
                         newsection->getEntries().insert(newsection->getEntries().end(), new ConfigFileEntryValue(getStripped(line.substr(0, pos1)), value, comment));
-std::cout << "1_15\n";
                         continue;
                     }
@@ -264 +246 @@
             }
         }
-std::cout << "1_16\n";
 
         file.close();
@@ -272 +253 @@
         // Save the file in case something changed (like stripped whitespaces)
         this->save();
-std::cout << "1_17\n";
     }
 
@@ -312 +292 @@
     ConfigFileSection* ConfigFile::getSection(const std::string& section)
     {
-std::cout << "22222222222222222222\n";
         for (std::list<ConfigFileSection*>::iterator it = this->sections_.begin(); it != this->sections_.end(); ++it)
             if ((*it)->getName() == section)
@@ -433 +412 @@
     ConfigFile* ConfigFileManager::getFile(ConfigFileType type)
     {
-std::cout << "111111111111111111\n";
         std::map<ConfigFileType, ConfigFile*>::iterator it = this->configFiles_.find(type);
         if (it != this->configFiles_.end())

code/branches/core2/src/orxonox/core/ConfigFileManager.h

@@ -76 +76 @@
     {
         public:
-            inline ConfigFileEntryValue(const std::string& name, const std::string& value = "", const std::string& additionalComment = "") : name_(name), value_(value), additionalComment_(additionalComment), bString_(false) { std::cout << "************* " << value << std::endl; }
+            inline ConfigFileEntryValue(const std::string& name, const std::string& value = "", const std::string& additionalComment = "") : name_(name), value_(value), additionalComment_(additionalComment), bString_(false) {}
             inline virtual ~ConfigFileEntryValue() {}
 

code/branches/core2/src/orxonox/core/ConfigValueContainer.cc

@@ -53 +53 @@
         this->varname_ = varname;
 
+        this->value_ = defvalue;
         this->bAddedDescription_ = false;
 
@@ -97 +98 @@
     void ConfigValueContainer::update()
     {
-std::cout << "AAA1: " << this->value_ << std::endl;
-std::cout << "    : " << ConfigFileManager::getSingleton()->getValue(this->type_, this->sectionname_, this->varname_, this->defvalueString_) << std::endl;
         this->value_.fromString(ConfigFileManager::getSingleton()->getValue(this->type_, this->sectionname_, this->varname_, this->defvalueString_));
-std::cout << "AAA2: " << this->value_ << std::endl;
     }
 

code/branches/core2/src/orxonox/core/DebugLevel.cc

@@ -95 +95 @@
 
         // Return a constant value while we're creating the object
-        return 4;
+        return 2;
     }
 }

code/branches/core2/src/orxonox/core/Language.cc

@@ -108 +108 @@
 
         // Read the translation file after the language was configured
-std::cout << "asdfasdfkjsfkdjaslfkjsaflkjsdfkl\n";
         this->readTranslatedLanguageFile();
     }