Changeset 4338 in orxonox.OLD for orxonox/trunk/src/lib/gui/gui

Timestamp:

May 27, 2005, 9:16:53 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/physics back to the trunk
merged with command
svn merge -r 3866:HEAD . ../../trunk/
many conflict that i tried to resolv
@patrick: i hope i did not interfere with your stuff :/

Location:

orxonox/trunk/src/lib/gui/gui

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• gui_gtk.cc (modified) (9 diffs)
• gui_gtk.h (modified) (2 diffs)

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

@@ -25 +25 @@
 noinst_LIBRARIES = libORXgui.a 
 
-libORXgui_a_CPPFLAGS=$(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
+libORXgui_a_CPPFLAGS = -DBUILD_ORXONOX \
+                        $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
 
 libORXgui_a_SOURCES = gui.cc \

orxonox/trunk/src/lib/gui/gui/Makefile.in

@@ -200 +200 @@
 AM_LDFLAGS = $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
 noinst_LIBRARIES = libORXgui.a 
-libORXgui_a_CPPFLAGS = $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
+libORXgui_a_CPPFLAGS = -DBUILD_ORXONOX \
+                        $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
+
 libORXgui_a_SOURCES = gui.cc \
                       gui_gtk.cc \

orxonox/trunk/src/lib/gui/gui/gui_gtk.cc

@@ -47 +47 @@
 bool initGUI(int argc, char *argv[])
 {
-  executable = new char[strlen(argv[0])+1];
-  strcpy(executable, argv[0]);
+  if (argv)
+    {
+      executable = new char[strlen(argv[0])+1];
+      strcpy(executable, argv[0]);
+    }
+  else
+    executable = NULL;
 
 #ifdef HAVE_GTK2
@@ -1073 +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)
 {
   static_cast<Option*>(option)->changeOption();
-  flags->setTextFromFlags(Window::mainWindow);  //// must be different !!!
+#ifdef BUILD_ORXONOX
+  flags->setTextFromFlags(Window::mainWindow);
+#endif
 }
 #endif /* HAVE_GTK2 */
@@ -1242 +1249 @@
    \param end The maximal Value of the slider.
 */
-Slider::Slider(const char* slidername, int start, int end)
-{
-  this->optionType = GUI_INT;
+Slider::Slider(const char* slidername, float start, float end)
+{
+  this->optionType = GUI_FLOAT;
 
   this->start = start;
@@ -1268 +1275 @@
 
 /**
+   \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 */
+}
+
+/**
    \brief Setting a new value to the Slider.
    Maybe you also require a Slider::redraw() for this to display
 */
-void Slider::setValue(int value)
-{
-  this->value = value;
+void Slider::setValue(float value)
+{
+  this->fValue = value;
 }
 
@@ -1283 +1301 @@
 {
 #ifdef HAVE_GTK2
-  gtk_range_set_value(GTK_RANGE(this->widget), this->value);
+  gtk_range_set_value(GTK_RANGE(this->widget), this->fValue);
 #endif /* HAVE_GTK2 */
 }
@@ -1293 +1311 @@
 {
 #ifdef HAVE_GTK2
-  this->value =(int)gtk_range_get_value(GTK_RANGE(this->widget));
+  this->fValue = gtk_range_get_value(GTK_RANGE(this->widget));
 #else /* HAVE_GTK2 */
   char tmpChar[20];
@@ -1299 +1317 @@
   scanf("%s", tmpChar);
 
-  if ((this->value = atoi(tmpChar))> this->end)
-    this->value = this->end;
-  if (this->value <= this->start)
-    this->value = this->start;
-
-  PRINT(0)("%s set to: %d\n",this->title, this->value);
-#endif /* HAVE_GTK2 */
-}
+  if ((this->fValue = atof(tmpChar))> this->end)
+    this->fValue = this->end;
+  if (this->fValue <= this->start)
+    this->fValue = this->start;
+
+  PRINT(0)("%s set to: %d\n",this->title, this->fValue);
+#endif /* HAVE_GTK2 */
+}
+
+char* Slider::save(void)
+{
+  char* value = new char [30];
+  sprintf (value, "%f", this->fValue);
+  return value;
+}
+void Slider::load(char* loadString)
+{
+  this->fValue = atof(loadString);
+  PRINT(5)("Loading %s: %s %f\n", this->title, loadString, fValue); 
+  this->redraw();
+}
+
 
 //////////
@@ -1387 +1419 @@
 {
   MenuItem* tmpItem = this->firstItem;
-  for (int i = 0; i<this->value; i++)
-    tmpItem = tmpItem->next;
-      
-  return tmpItem->name;
+  for (int i = 0; i < this->value; i++)
+    if (tmpItem)
+      tmpItem = tmpItem->next;
+    else
+      break;
+  if (tmpItem)
+    {
+      char* tmpName = new char[strlen(tmpItem->name)+1];
+      strcpy(tmpName, tmpItem->name);
+      return tmpName;
+    }
+  else 
+    return NULL;
 }
 
@@ -1471 +1512 @@
 
 #endif /* HAVE_GTK2 */
-  PRINT(5)("%s set to: %d\n", this->title, this->value);
+  PRINT(1)("%s set to: %d\n", this->title, this->value);
 }
 

orxonox/trunk/src/lib/gui/gui/gui_gtk.h

@@ -61 +61 @@
 
   virtual void setTitle(const char* title);  //!< An abstract Function, that sets the title of Widgets.
+  virtual const char* getTitle(void) const { return this->title; };
 
   Widget* findWidgetByName(char* name, unsigned int depth);
@@ -296 +297 @@
 {
  private:
-  int start;                            //!< The beginning of the Slider-range.
-  int end;                              //!< The end of the Slider-range.
- public:
-  Slider(const char* slidername, int start, int end);
+  float start;                            //!< The beginning of the Slider-range.
+  float end;                              //!< The end of the Slider-range.
+  float fValue;                           //!< a value for the slider
+ public:
+  Slider(const char* slidername, float start, float end);
   virtual ~Slider(void);
 
-  void setValue(int value);
-  virtual void redraw(void);
-  virtual void changeOption(void);
+  void setExactness(int exactness);
+  void setValue(float value);
+  virtual void redraw(void);
+  virtual void changeOption(void);
+
+  virtual char* save(void);
+  virtual void load(char* loadString);
 };