Changeset 3162 in orxonox.OLD

Timestamp:

Dec 13, 2004, 2:12:42 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk/gui: nicer Print of OptionLabel

Location:

orxonox/trunk/gui

Files:

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

orxonox/trunk/gui/orxonox_gui_exec.cc

@@ -184 +184 @@
       char Buffer[256] = "";
       char Variable[256]= "";
-      int Value;
+      char* Value;
       while (fscanf (CONFIG_FILE, "%s", Buffer) != EOF)
         {
@@ -206 +206 @@
               
               fscanf (CONFIG_FILE, "%s", Buffer);
-              Value = atoi(Buffer);
+              Value = Buffer;
               readFileText (groupWidget, Variable, Value, 0);
               sprintf (Variable, "");
@@ -222 +222 @@
    \param depth the depth of the local Widget
 */
-void OrxonoxGuiExec::readFileText (Widget* widget, char* variableName, int variableValue, int depth)
-{
-  if (widget->isOption >= 1)
-    if (!strcmp (static_cast<Option*>(widget)->label, variableName))
-        static_cast<Option*>(widget)->value = variableValue;
-
+void OrxonoxGuiExec::readFileText (Widget* widget, char* variableName, char* variableValue, int depth)
+{
+  if (widget->isOption >= 1 && widget->isOption <= 3)
+    {
+      if (!strcmp (static_cast<Option*>(widget)->label, variableName))
+        static_cast<Option*>(widget)->value = atoi(variableValue);
+    }
+  else if (widget->isOption == 5)
+    {
+       if (!strcmp (static_cast<Option*>(widget)->label, variableName))
+        static_cast<OptionLabel*>(widget)->setValue(variableValue);
+    }
   if (widget->isOption < 0)
     {

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, int depth);
+  void readFileText (Widget* widget, char* variableName, char* variableValue, int depth);
   Widget* locateGroup(Widget* widget, char* groupName, int depth);