Changeset 2634 in orxonox.OLD for orxonox/trunk

Timestamp:

Oct 23, 2004, 9:14:22 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk/gui: load now more efficient. Loads first searches for a group, then inside the group for the option.

Location:

orxonox/trunk/gui

Files:

• orxonox_gui_exec.cc (modified) (6 diffs)
• orxonox_gui_exec.h (modified) (1 diff)

orxonox/trunk/gui/orxonox_gui_exec.cc

@@ -175 +175 @@
   if (CONFIG_FILE)
     {
+      Widget* groupWidget = widget;
       char Buffer[256] = "";
       char Variable[256]= "";
@@ -180 +181 @@
       while (fscanf (CONFIG_FILE, "%s", Buffer) != EOF)
         {
+          if (!strncmp (Buffer, "[", 1))
+            {
+              if ((groupWidget = locateGroup (widget, Buffer, 1))==NULL)
+                {
+                  cout << "the input " << Buffer << "does not belong to any group\n";
+                  groupWidget = widget;
+                }
+            }
           if (!strcmp (Buffer, "="))
             {
@@ -190 +199 @@
               fscanf (CONFIG_FILE, "%s", Buffer);
               Value = atoi(Buffer);
-              readFileText (widget, Variable, Value);
+              readFileText (groupWidget, Variable, Value, 0);
               sprintf (Variable, "");
             }
@@ -198 +207 @@
     }
 }
-
 /**
    \brief Maps Confugurations to the Options.
@@ -204 +212 @@
    \param variableName the name of the Variable that should be set up.
    \param variableValue the Value of the Variable that should be set up
-*/
-void OrxonoxGuiExec::readFileText (Widget* widget, char* variableName, int variableValue)
+   \param depth the depth of the local Widget
+*/
+void OrxonoxGuiExec::readFileText (Widget* widget, char* variableName, int variableValue, int depth)
 {
   if (widget->is_option >= 1)
@@ -213 +222 @@
   if (widget->is_option < 0)
     {
-
-      readFileText (static_cast<Packer*>(widget)->down, variableName, variableValue);
+      readFileText (static_cast<Packer*>(widget)->down, variableName, variableValue, depth+1);
     } 
 
-  if (widget->next != NULL)
-    readFileText (widget->next, variableName, variableValue);
+  if (widget->next != NULL && depth !=0)
+    readFileText (widget->next, variableName, variableValue, depth);
+}
+
+/**
+   \brief locates a Group member
+*/
+Widget* OrxonoxGuiExec::locateGroup(Widget* widget, char* groupName, int depth)
+{
+  Widget* tmp;
+
+  // removes the trailing and ending [ ].
+  if (!strncmp (groupName, "[", 1))
+    {
+      groupName = groupName+1;
+      groupName[strlen(groupName)-1] = '\0';
+    }
+
+  if (widget->is_option < 0)
+    {
+      if (!strcmp(groupName, static_cast<Packer*>(widget)->getGroupName()))
+        {
+          return widget;
+        }
+      else
+        {
+          if ((tmp = locateGroup (static_cast<Packer*>(widget)->down, groupName, depth+1)) != NULL)
+            return tmp;
+        }
+    } 
+  
+  if (widget->next != NULL && depth != 0)
+    {
+      if ((tmp = locateGroup (widget->next, groupName, depth)) != NULL)
+        return tmp;
+    }
+  return NULL;
 }
 

orxonox/trunk/gui/orxonox_gui_exec.h

@@ -35 +35 @@
   void writeFileText (Widget* widget, int depth);
   void readFromFile (Widget* widget);
-  void readFileText (Widget* widget, char* variableName, int variableValue);
+  void readFileText (Widget* widget, char* variableName, int variableValue, int depth);
+  Widget* locateGroup(Widget* widget, char* groupName, int depth);
 
 };