[chronojump] Renamed Normal(Jumps|Runs) to Simple (Jumps|Runs)
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Renamed Normal(Jumps|Runs) to Simple (Jumps|Runs)
- Date: Fri, 22 Apr 2022 09:21:38 +0000 (UTC)
commit afd1de0070c77dba3b2578d0dd35fad6e9f6dd09
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Apr 22 11:21:07 2022 +0200
Renamed Normal(Jumps|Runs) to Simple (Jumps|Runs)
src/execute/jump.cs | 2 +-
src/execute/reactionTime.cs | 2 +-
src/exportSession.cs | 2 +-
src/gui/app1/chronojump.cs | 24 ++++++++++++------------
src/gui/app1/jump.cs | 2 +-
src/gui/app1/run.cs | 2 +-
src/gui/person/addModify.cs | 8 ++++----
src/run.cs | 2 +-
src/sqlite/jumpRj.cs | 2 +-
src/sqlite/personSession.cs | 4 ++--
src/sqlite/session.cs | 4 ++--
src/treeview/jump.cs | 2 +-
12 files changed, 28 insertions(+), 28 deletions(-)
---
diff --git a/src/execute/jump.cs b/src/execute/jump.cs
index 0799d4445..fa0b25ec2 100644
--- a/src/execute/jump.cs
+++ b/src/execute/jump.cs
@@ -412,7 +412,7 @@ public class JumpExecute : EventExecute
);
needUpdateEventProgressBar = true;
} else {
- //**** graphD (if normal jump) ****
+ //**** graphD (if simple jump) ****
//**** graphB (if hasFall and fall == -1) ****
initializeTimer();
diff --git a/src/execute/reactionTime.cs b/src/execute/reactionTime.cs
index 6ea9b7f0c..ed40dbed0 100644
--- a/src/execute/reactionTime.cs
+++ b/src/execute/reactionTime.cs
@@ -241,7 +241,7 @@ public class ReactionTimeExecute : EventExecute
updateProgressBar = new UpdateProgressBar (
true, //isEvent
true, //percentageMode
- 1 //normal jump, phase 1/2
+ 1 //simple jump, phase 1/2
);
needUpdateEventProgressBar = true;
diff --git a/src/exportSession.cs b/src/exportSession.cs
index 3edc28d62..9b3cb81ea 100644
--- a/src/exportSession.cs
+++ b/src/exportSession.cs
@@ -293,7 +293,7 @@ public class ExportSession
if(tf > 0) {
if(tc > 0) //dj
return Util.TrimDecimals(Util.GetDjPower(tc, tf, (personWeight +
extraWeightInKg), fall).ToString(), dec);
- else //it's a normal jump without tc
+ else //it's a simple jump without tc
return Util.TrimDecimals(Util.GetPower(tf, personWeight,
extraWeightInKg).ToString(), dec);
}
return "-";
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index 8bc5ef316..13f06c111 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -397,11 +397,11 @@ public partial class ChronoJumpWindow
//persons
private TreeViewPersons myTreeViewPersons;
- //normal jumps
+ //simple jumps
private TreeViewJumps myTreeViewJumps;
//rj jumps
private TreeViewJumpsRj myTreeViewJumpsRj;
- //normal runs
+ //simple runs
private TreeViewRuns myTreeViewRuns;
//runs interval
private TreeViewRunsInterval myTreeViewRunsInterval;
@@ -4668,7 +4668,7 @@ public partial class ChronoJumpWindow
if(current_mode == Constants.Modes.JUMPSSIMPLE)
{
- on_normal_jump_activate(canCaptureC);
+ on_simple_jump_activate(canCaptureC);
}
else if(current_mode == Constants.Modes.JUMPSREACTIVE)
{
@@ -4678,7 +4678,7 @@ public partial class ChronoJumpWindow
{
extra_window_runs_distance =
Convert.ToDouble(label_runs_simple_track_distance_value.Text);
- on_normal_run_activate(canCaptureC, wireless);
+ on_simple_run_activate(canCaptureC, wireless);
}
else if(current_mode == Constants.Modes.RUNSINTERVALLIC)
{
@@ -4883,7 +4883,7 @@ public partial class ChronoJumpWindow
*/
//suitable for all jumps not repetitive
- private void on_normal_jump_activate (bool canCaptureC)
+ private void on_simple_jump_activate (bool canCaptureC)
{
if(execute_auto_doing)
sensitiveGuiAutoExecuteOrWait (true);
@@ -4946,7 +4946,7 @@ public partial class ChronoJumpWindow
else if( currentJumpType.StartIn ||
currentJumpType.Name == Constants.TakeOffName ||
currentJumpType.Name == Constants.TakeOffWeightName)
- progressbarLimit = 2; //2 for normal jump (or take off)
+ progressbarLimit = 2; //2 for simple jump (or take off)
//don't let update until test finishes
if(createdStatsWin)
@@ -5351,9 +5351,9 @@ public partial class ChronoJumpWindow
*/
//suitable for all runs not repetitive
- private void on_normal_run_activate (bool canCaptureC, bool wireless)
+ private void on_simple_run_activate (bool canCaptureC, bool wireless)
{
- LogB.Information("on_normal_run_activate");
+ LogB.Information("on_simple_run_activate");
//if distance can be always different in this run,
//show values selected in runExtraWin
double myDistance = 0;
@@ -6323,7 +6323,7 @@ LogB.Debug("mc finished 5");
private void on_edit_selected_jump_clicked (object o, EventArgs args) {
//notebooks_change(0); see "notebooks_change sqlite problem"
- LogB.Information("Edit selected jump (normal)");
+ LogB.Information("Edit selected jump (simple)");
//1.- check that there's a line selected
//2.- check that this line is a jump and not a person (check also if it's not a individual
RJ, the pass the parent RJ)
if (myTreeViewJumps.EventSelectedID > 0) {
@@ -6401,7 +6401,7 @@ LogB.Debug("mc finished 5");
private void on_edit_selected_run_clicked (object o, EventArgs args) {
//notebooks_change(2); see "notebooks_change sqlite problem"
- LogB.Information("Edit selected run (normal)");
+ LogB.Information("Edit selected run (simple)");
//1.- check that there's a line selected
//2.- check that this line is a jump and not a person (check also if it's not a individual
RJ, the pass the parent RJ)
if (myTreeViewRuns.EventSelectedID > 0) {
@@ -6666,7 +6666,7 @@ LogB.Debug("mc finished 5");
private void on_delete_selected_jump_clicked (object o, EventArgs args) {
//notebooks_change(0); see "notebooks_change sqlite problem"
- LogB.Information("delete this jump (normal)");
+ LogB.Information("delete this jump (simple)");
//1.- check that there's a line selected
//2.- check that this line is a jump and not a person
LogB.Information(myTreeViewJumps.EventSelectedID.ToString());
@@ -6764,7 +6764,7 @@ LogB.Debug("mc finished 5");
private void on_delete_selected_run_clicked (object o, EventArgs args) {
//notebooks_change(2); see "notebooks_change sqlite problem"
- LogB.Information("delete this race (normal)");
+ LogB.Information("delete this race (simple)");
//1.- check that there's a line selected
//2.- check that this line is a jump and not a person
diff --git a/src/gui/app1/jump.cs b/src/gui/app1/jump.cs
index 3c38bb5d2..63d5f5083 100644
--- a/src/gui/app1/jump.cs
+++ b/src/gui/app1/jump.cs
@@ -106,7 +106,7 @@ public partial class ChronoJumpWindow
//creates and if is not predefined, checks database to gather all the data
- //simple == true for normal jumps, and false for reactive
+ //simple == true for simple jumps, and false for reactive
private JumpType createJumpType(string name, bool simple) {
JumpType t = new JumpType(name);
diff --git a/src/gui/app1/run.cs b/src/gui/app1/run.cs
index 825a14d34..64684f8f7 100644
--- a/src/gui/app1/run.cs
+++ b/src/gui/app1/run.cs
@@ -63,7 +63,7 @@ public partial class ChronoJumpWindow
//creates and if is not predefined, checks database to gather all the data
- //simple == true for normal runs, and false for intervallic
+ //simple == true for simple runs, and false for intervallic
private RunType createRunType(string name, bool simple) {
RunType t = new RunType(name);
diff --git a/src/gui/person/addModify.cs b/src/gui/person/addModify.cs
index 61a37485e..349ef1cd4 100644
--- a/src/gui/person/addModify.cs
+++ b/src/gui/person/addModify.cs
@@ -1075,20 +1075,20 @@ public class PersonAddModifyWindow
(! radio_metric.Active &&
Util.ConvertPoundsToKg(spinbutton_weight_imperial.Value) != weightIniMetric)
) ) {
//see if this person has done jumps with weight
- string [] myJumpsNormal = SqliteJump.SelectJumpsSA (false,
currentSession.UniqueID, currentPerson.UniqueID, "withWeight", "",
+ string [] myJumpsSimple = SqliteJump.SelectJumpsSA (false,
currentSession.UniqueID, currentPerson.UniqueID, "withWeight", "",
Sqlite.Orders_by.DEFAULT, -1);
string [] myJumpsReactive = SqliteJumpRj.SelectJumpsSA (false,
currentSession.UniqueID, currentPerson.UniqueID, "withWeight", "");
- if(myJumpsNormal.Length > 0 || myJumpsReactive.Length > 0) {
+ if(myJumpsSimple.Length > 0 || myJumpsReactive.Length > 0) {
//create the convertWeight Window
if(radio_metric.Active)
convertWeightWin = ConvertWeightWindow.Show(
weightIniMetric, (double)
spinbutton_weight_metric.Value,
- myJumpsNormal, myJumpsReactive);
+ myJumpsSimple, myJumpsReactive);
else
convertWeightWin = ConvertWeightWindow.Show(
weightIniMetric,
Util.ConvertPoundsToKg(spinbutton_weight_imperial.Value),
- myJumpsNormal, myJumpsReactive);
+ myJumpsSimple, myJumpsReactive);
convertWeightWin.Button_accept.Clicked += new
EventHandler(on_convertWeightWin_accepted);
convertWeightWin.Button_cancel.Clicked += new
EventHandler(on_convertWeightWin_cancelled);
} else
diff --git a/src/run.cs b/src/run.cs
index accb4e438..945dfb31c 100644
--- a/src/run.cs
+++ b/src/run.cs
@@ -67,7 +67,7 @@ public class Run : Event
this.datetime = datetime;
}
- //used to select a run at SqliteRun.SelectNormalRunData and at Sqlite.convertTables
+ //used to select a run at SqliteRun.SelectRunData and at Sqlite.convertTables
public Run(string [] eventString)
{
this.uniqueID = Convert.ToInt32(eventString[0]);
diff --git a/src/sqlite/jumpRj.cs b/src/sqlite/jumpRj.cs
index 7730d0faa..3b2fae6f9 100644
--- a/src/sqlite/jumpRj.cs
+++ b/src/sqlite/jumpRj.cs
@@ -46,7 +46,7 @@ class SqliteJumpRj : SqliteJump
"tcMax FLOAT, " +
"fall FLOAT, " +
"weight TEXT, " + //string because can contain "33%" or "50Kg"
- "description TEXT, " + //this and the above values are equal than normal jump
+ "description TEXT, " + //this and the above values are equal than simple jump
"tvAvg FLOAT, " + //this and next values are Rj specific
"tcAvg FLOAT, " +
"tvString TEXT, " +
diff --git a/src/sqlite/personSession.cs b/src/sqlite/personSession.cs
index 03ccdf530..36f088ccc 100644
--- a/src/sqlite/personSession.cs
+++ b/src/sqlite/personSession.cs
@@ -439,7 +439,7 @@ class SqlitePersonSession : Sqlite
//3.- Delete tests without files
- //delete normal jumps
+ //delete simple jumps
dbcmd.CommandText = "Delete FROM jump WHERE sessionID == " + sessionID +
" AND personID == " + personID;
@@ -450,7 +450,7 @@ class SqlitePersonSession : Sqlite
" AND personID == " + personID;
dbcmd.ExecuteNonQuery();
- //delete normal runs
+ //delete simple runs
dbcmd.CommandText = "Delete FROM run WHERE sessionID == " + sessionID +
" AND personID == " + personID;
diff --git a/src/sqlite/session.cs b/src/sqlite/session.cs
index ecd3408b2..f168424c7 100644
--- a/src/sqlite/session.cs
+++ b/src/sqlite/session.cs
@@ -975,7 +975,7 @@ class SqliteSession : Sqlite
// 3) delete tests without files
- //delete normal jumps
+ //delete simple jumps
dbcmd.CommandText = "Delete FROM " + Constants.JumpTable + " WHERE sessionID == " + sessionID;
dbcmd.ExecuteNonQuery();
@@ -983,7 +983,7 @@ class SqliteSession : Sqlite
dbcmd.CommandText = "Delete FROM " + Constants.JumpRjTable + " WHERE sessionID == " +
sessionID;
dbcmd.ExecuteNonQuery();
- //delete normal runs
+ //delete simple runs
dbcmd.CommandText = "Delete FROM " + Constants.RunTable + " WHERE sessionID == " + sessionID;
dbcmd.ExecuteNonQuery();
diff --git a/src/treeview/jump.cs b/src/treeview/jump.cs
index f37b27f58..0cc2e22f9 100644
--- a/src/treeview/jump.cs
+++ b/src/treeview/jump.cs
@@ -220,7 +220,7 @@ public class TreeViewJumps : TreeViewEvent
if(newJump.Tc > 0) //if it's Dj (has tf, and tc)
myData[count++] = Util.TrimDecimals(
Util.GetDjPower(newJump.Tc, newJump.Tv, (personWeight
+ weightInKg), newJump.Fall).ToString(), 1);
- else { //it's a normal jump without tc
+ else { //it's a simple jump without tc
myData[count++] = Util.TrimDecimals(
Util.GetPower(newJump.Tv, personWeight,
weightInKg).ToString(), 1);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
