Changeset 7855 in orxonox.OLD

Timestamp:

May 25, 2006, 3:42:18 PM (18 years ago)

Author:

bensch

Message:

qtgui: cleanup as patrick sugested

Location:

trunk/src/lib/gui

Files:

• gl_gui/Makefile.am (modified) (2 diffs)
• gl_gui/glgui.h (modified) (1 diff)
• gl_gui/glgui_widget.cc (modified) (4 diffs)
• gl_gui/glgui_widget.h (modified) (4 diffs)
• gl_gui/signal_connector.cc (modified) (1 diff)
• gl_gui/signal_connector.h (modified) (2 diffs)
• qt_gui/gui_audio.cc (modified) (1 diff)
• qt_gui/gui_general.cc (modified) (1 diff)
• qt_gui/qt_gui.cc (modified) (2 diffs)

trunk/src/lib/gui/gl_gui/Makefile.am

@@ -11 +11 @@
 libORXglgui_a_SOURCES = glmenu/glmenu_imagescreen.cc \
                         glgui_handler.cc \
+                        signal_connector.cc \
                         glgui_mainwidget.cc \
                         glgui_widget.cc \
@@ -23 +24 @@
 
 noinst_HEADERS= glmenu/glmenu_imagescreen.h \
+                signal_connector.h \
                 glgui.h \
                 glgui_handler.h \

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

@@ -8 +8 @@
 #include "glgui_widget.h"
 
+#include "glgui_bar.h"
+#include "glgui_box.h"
+#include "glgui_button.h"
+#include "glgui_checkbutton.h"
+#include "glgui_colorselector.h"
+
 namespace OrxGui
 {
+
 
 };

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

@@ -58 +58 @@
     this->frontModel = 0;
 
-    this->widgetSignals.resize(GLGuiSignalCount, NULL);
+    this->widgetSignals.resize(SignalCount, SignalConnector());
   }
 
@@ -64 +64 @@
   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)
+    if (this->getAbsCoor2D().x < x && this->getAbsCoor2D().x + this->getSizeX2D() > x &&
+        this->getAbsCoor2D().y < y && this->getAbsCoor2D().y + this->getSizeY2D() > y)
       return true;
     else
@@ -76 +76 @@
    * @param signal the name of the Signal
    */
-  void GLGuiWidget::connectSignal(GLGuiSignalType signalType, BaseObject*, const Executor* signal)
+  void GLGuiWidget::connectSignal(SignalType signalType, BaseObject* object, const Executor* signal)
   {
-    if (signalType >= GLGuiSignalCount)
+    if (signalType >= this->widgetSignals.size())
       return;
 
-    if (this->widgetSignals[signalType] != NULL)
-      PRINTF(2)("Already connected a Signal to '%s::%s' type %s... overwriting\n", this->getClassName(), this->getName(), "TEST");
+//    if (this->widgetSignals[signalType] != NULL)
+//      PRINTF(2)("Already connected a Signal to '%s::%s' type %s... overwriting\n", this->getClassName(), this->getName(), "TEST");
 
-    //this->widgetSignals[signalType] = ;
+    this->widgetSignals[signalType] = SignalConnector(object, signal);
   }
 
@@ -91 +91 @@
    * @param signalType the type of Signal to remove.
    */
-  void GLGuiWidget::disconnectSignal(GLGuiSignalType signalType)
+  void GLGuiWidget::disconnectSignal(SignalType signalType)
   {
-    if (signalType > GLGuiSignalCount)
+    if (signalType >= this->widgetSignals.size())
       return;
 
-    this->widgetSignals[signalType] = NULL;
+    this->widgetSignals[signalType] = SignalConnector();
   }
 

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

@@ -22 +22 @@
   typedef enum
   {
-    GLGuiSignal_click     = 0,
-    GLGuiSignal_release,
-    GLGuiSignal_rollOn,
-    GLGuiSignal_rollOff,
-    GLGuiSignal_open,
-    GLGuiSignal_close,
-    GLGuiSignal_destroy,
+    Signal_click     = 0,
+    Signal_release,
+    Signal_rollOn,
+    Signal_rollOff,
+    Signal_open,
+    Signal_close,
+    Signal_destroy,
 
-    GLGuiSignalCount,
-  } GLGuiSignalType;
+    SignalCount,
+  } SignalType;
+
 
   //! if the Element should be visible by default.
@@ -51 +52 @@
     void hide();
 
-    void connectSignal(GLGuiSignalType signalType, BaseObject* obj, const Executor* signal);
-    void disconnectSignal(GLGuiSignalType signalType);
+    void connectSignal(SignalType signalType, BaseObject* obj, const Executor* signal);
+    void disconnectSignal(SignalType signalType);
     bool focusOverWidget(float x, float y);
 
     // if something was clickt on the GUI-widget.
-    virtual void click(const Event& event) {};
-    virtual void release(const Event& event) {};
+    virtual void clicked(const Event& event) {};
+    virtual void released(const Event& event) {};
 
-    virtual void receiveFocus() {};
-    virtual void removeFocus() {};
+    virtual void receivedFocus() {};
+    virtual void removedFocus() {};
+
+    virtual void destroyed() {};
 
     virtual void update() {};
@@ -75 +78 @@
     void init();
 
+
+
+
   protected:
     Material               backMat;
@@ -83 +89 @@
 
   private:
-    std::vector<SignalConnector*> widgetSignals;
+    std::vector<SignalConnector> widgetSignals;
 
     bool                   focusable;        //!< If this widget can receive focus.

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

@@ -21 +21 @@
 {
 
+  SignalConnector::SignalConnector( )
+  {
+    this->object = NULL;
+    this->exec = NULL;
+  }
+
   SignalConnector::SignalConnector(BaseObject* object, const Executor* executor)
-      : object(object), exec(exec)
-  {};
+  {
+    this->object = object;
+    this->exec = executor;
+  };
+
+  SignalConnector::SignalConnector(const SignalConnector& signalConnector)
+  {
+    this->object = signalConnector.object;
+    this->exec = (signalConnector.exec == NULL) ? NULL : signalConnector.exec->clone();
+  }
+
+  SignalConnector::~SignalConnector()
+  {
+    delete exec;
+  }
+
+  SignalConnector& SignalConnector::operator=(const SignalConnector& signalConnector)
+  {
+    delete this->exec;
+    this->object = signalConnector.object;
+    this->exec = (signalConnector.exec == NULL) ? NULL : signalConnector.exec->clone();
+  }
+
+  void SignalConnector::operator()(const std::string& parameters) const
+  {
+    if (exec != NULL && object != NULL)
+      (*this->exec)(this->object, parameters);
+  }
+
 }

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

@@ -1 +1 @@
 /*!
  * @file signal_connector.h
- * @brief Definition of ...
+ * @brief Definition of a SignalConnector class
 */
 
@@ -11 +11 @@
 namespace OrxGui
 {
-  //! A class for ...
+  //! A class for Conncting Signals to Objects, inside of the GUI
   class SignalConnector
   {
   public:
+    SignalConnector();
     SignalConnector(BaseObject* object, const Executor* exec);
     SignalConnector(const SignalConnector& signalConnector);
-    ~SignalConnector() { delete exec; }
+    ~SignalConnector();
 
     SignalConnector& operator=(const SignalConnector& signalConnector);
 
+    void operator()(const std::string& parameters) const;
+    void execute(const std::string& parameters) const { (*this)(parameters); };
+
+    bool isClean() const { return (this->object == NULL || this->exec == NULL); }
+
+
   private:
-    const Executor*     exec;
-    BaseObject*         object;
+    BaseObject*          object;         //!< The object to call.
+    const Executor*      exec;           //!< The Executor, that will be called, on object.
   };
 }

trunk/src/lib/gui/qt_gui/gui_audio.cc

@@ -53 +53 @@
       QtGuiComboBox* soundCard = new QtGuiComboBox(CONFIG_NAME_SOUNDCARD, this, "");
       layout->addWidget(soundCard, 0, 2);
+      soundCard->addItem("Not supportet yet");
+
 
 

trunk/src/lib/gui/qt_gui/gui_general.cc

@@ -60 +60 @@
 
       debug->addItem("0 - minimal");
-#if DEBUG >=1
+#if DEBUG_LEVEL >=1
       debug->addItem("1 - errors");
 #endif
-#if DEBUG >=2
+#if DEBUG_LEVEL >=2
       debug->addItem("2 - warnings");
 #endif
-#if DEBUG >=3
+#if DEBUG_LEVEL >=3
       debug->addItem("3 - information");
 #endif
-#if DEBUG >=4
+#if DEBUG_LEVEL >=4
       debug->addItem("4 - debug");
 #endif
-#if DEBUG >=5
+#if DEBUG_LEVEL >=5
       debug->addItem("5 - extremely debug");
 #endif

trunk/src/lib/gui/qt_gui/qt_gui.cc

@@ -25 +25 @@
 #include "q_image_widget.h"
 
+#include "gui_general.h"
 #include "gui_video.h"
 #include "gui_audio.h"
 #include "gui_control.h"
-#include "gui_general.h"
 
 #include "banner.xpm"
@@ -53 +53 @@
       QToolBox* toolBox = new QToolBox(groupBox);
       {
-
+        toolBox->addItem(new GuiGeneral(this), "General");
         toolBox->addItem(new GuiVideo(this), "Video");
         toolBox->addItem(new GuiAudio(this), "Audio");
         toolBox->addItem(new GuiControl(this), "Control");
-        toolBox->addItem(new GuiGeneral(this), "General");
       }
       mainLayout->addWidget(toolBox,1,1, 1, 3);