Changeset 1978 in orxonox.OLD for orxonox

Timestamp:

Jun 18, 2004, 11:07:53 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/gui/guicc: added video and audio frames. made default signal connection to slider and checkbutton

Location:

orxonox/branches/gui/guicc

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (5 diffs)
• orxonox_gui.cc (modified) (8 diffs)
• orxonox_gui.h (modified) (2 diffs)
• orxonox_gui_audio.cc (added)
• orxonox_gui_audio.h (added)
• orxonox_gui_video.cc (added)
• orxonox_gui_video.h (added)

orxonox/branches/gui/guicc/Makefile.am

@@ -3 +3 @@
 
 bin_PROGRAMS=gui
-gui_SOURCES=orxonox_gui.cc orxonox_gui_video.cc
-#orxonox_gui_audio.cc orxonox_gui_exec.cc orxonox_gui_file.cc 
+gui_SOURCES=orxonox_gui.cc orxonox_gui_video.cc orxonox_gui_audio.cc 
+#orxonox_gui_exec.cc orxonox_gui_file.cc 
 
 #  uncomment the following if bencoder requires the math library

orxonox/branches/gui/guicc/Makefile.in

@@ -114 +114 @@
 
 bin_PROGRAMS = gui
-gui_SOURCES = orxonox_gui.cc orxonox_gui_video.cc
+gui_SOURCES = orxonox_gui.cc orxonox_gui_video.cc orxonox_gui_audio.cc 
 subdir = guicc
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -123 +123 @@
 PROGRAMS = $(bin_PROGRAMS)
 
-am_gui_OBJECTS = orxonox_gui.$(OBJEXT) orxonox_gui_video.$(OBJEXT)
+am_gui_OBJECTS = orxonox_gui.$(OBJEXT) orxonox_gui_video.$(OBJEXT) \
+        orxonox_gui_audio.$(OBJEXT)
 gui_OBJECTS = $(am_gui_OBJECTS)
 gui_LDADD = $(LDADD)
@@ -133 +134 @@
 am__depfiles_maybe = depfiles
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/orxonox_gui.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_audio.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_video.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -187 +189 @@
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_audio.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_video.Po@am__quote@
 
@@ -385 +388 @@
         uninstall-am uninstall-binPROGRAMS uninstall-info-am
 
-#orxonox_gui_audio.cc orxonox_gui_exec.cc orxonox_gui_file.cc 
+#orxonox_gui_exec.cc orxonox_gui_file.cc 
 
 #  uncomment the following if bencoder requires the math library

orxonox/branches/gui/guicc/orxonox_gui.cc

@@ +1 @@
+#include <iostream.h>
+
 #include "orxonox_gui.h"
-#include <iostream.h>
+#include "orxonox_gui_video.h"
+#include "orxonox_gui_audio.h"
 
 
@@ -22 +25 @@
   orxonoxGUI->connectSignal ("delete_event", orxonoxGUI->orxonox_gui_quit);
   
+  Box* windowBox = new Box ('v');
+  {
+    Box* avBox = new Box ('h');
+    {
+      OrxonoxGuiVideo * video = new OrxonoxGuiVideo ();
+      avBox->fill (video->getFrame());
+      OrxonoxGuiAudio * audio = new OrxonoxGuiAudio ();
+      avBox->fill (audio->getFrame());
+      
+    }
+    windowBox->fill (avBox);
+  }
+  orxonoxGUI->fill (windowBox);
+  orxonoxGUI->listOptions();
+
+  /* TEST ENVIRONMENT
   Frame* Frametest = new Frame ("Test");
   orxonoxGUI->fill((Frame*) Frametest);
@@ -40 +59 @@
   box->fill(menu2);
   orxonoxGUI->listOptions();
+  */
   orxonoxGUI->showall ();
-  
+
   
   gtk_main();
@@ -277 +297 @@
    */
   is_option = 0;
+  value = 0;
   next = NULL;
   option_name = buttonname;
@@ -289 +310 @@
    */
   is_option = 1;
+  value = 0;
   next = NULL;
   option_name = buttonname;
   widget = gtk_check_button_new_with_label (buttonname);
+
+  this->connectSignal ("clicked", this->OptionChange);
+}
+gint CheckButton::OptionChange (GtkWidget *widget, Widget* checkbutton)
+{
+  /** 
+   * Writes value, if changed on the checkbutton, to the object.
+   */
+  static_cast<CheckButton*>(checkbutton)->value = (int)gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON ((CheckButton*)checkbutton->widget));
+  cout << static_cast<CheckButton*>(checkbutton)->option_name << " set to: " << static_cast<CheckButton*>(checkbutton)->value << endl;
 }
 
@@ -301 +333 @@
    */
   is_option = 1;
+  value = 0;
   next = NULL;
   option_name = slidername;
   widget = gtk_hscale_new_with_range (start, end, 5);
   value = start;
+
+  this->connectSignal ("value_changed", this->OptionChange);
 }
 
@@ -313 +348 @@
    */
   static_cast<Slider*>(slider)->value = (int)gtk_range_get_value (GTK_RANGE ((Slider*)slider->widget));
-  cout << static_cast<Slider*>(slider)->value << endl;
+  cout << static_cast<Slider*>(slider)->option_name << " set to: "<< static_cast<Slider*>(slider)->value << endl;
 }
 
@@ -323 +358 @@
    */
   is_option = 1;
+  value = 0;
   next = NULL;
   option_name = menuname;

orxonox/branches/gui/guicc/orxonox_gui.h

@@ -15 +15 @@
 #include <gtk/gtkmenu.h>
 #include <gtk/gtkmenuitem.h>
+
 
 class OrxonoxGui
@@ -110 +111 @@
   CheckButton (char* buttonname);
   ~CheckButton (void);
+  static gint OptionChange (GtkWidget *widget, Widget* checkbutton);
 };