Changeset 7234 in orxonox.OLD

Timestamp:

Mar 21, 2006, 3:36:22 PM (18 years ago)

Author:

bensch

Message:

orxonox/branches/preferences: merged the old preferences here… some minor conflicts, hope it works

Location:

branches/preferences

Files:

• AUTHORS (modified) (1 diff)
• src/defs/class_id.h (modified) (1 diff)
• src/lib/parser/Makefile.am (modified) (1 diff)
• src/lib/parser/ini_parser/ini_parser.cc (modified) (1 diff)
• src/lib/parser/preferences (copied) (copied from branches/preferences.old/src/lib/parser/preferences)
• src/lib/parser/preferences/Makefile.am (copied) (copied from branches/preferences.old/src/lib/parser/preferences/Makefile.am)
• src/lib/parser/preferences/cmd_line_prefs_reader.cc (copied) (copied from branches/preferences.old/src/lib/parser/preferences/cmd_line_prefs_reader.cc)
• src/lib/parser/preferences/cmd_line_prefs_reader.h (copied) (copied from branches/preferences.old/src/lib/parser/preferences/cmd_line_prefs_reader.h)
• src/lib/parser/preferences/ini_file_prefs_reader.cc (copied) (copied from branches/preferences.old/src/lib/parser/preferences/ini_file_prefs_reader.cc)
• src/lib/parser/preferences/ini_file_prefs_reader.h (copied) (copied from branches/preferences.old/src/lib/parser/preferences/ini_file_prefs_reader.h)
• src/lib/util/preferences.cc (copied) (copied from branches/preferences.old/src/lib/util/preferences.cc)
• src/lib/util/preferences.h (copied) (copied from branches/preferences.old/src/lib/util/preferences.h)
• src/orxonox.cc (modified) (3 diffs)

branches/preferences/AUTHORS

@@ -1 +1 @@
 orxonox-crew: <orxonox-dev@mail.datacore.ch>
 
+Maintainers:
 Patrick Boenzli <patrick@orxonox.ethz.ch>
 Benjamin Grauer <bensch@orxonox.ethz.ch>
+
+Developers:
+Christian Meyer
+David Gruetter
+
+Coders:
 Simon Hofmann
-David Gruetter
 Johannes Bader
 Adrian Buerli
-Christian Meyer
+
+

branches/preferences/src/defs/class_id.h

@@ -96 +96 @@
   CL_MASK_LOWLEVEL_CLASS        =    0x00000fff,
 
+  CL_PREFERENCES                =    0X00000f51,
 
   /// SINGLETON classes (range from 0x00000000 to 0x000000ff)

branches/preferences/src/lib/parser/Makefile.am

@@ -1 +1 @@
 SUBDIRS = \
           tinyxml \
-          ini_parser
+                                ini_parser \
+                                preferences
 
 

branches/preferences/src/lib/parser/ini_parser/ini_parser.cc

@@ -392 +392 @@
 }
 
+/**
+ * @brief edits the entry speciefied by entryName in sectionName/currentSection or creates it if it doesn't exist
+ * @param entryName the Name of the Entry to add
+ * @param value the value to assign to this entry
+ * @param sectionName if NULL then this entry will be set to the currentSection
+ * otherwise to the section refered to by sectionName.
+ * If both are NULL no entry will be added
+ * @return true if everything is ok false on error
+ */
+bool IniParser::editVar(const char* entryName, const char* value, const char* sectionName)
+{
+  std::list<IniSection>::iterator section;
+
+  if (sectionName != NULL)
+  {
+    for (section = this->sections.begin(); section != this->sections.end(); section++)
+      if (!strcmp((*section).name, sectionName))
+        break;
+  }
+  else
+    section = this->currentSection;
+
+  if (section == this->sections.end())
+  {
+    IniSection sec;
+    sec.comment = NULL;
+    sec.name = new char[strlen(sectionName)+1];
+    strcpy(sec.name, sectionName);
+    section = this->sections.insert(this->sections.end(), sec);
+  }
+
+  if (section == this->sections.end())
+  {
+    PRINTF(2)("section '%s' not found for value '%s'\n", sectionName, entryName);
+    return false;
+  }
+  else
+  {
+    //try find item
+    std::list<IniEntry>::iterator entry;
+    for (entry = section->entries.begin(); entry!=section->entries.end(); entry++)
+      if (!strcmp( entry->name, entryName ))
+        break;
+
+    //found it?
+    if ( entry != section->entries.end() )
+    {
+      if ( entry->value != NULL )
+      {
+        delete[] entry->value;
+      }
+      entry->value = new char[strlen(value)+1];
+      strcpy(entry->value, value);
+
+      return true;
+    }
+
+    //not found -> create it
+    (*section).entries.push_back(IniEntry());
+    (*section).entries.back().comment = NULL;
+    (*section).entries.back().name = new char[strlen(entryName)+1];
+    strcpy((*section).entries.back().name, entryName);
+    (*section).entries.back().value = new char[strlen(value)+1];
+    strcpy((*section).entries.back().value, value);
+    PRINTF(5)("Added Entry %s with Value '%s' to Section %s\n",
+    (*section).entries.back().name,
+    (*section).entries.back().value,
+    (*section).name);
+    this->currentEntry = --(*section).entries.end();
+    return true;
+  }
+}
+
 
 /**

branches/preferences/src/orxonox.cc

@@ -58 +58 @@
 
 #include "state.h"
-
+#include "lib/parser/preferences/cmd_line_prefs_reader.h"
 #include <string.h>
 
@@ -403 +403 @@
 int main(int argc, char** argv)
 {
-  int i;
+  CmdLinePrefsReader prefs(argc, argv);
+
+  /*int i;
   for(i = 1; i < argc; ++i)
   {
@@ -416 +418 @@
     else if(!strcmp( "--license", argv[i])  || !strcmp("-l", argv[i]))
       return PRINT(0)(ORXONOX_LICENSE_SHORT);
-  }
-
-  return startOrxonox(argc, argv, NULL, -1);
+}
+
+  return startOrxonox(argc, argv, NULL, -1);*/
+  return 0;
 }