[chronojump] renamed strings on code: RaceEncoder RaceAnalyzer to RunEncoder
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] renamed strings on code: RaceEncoder RaceAnalyzer to RunEncoder
- Date: Tue, 17 Sep 2019 13:57:54 +0000 (UTC)
commit cb1c195bbc3504dba1666a910867faba9a7555cc
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Sep 17 15:57:32 2019 +0200
renamed strings on code: RaceEncoder RaceAnalyzer to RunEncoder
src/chronojump.cs | 2 +-
src/gui/runEncoder.cs | 14 +++++++-------
src/runEncoder.cs | 29 ++++++++++++++++++++---------
src/sqlite/runEncoder.cs | 10 +++++-----
src/util.cs | 14 +++++++-------
src/utilEncoder.cs | 10 ----------
6 files changed, 40 insertions(+), 39 deletions(-)
---
diff --git a/src/chronojump.cs b/src/chronojump.cs
index 2fe584e0..029c0395 100644
--- a/src/chronojump.cs
+++ b/src/chronojump.cs
@@ -272,7 +272,7 @@ public class ChronoJump
//to store (encoder, force sensor, run encoder) data and graphs
UtilEncoder.CreateEncoderDirIfNeeded();
Util.CreateForceSensorDirIfNeeded();
- Util.CreateRaceAnalyzerDirIfNeeded();
+ Util.CreateRunEncoderDirIfNeeded();
//TODO: when a session is deleted, encoder data has to be deleted, also multimedia videos, I suppose. Show
message to user warning about it
//TODO: encoder weight auto written depending on person loaded, and changes if it changes person or weight
diff --git a/src/gui/runEncoder.cs b/src/gui/runEncoder.cs
index 832c2d93..24857a64 100644
--- a/src/gui/runEncoder.cs
+++ b/src/gui/runEncoder.cs
@@ -333,12 +333,12 @@ public partial class ChronoJumpWindow
//forceCaptureStartMark = true;
capturingRunEncoder = arduinoCaptureStatus.CAPTURING;
- Util.CreateRaceAnalyzerSessionDirIfNeeded (currentSession.UniqueID);
+ Util.CreateRunEncoderSessionDirIfNeeded (currentSession.UniqueID);
string idNameDate = currentPerson.UniqueID + "_" + currentPerson.Name + "_" +
UtilDate.ToFile(DateTime.Now);
//fileName to save the csv
- string fileName = Util.GetRaceAnalyzerSessionDir(currentSession.UniqueID) +
Path.DirectorySeparatorChar + idNameDate + ".csv";
+ string fileName = Util.GetRunEncoderSessionDir(currentSession.UniqueID) +
Path.DirectorySeparatorChar + idNameDate + ".csv";
//lastRunEncoderFile to save the images
lastRunEncoderFile = idNameDate;
@@ -434,7 +434,7 @@ public partial class ChronoJumpWindow
Util.FileDelete(fileName);
else {
//call graph. Prepare data
- File.Copy(fileName, UtilEncoder.GetRaceAnalyzerCSVFileName(), true); //can be
overwritten
+ File.Copy(fileName, RunEncoder.GetCSVFileName(), true); //can be overwritten
//lastRunEncoderFullPath = fileName;
raceEncoderCaptureGraphDo();
@@ -576,7 +576,7 @@ public partial class ChronoJumpWindow
lastRunEncoderFile =
Util.RemoveExtension(Util.GetLastPartOfPath(filechooser.Filename));
//try to change currentPerson on loading set
- RaceEncoderLoadTryToAssignPerson relt = new RaceEncoderLoadTryToAssignPerson(false,
lastRunEncoderFile, currentSession.UniqueID);
+ RunEncoderLoadTryToAssignPerson relt = new RunEncoderLoadTryToAssignPerson(false,
lastRunEncoderFile, currentSession.UniqueID);
Person p = relt.GetPerson();
if(p.UniqueID != -1)
{
@@ -596,7 +596,7 @@ public partial class ChronoJumpWindow
//lastRunEncoderFullPath = filechooser.Filename; //used on recalculate
//call graph. Prepare data
- File.Copy(filechooser.Filename, UtilEncoder.GetRaceAnalyzerCSVFileName(), true);
//can be overwritten
+ File.Copy(filechooser.Filename, UtilEncoder.GetRunEncoderCSVFileName(), true); //can
be overwritten
raceEncoderReadWidgets(); //needed to be able to do R graph
raceEncoderCaptureGraphDo();
@@ -644,7 +644,7 @@ public partial class ChronoJumpWindow
private void raceEncoderCopyTempAndDoGraphs()
{
- File.Copy(lastRunEncoderFullPath, UtilEncoder.GetRaceAnalyzerCSVFileName(), true); //can be
overwritten
+ File.Copy(lastRunEncoderFullPath, RunEncoder.GetCSVFileName(), true); //can be overwritten
raceEncoderCaptureGraphDo();
@@ -679,7 +679,7 @@ public partial class ChronoJumpWindow
LogB.Information("File exists on png, trying to copy");
try {
File.Copy(UtilEncoder.GetSprintEncoderImage(),
- Util.GetRaceAnalyzerSessionDir(currentSession.UniqueID) +
Path.DirectorySeparatorChar +
+ Util.GetRunEncoderSessionDir(currentSession.UniqueID) +
Path.DirectorySeparatorChar +
lastRunEncoderFile + //idNameDate
".png",
true); //can be overwritten
diff --git a/src/runEncoder.cs b/src/runEncoder.cs
index cf46edf6..348948f4 100644
--- a/src/runEncoder.cs
+++ b/src/runEncoder.cs
@@ -147,9 +147,20 @@ public class RunEncoder
return DevicesStringMANUAL;
}
+ public static string GetScript() {
+ return System.IO.Path.Combine(UtilEncoder.GetSprintPath(), "sprintEncoder.R");
+ }
+ public static string GetCSVFileName() {
+ return Path.Combine(Path.GetTempPath(), "cj_race_analyzer_data.csv");
+ }
+ public static string GetTempFileName() {
+ return Path.Combine(Path.GetTempPath(), "cj_race_analyzer_graph.png");
+ }
+
+
public string FullURL
{
- get { return Util.GetRaceAnalyzerSessionDir(sessionID) + Path.DirectorySeparatorChar +
filename; }
+ get { return Util.GetRunEncoderSessionDir(sessionID) + Path.DirectorySeparatorChar +
filename; }
}
public string Filename
{
@@ -202,7 +213,7 @@ public class RunEncoderGraph
{
LogB.Information("\nrunEncoder CallR ----->");
writeOptionsFile(graphWidth, graphHeight);
- return ExecuteProcess.CallR(UtilEncoder.GetRaceAnalyzerScript());
+ return ExecuteProcess.CallR(RunEncoder.GetScript());
}
private void writeOptionsFile(int graphWidth, int graphHeight)
@@ -216,7 +227,7 @@ public class RunEncoderGraph
string scriptOptions =
"#scriptsPath\n" + UtilEncoder.GetScriptsPath() + "\n" +
- "#filename\n" + UtilEncoder.GetRaceAnalyzerCSVFileName() + "\n" +
+ "#filename\n" + RunEncoder.GetCSVFileName() + "\n" +
"#mass\n" + Util.ConvertToPoint(mass) + "\n" +
"#personHeight\n" + Util.ConvertToPoint(personHeight / 100.0) + "\n" +
//send it in meters
"#tempC\n" + tempC + "\n" +
@@ -237,26 +248,26 @@ public class RunEncoderGraph
public static string GetDataDir(int sessionID)
{
System.IO.DirectoryInfo folderSession =
- new System.IO.DirectoryInfo(Util.GetRaceAnalyzerSessionDir(sessionID));
+ new System.IO.DirectoryInfo(Util.GetRunEncoderSessionDir(sessionID));
System.IO.DirectoryInfo folderGeneric =
- new System.IO.DirectoryInfo(Util.GetRaceAnalyzerDir());
+ new System.IO.DirectoryInfo(Util.GetRunEncoderDir());
if(folderSession.Exists)
- return Util.GetRaceAnalyzerSessionDir(sessionID);
+ return Util.GetRunEncoderSessionDir(sessionID);
else if(folderGeneric.Exists)
- return Util.GetRaceAnalyzerDir();
+ return Util.GetRunEncoderDir();
else
return "";
}
}
-public class RaceEncoderLoadTryToAssignPerson
+public class RunEncoderLoadTryToAssignPerson
{
private bool dbconOpened;
private string filename; //filename comes without extension
private int currentSessionID; //we get a person if already exists on that session
- public RaceEncoderLoadTryToAssignPerson(bool dbconOpened, string filename, int currentSessionID)
+ public RunEncoderLoadTryToAssignPerson(bool dbconOpened, string filename, int currentSessionID)
{
this.dbconOpened = dbconOpened;
this.filename = filename;
diff --git a/src/sqlite/runEncoder.cs b/src/sqlite/runEncoder.cs
index 883eceac..23859689 100644
--- a/src/sqlite/runEncoder.cs
+++ b/src/sqlite/runEncoder.cs
@@ -191,7 +191,7 @@ class SqliteRunEncoder : Sqlite
LogB.Information("at import_from_1_70_to_1_71()");
//LogB.Information("Sqlite isOpened: " + Sqlite.IsOpened.ToString());
- string raceAnalyzerDir = Util.GetRaceAnalyzerDir();
+ string raceAnalyzerDir = Util.GetRunEncoderDir();
DirectoryInfo [] sessions = new DirectoryInfo(raceAnalyzerDir).GetDirectories();
foreach (DirectoryInfo session in sessions) //session.Name will be the UniqueID
{
@@ -203,8 +203,8 @@ class SqliteRunEncoder : Sqlite
continue;
string fileWithoutExtension =
Util.RemoveExtension(Util.GetLastPartOfPath(file.Name));
- RaceEncoderLoadTryToAssignPerson relt =
- new RaceEncoderLoadTryToAssignPerson(true, fileWithoutExtension,
Convert.ToInt32(session.Name));
+ RunEncoderLoadTryToAssignPerson relt =
+ new RunEncoderLoadTryToAssignPerson(true, fileWithoutExtension,
Convert.ToInt32(session.Name));
Person p = relt.GetPerson();
if(p.UniqueID == -1)
@@ -222,7 +222,7 @@ class SqliteRunEncoder : Sqlite
string myFilename = p.UniqueID + "_" + p.Name + "_" + parsedDate + ".csv";
//try to move the file
try{
- File.Move(file.FullName,
Util.GetRaceAnalyzerSessionDir(Convert.ToInt32(session.Name)) + Path.DirectorySeparatorChar + myFilename);
+ File.Move(file.FullName,
Util.GetRunEncoderSessionDir(Convert.ToInt32(session.Name)) + Path.DirectorySeparatorChar + myFilename);
} catch {
//if cannot, then use old filename
myFilename = file.FullName;
@@ -234,7 +234,7 @@ class SqliteRunEncoder : Sqlite
RunEncoder runEncoder = new RunEncoder(-1, p.UniqueID,
Convert.ToInt32(session.Name), exerciseID,
RunEncoder.Devices.MANUAL, distance, temperature,
myFilename,
-
Util.MakeURLrelative(Util.GetRaceAnalyzerSessionDir(Convert.ToInt32(session.Name))),
+
Util.MakeURLrelative(Util.GetRunEncoderSessionDir(Convert.ToInt32(session.Name))),
parsedDate, "", "");
runEncoder.InsertSQL(true);
}
diff --git a/src/util.cs b/src/util.cs
index 4c884f05..9261601b 100644
--- a/src/util.cs
+++ b/src/util.cs
@@ -1009,15 +1009,15 @@ public class Util
*/
//to store run encoder data and graphs
- public static string GetRaceAnalyzerDir()
+ public static string GetRunEncoderDir()
{
return Path.Combine(
Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
"Chronojump" + Path.DirectorySeparatorChar + "raceAnalyzer");
}
- public static void CreateRaceAnalyzerDirIfNeeded ()
+ public static void CreateRunEncoderDirIfNeeded ()
{
- string dir = GetRaceAnalyzerDir();
+ string dir = GetRunEncoderDir();
if( ! Directory.Exists(dir)) {
Directory.CreateDirectory (dir);
LogB.Information ("created dir:", dir);
@@ -1025,13 +1025,13 @@ public class Util
}
//runEncoder organized by sessions.
- public static string GetRaceAnalyzerSessionDir (int sessionID)
+ public static string GetRunEncoderSessionDir (int sessionID)
{
- return GetRaceAnalyzerDir() + Path.DirectorySeparatorChar + sessionID.ToString();
+ return GetRunEncoderDir() + Path.DirectorySeparatorChar + sessionID.ToString();
}
- public static void CreateRaceAnalyzerSessionDirIfNeeded (int sessionID)
+ public static void CreateRunEncoderSessionDirIfNeeded (int sessionID)
{
- string dir = GetRaceAnalyzerSessionDir(sessionID);
+ string dir = GetRunEncoderSessionDir(sessionID);
if( ! Directory.Exists(dir)) {
Directory.CreateDirectory (dir);
LogB.Information ("created dir:", dir);
diff --git a/src/utilEncoder.cs b/src/utilEncoder.cs
index 4c343975..065fdfae 100644
--- a/src/utilEncoder.cs
+++ b/src/utilEncoder.cs
@@ -254,16 +254,6 @@ public class UtilEncoder
return System.IO.Path.Combine(Util.GetDataDir(), "r-scripts");
}
- public static string GetRaceAnalyzerScript() {
- return System.IO.Path.Combine(GetSprintPath(), "sprintEncoder.R");
- }
- public static string GetRaceAnalyzerCSVFileName() {
- return Path.Combine(Path.GetTempPath(), "cj_race_analyzer_data.csv");
- }
- public static string GetRaceAnalyzerTempFileName() {
- return Path.Combine(Path.GetTempPath(), "cj_race_analyzer_graph.png");
- }
-
public static string GetmifScript() {
return System.IO.Path.Combine(GetSprintPath(), "maximumIsometricForce.R");
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
