commit 30259c0a100405d28583434ed7fb58ad5a05b873
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Feb 24 20:14:45 2015 +0100
Inertia moment calculation as integer
glade/chronojump.glade | 60 +++++++++++++++++++++++++++++++++++++-
src/gui/encoderConfiguration.cs | 4 ++-
2 files changed, 61 insertions(+), 3 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 16fdf50..efc8205 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -6573,6 +6573,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -7393,6 +7396,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
<child>
@@ -8465,6 +8471,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">2</property>
@@ -9178,6 +9187,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">4</property>
@@ -19521,6 +19533,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -20142,6 +20157,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -21255,6 +21273,9 @@ by you</property>
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkButton" id="button_video_url">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -21425,6 +21446,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -24303,9 +24327,8 @@ 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">80 0 5000 0.01 10 0</property>
+ <property name="adjustment">80 0 5000 1 10 0</property>
<property name="climb_rate">1</property>
- <property name="digits">2</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
</widget>
@@ -31048,6 +31071,24 @@ options</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -33049,6 +33090,9 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -33708,6 +33752,9 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -36333,6 +36380,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -36618,6 +36668,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -36918,6 +36971,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/src/gui/encoderConfiguration.cs b/src/gui/encoderConfiguration.cs
index 6060270..e78b0b0 100644
--- a/src/gui/encoderConfiguration.cs
+++ b/src/gui/encoderConfiguration.cs
@@ -284,7 +284,9 @@ public class EncoderConfigurationWindow {
if(imResult == 0)
label_im_feedback.Text = message;
else {
- label_im_result_disc.Text = Util.TrimDecimals(imResult, 2);
+ //label_im_result_disc.Text = Util.TrimDecimals(imResult, 2);
+ //as int now
+ label_im_result_disc.Text = Convert.ToInt32(imResult);
spin_inertia.Value = imResult;
label_im_feedback.Text = "";