[chronojump] Signal/curve -> Set/repetition
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Signal/curve -> Set/repetition
- Date: Wed, 23 Jul 2014 12:50:25 +0000 (UTC)
commit b3ef47e8fc1cf3b91d8bd401cbb153fa3e35d752
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Jul 23 14:49:43 2014 +0200
Signal/curve -> Set/repetition
glade/chronojump.glade | 142 ++++++++++++++++++++++++++++++++++++++----
src/constants.cs | 12 ++--
src/gui/encoder.cs | 40 ++++++------
src/gui/encoderTreeviews.cs | 2 +-
src/gui/person.cs | 4 +-
src/gui/session.cs | 4 +-
6 files changed, 159 insertions(+), 45 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index afc24fb..9658f3d 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -6203,6 +6203,12 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -6822,6 +6828,12 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
<child>
@@ -7575,6 +7587,12 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">2</property>
@@ -8087,6 +8105,12 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">4</property>
@@ -12643,7 +12667,7 @@ on current Chronojump version.</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Load
signal</property>
+ <property name="tooltip" translatable="yes">Load
set</property>
<signal name="clicked"
handler="on_button_encoder_load_signal_clicked" swapped="no"/>
<child>
<widget class="GtkImage"
id="image_encoder_capture_open">
@@ -12667,7 +12691,7 @@ on current Chronojump version.</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip"
translatable="yes">Recalculate signal with changed parameters</property>
+ <property name="tooltip"
translatable="yes">Recalculate set with changed parameters</property>
<property name="use_underline">True</property>
<signal name="clicked"
handler="on_button_encoder_recalculate_clicked" swapped="no"/>
<child>
@@ -12692,7 +12716,7 @@ on current Chronojump version.</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip"
translatable="yes">Delete signal</property>
+ <property name="tooltip"
translatable="yes">Delete set</property>
<signal name="clicked"
handler="on_button_encoder_delete_signal_clicked" swapped="no"/>
<child>
<widget class="GtkImage"
id="image_encoder_signal_delete">
@@ -12834,7 +12858,7 @@ on current Chronojump version.</property>
<widget class="GtkLabel" id="label115">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">curves</property>
+ <property name="label">repetitions</property>
</widget>
<packing>
<property name="position">1</property>
@@ -12864,7 +12888,7 @@ on current Chronojump version.</property>
<widget class="GtkLabel" id="label75">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Signal</property>
+ <property name="label" translatable="yes">Set</property>
<property name="use_markup">True</property>
</widget>
<packing>
@@ -13053,7 +13077,7 @@ on current Chronojump version.</property>
<widget class="GtkLabel" id="label85">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Curves (select
them to save)</property>
+ <property name="label" translatable="yes">Repetitions
(select them to save)</property>
<property name="use_markup">True</property>
</widget>
<packing>
@@ -13204,7 +13228,7 @@ on current Chronojump version.</property>
<widget class="GtkLabel"
id="label_encoder_analyze_current_signal">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Current
signal</property>
+ <property name="label" translatable="yes">Current
set</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -13215,7 +13239,7 @@ on current Chronojump version.</property>
<child>
<widget class="GtkLabel"
id="label_encoder_analyze_saved_curves">
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Saved
curves</property>
+ <property name="label" translatable="yes">Saved
repetitions</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -13471,7 +13495,7 @@ on current Chronojump version.</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Single
curve</property>
+ <property name="tooltip" translatable="yes">Single
repetition</property>
<property name="draw_indicator">False</property>
<property
name="group">radiobutton_encoder_analyze_powerbars</property>
<signal name="toggled"
handler="on_radiobutton_encoder_analyze_single_toggled" swapped="no"/>
@@ -13668,7 +13692,7 @@ on current Chronojump version.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
- <property name="tooltip"
translatable="yes">Curve number</property>
+ <property name="tooltip"
translatable="yes">Repetition number</property>
<property name="label">nº</property>
</widget>
<packing>
@@ -13682,7 +13706,7 @@ on current Chronojump version.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
- <property name="tooltip"
translatable="yes">Curve number</property>
+ <property name="tooltip"
translatable="yes">Repetition number</property>
<child>
<placeholder/>
</child>
@@ -17382,6 +17406,12 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -17802,6 +17832,12 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -18656,6 +18692,18 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -20978,7 +21026,7 @@ comments</property>
</child>
<child>
<widget class="GtkCheckButton" id="check_show_start_and_duration">
- <property name="label" translatable="yes">Show start and duration of each curve</property>
+ <property name="label" translatable="yes">Show start and duration of each repetition</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -26235,6 +26283,42 @@ options</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -28045,6 +28129,12 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -28524,6 +28614,12 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -29616,7 +29712,7 @@ show elevation as:</property>
<widget class="GtkLabel" id="label40">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Save the curve
with best mean power</property>
+ <property name="label" translatable="yes">Save the
repetition with best mean power</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -29732,7 +29828,7 @@ show elevation as:</property>
<widget class="GtkLabel" id="label35">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Save curves automatically on
capture</property>
+ <property name="label" translatable="yes">Save repetitions automatically on
capture</property>
<property name="use_markup">True</property>
</widget>
<packing>
@@ -30976,6 +31072,12 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -31060,6 +31162,12 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -31159,6 +31267,12 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/src/constants.cs b/src/constants.cs
index 0300673..ebc0a92 100644
--- a/src/constants.cs
+++ b/src/constants.cs
@@ -788,7 +788,7 @@ public class Constants
"land",
"air",
"jump height",
- "Curve",
+ "Repetition",
"Not enough data.",
"Encoder is not connected.",
"prediction",
@@ -796,13 +796,13 @@ public class Constants
"Estimated percentual load =",
"Adapted from",
"Mean speed in concentric propulsive phase",
- "Sorry, no curves matched your criteria.",
+ "Sorry, no repetitions matched your criteria.",
"Need 6 jumps and 4 phases for each jump",
"Need at least three jumps executed on the odd concentric phases",
"Starting R",
"Loading libraries",
"Starting process",
- "Curves processed",
+ "Repetitions processed",
"R tasks done"
};
/*
@@ -834,7 +834,7 @@ public class Constants
Catalog.GetString("land"),
Catalog.GetString("air"),
Catalog.GetString("jump height"),
- Catalog.GetString("Curve"),
+ Catalog.GetString("Repetition"),
Catalog.GetString("Not enough data."),
Catalog.GetString("Encoder is not connected."),
Catalog.GetString("prediction"),
@@ -842,13 +842,13 @@ public class Constants
Catalog.GetString("Estimated percentual load ="),
Catalog.GetString("Adapted from"),
Catalog.GetString("Mean speed in concentric propulsive phase"),
- Catalog.GetString("Sorry, no curves matched your criteria."),
+ Catalog.GetString("Sorry, no repetitions matched your criteria."),
Catalog.GetString("Need 6 jumps and 4 phases for each jump"),
Catalog.GetString("Need at least three jumps executed on the odd concentric phases"),
Catalog.GetString("Starting R"),
Catalog.GetString("Loading libraries"),
Catalog.GetString("Starting process"),
- Catalog.GetString("Curves processed"),
+ Catalog.GetString("Repetitions processed"),
Catalog.GetString("R tasks done")
};
}
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 7d5ebf2..efc046e 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -770,7 +770,7 @@ public partial class ChronoJumpWindow
string [] columnsString = {
Catalog.GetString("ID"),
Catalog.GetString("Active"), //checkboxes
- Catalog.GetString("Curve"),
+ Catalog.GetString("Repetition"),
Catalog.GetString("Exercise"),
"RL",
Catalog.GetString("Extra weight"),
@@ -803,9 +803,9 @@ public partial class ChronoJumpWindow
}
genericWin = GenericWindow.Show(false, //don't show now
- string.Format(Catalog.GetString("Saved curves of athlete {0} on this
session."),
+ string.Format(Catalog.GetString("Saved repetitions of athlete {0} on this
session."),
currentPerson.Name) + "\n" +
- Catalog.GetString("Activate the curves you want to use clicking on first
column.") + "\n" +
+ Catalog.GetString("Activate the repetitions you want to use clicking on first
column.") + "\n" +
Catalog.GetString("If you want to edit or delete a row, right click on it.")
+ "\n",
bigArray);
@@ -821,7 +821,7 @@ public partial class ChronoJumpWindow
foreach (Person p in personsPre)
persons[count++] = p.UniqueID.ToString() + ":" + p.Name;
genericWin.SetComboValues(persons, currentPerson.UniqueID + ":" + currentPerson.Name);
- genericWin.SetComboLabel(Catalog.GetString("Change the owner of selected curve") +
+ genericWin.SetComboLabel(Catalog.GetString("Change the owner of selected repetition") +
" (" + Catalog.GetString("code") + ":" + Catalog.GetString("name") + ")");
genericWin.ShowEditRow(false);
genericWin.CommentColumn = 10;
@@ -924,7 +924,7 @@ public partial class ChronoJumpWindow
protected void on_encoder_show_curves_row_delete_pre (object o, EventArgs args) {
if(askDeletion) {
ConfirmWindow confirmWin = ConfirmWindow.Show(Catalog.GetString(
- "Are you sure you want to delete this curve?"), "", "");
+ "Are you sure you want to delete this repetition?"), "", "");
confirmWin.Button_accept.Clicked += new
EventHandler(on_encoder_show_curves_row_delete);
} else
on_encoder_show_curves_row_delete (o, args);
@@ -1019,8 +1019,8 @@ public partial class ChronoJumpWindow
Catalog.GetString("ID"),
"", //checkboxes
Catalog.GetString("Person name"),
- Catalog.GetString("Selected\ncurves"),
- Catalog.GetString("All\ncurves")
+ Catalog.GetString("Selected\nrepetitions"),
+ Catalog.GetString("All\nrepetitions")
};
ArrayList bigArray = new ArrayList();
@@ -1112,8 +1112,8 @@ public partial class ChronoJumpWindow
"", //checkboxes
Catalog.GetString("Session name"),
Catalog.GetString("Session date"),
- Catalog.GetString("Selected\ncurves"),
- Catalog.GetString("All\ncurves")
+ Catalog.GetString("Selected\nrepetitions"),
+ Catalog.GetString("All\nrepetitions")
};
ArrayList bigArray = new ArrayList();
@@ -1128,7 +1128,7 @@ public partial class ChronoJumpWindow
bigArray.Add(a2);
genericWin = GenericWindow.Show(false, //don't show now
- string.Format(Catalog.GetString("Compare curves of {0} from this session with
the following sessions."),
+ string.Format(Catalog.GetString("Compare repetitions of {0} from this session
with the following sessions."),
currentPerson.Name), bigArray);
//convert data from array of EncoderPersonCurvesInDB to array of strings []
@@ -1184,7 +1184,7 @@ public partial class ChronoJumpWindow
string [] columnsString = {
Catalog.GetString("ID"),
- Catalog.GetString("Signal"),
+ Catalog.GetString("Set"),
Catalog.GetString("Exercise"),
"RL",
Catalog.GetString("Extra weight"),
@@ -1206,7 +1206,7 @@ public partial class ChronoJumpWindow
bigArray.Add(a2);
genericWin = GenericWindow.Show(false, //don't show now
- string.Format(Catalog.GetString("Select signal of athlete {0} on this
session."),
+ string.Format(Catalog.GetString("Select set of athlete {0} on this
session."),
currentPerson.Name) + "\n" +
Catalog.GetString("If you want to edit or delete a row, right click on it."),
bigArray);
@@ -1219,7 +1219,7 @@ public partial class ChronoJumpWindow
foreach (Person p in personsPre)
persons[count++] = p.UniqueID.ToString() + ":" + p.Name;
genericWin.SetComboValues(persons, currentPerson.UniqueID + ":" + currentPerson.Name);
- genericWin.SetComboLabel(Catalog.GetString("Change the owner of selected signal") +
+ genericWin.SetComboLabel(Catalog.GetString("Change the owner of selected set") +
" (" + Catalog.GetString("code") + ":" + Catalog.GetString("name") + ")");
genericWin.ShowEditRow(false);
genericWin.CommentColumn = 9;
@@ -1319,7 +1319,7 @@ public partial class ChronoJumpWindow
protected void on_encoder_load_signal_row_delete_pre (object o, EventArgs args) {
if(askDeletion) {
ConfirmWindow confirmWin = ConfirmWindow.Show(Catalog.GetString(
- "Are you sure you want to delete this signal?"),
Catalog.GetString("Saved curves related to this signal will also be deleted."), "");
+ "Are you sure you want to delete this set?"),
Catalog.GetString("Saved repetitions related to this set will also be deleted."), "");
confirmWin.Button_accept.Clicked += new
EventHandler(on_encoder_load_signal_row_delete);
} else
on_encoder_load_signal_row_delete (o, args);
@@ -1552,7 +1552,7 @@ public partial class ChronoJumpWindow
{
if(askDeletion) {
ConfirmWindow confirmWin = ConfirmWindow.Show(Catalog.GetString(
- "Are you sure you want to delete this signal?"),
Catalog.GetString("Saved curves related to this signal will also be deleted."), "");
+ "Are you sure you want to delete this set?"),
Catalog.GetString("Saved repetitions related to this set will also be deleted."), "");
confirmWin.Button_accept.Clicked += new
EventHandler(on_button_encoder_delete_signal_accepted);
} else
on_button_encoder_delete_signal_accepted (o, args);
@@ -1571,7 +1571,7 @@ public partial class ChronoJumpWindow
treeviewEncoderCaptureRemoveColumns();
UtilGtk.ErasePaint(encoder_capture_curves_bars_drawingarea,
encoder_capture_curves_bars_pixmap);
encoderButtonsSensitive(encoderSensEnum.DONENOSIGNAL);
- encoder_pulsebar_capture.Text = Catalog.GetString("Signal deleted");
+ encoder_pulsebar_capture.Text = Catalog.GetString("Set deleted");
//entry_encoder_signal_comment.Text = "";
}
@@ -1755,7 +1755,7 @@ public partial class ChronoJumpWindow
myID = SqliteEncoder.Insert(false, eSQL).ToString(); //Adding on SQL
if(mode == "signal") {
encoderSignalUniqueID = myID;
- feedback = Catalog.GetString("Signal saved");
+ feedback = Catalog.GetString("Set saved");
button_video_play_this_test_encoder.Sensitive = false;
//copy video
@@ -1780,7 +1780,7 @@ public partial class ChronoJumpWindow
else {
//only signal is updated
SqliteEncoder.Update(false, eSQL); //Adding on SQL
- feedback = Catalog.GetString("Signal updated");
+ feedback = Catalog.GetString("Set updated");
}
return feedback;
@@ -1802,7 +1802,7 @@ public partial class ChronoJumpWindow
false, true);
if(data.Count == 0) {
new DialogMessage(Constants.MessageTypes.WARNING,
- Catalog.GetString("Sorry, no curves selected."));
+ Catalog.GetString("Sorry, no repetitions selected."));
return;
}
@@ -1823,7 +1823,7 @@ public partial class ChronoJumpWindow
)) {
new DialogMessage(Constants.MessageTypes.WARNING,
Catalog.GetString("Sorry, this graph is not supported yet.") +
- "\n\nUser curves - compare - cross variables" +
+ "\n\nSaved repetitions - compare - cross variables" +
"\n- Speed,Power / Load" +
"\n- 1RM Bench Press" +
"\n- 1RM Any exercise"
diff --git a/src/gui/encoderTreeviews.cs b/src/gui/encoderTreeviews.cs
index 73d700b..744a95a 100644
--- a/src/gui/encoderTreeviews.cs
+++ b/src/gui/encoderTreeviews.cs
@@ -427,7 +427,7 @@ public partial class ChronoJumpWindow
string [] treeviewEncoderAnalyzeHeaders = {
- Catalog.GetString("Curve") + "\n",
+ Catalog.GetString("Repetition") + "\n",
Catalog.GetString("Series") + "\n",
Catalog.GetString("Exercise") + "\n",
Catalog.GetString("Extra weight") + "\n (Kg)",
diff --git a/src/gui/person.cs b/src/gui/person.cs
index aaee1bb..3ab46e9 100644
--- a/src/gui/person.cs
+++ b/src/gui/person.cs
@@ -2439,8 +2439,8 @@ public class PersonShowAllEventsWindow {
tv.AppendColumn ( Catalog.GetString ("Reaction\ntime"), new CellRendererText(), "text",
count++);
tv.AppendColumn ( Catalog.GetString ("Pulses"), new CellRendererText(), "text", count++);
tv.AppendColumn ( Catalog.GetString ("MultiChronopic"), new CellRendererText(), "text",
count++);
- tv.AppendColumn ( Catalog.GetString ("Encoder signals"), new CellRendererText(), "text",
count++);
- tv.AppendColumn ( Catalog.GetString ("Encoder curves"), new CellRendererText(), "text",
count++);
+ tv.AppendColumn ( Catalog.GetString ("Encoder sets"), new CellRendererText(), "text",
count++);
+ tv.AppendColumn ( Catalog.GetString ("Encoder repetitions"), new CellRendererText(), "text",
count++);
}
protected void fillTreeView (Gtk.TreeView tv, TreeStore store, int personID) {
diff --git a/src/gui/session.cs b/src/gui/session.cs
index b9186dd..6b06dce 100644
--- a/src/gui/session.cs
+++ b/src/gui/session.cs
@@ -736,8 +736,8 @@ public class SessionLoadWindow {
tv.AppendColumn ( Catalog.GetString ("MultiChronopic"), new CellRendererText(),
"text", count++);
}
if(showEncoder) {
- tv.AppendColumn ( Catalog.GetString ("Encoder signals"), new CellRendererText(),
"text", count++);
- tv.AppendColumn ( Catalog.GetString ("Encoder curves"), new CellRendererText(),
"text", count++);
+ tv.AppendColumn ( Catalog.GetString ("Encoder sets"), new CellRendererText(), "text",
count++);
+ tv.AppendColumn ( Catalog.GetString ("Encoder repetitions"), new CellRendererText(),
"text", count++);
}
tv.AppendColumn ( Catalog.GetString ("Comments"), new CellRendererText(), "text", count++);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
