Changeset 5393 in orxonox.OLD for trunk/src

Timestamp:

Oct 16, 2005, 2:28:55 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: container-packing

Location:

trunk/src/lib/gui/gl_gui

Files:

• glgui_box.cc (modified) (3 diffs)
• glgui_box.h (modified) (2 diffs)
• glgui_container.cc (modified) (4 diffs)
• glgui_container.h (modified) (3 diffs)
• glgui_frame.cc (modified) (2 diffs)
• glgui_frame.h (modified) (1 diff)

trunk/src/lib/gui/gl_gui/glgui_box.cc

@@ -18 +18 @@
 #include "glgui_box.h"
 
+#include "list.h"
+
 using namespace std;
 
@@ -36 +38 @@
 GLGuiBox::~GLGuiBox()
 {
-
+  delete this->children;
 }
 
@@ -45 +47 @@
 {
   this->setClassID(CL_GLGUI_BOX, "GLGuiBox");
+  this->children = new tList<GLGuiWidget>;
+}
+
+void GLGuiBox::pack(GLGuiWidget* widget)
+{
+  if (widget == NULL)
+    return;
+
+  this->children->add(widget);
+}
+
+
+void GLGuiBox::unpack(GLGuiWidget* widget)
+{
+  if (widget == NULL)
+  {
+    delete this->children;
+    this->children = new tList<GLGuiWidget>;
+  }
+  else
+  {
+    this->children->remove(widget);
+  }
+}
+
+void GLGuiBox::showAll()
+{
+  tIterator<GLGuiWidget>* itC = this->children->getIterator();
+  GLGuiWidget* enumC = itC->firstElement();
+  while (enumC != NULL)
+  {
+    if (enumC->isA(CL_GLGUI_CONTAINER))
+      static_cast<GLGuiContainer*>(enumC)->showAll();
+    else
+      enumC->show();
+    enumC = itC->nextElement();
+  }
+  delete itC;
+
+  this->show();
 
 }
+
+void GLGuiBox::hideAll()
+{
+  tIterator<GLGuiWidget>* itC = this->children->getIterator();
+  GLGuiWidget* enumC = itC->firstElement();
+  while (enumC != NULL)
+  {
+    if (enumC->isA(CL_GLGUI_CONTAINER))
+      static_cast<GLGuiContainer*>(enumC)->showAll();
+    else
+      enumC->hide();
+    enumC = itC->nextElement();
+  }
+  delete itC;
+
+  this->hide();
+}
+
 
 /**

trunk/src/lib/gui/gl_gui/glgui_box.h

@@ -11 +11 @@
 
 // FORWARD DECLARATION
+template<class T> class tList;
 
 typedef enum
@@ -31 +32 @@
   void setType(GLGuiBoxType type) { this->type = type; };
 
+  virtual void pack(GLGuiWidget* widget);
+  virtual void unpack(GLGuiWidget* widget);
+  virtual void showAll();
+  virtual void hideAll();
+
   virtual void draw();
 
  private:
-   GLGuiBoxType         type;
+   GLGuiBoxType             type;
+   tList<GLGuiWidget>*      children;
 
 };

trunk/src/lib/gui/gl_gui/glgui_container.cc

@@ -18 +18 @@
 #include "glgui_container.h"
 
-#include "list.h"
-
-
 using namespace std;
 
@@ -29 +26 @@
 {
   this->init();
-  this->children = new tList<GLGuiWidget>;
 }
 
@@ -38 +34 @@
 GLGuiContainer::~GLGuiContainer()
 {
-  delete this->children;
 }
 
@@ -50 +45 @@
 }
 
-void GLGuiContainer::showAll()
-{
-  tIterator<GLGuiWidget>* itC = this->children->getIterator();
-  GLGuiWidget* enumC = itC->firstElement();
-  while (enumC != NULL)
-  {
-    if (enumC->isA(CL_GLGUI_CONTAINER))
-      static_cast<GLGuiContainer*>(enumC)->showAll();
-    else
-      enumC->show();
-    enumC = itC->nextElement();
-  }
-  delete itC;
-
-  this->show();
-
-}
-
-void GLGuiContainer::hideAll()
-{
-  tIterator<GLGuiWidget>* itC = this->children->getIterator();
-  GLGuiWidget* enumC = itC->firstElement();
-  while (enumC != NULL)
-  {
-    if (enumC->isA(CL_GLGUI_CONTAINER))
-      static_cast<GLGuiContainer*>(enumC)->showAll();
-    else
-      enumC->hide();
-    enumC = itC->nextElement();
-  }
-  delete itC;
-
-  this->hide();
-}
-
 
 /**

trunk/src/lib/gui/gl_gui/glgui_container.h

@@ -11 +11 @@
 
 // FORWARD DECLARATION
-template<class T> class tList;
 
 //! This is part of the openglGUI class
@@ -25 +24 @@
   void init();
 
-  void add(GLGuiWidget* widget);
 
   void setBorderWidth(float borderwidth);
 
-  void hideAll();
-  void showAll();
+
+  virtual void pack(GLGuiWidget* widget) = 0;
+  /** unpacks a Widget from this container. @param widget the GLGuiWidget to unpack, if NULL all subwidgets will be unpackt. */
+  virtual void unpack(GLGuiWidget* widget) = 0;
+  virtual void hideAll() = 0;
+  virtual void showAll() = 0;
 
 
@@ -36 +38 @@
 
  private:
-  tList<GLGuiWidget>*           children;
 
 };

trunk/src/lib/gui/gl_gui/glgui_frame.cc

@@ -17 +17 @@
 
 #include "glgui_frame.h"
+
+#include "debug.h"
 
 using namespace std;
@@ -44 +46 @@
 {
   this->setClassID(CL_GLGUI_FRAME, "GLGuiFrame");
+  this->child = NULL;
+}
 
+void GLGuiFrame::pack(GLGuiWidget* widget)
+{
+  if (widget == NULL)
+    return;
+
+  if (this->child == NULL)
+    this->child = widget;
+  else
+  {
+    PRINTF(2)("Frame %s is already filled, not filling with %s\n", this->getName(), widget->getName());
+  }
 }
+
+void GLGuiFrame::unpack(GLGuiWidget* widget)
+{
+  if (widget == NULL || widget == this->child)
+    this->child = NULL;
+}
+
+void GLGuiFrame::showAll()
+{
+  if (this->child != NULL)
+  {
+    if (this->child->isA(CL_GLGUI_CONTAINER))
+      static_cast<GLGuiContainer*>(this->child)->showAll();
+    else
+      this->child->show();
+  }
+  this->show();
+}
+
+void GLGuiFrame::hideAll()
+{
+  if (this->child != NULL)
+  {
+    if (this->child->isA(CL_GLGUI_CONTAINER))
+      static_cast<GLGuiContainer*>(this->child)->hideAll();
+    else
+      this->child->hide();
+  }
+  this->hide();
+}
+
 
 /**

trunk/src/lib/gui/gl_gui/glgui_frame.h

@@ -24 +24 @@
   void init();
 
+  virtual void pack(GLGuiWidget* widget);
+  virtual void unpack(GLGuiWidget* widget);
+  virtual void showAll();
+  virtual void hideAll();
+
   virtual void draw();
 
  private:
+   GLGuiWidget*           child;
 
 };