Changeset 3299 in orxonox.OLD for orxonox/branches/updater/src/gui/orxonox_gui_flags.cc

Timestamp:

Dec 27, 2004, 2:02:11 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/updater: flags now working perfectly. not the fastest way to implement this, but still….

File:

• orxonox/branches/updater/src/gui/orxonox_gui_flags.cc (modified) (4 diffs)

orxonox/branches/updater/src/gui/orxonox_gui_flags.cc

@@ -32 +32 @@
 OrxonoxGuiFlags::OrxonoxGuiFlags (Widget* widget)
 {
-  flagText = (char*) malloc (1024);
+  this->flagsFrame = new Frame ("Orxonox-Startup-Flags:");
+  this->flagsBox = new Box ('v');
 
-  flagsFrame = new Frame ("Orxonox-Startup-Flags:");
-  flagsBox = new Box ('v');
+  this->flagsLabel = new Label ();
+  this->flagsLabel->setSize (260,60);
+  this->flagsBox->fill (flagsLabel);
+  this->shortFlags = new CheckButton ("shortFlags");
+  this->flagsBox->fill (shortFlags);
 
-  flagsLabel = new Label ();
-  flagsLabel->setSize (260,60);
-  flagsBox->fill (flagsLabel);
-  shortFlags = new CheckButton ("shortFlags");
-  flagsBox->fill (shortFlags);
-
-  flagsFrame->fill (flagsBox);
+  this->flagsFrame->fill (flagsBox);
 }
 
@@ -52 +50 @@
 Widget* OrxonoxGuiFlags::getWidget ()
 {
-  return flagsFrame;
+  return this->flagsFrame;
 }
 
@@ -61 +59 @@
 void OrxonoxGuiFlags::setTextFromFlags (Widget* widget)
 {
-  sprintf (flagText, "");
-  strcat (flagText, "orxonox");
-  FlagsText (widget);
-  flagsLabel->setTitle(flagText);
+  FlagInfo flagInfo;
+  flagInfo.shortFlags = this->shortFlags;
+  flagInfo.flagsLabel = this->flagsLabel;
+
+  this->flagsLabel->ereaseText();
+  this->flagsLabel->appendText("orxonox");
+  widget->walkThrough(OrxonoxGuiFlags::flagsText, &flagInfo, 0);
+  //  flagsLabel->setTitle(flagText);
 }
 
@@ -71 +73 @@
     \param widget like OrxonoxGuiFlags::setTextFromFlags(widget)
 */
-void OrxonoxGuiFlags::FlagsText(Widget* widget)
+void OrxonoxGuiFlags::flagsText(Widget* widget, void* flagInfo)
 {
+  FlagInfo* info = (FlagInfo*)flagInfo;
   if (widget->isOption >= 1)
-    if  (static_cast<Option*>(widget)->value != static_cast<Option*>(widget)->defaultValue && (static_cast<Option*>(widget)->flagName || static_cast<Option*>(widget)->flagNameShort ))
+    if  (static_cast<Option*>(widget)->value != static_cast<Option*>(widget)->defaultValue )
       {
-        if (shortFlags->isActive())
+        if (info->shortFlags->isActive() && static_cast<Option*>(widget)->flagNameShort)
           {
-            strcat (flagText, " -");
-            strcat (flagText, static_cast<Option*>(widget)->flagNameShort);
+            info->flagsLabel->appendText(" -");
+            info->flagsLabel->appendText(static_cast<Option*>(widget)->flagNameShort);
           }
-        else
+        else if (!info->shortFlags->isActive() && static_cast<Option*>(widget)->flagName)
           {
-            strcat (flagText, " --");
-            strcat (flagText, static_cast<Option*>(widget)->flagName);
+            info->flagsLabel->appendText(" --");
+            info->flagsLabel->appendText(static_cast<Option*>(widget)->flagName);
           }
+
         if (static_cast<Option*>(widget)->isOption == 2)
           {
-            sprintf (flagText, "%s=%i", flagText, static_cast<Option*>(widget)->value);
+            info->flagsLabel->appendText("=");
+            info->flagsLabel->appendInt(static_cast<Option*>(widget)->value);
           }
       }
-  switch (widget->isOption)
-    {
-    case -1:
-      FlagsText (static_cast<Container*>(widget)->down);
-      break;
-    case -2:
-      FlagsText (static_cast<Box*>(widget)->down);
-      break;
-    } 
-  
-  if (widget->next != NULL)
-    FlagsText (widget->next);
 }