Changeset 1030 for code/branches/core2/src/orxonox/core/ConfigFileManager.h

Timestamp:

Apr 12, 2008, 3:34:55 PM (17 years ago)

Author:

landauf

Message:

extracted all config-value related macros from CoreIncludes.h and moved them to ConfigValueIncludes.h.

ConfigValueContainer can now handle std::vector<x> where 'x' is is any type supported by MultiTypeMath (all primitives, pointer, string, vector2, vector3, quaternion, colourvalue, radian, degree).

the vectors size is currently limited to 256 elements. this is just a practical limit, it can be raised if it's necessary. the reason for the limit is: you can add new elements to a vector by simply typing 'set classname varname index value' into the console or adding a new entry in the config-file. if 'index' is bigger than the vectors size, all elements up to 'index' are inserted. if the user accidentally enters a big number, he could end up with >4*10^{9 elements in his config-file, resulting in 10-100gb on the hdd and a completely filled memory. and that's not exactly what i want}

File:

• code/branches/core2/src/orxonox/core/ConfigFileManager.h (modified) (6 diffs)

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

@@ -107 +107 @@
 
     ///////////////////////////////
-    // ConfigFileEntryArrayValue //
+    // ConfigFileEntryVectorValue //
     ///////////////////////////////
-    class _CoreExport ConfigFileEntryArrayValue : public ConfigFileEntryValue
-    {
-        public:
-            inline ConfigFileEntryArrayValue(const std::string& name, unsigned int index, const std::string& value = "", const std::string& additionalComment = "") : ConfigFileEntryValue(name, value, additionalComment), index_(index) {}
-            inline virtual ~ConfigFileEntryArrayValue() {}
+    class _CoreExport ConfigFileEntryVectorValue : public ConfigFileEntryValue
+    {
+        public:
+            inline ConfigFileEntryVectorValue(const std::string& name, unsigned int index, const std::string& value = "", const std::string& additionalComment = "") : ConfigFileEntryValue(name, value, additionalComment), index_(index) {}
+            inline virtual ~ConfigFileEntryVectorValue() {}
 
             inline virtual unsigned int getIndex() const
@@ -179 +179 @@
             inline const std::string& getValue(const std::string& name, unsigned int index, const std::string& fallback)
                 { return this->getEntry(name, index, fallback)->getValue(); }
+
+            void deleteVectorEntries(const std::string& name, unsigned int startindex = 0);
+            unsigned int getVectorSize(const std::string& name);
 
             std::string getFileEntry() const;
@@ -216 +219 @@
             void load(bool bCreateIfNotExisting = true);
             void save() const;
-            void clean();
+            void clean(bool bCleanComments = false);
 
             inline void setValue(const std::string& section, const std::string& name, const std::string& value)
@@ -228 +231 @@
                 { const std::string& output = this->getSection(section)->getValue(name, index, fallback); this->saveIfUpdated(); return output; }
 
+            inline void deleteVectorEntries(const std::string& section, const std::string& name, unsigned int startindex = 0)
+                { this->getSection(section)->deleteVectorEntries(name, startindex); }
+            inline unsigned int getVectorSize(const std::string& section, const std::string& name)
+                { return this->getSection(section)->getVectorSize(name); }
+
         private:
             ConfigFileSection* getSection(const std::string& section);
@@ -250 +258 @@
             void load(bool bCreateIfNotExisting = true);
             void save();
-            void clean();
+            void clean(bool bCleanComments = false);
 
             void load(ConfigFileType type, bool bCreateIfNotExisting = true);
             void save(ConfigFileType type);
-            void clean(ConfigFileType type);
+            void clean(ConfigFileType type, bool bCleanComments = false);
 
             inline void setValue(ConfigFileType type, const std::string& section, const std::string& name, const std::string& value)
@@ -266 +274 @@
                 { return this->getFile(type)->getValue(section, name, index, fallback); }
 
+            inline void deleteVectorEntries(ConfigFileType type, const std::string& section, const std::string& name, unsigned int startindex = 0)
+                { this->getFile(type)->deleteVectorEntries(section, name, startindex); }
+            inline unsigned int getVectorSize(ConfigFileType type, const std::string& section, const std::string& name)
+                { return this->getFile(type)->getVectorSize(section, name); }
+
             void updateConfigValues() const;
             void updateConfigValues(ConfigFileType type) const;