[chronojump] EncoderCaptureOptions -> preferences (82%)

[Xavier de Blas <xaviblas src gnome org>]

commit de45be14d6cae1c599c141aee9537ee0f91002a2
Author: Xavier de Blas <xaviblas gmail com>
Date:   Fri Aug 12 22:03:51 2016 +0200

    EncoderCaptureOptions -> preferences (82%)

 src/gui/encoder.cs |   14 ++++++++------
 src/preferences.cs |    6 ++++++
 2 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index b6935d7..7c784d8 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -295,7 +295,7 @@ public partial class ChronoJumpWindow
        private static bool encoderProcessFinish;
        private static bool encoderProcessFinishContMode;
 
-       EncoderCaptureOptionsWindow encoderCaptureOptionsWin;
+//     EncoderCaptureOptionsWindow encoderCaptureOptionsWin;
        EncoderConfigurationWindow encoder_configuration_win;
 
        EncoderConfiguration encoderConfigurationCurrent;
@@ -968,8 +968,8 @@ public partial class ChronoJumpWindow
                                "",     //signalOrCurve,
                                "",     //fileSaved,    //to know date do: select substr(name,-23,19) from 
encoder;
                                "",     //path,                 //url
-                               (int) encoderCaptureOptionsWin.spin_encoder_capture_time.Value, 
-                               
encoderCaptureOptionsWin.GetMinHeight(encoderConfigurationCurrent.has_inertia), 
+                               preferences.encoderCaptureTime, 
+                               preferences.EncoderCaptureMinHeight(encoderConfigurationCurrent.has_inertia), 
                                Util.RemoveTildeAndColonAndDot(textview_encoder_signal_comment.Buffer.Text), 
//desc,
                                "", videoURL,           //status, videoURL
                                encoderConfigurationCurrent,
@@ -980,7 +980,7 @@ public partial class ChronoJumpWindow
 
 
                EncoderParams ep = new EncoderParams(
-                               
encoderCaptureOptionsWin.GetMinHeight(encoderConfigurationCurrent.has_inertia), 
+                               preferences.EncoderCaptureMinHeight(encoderConfigurationCurrent.has_inertia), 
                                getExercisePercentBodyWeightFromComboCapture (),
                                Util.ConvertToPoint(findMass(Constants.MassType.BODY)),
                                Util.ConvertToPoint(findMass(Constants.MassType.EXTRA)),
@@ -2442,7 +2442,7 @@ public partial class ChronoJumpWindow
                                curveNum = 
Convert.ToInt32(UtilGtk.ComboGetActive(combo_encoder_analyze_curve_num_combo));
 
                        ep = new EncoderParams(
-                                       
encoderCaptureOptionsWin.GetMinHeight(encoderConfigurationCurrent.has_inertia),
+                                       
preferences.EncoderCaptureMinHeight(encoderConfigurationCurrent.has_inertia), 
                                        getExercisePercentBodyWeightFromComboCapture (),
                                        Util.ConvertToPoint(findMass(Constants.MassType.BODY)),
                                        Util.ConvertToPoint(findMass(Constants.MassType.EXTRA)),
@@ -4729,7 +4729,7 @@ public partial class ChronoJumpWindow
        private void runEncoderCaptureNoRDotNetInitialize() 
        {
                EncoderParams ep = new EncoderParams(
-                               
encoderCaptureOptionsWin.GetMinHeight(encoderConfigurationCurrent.has_inertia),
+                               preferences.EncoderCaptureMinHeight(encoderConfigurationCurrent.has_inertia), 
                                getExercisePercentBodyWeightFromComboCapture (),
                                Util.ConvertToPoint(findMass(Constants.MassType.BODY)),
                                Util.ConvertToPoint(findMass(Constants.MassType.EXTRA)),
@@ -5950,12 +5950,14 @@ public class EncoderCaptureOptionsWindow {
                return repetitiveConditionsWin.EncoderInertialDiscardFirstThree;
        }
 
+       /*
        public int GetMinHeight (bool inertial) {
                if(inertial)
                        return (int) spin_encoder_capture_min_height_inertial.Value;
                else
                        return (int) spin_encoder_capture_min_height_gravitatory.Value;
        }
+       */
        public void SetMinHeight (bool inertial, int height) {
                if(inertial)
                        spin_encoder_capture_min_height_inertial.Value = height;
diff --git a/src/preferences.cs b/src/preferences.cs
index 2c28741..00f315f 100644
--- a/src/preferences.cs
+++ b/src/preferences.cs
@@ -98,6 +98,12 @@ public class Preferences
                return SqlitePreferences.SelectAll();
        }
        
+       public int EncoderCaptureMinHeight(bool inertial) {
+               if(inertial)
+                       return encoderCaptureMinHeightInertial;
+               else
+                       return encoderCaptureMinHeightGravitatory;
+       }
 
        ~Preferences() {}