[chronojump] Removed smooth ecc-con except on pyserial_pypers



commit 17dc0ed7b40ea2d775da27f2d1a042459921d42f
Author: Xavier de Blas <xaviblas gmail com>
Date:   Fri Aug 2 11:44:57 2013 +0200

    Removed smooth ecc-con except on pyserial_pypers

 encoder/graph.R                   |   21 +++---
 encoder/pyserial_pyper.py         |   34 ++++----
 encoder/pyserial_pyper_windows.py |   36 +++++-----
 glade/chronojump.glade            |  149 ++++++++++++------------------------
 src/encoder.cs                    |   11 +--
 src/gui/chronojump.cs             |    6 +-
 src/gui/encoder.cs                |    6 --
 src/gui/preferences.cs            |    8 +--
 8 files changed, 101 insertions(+), 170 deletions(-)
---
diff --git a/encoder/graph.R b/encoder/graph.R
index 0e70e1f..92e7f3f 100644
--- a/encoder/graph.R
+++ b/encoder/graph.R
@@ -101,7 +101,7 @@ cols=c(colSpeed,colForce,colPower); lty=rep(1,3)
 #way A. passing options to a file
 getOptionsFromFile <- function(optionsFile) {
        optionsCon <- file(optionsFile, 'r')
-       options=readLines(optionsCon,n=19)
+       options=readLines(optionsCon,n=18)
        close(optionsCon)
        return (options)
 }
@@ -122,7 +122,7 @@ print(options)
 
 OutputData2 = options[4] #currently used to display processing feedback
 SpecialData = options[5]
-OperatingSystem=options[19]
+OperatingSystem=options[18]
 
 
 write("(1/5) Starting R", OutputData2)
@@ -1522,14 +1522,13 @@ doProcess <- function(options) {
        Eccon=options[9]
        Analysis=options[10]    #in cross comes as "cross;Force;Speed;mean"
        AnalysisOptions=options[11]     
-       SmoothingOneEC=options[12] #unused, now it's calculated with findSmoothingsEC
-       SmoothingOneC=options[13]
-       Jump=options[14]
-       Width=as.numeric(options[15])
-       Height=as.numeric(options[16])
-       DecimalSeparator=options[17]
-       Title=options[18]
-       OperatingSystem=options[19]     #if this changes, change it also at start of this R file
+       SmoothingOneC=options[12]
+       Jump=options[13]
+       Width=as.numeric(options[14])
+       Height=as.numeric(options[15])
+       DecimalSeparator=options[16]
+       Title=options[17]
+       OperatingSystem=options[18]     #if this changes, change it also at start of this R file
        #important, if this grows, change the readLines value on getOptionsFromFile
 
        print(File)
@@ -1782,7 +1781,7 @@ doProcess <- function(options) {
                                       y1=myY, col="blue",code=0,length=0.1)
                                #mtext(at=((curves[i,1]+curves[i,2])/2/1000),   #/1000 ms -> s
                                #     side=1,text=myLabel, cex=.8, col="blue")
-                               abline(v=mean(curves[i,1],curves[i,2])/1000, lty=3, col="gray")
+                               abline(v=c(curves[i,1],curves[i,2])/1000, lty=3, col="gray")
                        }
 
                        #plot speed
diff --git a/encoder/pyserial_pyper.py b/encoder/pyserial_pyper.py
index 7bee9b7..3c97f6c 100644
--- a/encoder/pyserial_pyper.py
+++ b/encoder/pyserial_pyper.py
@@ -49,23 +49,23 @@ record_time = int(sys.argv[3])*1000         #from s to ms
 minRange = int(sys.argv[4])                    #all is stored, but only display when vertical range is >= 
minRange
 isJump = sys.argv[5]
 mass = float(sys.argv[6])
-smoothingOneEC = float(sys.argv[7])
-smoothingOneC = float(sys.argv[8])
-eccon = sys.argv[9]                            #contraction "ec" or "c"
-analysisOptions = sys.argv[10]                 #["p","none"]: propulsive or none
-heightHigherCondition = int(sys.argv[11])
-heightLowerCondition = int(sys.argv[12])
-meanSpeedHigherCondition = float(sys.argv[13])
-meanSpeedLowerCondition = float(sys.argv[14])
-maxSpeedHigherCondition = float(sys.argv[15])
-maxSpeedLowerCondition = float(sys.argv[16])
-powerHigherCondition = int(sys.argv[17])
-powerLowerCondition = int(sys.argv[18])
-peakPowerHigherCondition = int(sys.argv[19])
-peakPowerLowerCondition = int(sys.argv[20])
-mainVariable = sys.argv[21]
-inverted = sys.argv[22]
-w_serial_port = sys.argv[23]
+smoothingOneEC = .6 #float(sys.argv[7])
+smoothingOneC = float(sys.argv[7])
+eccon = sys.argv[8]                            #contraction "ec" or "c"
+analysisOptions = sys.argv[9]                  #["p","none"]: propulsive or none
+heightHigherCondition = int(sys.argv[10])
+heightLowerCondition = int(sys.argv[11])
+meanSpeedHigherCondition = float(sys.argv[12])
+meanSpeedLowerCondition = float(sys.argv[13])
+maxSpeedHigherCondition = float(sys.argv[14])
+maxSpeedLowerCondition = float(sys.argv[15])
+powerHigherCondition = int(sys.argv[16])
+powerLowerCondition = int(sys.argv[17])
+peakPowerHigherCondition = int(sys.argv[18])
+peakPowerLowerCondition = int(sys.argv[19])
+mainVariable = sys.argv[20]
+inverted = sys.argv[21]
+w_serial_port = sys.argv[22]
 
 delete_initial_time = 20                       #delete first records because there's encoder bug
 #w_baudrate = 9600                           # Setting the baudrate of Chronopic(9600)
diff --git a/encoder/pyserial_pyper_windows.py b/encoder/pyserial_pyper_windows.py
index e83e532..740efb9 100644
--- a/encoder/pyserial_pyper_windows.py
+++ b/encoder/pyserial_pyper_windows.py
@@ -61,24 +61,24 @@ record_time = int(sys.argv[3])*1000         #from s to ms
 minRange = int(sys.argv[4])                    #all is stored, but only display when vertical range is >= 
minRange
 isJump = sys.argv[5]
 mass = float(sys.argv[6])
-smoothingOneEC = float(sys.argv[7])
-smoothingOneC = float(sys.argv[8])
-eccon = sys.argv[9]                            #contraction "ec" or "c"
-analysisOptions = sys.argv[10]                 #["p","none"]: propulsive or none
-heightHigherCondition = int(sys.argv[11])
-heightLowerCondition = int(sys.argv[12])
-meanSpeedHigherCondition = float(sys.argv[13])
-meanSpeedLowerCondition = float(sys.argv[14])
-maxSpeedHigherCondition = float(sys.argv[15])
-maxSpeedLowerCondition = float(sys.argv[16])
-powerHigherCondition = int(sys.argv[17])
-powerLowerCondition = int(sys.argv[18])
-peakPowerHigherCondition = int(sys.argv[19])
-peakPowerLowerCondition = int(sys.argv[20])
-mainVariable = sys.argv[21]
-inverted = sys.argv[22]
-w_serial_port = sys.argv[23]
-r_path = sys.argv[24]
+smoothingOneEC = .6 #float(sys.argv[7])
+smoothingOneC = float(sys.argv[7])
+eccon = sys.argv[8]                            #contraction "ec" or "c"
+analysisOptions = sys.argv[9]                  #["p","none"]: propulsive or none
+heightHigherCondition = int(sys.argv[10])
+heightLowerCondition = int(sys.argv[11])
+meanSpeedHigherCondition = float(sys.argv[12])
+meanSpeedLowerCondition = float(sys.argv[13])
+maxSpeedHigherCondition = float(sys.argv[14])
+maxSpeedLowerCondition = float(sys.argv[15])
+powerHigherCondition = int(sys.argv[16])
+powerLowerCondition = int(sys.argv[17])
+peakPowerHigherCondition = int(sys.argv[18])
+peakPowerLowerCondition = int(sys.argv[19])
+mainVariable = sys.argv[20]
+inverted = sys.argv[21]
+w_serial_port = sys.argv[22]
+r_path = sys.argv[23]
 
 delete_initial_time = 20                       #delete first records because there's encoder bug
 #w_baudrate = 9600                           # Setting the baudrate of Chronopic(9600)
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 1bf5927..5df400d 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -25612,120 +25612,71 @@ show elevation as:</property>
                             <property name="border_width">8</property>
                             <property name="spacing">12</property>
                             <child>
-                              <widget class="GtkTable" id="table2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="n_rows">2</property>
-                                <property name="n_columns">2</property>
-                                <property name="column_spacing">10</property>
-                                <property name="row_spacing">8</property>
-                                <child>
-                                  <widget class="GtkSpinButton" id="spin_encoder_smooth_ecc_con">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="invisible_char">●</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">0.59999999999999998 0 1 0.01 
0.10000000000000001 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>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkSpinButton" id="spin_encoder_smooth_con">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="invisible_char">●</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">0.69999999999999996 0 1 0.01 
0.10000000000000001 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>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkLabel" id="label7">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Eccentric-concentric</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="x_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkLabel" id="label8">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Concentric</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                              </widget>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkHBox" id="hbox4">
+                              <widget class="GtkHBox" id="hbox2">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="spacing">12</property>
+                                <property name="spacing">20</property>
                                 <child>
-                                  <widget class="GtkLabel" id="label13">
+                                  <widget class="GtkHBox" id="hbox5">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Recommended values:</property>
+                                    <property name="spacing">10</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="label8">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="xalign">0</property>
+                                        <property name="label" translatable="yes">Smooth</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkSpinButton" id="spin_encoder_smooth_con">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">●</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">0.69999999999999996 0 1 0.01 
0.10000000000000001 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>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
                                   </widget>
                                   <packing>
-                                    <property name="expand">False</property>
+                                    <property name="expand">True</property>
                                     <property name="fill">True</property>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkHBox" id="hbox5">
+                                  <widget class="GtkHBox" id="hbox3">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="spacing">8</property>
+                                    <property name="spacing">10</property>
                                     <child>
-                                      <widget class="GtkLabel" id="label_encoder_ecc_con">
+                                      <widget class="GtkLabel" id="label13">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
+                                        <property name="label" translatable="yes">Recommended:</property>
                                       </widget>
                                       <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
@@ -25735,14 +25686,14 @@ show elevation as:</property>
                                         <property name="can_focus">False</property>
                                       </widget>
                                       <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
                                   </widget>
                                   <packing>
-                                    <property name="expand">False</property>
+                                    <property name="expand">True</property>
                                     <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
@@ -25751,7 +25702,7 @@ show elevation as:</property>
                               <packing>
                                 <property name="expand">True</property>
                                 <property name="fill">True</property>
-                                <property name="position">1</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                           </widget>
diff --git a/src/encoder.cs b/src/encoder.cs
index eb132d1..e94d5b6 100644
--- a/src/encoder.cs
+++ b/src/encoder.cs
@@ -34,7 +34,6 @@ public class EncoderParams
        private string eccon;
        private string analysis;
        private string analysisOptions;         //p: propulsive
-       private string smoothEccCon; //to pass always as "." to R
        private string smoothCon; //to pass always as "." to R
        private int curve;
        private int width;
@@ -59,7 +58,7 @@ public class EncoderParams
 
        //to encoder capture (pyserial_pyper.py)
        public EncoderParams(int time, int minHeight, int exercisePercentBodyWeight, string mass, 
-                       string smoothEccCon, string smoothCon, string eccon, string analysisOptions,
+                       string smoothCon, string eccon, string analysisOptions,
                        double heightHigherCondition, double heightLowerCondition, 
                        double meanSpeedHigherCondition, double meanSpeedLowerCondition, 
                        double maxSpeedHigherCondition, double maxSpeedLowerCondition, 
@@ -71,7 +70,6 @@ public class EncoderParams
                this.minHeight = minHeight;
                this.exercisePercentBodyWeight = exercisePercentBodyWeight;
                this.mass = mass;
-               this.smoothEccCon = smoothEccCon;
                this.smoothCon = smoothCon;
                this.eccon = eccon;
                this.analysisOptions = analysisOptions;
@@ -96,7 +94,7 @@ public class EncoderParams
                        analysisOptionsPrint = "none";
 
                return time.ToString() + " " + minHeight.ToString() + " " + 
exercisePercentBodyWeight.ToString() + 
-                       " " + mass.ToString() + " " + smoothEccCon + " " + smoothCon + " " + eccon + " " + 
analysisOptionsPrint +
+                       " " + mass.ToString() + " " + smoothCon + " " + eccon + " " + analysisOptionsPrint +
                        " " + heightHigherCondition.ToString() +        " " + heightLowerCondition.ToString() 
+
                        " " + Util.ConvertToPoint(meanSpeedHigherCondition.ToString()) +        
                        " " + Util.ConvertToPoint(meanSpeedLowerCondition.ToString()) +
@@ -109,7 +107,7 @@ public class EncoderParams
        
        //to graph.R    
        public EncoderParams(int minHeight, int exercisePercentBodyWeight, string mass, string eccon, 
-                       string analysis, string analysisOptions, string smoothEccCon, string smoothCon,
+                       string analysis, string analysisOptions, string smoothCon,
                        int curve, int width, int height, string decimalSeparator)
        {
                this.minHeight = minHeight;
@@ -118,7 +116,6 @@ public class EncoderParams
                this.eccon = eccon;
                this.analysis = analysis;
                this.analysisOptions = analysisOptions;
-               this.smoothEccCon = smoothEccCon;
                this.smoothCon = smoothCon;
                this.curve = curve;
                this.width = width;
@@ -129,7 +126,7 @@ public class EncoderParams
        public string ToString2 (string sep) 
        {
                return minHeight + sep + exercisePercentBodyWeight + sep + mass + sep + eccon + 
-                       sep + analysis + sep + analysisOptions + sep + smoothEccCon + sep + smoothCon + 
+                       sep + analysis + sep + analysisOptions + sep + smoothCon + 
                        sep + curve + sep + width + sep + height + sep + decimalSeparator;
        }
        
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 9c806f5..b0c80e0 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -903,8 +903,6 @@ public partial class ChronoJumpWindow
                update_sqlite_at_runs_speed_radios = true;
 
                encoderPropulsive = SqlitePreferences.Select("encoderPropulsive") == "True"; 
-               encoderSmoothEccCon = Convert.ToDouble ( Util.ChangeDecimalSeparator ( 
-                                       SqlitePreferences.Select("encoderSmoothEccCon") ) );
                encoderSmoothCon = Convert.ToDouble ( Util.ChangeDecimalSeparator (
                                SqlitePreferences.Select("encoderSmoothCon") ) );
 
@@ -2621,7 +2619,7 @@ public partial class ChronoJumpWindow
                                askDeletion, weightPercentPreferred, heightPreferred, metersSecondsPreferred,
                                //System.Threading.Thread.CurrentThread.CurrentUICulture.ToString(),
                                SqlitePreferences.Select("language"),
-                               encoderPropulsive, encoderSmoothEccCon, encoderSmoothCon,
+                               encoderPropulsive, encoderSmoothCon,
                                videoDevices, videoDeviceNum, SqlitePreferences.Select("encoder1RMMethod")
                                );
                myWin.Button_accept.Clicked += new EventHandler(on_preferences_accepted);
@@ -2704,8 +2702,6 @@ public partial class ChronoJumpWindow
                        metersSecondsPreferred = false;
                
                encoderPropulsive = SqlitePreferences.Select("encoderPropulsive") == "True"; 
-               encoderSmoothEccCon = Convert.ToDouble ( Util.ChangeDecimalSeparator ( 
-                                       SqlitePreferences.Select("encoderSmoothEccCon") ) );
                encoderSmoothCon = Convert.ToDouble ( Util.ChangeDecimalSeparator (
                                SqlitePreferences.Select("encoderSmoothCon") ) );
 
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index ed56fbb..ffbff6f 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -146,7 +146,6 @@ public partial class ChronoJumpWindow
 
        //smooth preferences on Sqlite since 1.3.7
        bool encoderPropulsive;
-       double encoderSmoothEccCon; 
        double encoderSmoothCon;
 
        bool lastRecalculateWasInverted;
@@ -264,7 +263,6 @@ public partial class ChronoJumpWindow
                                (int) spin_encoder_capture_min_height.Value, 
                                getExercisePercentBodyWeightFromCombo (),
                                Util.ConvertToPoint(findMassFromCombo(true)),
-                               Util.ConvertToPoint(encoderSmoothEccCon),               //R decimal: '.'
                                Util.ConvertToPoint(encoderSmoothCon),                  //R decimal: '.'
                                findEccon(true),                                        //force ecS (ecc-conc 
separated)
                                analysisOptions,
@@ -616,7 +614,6 @@ public partial class ChronoJumpWindow
                                findEccon(true),                                        //force ecS (ecc-conc 
separated)
                                analysis,
                                analysisOptions,
-                               Util.ConvertToPoint(encoderSmoothEccCon),               //R decimal: '.'
                                Util.ConvertToPoint(encoderSmoothCon),                  //R decimal: '.'
                                0,                      //curve is not used here
                                image_encoder_width, image_encoder_height,
@@ -1176,7 +1173,6 @@ public partial class ChronoJumpWindow
                                findEccon(false), //do not force ecS (ecc-conc separated) //not taken from 
lastEncoderSQL because there is (true)
                                "exportCSV",
                                analysisOptions,
-                               Util.ConvertToPoint(encoderSmoothEccCon),               //R decimal: '.'
                                Util.ConvertToPoint(encoderSmoothCon),                  //R decimal: '.'
                                -1,
                                image_encoder_width,
@@ -1860,7 +1856,6 @@ public partial class ChronoJumpWindow
                                        myEccon,        //this decides if analysis will be together or 
separated
                                        sendAnalysis,
                                        analysisOptions,
-                                       Util.ConvertToPoint(encoderSmoothEccCon),               //R decimal: 
'.'
                                        Util.ConvertToPoint(encoderSmoothCon),                  //R decimal: 
'.'
                                        myCurveNum,
                                        image_encoder_width, 
@@ -1960,7 +1955,6 @@ Log.WriteLine(str);
                                        findEccon(false),               //do not force ecS (ecc-conc 
separated)
                                        sendAnalysis,
                                        analysisOptions,
-                                       Util.ConvertToPoint(encoderSmoothEccCon),               //R decimal: 
'.'
                                        Util.ConvertToPoint(encoderSmoothCon),                  //R decimal: 
'.'
                                        
Convert.ToInt32(UtilGtk.ComboGetActive(combo_encoder_analyze_curve_num_combo)),
                                        image_encoder_width,
diff --git a/src/gui/preferences.cs b/src/gui/preferences.cs
index d4c950b..5f1317c 100644
--- a/src/gui/preferences.cs
+++ b/src/gui/preferences.cs
@@ -60,9 +60,7 @@ public class PreferencesWindow {
        [Widget] Gtk.RadioButton radio_weight_kg;
        
        [Widget] Gtk.CheckButton checkbutton_encoder_propulsive;
-       [Widget] Gtk.SpinButton spin_encoder_smooth_ecc_con;
        [Widget] Gtk.SpinButton spin_encoder_smooth_con;
-       [Widget] Gtk.Label label_encoder_ecc_con;
        [Widget] Gtk.Label label_encoder_con;
                        
        [Widget] Gtk.RadioButton radio_encoder_1RM_nonweighted;
@@ -106,7 +104,7 @@ public class PreferencesWindow {
        static public PreferencesWindow Show (int digitsNumber, bool showHeight, bool showPower,  
                        bool showInitialSpeed, bool showAngle, bool showQIndex, bool showDjIndex,
                        bool askDeletion, bool weightStatsPercent, bool heightPreferred, bool 
metersSecondsPreferred, 
-                       string language, bool encoderPropulsive, double encoderSmoothEccCon, double 
encoderSmoothCon,
+                       string language, bool encoderPropulsive, double encoderSmoothCon,
                        string [] videoDevices, int videoDeviceNum, string encoder1RMMethod)
        {
                if (PreferencesWindowBox == null) {
@@ -188,7 +186,6 @@ public class PreferencesWindow {
        
                //encoder       
                PreferencesWindowBox.checkbutton_encoder_propulsive.Active = encoderPropulsive;
-               PreferencesWindowBox.spin_encoder_smooth_ecc_con.Value = encoderSmoothEccCon;
                PreferencesWindowBox.spin_encoder_smooth_con.Value = encoderSmoothCon;
 
                if(encoder1RMMethod == Constants.Encoder1RMMethod.NONWEIGHTED.ToString())
@@ -217,7 +214,6 @@ public class PreferencesWindow {
                */
 
                //done here and not in glade to be shown with the decimal point of user language        
-               PreferencesWindowBox.label_encoder_ecc_con.Text = (0.6).ToString();
                PreferencesWindowBox.label_encoder_con.Text = (0.7).ToString();
 
                PreferencesWindowBox.preferences.Show ();
@@ -424,8 +420,6 @@ public class PreferencesWindow {
                
                SqlitePreferences.Update("encoderPropulsive", 
                                PreferencesWindowBox.checkbutton_encoder_propulsive.Active.ToString(), true);
-               SqlitePreferences.Update("encoderSmoothEccCon", Util.ConvertToPoint( 
-                               (double) PreferencesWindowBox.spin_encoder_smooth_ecc_con.Value), true);
                SqlitePreferences.Update("encoderSmoothCon", Util.ConvertToPoint( 
                                (double) PreferencesWindowBox.spin_encoder_smooth_con.Value), true);
                SqlitePreferences.Update("videoDevice", UtilGtk.ComboGetActivePos(combo_camera).ToString(), 
true);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]