Changeset 4071 in orxonox.OLD for orxonox/trunk

Timestamp:

May 5, 2005, 11:30:32 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk/gui: new isOption-tag of Widgets: optionType

Location:

orxonox/trunk/src/lib/gui/gui

Files:

• gui_exec.cc (modified) (5 diffs)
• gui_flags.cc (modified) (2 diffs)
• gui_gtk.cc (modified) (27 diffs)
• gui_gtk.h (modified) (4 diffs)

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

@@ -177 +177 @@
 {
   int counter = 0;
-  while(counter < depth &&((widget->isOption>0
+  while(counter < depth &&((widget->optionType > GUI_NOTHING
                               &&(static_cast<Option*>(widget)->isSaveable()))
-                             ||(widget->isOption<0
+                             ||(widget->optionType < GUI_NOTHING
                                 && static_cast<Packer*>(widget)->getGroupName())))
     {
@@ -187 +187 @@
   
   // check if it is a Packer, and if it is, check if it has a name and if there is something in it.
-  if(widget->isOption <0)
+  if(widget->optionType < GUI_NOTHING)
     {
       if(static_cast<Packer*>(widget)->getGroupName())
@@ -200 +200 @@
         }
     } 
-  //  if(widget->isOption == 0)
-  //    printf("%s\n",widget->title);
-  if(widget->isOption >= 1)
+
+  if(widget->optionType > GUI_NOTHING)
     if (static_cast<Option*>(widget)->isSaveable())
       {
@@ -280 +279 @@
     {
       PRINT(5)("Located Option %s.\n", widget->title);
-      if(widget->isOption >= 1)
+      if(widget->optionType > GUI_NOTHING)
         static_cast<Option*>(widget)->load(info->variableValue);
     }
@@ -305 +304 @@
     }
 
-  if(widget->isOption < 0)
+  if(widget->optionType < GUI_NOTHING)
     {
       if(static_cast<Packer*>(widget)->getGroupName() &&

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

@@ -76 +76 @@
 {
   FlagInfo* info =(FlagInfo*)flagInfo;
-  if(widget->isOption >= 1)
+  if(widget->optionType > GUI_NOTHING)
     if (static_cast<Option*>(widget)->value != static_cast<Option*>(widget)->defaultValue )
       {
@@ -90 +90 @@
           }
 
-        if(static_cast<Option*>(widget)->isOption == 2)
+        if(static_cast<Option*>(widget)->optionType > GUI_BOOL)
           {
             info->flagsLabel->appendText("=");

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

@@ -222 +222 @@
     return this;
 
-  if (this->isOption < 0 && static_cast<Packer*>(this)->down)
+  if (this->optionType < GUI_NOTHING && static_cast<Packer*>(this)->down)
     {
       Widget* tmp = static_cast<Packer*>(this)->down->findWidgetByName(name, depth+1);
@@ -243 +243 @@
 {
   function(this);
-  if (this->isOption < 0)
+  if (this->optionType < GUI_NOTHING)
     {
       static_cast<Packer*>(this)->down->walkThrough(function, depth+1);
@@ -261 +261 @@
 {
   function(this, data);
-  if (this->isOption < 0)
+  if (this->optionType < GUI_NOTHING)
     {
       static_cast<Packer*>(this)->down->walkThrough(function, data, depth+1);
@@ -275 +275 @@
 void Widget::listOptionsAndGroups(Widget* widget)
 {
-  if (widget->isOption < 0 && static_cast<Packer*>(widget)->groupName)
+  if (widget->optionType < GUI_NOTHING && static_cast<Packer*>(widget)->groupName)
     PRINT(0)("[%s]\n", static_cast<Packer*>(widget)->groupName);
-  if (widget->isOption >= 1)
+  if (widget->optionType > GUI_NOTHING)
     {
       Widget::listOptions(widget);
@@ -289 +289 @@
 void Widget::listOptions(Widget* widget)
 {
-  if(widget->isOption >= 1)
+  if(widget->optionType > GUI_NOTHING)
     PRINT(0)("  %s is %s\n", static_cast<Option*>(widget)->title, static_cast<Option*>(widget)->save());
 }
@@ -301 +301 @@
 {
   
-  if (widget->isOption >= 1)
+  if (widget->optionType > GUI_NOTHING)
     {
       int* count =(int*)data;
@@ -320 +320 @@
 Widget* Widget::findOptionByNumber(int* number, unsigned int depth)
 {
-  if (isOption > 0)
+  if (optionType > GUI_NOTHING)
     {
       --*number;
@@ -328 +328 @@
         }
     }
-  if (this->isOption < 0 && static_cast<Packer*>(this)->down)
+  if (this->optionType < GUI_NOTHING && static_cast<Packer*>(this)->down)
     {
       Widget* tmp = static_cast<Packer*>(this)->down->findOptionByNumber(number, depth+1);
@@ -346 +346 @@
 void Widget::listGroups(Widget* widget)
 {
-  if (widget->isOption < 0 && static_cast<Packer*>(widget)->groupName)
+  if (widget->optionType < GUI_NOTHING && static_cast<Packer*>(widget)->groupName)
     PRINT(0)("[%s]\n", static_cast<Packer*>(widget)->groupName);
 }
@@ -358 +358 @@
 {
   int* count = (int*)data;
-  if (widget->isOption < 0 && static_cast<Packer*>(widget)->groupName)
+  if (widget->optionType < GUI_NOTHING && static_cast<Packer*>(widget)->groupName)
     PRINT(0)("%d: [%s]\n", ++*count, static_cast<Packer*>(widget)->groupName);
 }
@@ -369 +369 @@
 Widget* Widget::findGroupByNumber(int* number, unsigned int depth)
 {
-  if (isOption < 0 && static_cast<Packer*>(this)->groupName)
+  if (optionType < GUI_NOTHING && static_cast<Packer*>(this)->groupName)
     {
       --*number;
@@ -377 +377 @@
         }
     }
-  if (this->isOption < 0 && static_cast<Packer*>(this)->down)
+  if (this->optionType < GUI_NOTHING && static_cast<Packer*>(this)->down)
     {
       Widget* tmp = static_cast<Packer*>(this)->down->findGroupByNumber(number, depth+1);
@@ -395 +395 @@
 void Widget::setOptions(Widget* widget)
 {
-  if (widget->isOption >= 1)
+  if (widget->optionType > GUI_NOTHING)
     static_cast<Option*>(widget)->redraw();
 }
@@ -406 +406 @@
 void Widget::redrawOptions(Widget* widget)
 {
-  if (widget->isOption >= 1)
+  if (widget->optionType > GUI_NOTHING)
     static_cast<Option*>(widget)->redraw();
 }
@@ -415 +415 @@
 void Widget::flagCheck(Widget* widget, void* flagName)
 {
-  if (widget->isOption>=1)
+  if (widget->optionType > GUI_NOTHING)
     {      
       Option* option =(Option*)widget;
@@ -567 +567 @@
 Container::Container(void)
 {
-  this->isOption = -1;
+  this->optionType = GUI_CONTAINER;
 }
 
@@ -814 +814 @@
 EventBox::EventBox(const char* eventBoxName)
 {
-  this->isOption = -1;
-
 #ifdef HAVE_GTK2
   this->widget = gtk_event_box_new();
@@ -842 +840 @@
 Box::Box(char boxtype)
 {
-  this->isOption = -2;
+  this->optionType = GUI_BOX;
 
 #ifdef HAVE_GTK2
@@ -1055 +1053 @@
 Button::Button(char* buttonName)
 {
-  isOption = 0;
+  this->optionType = GUI_NOTHING;
 
 #ifdef HAVE_GTK2
@@ -1115 +1113 @@
 CheckButton::CheckButton(const char* buttonName)
 {
-  this->isOption = 1;
+  this->optionType = GUI_BOOL;
 
 #ifdef HAVE_GTK2
@@ -1205 +1203 @@
 Slider::Slider(const char* slidername, int start, int end)
 {
-  this->isOption = 2;
+  this->optionType = GUI_INT;
 
   this->start = start;
@@ -1329 +1327 @@
 void Menu::init(void)
 {
-  this->isOption = 2;
+  this->optionType = GUI_INT;
   this->firstItem = NULL;
 
@@ -1443 +1441 @@
 OptionLabel::OptionLabel(const char* label, const char* value)
 {
-  this->isOption = 5;
+  this->optionType = GUI_CHAR_ARRAY;
   cValue = NULL;
 
@@ -1533 +1531 @@
 Label:: Label(const char* text)
 {
-  this->isOption = 0;
+  this->optionType = GUI_NOTHING;
   
 #ifdef HAVE_GTK2
@@ -1629 +1627 @@
 ProgressBar::ProgressBar(const char* label)
 {
-  this->isOption = 0;
+  this->optionType = GUI_NOTHING;
   this->progress = 0.0;
   this->totalSize = 0.0;
@@ -1728 +1726 @@
 void Image::init(const char* name)
 {
-  isOption = 0;
+  optionType = GUI_NOTHING;
 
   if (this->title)
@@ -1746 +1744 @@
 FileDialog::FileDialog(const char* fileDialogName)
 {
-  this->isOption = 0;
+  this->optionType = GUI_NOTHING;
   this->isOpen = false;
   this->changeOption = NULL;

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

@@ -32 +32 @@
 
 // enumerator for different GuiOption-Types
-enum GUI_OPTION {GUI_CONTAINER = -2,
-                 GUI_BOX = -1,
+enum GUI_OPTION {GUI_BOX = -2,
+                 GUI_CONTAINER = -1,
                  GUI_NOTHING = 0,
                  GUI_BOOL = 1,
@@ -64 +64 @@
   void walkThrough(void(*function)(Widget*), unsigned int depth);
   void walkThrough(void(*function)(Widget*, void*), void* data, unsigned int depth);
-  static void listOptionsAndGroups(Widget* widget);
-  static void listOptions(Widget* widget);
-  static void listOptions(Widget* widget, void* data);
-  Widget* findOptionByNumber(int* number, unsigned int depth);
-  static void listGroups(Widget* widget);
-  static void listGroups(Widget* widget, void* data);
-  Widget* findGroupByNumber(int* number, unsigned int depth);
-  static void setOptions(Widget* widget);
-  static void redrawOptions(Widget* widget);
-  static void flagCheck(Widget* widget, void* flagName);
+   static void listOptionsAndGroups(Widget* widget);
+   static void listOptions(Widget* widget);
+   static void listOptions(Widget* widget, void* data);
+   Widget* findOptionByNumber(int* number, unsigned int depth);
+   static void listGroups(Widget* widget);
+   static void listGroups(Widget* widget, void* data);
+   Widget* findGroupByNumber(int* number, unsigned int depth);
+   static void setOptions(Widget* widget);
+   static void redrawOptions(Widget* widget);
+   static void flagCheck(Widget* widget, void* flagName);
   
 #ifdef HAVE_GTK2
@@ -104 +104 @@
 #endif /* HAVE_GTK2 */
 
-  int isOption;                     //!< with this Paramenter one can set the option-type: -2:Container, -1: Box, 0: not an Option, 1: Bool-option, 2: int-option, 3: float option, 4:char option, 5: char* option
-  
+  GUI_OPTION optionType;            //!< The Type of the Widget.
   char* title;                      //!< The name of the Widget. Some do display it, Options need it to save;
 };
@@ -142 +141 @@
   Container(void);
   virtual ~Container(void);
+
   void setBorderWidth(int borderwidth);
   void fill(Widget* lowerWidget);