Changeset 5021 in orxonox.OLD

Timestamp:

Aug 15, 2005, 12:10:07 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: writing, loading, and comments work

Location:

orxonox/trunk/src/lib

Files:

• gui/gui_exec.cc (modified) (4 diffs)
• gui/gui_exec.h (modified) (2 diffs)
• util/ini_parser.cc (modified) (8 diffs)

orxonox/trunk/src/lib/gui/gui_exec.cc

@@ -202 +202 @@
 void GuiExec::writeToFile(Widget* widget)
 {
-  this->CONFIG_FILE = fopen(this->confFile, "w");
-  if(this->CONFIG_FILE)
-    this->writeFileText(widget, 0);
-  fclose(this->CONFIG_FILE);
+  IniParser iniParser;
+  this->writeFileText(widget, &iniParser, 0);
+  char* fileName = ResourceManager::homeDirCheck(confFile);
+  iniParser.writeFile(fileName);
+  delete fileName;
 }
 
@@ -211 +212 @@
  *  Actually writes into the configuration file to the disk.
  * @param widget from which Widget on should be saved.
+ * @param parser the IniParser to write to.
  * @param depth initially "0", and grows higher, while new Groups are bundeled.
 */
-void GuiExec::writeFileText(Widget* widget, int depth)
-{
-  int counter = 0;
-  while(counter < depth &&((widget->optionType > GUI_NOTHING
-                              &&(static_cast<Option*>(widget)->isSaveable()))
-                             ||(widget->optionType < GUI_NOTHING
-                                && static_cast<Packer*>(widget)->getGroupName())))
-    {
-      fprintf(this->CONFIG_FILE, "  ", depth);
-      counter++;
-    }
+void GuiExec::writeFileText(Widget* widget, IniParser* parser, int depth)
+{
+//   int counter = 0;
+//   while(counter < depth &&((widget->optionType > GUI_NOTHING
+//                               &&(static_cast<Option*>(widget)->isSaveable()))
+//                              ||(widget->optionType < GUI_NOTHING
+//                                 && static_cast<Packer*>(widget)->getGroupName())))
+//     {
+//       fprintf(this->CONFIG_FILE, "  ", depth);
+//       counter++;
+//     }
 
   // check if it is a Packer, and if it is, check if it has a name and if there is something in it.
@@ -230 +232 @@
       if(static_cast<Packer*>(widget)->getGroupName())
         {
-          fprintf(CONFIG_FILE, "[%s]\n", static_cast<Packer*>(widget)->getGroupName());
-          this->writeFileText(static_cast<Packer*>(widget)->down, depth+1);
-          fprintf(CONFIG_FILE, "\n");
+          parser->addSection(static_cast<Packer*>(widget)->getGroupName());
+          this->writeFileText(static_cast<Packer*>(widget)->down, parser, depth+1);
         }
       else
         {
-          this->writeFileText(static_cast<Packer*>(widget)->down, depth);
+          this->writeFileText(static_cast<Packer*>(widget)->down, parser, depth);
         }
     }
@@ -242 +243 @@
   if(widget->optionType > GUI_NOTHING)
     if (static_cast<Option*>(widget)->isSaveable())
-      fprintf(CONFIG_FILE, "%s = %s\n", static_cast<Option*>(widget)->title, static_cast<Option*>(widget)->save());
+      parser->addVar(static_cast<Option*>(widget)->title, static_cast<Option*>(widget)->save());
 
   if(widget->next != NULL)
-    this->writeFileText(widget->next, depth);
+    this->writeFileText(widget->next, parser, depth);
 }
 

orxonox/trunk/src/lib/gui/gui_exec.h

@@ -14 +14 @@
 class CheckButton;
 using namespace std;
+class IniParser;
 
 //! Class that creates the execute-Options.
@@ -41 +42 @@
   int shouldsave();
   void writeToFile(Widget* widget);
-  void writeFileText(Widget* widget, int depth);
+  void writeFileText(Widget* widget, IniParser* parser, int depth);
   void readFromFile(Widget* widget);
   static void readFileText(Widget* widget, void* varInfo);

orxonox/trunk/src/lib/util/ini_parser.cc

@@ -116 +116 @@
     char lineBuffer[PARSELINELENGHT];
     char buffer[PARSELINELENGHT];
+    const char* lineBegin;
     char* ptr;
 
@@ -122 +123 @@
       // get next line
       fgets (lineBuffer, PARSELINELENGHT, stream);
+      lineBegin = lineBuffer;
       // remove newline char, and \0-terminate
       if( (ptr = strchr( lineBuffer, '\n')) != NULL)
         *ptr = 0;
+      // cut up to the beginning of the line.
+      while((*lineBegin == ' ' || *lineBegin == '\t') && lineBegin < lineBuffer + strlen(lineBuffer))
+        ++lineBegin;
+      if (strlen(lineBegin) <= 1 || *lineBegin == '#' || *lineBegin == ';')
+        continue;//printf("empty Line\n");
       // check for section identifyer
-      if (strlen(lineBuffer) <= 1)
-        ;//printf("empty Line\n");
-      else if( sscanf (lineBuffer, "[%s", buffer) == 1)
+      else if( sscanf (lineBegin, "[%s", buffer) == 1)
       {
         if( (ptr = strchr( buffer, ']')) != NULL)
@@ -137 +142 @@
       }
       // check for Entry identifier (Entry = Value)
-      else if( (ptr = strchr( lineBuffer, '=')) != NULL)
+      else if( (ptr = strchr( lineBegin, '=')) != NULL)
       {
         if (currentSection == NULL)
         {
-          PRINTF(2)("Not in a Section yet for %s\n", lineBuffer);
+          PRINTF(2)("Not in a Section yet for %s\n", lineBegin);
           continue;
         }
-        if( ptr == lineBuffer)
+        if( ptr == lineBegin)
           continue;
         char* valueBegin = ptr+1;
-        while ((*valueBegin == ' ' || *valueBegin == '\t') && valueBegin <= lineBuffer + strlen(lineBuffer))
+        while ((*valueBegin == ' ' || *valueBegin == '\t') && valueBegin <= lineBegin + strlen(lineBegin))
           ++valueBegin;
-        char* nameBegin = lineBuffer;
-        while ((*nameBegin == ' ' || *nameBegin == '\t') && nameBegin < ptr)
-          ++nameBegin;
         char* nameEnd = ptr-1;
-        while ((*nameEnd == ' ' || *nameEnd == '\t' ) && nameEnd >= nameBegin)
+        while ((*nameEnd == ' ' || *nameEnd == '\t' ) && nameEnd >= lineBegin)
           --nameEnd;
         nameEnd[1] = '\0';
 
-        this->addVar(nameBegin, valueBegin);
+        this->addVar(lineBegin, valueBegin);
       }
     }
@@ -173 +175 @@
 {
   FILE*    stream;           //!< The stream we use to read the file.
-  if (sections != NULL)
-    deleteSections();
   if( fileName == NULL)
     return false;
@@ -191 +191 @@
       while (sectionEnum)
       {
-        fprintf(stream, " [%s]\n", sectionEnum->name);
+        fprintf(stream, "\n [%s]\n", sectionEnum->name);
 
         tIterator<IniEntry>* entryIt = sectionEnum->entries->getIterator();
@@ -197 +197 @@
         while (entryEnum)
         {
-          fprintf(stream, " %s = %s\n", entryEnum->name, entryEnum->value);
+          fprintf(stream, "   %s = %s\n", entryEnum->name, entryEnum->value);
 
           entryEnum = entryIt->nextElement();
@@ -213 +213 @@
 }
 
+/**
+ * adds a section to the list of Sections,
+ * if no Section list is availiable, it will create it
+ * @param sectionName the Name of the section to add
+ * @return true on success... there is only success or segfault :)
+ */
 bool IniParser::addSection(const char* sectionName)
 {
@@ -224 +230 @@
   this->currentSection = newSection;
   this->sections->add(newSection);
+  PRINTF(0)("Added Section %s\n", sectionName);
+  return true;
 }