Changeset 704 for code/branches/FICN/src

Timestamp:

Dec 28, 2007, 12:56:17 AM (17 years ago)

Author:

landauf

Message:

added a new class: Language
it's a manager for different language files to store translations of ingame text (it uses the default text, defined in the code, if no translation in the configured language is available)

Location:

code/branches/FICN/src/orxonox/core

Files:

• CMakeLists.txt (modified) (1 diff)
• ClassFactory.h (modified) (1 diff)
• ConfigValueContainer.cc (modified) (5 diffs)
• ConfigValueContainer.h (modified) (2 diffs)
• CoreIncludes.h (modified) (2 diffs)
• DebugLevel.h (modified) (1 diff)
• Language.cc (added)
• Language.h (added)
• MetaObjectList.h (modified) (1 diff)
• OutputHandler.h (modified) (1 diff)

code/branches/FICN/src/orxonox/core/CMakeLists.txt

@@ -13 +13 @@
   DebugLevel.cc
   OutputHandler.cc
+  Language.cc
 )
 

code/branches/FICN/src/orxonox/core/ClassFactory.h

@@ -60 +60 @@
             ClassFactory() {}                               // Don't create
             ClassFactory(const ClassFactory& factory) {}    // Don't copy
-            ~ClassFactory() {}                              // Don't delete
+            virtual ~ClassFactory() {}                      // Don't delete
 
             static T* createNewObject();

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

@@ -647 +647 @@
 
     /**
-        @brief Sets the value of the variable back to the default value.
+        @brief Sets the value of the variable back to the default value and resets the config-file entry.
     */
     void ConfigValueContainer::resetConfigValue()
     {
-        parseSting(this->defvalueString_);
+        this->parseSting(this->defvalueString_);
+        this->resetConfigFileEntry();
     }
 
@@ -854 +855 @@
     void ConfigValueContainer::readConfigFile(const std::string& filename)
     {
-        ConfigValueContainer::finishedReadingConfigFile(true);
-
         // This creates the file if it's not existing
         std::ofstream createFile;
@@ -865 +864 @@
         file.open(filename.c_str(), std::fstream::in);
 
+        if (!file.is_open())
+        {
+            COUT(1) << "Error: Couldn't open config-file " << filename << " to read the config values!" << std::endl;
+            return;
+        }
+
         char line[1024];
 
@@ -887 +892 @@
 
         file.close();
+
+        ConfigValueContainer::finishedReadingConfigFile(true);
     }
 
@@ -903 +910 @@
         file.open(filename.c_str(), std::fstream::out);
 
+        if (!file.is_open())
+        {
+            COUT(1) << "Error: Couldn't open config-file " << filename << " to write the config values!" << std::endl;
+            return;
+        }
+
         // Iterate through the list an write the lines into the file
         std::list<std::string>::iterator it;
-        for(it = ConfigValueContainer::getConfigFileLines().begin(); it != ConfigValueContainer::getConfigFileLines().end(); ++it)
+        for (it = ConfigValueContainer::getConfigFileLines().begin(); it != ConfigValueContainer::getConfigFileLines().end(); ++it)
         {
             file << (*it) << std::endl;

code/branches/FICN/src/orxonox/core/ConfigValueContainer.h

@@ -135 +135 @@
             void resetConfigValue();
 
+            static std::string getStrippedLine(const std::string& line);
+            static bool isEmpty(const std::string& line);
+            static bool isComment(const std::string& line);
+
         private:
             bool parseSting(const std::string& input, int defvalue);
@@ -155 +159 @@
             std::string parseValueString(bool bStripped = true);
 
-            static std::string getStrippedLine(const std::string& line);
-            static bool isEmpty(const std::string& line);
-            static bool isComment(const std::string& line);
             static void readConfigFile(const std::string& filename);
             static void writeConfigFile(const std::string& filename);

code/branches/FICN/src/orxonox/core/CoreIncludes.h

@@ -144 +144 @@
 
 /**
-    @brief Sets the variable back to the previously defined default-value.
+    @brief Sets the variable and the config-file entry back to the previously defined default-value.
     @param varname The name of the variable
 */
@@ -152 +152 @@
     { \
         container##varname##reset->resetConfigValue(); \
-        varname = container##varname->getValue(varname); \
+        varname = container##varname##reset->getValue(varname); \
     } \
     else \

code/branches/FICN/src/orxonox/core/DebugLevel.h

@@ -53 +53 @@
             explicit DebugLevel(bool& bReturnSoftDebugLevel);
             DebugLevel(const DebugLevel& dl) {} // don't copy
-            ~DebugLevel() {}                    // don't delete
+            virtual ~DebugLevel() {}            // don't delete
 
             int softDebugLevel_;                            //!< The debug level

code/branches/FICN/src/orxonox/core/MetaObjectList.h

@@ -65 +65 @@
         public:
             MetaObjectListElement(ObjectList<T>* list, ObjectListElement<T>* element);
-            ~MetaObjectListElement();
+            virtual ~MetaObjectListElement();
 
             ObjectListElement<T>* element_;         //!< The list element, containing the object

code/branches/FICN/src/orxonox/core/OutputHandler.h

@@ -110 +110 @@
             explicit OutputHandler(const std::string& logfilename);
             OutputHandler(const OutputHandler& oh) {}; // don't copy
-            ~OutputHandler();
+            virtual ~OutputHandler();
             std::ofstream logfile_;     //!< The logfile where the output is logged
             std::string logfilename_;   //!< The name of the logfile