[chronojump] Encoder capture visual height moved to option

[Xavier de Blas <xaviblas src gnome org>]

commit d4de50be905d907fed8bab37d9e60b2ff7116954
Author: Xavier de Blas <xaviblas gmail com>
Date:   Sat Nov 2 20:35:21 2013 +0100

    Encoder capture visual height moved to option

 glade/chronojump.glade |  109 ++++++++++++++++++++++++++++++-----------------
 src/gui/encoder.cs     |    4 +-
 2 files changed, 71 insertions(+), 42 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 7860147..ebaa370 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -13219,42 +13219,6 @@ on current Chronojump version.</property>
                                                             <property name="position">0</property>
                                                             </packing>
                                                             </child>
-                                                            <child>
-                                                            <widget class="GtkVBox" id="vbox7">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <child>
-                                                            <widget class="GtkSpinButton" 
id="spin_encoder_capture_curves_height_range">
-                                                            <property name="visible">True</property>
-                                                            <property name="can_focus">True</property>
-                                                            <property name="has_tooltip">True</property>
-                                                            <property name="tooltip" translatable="yes">On 
capture: displayed positive and negative height in meters</property>
-                                                            <property name="invisible_char">●</property>
-                                                            <property name="width_chars">3</property>
-                                                            <property 
name="invisible_char_set">True</property>
-                                                            <property 
name="primary_icon_activatable">False</property>
-                                                            <property 
name="secondary_icon_activatable">False</property>
-                                                            <property 
name="primary_icon_sensitive">True</property>
-                                                            <property 
name="secondary_icon_sensitive">True</property>
-                                                            <property name="adjustment">1 0.5 3 0.5 1 
0</property>
-                                                            <property name="climb_rate">1</property>
-                                                            <property name="digits">1</property>
-                                                            <property name="snap_to_ticks">True</property>
-                                                            <property name="numeric">True</property>
-                                                            </widget>
-                                                            <packing>
-                                                            <property name="expand">False</property>
-                                                            <property name="fill">False</property>
-                                                            <property name="position">0</property>
-                                                            </packing>
-                                                            </child>
-                                                            </widget>
-                                                            <packing>
-                                                            <property name="expand">False</property>
-                                                            <property name="fill">False</property>
-                                                            <property name="position">1</property>
-                                                            </packing>
-                                                            </child>
                                                           </widget>
                                                           <packing>
                                                             <property name="expand">True</property>
@@ -20479,7 +20443,7 @@ comments</property>
           <widget class="GtkTable" id="table7">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="n_rows">4</property>
+            <property name="n_rows">5</property>
             <property name="n_columns">2</property>
             <property name="column_spacing">12</property>
             <property name="row_spacing">8</property>
@@ -20571,8 +20535,8 @@ comments</property>
                 <property name="label" translatable="yes">Feedback</property>
               </widget>
               <packing>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
               </packing>
             </child>
             <child>
@@ -20644,7 +20608,7 @@ comments</property>
                     <property name="secondary_icon_activatable">False</property>
                     <property name="primary_icon_sensitive">True</property>
                     <property name="secondary_icon_sensitive">True</property>
-                    <property name="adjustment">20 1 300 1 10 0</property>
+                    <property name="adjustment">3 1 300 1 10 0</property>
                     <property name="climb_rate">1</property>
                     <property name="snap_to_ticks">True</property>
                     <property name="numeric">True</property>
@@ -20709,11 +20673,76 @@ comments</property>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+                <property name="x_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkHBox" id="hbox2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="spacing">4</property>
+                <child>
+                  <widget class="GtkSpinButton" id="spin_encoder_capture_curves_height_range">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="has_tooltip">True</property>
+                    <property name="tooltip" translatable="yes">Displayed positive and negative 
height</property>
+                    <property name="invisible_char">●</property>
+                    <property name="width_chars">3</property>
+                    <property name="invisible_char_set">True</property>
+                    <property name="primary_icon_activatable">False</property>
+                    <property name="secondary_icon_activatable">False</property>
+                    <property name="primary_icon_sensitive">True</property>
+                    <property name="secondary_icon_sensitive">True</property>
+                    <property name="adjustment">1 0.5 3 0.5 1 0</property>
+                    <property name="climb_rate">1</property>
+                    <property name="digits">1</property>
+                    <property name="snap_to_ticks">True</property>
+                    <property name="numeric">True</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="label6">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">1</property>
+                    <property name="label" translatable="yes">m</property>
+                    <property name="use_markup">True</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
                 <property name="top_attach">3</property>
                 <property name="bottom_attach">4</property>
                 <property name="x_options">GTK_FILL</property>
               </packing>
             </child>
+            <child>
+              <widget class="GtkLabel" id="label5">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Displayed height</property>
+              </widget>
+              <packing>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+              </packing>
+            </child>
           </widget>
           <packing>
             <property name="expand">False</property>
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 47058e8..76ac018 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -61,7 +61,6 @@ public partial class ChronoJumpWindow
        [Widget] Gtk.Button button_encoder_load_signal;
        [Widget] Gtk.Button button_video_play_this_test_encoder;
        [Widget] Gtk.Viewport viewport_image_encoder_capture;
-       [Widget] Gtk.SpinButton spin_encoder_capture_curves_height_range;
        [Widget] Gtk.Image image_encoder_capture;
        [Widget] Gtk.Image image_encoder_capture_open;
        [Widget] Gtk.ProgressBar encoder_pulsebar_capture;
@@ -1785,7 +1784,7 @@ public partial class ChronoJumpWindow
        {
                int width=encoder_capture_drawingarea.Allocation.Width;
                int height=encoder_capture_drawingarea.Allocation.Height;
-               double realHeight = 1000 * 2 * spin_encoder_capture_curves_height_range.Value;
+               double realHeight = 1000 * 2 * (int) 
encoderCaptureOptionsWin.spin_encoder_capture_curves_height_range.Value;
                
                Log.Write(" 00a 2 ");
                SerialPort sp = new SerialPort(port);
@@ -4340,6 +4339,7 @@ public class EncoderCaptureOptionsWindow {
        [Widget] public Gtk.RadioButton radiobutton_encoder_capture_external;
        [Widget] public Gtk.SpinButton spin_encoder_capture_time;
        [Widget] public Gtk.SpinButton spin_encoder_capture_min_height;
+       [Widget] public Gtk.SpinButton spin_encoder_capture_curves_height_range;
        [Widget] Gtk.Image image_encoder_bell;
        [Widget] Gtk.Button button_close;