[chronojump] Fixed GUI issues with new encoder analyze instantaneous options
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Fixed GUI issues with new encoder analyze instantaneous options
- Date: Fri, 6 Apr 2018 23:44:10 +0000 (UTC)
commit 0683510527351d55658874b043882600ff2b40fe
Author: Xavier de Blas <xaviblas gmail com>
Date: Sat Apr 7 01:43:33 2018 +0200
Fixed GUI issues with new encoder analyze instantaneous options
src/gui/encoder.cs | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 97fac8c..773bf98 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -3037,9 +3037,10 @@ public partial class ChronoJumpWindow
}
else if(
( radio_encoder_analyze_individual_current_set.Active && findEccon(false) ==
"c" ) || // 2
- radiobutton_encoder_analyze_single.Active ||
+ ( radiobutton_encoder_analyze_instantaneous.Active &&
+ (radiobutton_encoder_analyze_single.Active ||
radiobutton_encoder_analyze_side.Active ||
- radiobutton_encoder_analyze_superpose.Active // 3
+ radiobutton_encoder_analyze_superpose.Active) ) // 3
) {
//together, mandatory
check_encoder_analyze_eccon_together.Sensitive = false;
@@ -3410,6 +3411,9 @@ public partial class ChronoJumpWindow
encoder_instantaneous_gui("superpose");
else if(o == (object) radiobutton_encoder_analyze_all_set)
encoder_instantaneous_gui("singleAllSet");
+
+ encoderButtonsSensitive(encoderSensEnumStored);
+ button_encoder_analyze_sensitiveness();
}
private void encoder_instantaneous_gui (string mode)
@@ -4623,7 +4627,7 @@ public partial class ChronoJumpWindow
)
);
//max 12 graphs on side compare
- if(analyze_sensitive && radiobutton_encoder_analyze_side.Active) {
+ if(analyze_sensitive && radiobutton_encoder_analyze_instantaneous.Active &&
radiobutton_encoder_analyze_side.Active) {
analyze_sensitive = curvesNumOkToSideCompare();
label_encoder_analyze_side_max.Visible = ! analyze_sensitive;
} else
@@ -4651,13 +4655,13 @@ public partial class ChronoJumpWindow
//button_encoder_analyze.Sensitive = encoderTimeStamp != null;
analyze_sensitive = (rows > 0);
- if(analyze_sensitive && radiobutton_encoder_analyze_side.Active) {
+ if(analyze_sensitive && radiobutton_encoder_analyze_instantaneous.Active &&
radiobutton_encoder_analyze_side.Active) {
analyze_sensitive = curvesNumOkToSideCompare();
label_encoder_analyze_side_max.Visible = ! analyze_sensitive;
}
} else {
analyze_sensitive = (currentPerson != null && encSelReps.RepsActive > 0);
- if(analyze_sensitive && radiobutton_encoder_analyze_side.Active) {
+ if(analyze_sensitive && radiobutton_encoder_analyze_instantaneous.Active &&
radiobutton_encoder_analyze_side.Active) {
analyze_sensitive = curvesNumOkToSideCompare();
label_encoder_analyze_side_max.Visible = ! analyze_sensitive;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]