[chronojump] Pmax(F0,V0) only concentric, mean, without date on x

[Xavier de Blas <xaviblas src gnome org>]

commit 874b1c664beca9b6b63f652d16ab5a198e4b189f
Author: Xavier de Blas <xaviblas gmail com>
Date:   Tue Jan 16 16:44:17 2018 +0100

    Pmax(F0,V0) only concentric, mean, without date on x

 encoder/graph.R    |    5 ++++-
 src/gui/encoder.cs |   28 +++++++++++++++++++++++-----
 2 files changed, 27 insertions(+), 6 deletions(-)
---
diff --git a/encoder/graph.R b/encoder/graph.R
index 3c11460..71c6c0f 100644
--- a/encoder/graph.R
+++ b/encoder/graph.R
@@ -3252,7 +3252,10 @@ doProcess <- function(options)
                         
                         if(! singleFile) {
                                 #only use concentric data      
-                                if( (op$Analysis == "1RMBadillo2010" || op$Analysis == "1RMAnyExercise") & 
repOp$eccon == "e") {
+                                if( (op$Analysis == "1RMBadillo2010" || op$Analysis == "1RMAnyExercise" ||
+                                    (op$Analysis == "cross" && op$AnalysisVariables[1] == "Pmax(F0,V0)")
+                                    ) && repOp$eccon == "e")
+                               {
                                         discardedCurves = c(i,discardedCurves)
                                         discardingCurves = TRUE
                                         next;
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 6e5d9d0..a09dd19 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -3759,10 +3759,26 @@ public partial class ChronoJumpWindow
                if (! radiobutton_encoder_analyze_cross.Active)
                        return;
 
-               check_encoder_analyze_mean_or_max.Sensitive = true;
-               check_encoder_analyze_eccon_together.Sensitive = true;
                block_check_encoder_analyze_eccon_together_if_needed();
-                       
+
+               //Pmax(F0,V0) is not translated
+               if(UtilGtk.ComboGetActive(combo_encoder_analyze_cross) == "Pmax(F0,V0)")
+               {
+                       check_encoder_intersession_x_is_date.Active = false;
+                       check_encoder_intersession_x_is_date.Sensitive = false;
+
+                       //eccon has to be ecS (separated), and R will use only "c"
+                       check_encoder_analyze_eccon_together.Active = false;
+                       check_encoder_analyze_eccon_together.Sensitive = false;
+
+                       check_encoder_analyze_mean_or_max.Active = true;
+                       check_encoder_analyze_mean_or_max.Sensitive = false;
+               } else {
+                       check_encoder_intersession_x_is_date.Sensitive = true;
+                       check_encoder_analyze_eccon_together.Sensitive = true;
+                       check_encoder_analyze_mean_or_max.Sensitive = true;
+               }
+
                button_encoder_analyze_sensitiveness();
        }
        
@@ -4460,8 +4476,10 @@ public partial class ChronoJumpWindow
                button_encoder_capture_finish.Sensitive = Util.IntToBool(table[8]);
                button_encoder_capture_finish_cont.Sensitive = Util.IntToBool(table[8]);
        }
-       
-       private void button_encoder_analyze_sensitiveness() {
+
+       //only related to button_encoder_analyze
+       private void button_encoder_analyze_sensitiveness()
+       {
                bool analyze_sensitive = false;
                if(radio_encoder_analyze_individual_current_set.Active) {
                        int rows = UtilGtk.CountRows(encoderCaptureListStore);