Changeset 5392 in orxonox.OLD

Timestamp:

Oct 16, 2005, 2:02:51 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: definition of Connect-signals for GLWidgets

Location:

trunk/src/lib/gui/gl_gui

Files:

• glgui_image.h (modified) (2 diffs)
• glgui_widget.cc (modified) (3 diffs)
• glgui_widget.h (modified) (2 diffs)

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

@@ -11 +11 @@
 
 // FORWARD DECLARATION
+struct SDL_Surface;
 
 //! This is Image part of the openglGUI class
@@ -23 +24 @@
 
   void init();
+  void loadImageFromFile(const char* fileName);
+  void loadImageFromSDLSurface(SDL_Surface* surface);
+  void loadImageFromDisplayList(GLuint displayList);
 
   virtual void draw();

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

@@ -17 +17 @@
 
 #include "glgui_widget.h"
+
+#include "debug.h"
 
 using namespace std;
@@ -39 +41 @@
 
 
-bool GLGuiWidget::focusOverWidget(float x, float y)
-{
-  if (this->getAbsCoor2D().x < x && this->getAbsCoor2D().x+ this->getSizeX2D() > x &&
-      this->getAbsCoor2D().y < y && this->getAbsCoor2D().y+ this->getSizeX2D() > y)
-    return true;
-  else
-    return false;
-}
-
-
 /**
  * initializes the GUI-element
@@ -63 +55 @@
   this->frontMat = NULL;
   this->frontModel = 0;
+
+  for (unsigned int i = 0; i < GLGuiSignalCount; i++)
+    this->widgetSignals[i] = NULL;
 }
+
+
+bool GLGuiWidget::focusOverWidget(float x, float y)
+{
+  if (this->getAbsCoor2D().x < x && this->getAbsCoor2D().x+ this->getSizeX2D() > x &&
+      this->getAbsCoor2D().y < y && this->getAbsCoor2D().y+ this->getSizeX2D() > y)
+    return true;
+  else
+    return false;
+}
+
+/**
+ * @brief connects a Signal to the Gui-Elements' Event.
+ * @param sinalType the Type of Signal to set. @see GLGuiSignalType
+ * @param signal the name of the Signal
+ */
+void GLGuiWidget::connectSignal(GLGuiSignalType signalType, Signal* signal)
+{
+  if (signal == NULL || signalType >= GLGuiSignalCount)
+    return;
+
+  if (this->widgetSignals[signalType] != NULL)
+    PRINTF(2)("Already connected a Signal to %s (%s) type %s... overwriting\n");
+
+  this->widgetSignals[signalType] = signal;
+}
+
+/**
+ * @brief removes a Signal from a Gui-ELements' Event
+ * @param signalType the type of Signal to remove.
+ */
+void GLGuiWidget::disconnectSignal(GLGuiSignalType signalType)
+{
+  if (signalType > GLGuiSignalCount)
+    return;
+
+  this->widgetSignals[signalType] = NULL;
+}
+

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

@@ -41 +41 @@
 
     void init();
+    /** @returns a new char-array containing a string with the options. Delete with delete[]; */
+    virtual char* save() {};
+    /** loads options of the Widget. @param loadString a string containing the Options */
+    virtual void load(const char* loadString) {};
 
     void show();
@@ -46 +50 @@
 
     void connectSignal(GLGuiSignalType signalType, Signal* signal);
-    void disconnectSignal(GLGuiSignalType);
+    void disconnectSignal(GLGuiSignalType signalType);
     bool focusOverWidget(float x, float y);