[chronojump] 4 analyze modes and code reorganization (95%)
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] 4 analyze modes and code reorganization (95%)
- Date: Fri, 13 May 2016 15:12:21 +0000 (UTC)
commit 86997afa6c9c76bc65ed0a681b700d4f2fd573ff
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri May 13 17:09:04 2016 +0200
4 analyze modes and code reorganization (95%)
src/gui/encoder.cs | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 135104e..8761475 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -984,8 +984,7 @@ public partial class ChronoJumpWindow
LogB.Information("on_analyze_repetitions_selected");
encSelReps.FakeButtonDone.Clicked -= new EventHandler(on_analyze_repetitions_selected);
- label_encoder_user_curves_active_num.Text = encSelReps.RepsActive.ToString();
- label_encoder_user_curves_all_num.Text = encSelReps.RepsAll.ToString();
+ updateUserCurvesLabelsAndCombo(false);
}
//called on changing radio mode (! show), and on clicking button_encoder_analyze_data_select_curves
(show)
@@ -1018,8 +1017,7 @@ public partial class ChronoJumpWindow
genericWin = encSelReps.Do();
- label_encoder_user_curves_active_num.Text = encSelReps.RepsActive.ToString();
- label_encoder_user_curves_all_num.Text = encSelReps.RepsAll.ToString();
+ updateUserCurvesLabelsAndCombo(false);
}
void on_delete_encoder_curve (object o, EventArgs args)
@@ -1601,27 +1599,21 @@ public partial class ChronoJumpWindow
private void updateUserCurvesLabelsAndCombo(bool dbconOpened)
{
- /* TODO
- ArrayList data;
- if(radio_encoder_analyze_individual_current_session.Active)
- data = SqliteEncoder.Select(
- dbconOpened, -1, currentPerson.UniqueID, currentSession.UniqueID, -1,
- "curve", EncoderSQL.Eccons.ALL,
- false, true);
- //else
- // read encSelReps public variables
-
- int activeCurvesNum = UtilEncoder.GetActiveCurvesNum(data);
- label_encoder_user_curves_active_num.Text = activeCurvesNum.ToString();
- label_encoder_user_curves_all_num.Text = data.Count.ToString();
+ label_encoder_user_curves_active_num.Text = encSelReps.RepsActive.ToString();
+ label_encoder_user_curves_all_num.Text = encSelReps.RepsAll.ToString();
if(radio_encoder_analyze_individual_current_set.Active)
updateComboEncoderAnalyzeCurveNumFromCurrentSet ();
- else
- updateComboEncoderAnalyzeCurveNumSavedReps(data, activeCurvesNum);
+ else if(radio_encoder_analyze_individual_current_session.Active)
+ {
+ ArrayList data = SqliteEncoder.Select(
+ dbconOpened, -1, currentPerson.UniqueID, currentSession.UniqueID, -1,
+ "curve", EncoderSQL.Eccons.ALL,
+ false, true);
+ updateComboEncoderAnalyzeCurveNumSavedReps(data, encSelReps.RepsActive);
+ } //interperson and intersession modes don't use combo_encoder_analyze_curve_num_combo
button_encoder_analyze_sensitiveness();
- */
}
private void updateComboEncoderAnalyzeCurveNumFromCurrentSet ()
@@ -2395,6 +2387,7 @@ public partial class ChronoJumpWindow
prepareAnalyzeRepetitions();
+ /*
if(currentPerson != null) {
ArrayList data = SqliteEncoder.Select(
false, -1, currentPerson.UniqueID, currentSession.UniqueID, -1,
@@ -2403,6 +2396,7 @@ public partial class ChronoJumpWindow
int activeCurvesNum = UtilEncoder.GetActiveCurvesNum(data);
updateComboEncoderAnalyzeCurveNumSavedReps(data, activeCurvesNum);
}
+ */
hbox_encoder_user_curves.Visible = currentPerson != null;
hbox_combo_encoder_exercise_analyze.Visible = false;
@@ -3457,6 +3451,12 @@ public partial class ChronoJumpWindow
// getActiveRepetitions() DOING THIS
} //rest of modes don't use this combo
*/
+ if(radio_encoder_analyze_individual_current_set.Active)
+ updateComboEncoderAnalyzeCurveNumFromCurrentSet ();
+ else
+ prepareAnalyzeRepetitions();
+
+
encoderButtonsSensitive(encoderSensEnum.YESPERSON);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]