Changeset 4325 in orxonox.OLD

Timestamp:

May 27, 2005, 2:18:49 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/particles: new Sliders

Location:

orxonox/branches/physics/src

Files:

• lib/gui/gui/gui_gtk.cc (modified) (2 diffs)
• lib/gui/gui/gui_gtk.h (modified) (1 diff)
• subprojects/particles/framework.cc (modified) (3 diffs)

orxonox/branches/physics/src/lib/gui/gui/gui_gtk.cc

@@ -1078 +1078 @@
 #ifdef HAVE_GTK2
 /** 
-    \brief Signal OptionChange writes the Value from the Slider to its Object-Database.
-    \param widget The widget(Slider) that has a changed Value
-    \param slider the Slider-Object that should receive the change.
+    \brief Signal OptionChange writes the Value from the Option to its Object-Database.
+    \param widget The widget(Option) that has a changed Value
+    \param option the Option-Object that should receive the change.
 */
 gint Option::OptionChange(GtkWidget *widget, Widget* option)
@@ -1272 +1272 @@
 {
   PRINTF(5)("deleting the Slider: %s\n", this->title);
+}
+
+/**
+   \brief sets the exactness of the widget
+   \param exactness count of digits after the dot
+*/
+void Slider::setExactness(int exactness)
+{
+#ifdef HAVE_GTK2
+ gtk_scale_set_digits(GTK_SCALE(this->widget), exactness);
+#endif /* HAVE_GTK2 */
 }
 

orxonox/branches/physics/src/lib/gui/gui/gui_gtk.h

@@ -304 +304 @@
   virtual ~Slider(void);
 
+  void setExactness(int exactness);
   void setValue(float value);
   virtual void redraw(void);

orxonox/branches/physics/src/subprojects/particles/framework.cc

@@ -366 +366 @@
   delete valueC;
 
-  printf("%s, %f\n", name, value);
-
   ParticleEmitter* tmpEmit = ParticleEngine::getInstance()->getEmitterByNumber(1);
   if (tmpEmit)
@@ -374 +372 @@
       {
         tmpEmit->setEmissionRate(value);
-        PRINT(3)("emissionRate set to %f\n", tmpEmit->getEmissionRate());
+        PRINT(3)("EmissionRate set to %f\n", value);
+      }
+      else if (!strcmp(name, "Velocity"))
+      {
+        tmpEmit->setEmissionVelocity(value);
+        PRINT(3)("Velocity set to %f\n", value);
       }
     }
@@ -392 +395 @@
     Box* windowBox = new Box('v');
     {
-      Slider* emissionRate = new Slider("EmissionRate", 0, 1000);
-      emissionRate->connectSignal("value_changed", (void*)emissionRate, changeOption );
-      windowBox->fill(emissionRate);
+      Slider* EmissionRate = new Slider("EmissionRate", 0, 1000);
+      EmissionRate->connectSignal("value_changed", (void*)EmissionRate, changeOption );
+      windowBox->fill(EmissionRate);
+
+      Slider* velocity = new Slider("Velocity", 0, 2);
+      velocity->setExactness(3);
+      velocity->connectSignal("value_changed", (void*)velocity, changeOption );
+      windowBox->fill(velocity);
+
+      Slider* SpreadAngle = new Slider("SpreadAngle", 0, 1000);
+      SpreadAngle->connectSignal("value_changed", (void*)SpreadAngle, changeOption );
+      windowBox->fill(SpreadAngle);
+
+      
 
       Button* quitButton = new Button("quit");