[chronojump/database-refactoring: 2/5] WIP - accessing using the new method avoiding static classes.
- From: Carles Pina i Estany <carlespina src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump/database-refactoring: 2/5] WIP - accessing using the new method avoiding static classes.
- Date: Mon, 12 Sep 2016 22:39:59 +0000 (UTC)
commit 97e084d098df50b8b49af85986c80553aea86986
Author: Carles Pina i Estany <carles pina cat>
Date: Mon Sep 12 19:03:16 2016 +0100
WIP - accessing using the new method avoiding static classes.
chronojump.csproj | 3 +-
src/chronojump.cs | 90 +-
src/encoder.cs | 2 +-
src/event.cs | 2 +-
src/execute/jump.cs | 14 +-
src/execute/multiChronopic.cs | 4 +-
src/execute/pulse.cs | 2 +-
src/execute/reactionTime.cs | 2 +-
src/execute/run.cs | 12 +-
src/executeAuto.cs | 4 +-
src/exportSession.cs | 34 +-
src/gui/chronojump.cs | 184 ++--
src/gui/chronopic.cs | 2 +-
src/gui/convertWeight.cs | 2 +-
src/gui/encoder.cs | 138 ++--
src/gui/encoderSelectRepetitions.cs | 20 +-
src/gui/encoderTreeviews.cs | 8 +-
src/gui/error.cs | 4 +-
src/gui/eventExecute.cs | 4 +-
src/gui/jump.cs | 22 +-
src/gui/multiChronopic.cs | 2 +-
src/gui/networks.cs | 4 +-
src/gui/person.cs | 48 +-
src/gui/preferences.cs | 98 +-
src/gui/pulse.cs | 4 +-
src/gui/reactionTime.cs | 2 +-
src/gui/run.cs | 18 +-
src/gui/stats.cs | 18 +-
src/gui/usefulObjects.cs | 6 +-
src/jump.cs | 16 +-
src/jumpType.cs | 8 +-
src/jumpsProfile.cs | 2 +-
src/multiChronopic.cs | 4 +-
src/oldCodeNeedToDBConvert/sqlite/personSession.cs | 2 +-
src/person.cs | 2 +-
src/personSession.cs | 2 +-
src/preferences.cs | 4 +-
src/pulse.cs | 4 +-
src/reactionTime.cs | 4 +-
src/report.cs | 24 +-
src/run.cs | 8 +-
src/runType.cs | 4 +-
src/server.cs | 38 +-
src/serverEvaluator.cs | 4 +-
src/serverPing.cs | 2 +-
src/session.cs | 4 +-
src/sport.cs | 2 +-
src/sqlite/encoder.cs | 4 +-
src/sqlite/event.cs | 2 +-
src/sqlite/executeAuto.cs | 2 +-
src/sqlite/jump.cs | 2 +-
src/sqlite/jumpRj.cs | 2 +-
src/sqlite/jumpType.cs | 2 +-
src/sqlite/main.cs | 931 ++++++++++++--------
src/sqlite/multiChronopic.cs | 2 +-
src/sqlite/person.cs | 2 +-
src/sqlite/personSession.cs | 2 +-
src/sqlite/personSessionNotUpload.cs | 2 +-
src/sqlite/preferences.cs | 2 +-
src/sqlite/pulse.cs | 2 +-
src/sqlite/pulseType.cs | 2 +-
src/sqlite/reactionTime.cs | 2 +-
src/sqlite/run.cs | 2 +-
src/sqlite/runInterval.cs | 2 +-
src/sqlite/runType.cs | 4 +-
src/sqlite/server.cs | 2 +-
src/sqlite/session.cs | 4 +-
src/sqlite/speciallity.cs | 2 +-
src/sqlite/sport.cs | 2 +-
src/treeViewRun.cs | 4 +-
70 files changed, 1036 insertions(+), 834 deletions(-)
---
diff --git a/chronojump.csproj b/chronojump.csproj
index a7b9a54..07e1086 100644
--- a/chronojump.csproj
+++ b/chronojump.csproj
@@ -2070,7 +2070,8 @@
<Properties>
<Policies>
<TextStylePolicy inheritsSet="null" scope="text/x-csharp" />
- <CSharpFormattingPolicy ElseIfNewLinePlacement="SameLine"
BeforeMethodDeclarationParentheses="False" AfterDelegateDeclarationParameterComma="True" inheritsSet="Mono"
inheritsScope="text/x-csharp" scope="text/x-csharp" />
+ <CSharpFormattingPolicy ElseIfNewLinePlacement="SameLine"
BeforeMethodDeclarationParentheses="False" BeforeMethodCallParentheses="False"
BeforeConstructorDeclarationParentheses="False" BeforeDelegateDeclarationParentheses="False"
AfterDelegateDeclarationParameterComma="True" NewParentheses="False" SpacesBeforeBrackets="False"
inheritsSet="Mono" inheritsScope="text/x-csharp" scope="text/x-csharp" />
+ <TextStylePolicy inheritsSet="null" scope="text/x-makefile" />
</Policies>
</Properties>
</MonoDevelop>
diff --git a/src/chronojump.cs b/src/chronojump.cs
index 7a61910..3e476b3 100644
--- a/src/chronojump.cs
+++ b/src/chronojump.cs
@@ -157,7 +157,7 @@ public class ChronoJump
string language = "";
if(File.Exists(System.IO.Path.Combine(Util.GetDatabaseDir(), "chronojump.db"))) {
try {
- SqliteForUser.Instance.Connect();
+ SqliteGeneral.Sqlite.Connect();
/*
* chronojump 1.5.2 converts DB 1.24 to 1.25 changing language to ""
@@ -165,14 +165,14 @@ public class ChronoJump
* We need here! to define the language from the beginning
* so we use language = "" if version is prior to 1.25
*/
- string currentVersion = SqlitePreferences.Select("databaseVersion", false);
+ string currentVersion = SqliteGeneral.SqlitePreferences.Select("databaseVersion",
false);
double currentVersionDouble =
Convert.ToDouble(Util.ChangeDecimalSeparator(currentVersion));
if(currentVersionDouble < Convert.ToDouble(Util.ChangeDecimalSeparator("1.25")))
language = "";
else
- language = SqlitePreferences.Select("language", false);
+ language = SqliteGeneral.SqlitePreferences.Select("language", false);
- Sqlite.DisConnect();
+ SqliteGeneral.Sqlite.DisConnect();
if(language != "") {
Environment.SetEnvironmentVariable ("LANGUAGE", language); //works
@@ -269,8 +269,8 @@ public class ChronoJump
Console.ReadLine();
*/
- Sqlite.CreateDir();
- bool defaultDBLocation = Sqlite.Connect();
+ SqliteGeneral.Sqlite.CreateDir();
+ bool defaultDBLocation = SqliteGeneral.Sqlite.Connect();
LogB.SQL("sqlite connected");
@@ -281,7 +281,7 @@ public class ChronoJump
*/
//Chech if the DB file exists
- if (!Sqlite.CheckTables(defaultDBLocation)) {
+ if (!SqliteGeneral.Sqlite.CheckTables(defaultDBLocation)) {
LogB.SQL ( Catalog.GetString ("no tables, creating ...") );
creatingDB = true;
@@ -297,9 +297,9 @@ public class ChronoJump
- Sqlite.CreateDir();
- Sqlite.CreateFile();
- //Sqlite.CreateFile(defaultDBLocation);
+ SqliteGeneral.Sqlite.CreateDir();
+ SqliteGeneral.Sqlite.CreateFile();
+ //SqliteGeneral.Sqlite.CreateFile(defaultDBLocation);
@@ -312,7 +312,7 @@ public class ChronoJump
createRunningFileName(runningFileName);
- Sqlite.CreateTables(false); //not server
+ SqliteGeneral.Sqlite.CreateTables(false); //not server
creatingDB = false;
} else {
LogB.SQL("doing backup");
@@ -326,8 +326,8 @@ public class ChronoJump
//System.IO.Compression.GZipStream are not in mono
- if(! Sqlite.IsSqlite3()) {
- bool ok = Sqlite.ConvertFromSqlite2To3();
+ if(! SqliteGeneral.Sqlite.IsSqlite3()) {
+ bool ok = SqliteGeneral.Sqlite.ConvertFromSqlite2To3();
if (!ok) {
LogB.Error("problem with sqlite");
//check (spanish)
@@ -341,17 +341,17 @@ public class ChronoJump
chronojumpHasToExit = true;
return;
}
- Sqlite.Connect();
+ SqliteGeneral.Sqlite.Connect();
}
splashMessageChange(4); //updating DB
updatingDB = true;
- if(Sqlite.ChangeDjToDJna())
+ if(SqliteGeneral.Sqlite.ChangeDjToDJna())
messageToShowOnBoot += Catalog.GetString("All DJ jumps have been renamed as
'DJna' (Drop Jumps with No Arms).") + "\n\n"+
Catalog.GetString("If your Drop Jumps were executed using the arms,
please rename them manually as 'DJa'.") + "\n";
- bool softwareIsNew = Sqlite.ConvertToLastChronojumpDBVersion();
+ bool softwareIsNew = SqliteGeneral.Sqlite.ConvertToLastChronojumpDBVersion();
updatingDB = false;
@@ -370,7 +370,7 @@ public class ChronoJump
//check for bad Rjs (activate if program crashes and you use it in the same db before
v.0.41)
- //SqliteJump.FindBadRjs();
+ //SqliteGeneral.SqliteJump.FindBadRjs();
createRunningFileName(runningFileName);
}
@@ -409,7 +409,7 @@ public class ChronoJump
//doing ping using json methods
/*
* temporarily disabled on start
- string machineID = SqlitePreferences.Select("machineID", false);
+ string machineID = SqliteGeneral.SqlitePreferences.Select("machineID", false);
Json js = new Json();
bool success = js.Ping(UtilAll.GetOS(), progVersion, machineID);
if(success)
@@ -425,9 +425,9 @@ public class ChronoJump
//while(! pingEnd) {
//}
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
- string versionAvailableKnown = SqlitePreferences.Select("versionAvailable", true);
+ string versionAvailableKnown = SqliteGeneral.SqlitePreferences.Select("versionAvailable",
true);
if( versionAvailable != Constants.ServerOffline && new Version(versionAvailable) > new
Version(progVersion) ) {
//check if available version is higher than known available version
Version versionAvailableAsV = new Version(versionAvailable);
@@ -445,7 +445,7 @@ public class ChronoJump
if(updateKnownVersion) {
//is the first time we know about this new version
//just write on db and show message to user
- SqlitePreferences.Update(Constants.PrefVersionAvailable, versionAvailable,
true);
+ SqliteGeneral.SqlitePreferences.Update(Constants.PrefVersionAvailable,
versionAvailable, true);
versionAvailableKnown = versionAvailable;
messageToShowOnBoot += string.Format(Catalog.GetString(
"\nNew Chronojump version available on website.\nYour
Chronojump version is: {1}"),
@@ -462,7 +462,7 @@ public class ChronoJump
Catalog.GetString("Please, update to new version: ") +
versionAvailableKnown + "\n";
else {
messageToShowOnBoot += messageCrashedBefore;
- //SqlitePreferences.Update("videoOn", "False", true);
+ //SqliteGeneral.SqlitePreferences.Update("videoOn", "False", true);
}
}
@@ -471,9 +471,9 @@ public class ChronoJump
//start as "simulated"
- SqlitePreferences.Update("simulated", "True", true); //dbcon opened
+ SqliteGeneral.SqlitePreferences.Update("simulated", "True", true); //dbcon opened
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
allSQLCallsDoneOnSqliteThingsThread = true;
LogB.SQL("all SQL calls done on sqliteThings thread");
@@ -580,24 +580,24 @@ public class ChronoJump
private static void createBlankDB() {
LogB.SQL("Creating blank database");
- Sqlite.ConnectBlank();
- Sqlite.CreateFile();
- Sqlite.CreateTables(false); //not server
+ SqliteGeneral.Sqlite.ConnectBlank();
+ SqliteGeneral.Sqlite.CreateFile();
+ SqliteGeneral.Sqlite.CreateTables(false); //not server
LogB.SQL("Created blank database! Exiting");
}
private static void createBlankDBServer() {
LogB.SQL("Creating blank database for server");
- if(Sqlite.CheckFileServer())
+ if(SqliteGeneral.Sqlite.CheckFileServer())
LogB.Error("File already exists. Cannot create.");
else {
- Sqlite.ConnectServer();
- Sqlite.CreateFile();
- Sqlite.CreateTables(true); //server
+ SqliteGeneral.Sqlite.ConnectServer();
+ SqliteGeneral.Sqlite.CreateFile();
+ SqliteGeneral.Sqlite.CreateTables(true); //server
LogB.SQL("Created blank database! Exiting");
string myVersion = UtilAll.ReadVersion();
LogB.Warning("CAUTION: client info about versionAvailable (on server): ", myVersion);
- SqlitePreferences.Update ("availableVersion", myVersion, false);
+ SqliteGeneral.SqlitePreferences.Update ("availableVersion", myVersion, false);
LogB.Information("Maybe you don't want to show this version on pings, change it to
last stable published version");
}
}
@@ -635,18 +635,18 @@ public class ChronoJump
if(updatingDB) {
splashWin.ShowProgressbar("updating");
- splashWin.UpdateLabel(splashMessage + " " + Sqlite.PrintConversionText());
+ splashWin.UpdateLabel(splashMessage + " " +
SqliteGeneral.Sqlite.PrintConversionText());
- splashWin.UpdateProgressbar("version", Sqlite.PrintConversionVersion());
- splashWin.UpdateProgressbar("rate", Sqlite.PrintConversionRate());
- splashWin.UpdateProgressbar("subrate", Sqlite.PrintConversionSubRate());
+ splashWin.UpdateProgressbar("version", SqliteGeneral.Sqlite.PrintConversionVersion());
+ splashWin.UpdateProgressbar("rate", SqliteGeneral.Sqlite.PrintConversionRate());
+ splashWin.UpdateProgressbar("subrate", SqliteGeneral.Sqlite.PrintConversionSubRate());
} else if(creatingDB) {
splashWin.ShowProgressbar("creating");
- splashWin.UpdateProgressbar("version", Sqlite.PrintCreation());
+ splashWin.UpdateProgressbar("version", SqliteGeneral.Sqlite.PrintCreation());
- //splashWin.UpdateProgressbar("rate", Sqlite.PrintConversionRate());
- splashWin.UpdateProgressbar("subrate", Sqlite.PrintConversionSubRate());
+ //splashWin.UpdateProgressbar("rate", SqliteGeneral.Sqlite.PrintConversionRate());
+ splashWin.UpdateProgressbar("subrate", SqliteGeneral.Sqlite.PrintConversionSubRate());
}
if(needUpdateSplashMessage) {
@@ -745,28 +745,28 @@ public class ChronoJump
string returnString = "";
string tableName = "tempJumpRj";
- int existsTempData = Sqlite.TempDataExists(tableName);
+ int existsTempData = SqliteGeneral.Sqlite.TempDataExists(tableName);
if(existsTempData > 0)
{
- JumpRj myJumpRj = SqliteJumpRj.SelectJumpData("tempJumpRj", existsTempData, false);
+ JumpRj myJumpRj = SqliteGeneral.SqliteJumpRj.SelectJumpData("tempJumpRj",
existsTempData, false);
try {
myJumpRj.InsertAtDB (true, Constants.JumpRjTable);
} catch {} //pitty, cannot insert
- Sqlite.DeleteTempEvents(tableName);
+ SqliteGeneral.Sqlite.DeleteTempEvents(tableName);
returnString = "Recuperated last Reactive Jump";
}
tableName = "tempRunInterval";
- existsTempData = Sqlite.TempDataExists(tableName);
+ existsTempData = SqliteGeneral.Sqlite.TempDataExists(tableName);
if(existsTempData > 0)
{
- RunInterval myRun = SqliteRunInterval.SelectRunData("tempRunInterval",
existsTempData, false);
+ RunInterval myRun = SqliteGeneral.SqliteRunInterval.SelectRunData("tempRunInterval",
existsTempData, false);
try {
myRun.InsertAtDB (true, Constants.RunIntervalTable);
} catch {} //pitty, cannot insert
- Sqlite.DeleteTempEvents(tableName);
+ SqliteGeneral.Sqlite.DeleteTempEvents(tableName);
returnString = "Recuperated last Intervallic Run";
}
diff --git a/src/encoder.cs b/src/encoder.cs
index 832006b..121c069 100644
--- a/src/encoder.cs
+++ b/src/encoder.cs
@@ -1466,7 +1466,7 @@ public class EncoderConfiguration {
//called on capture, recalculate, load
public void SQLUpdate()
{
- SqlitePreferences.Update("encoderConfiguration", this.ToStringOutput(Outputs.SQL), false);
+ SqliteGeneral.SqlitePreferences.Update("encoderConfiguration",
this.ToStringOutput(Outputs.SQL), false);
}
public enum Outputs { ROPTIONS, RCSV, SQL}
diff --git a/src/event.cs b/src/event.cs
index e539f13..7a9b08b 100644
--- a/src/event.cs
+++ b/src/event.cs
@@ -87,7 +87,7 @@ public partial class Event
public string PersonName
{
//get { return personName; }
- get { return SqlitePerson.SelectAttribute(personID, Constants.Name); }
+ get { return SqliteGeneral.SqlitePerson.SelectAttribute(personID, Constants.Name); }
}
diff --git a/src/execute/jump.cs b/src/execute/jump.cs
index a60b213..3cb60a5 100644
--- a/src/execute/jump.cs
+++ b/src/execute/jump.cs
@@ -464,7 +464,7 @@ public class JumpExecute : EventExecute
string table = Constants.JumpTable;
- uniqueID = SqliteJump.Insert(false, table, "NULL", personID, sessionID,
+ uniqueID = SqliteGeneral.SqliteJump.Insert(false, table, "NULL", personID, sessionID,
type, tv, tc, fall, //type, tv, tc, fall
weight, description, angle, Util.BoolToNegativeInt(simulated));
@@ -496,12 +496,12 @@ public class JumpExecute : EventExecute
public virtual bool TypeHasWeight
{
- get { return SqliteJumpType.HasWeight("jumpType", type); }
+ get { return SqliteGeneral.SqliteJumpType.HasWeight("jumpType", type); }
}
public virtual bool TypeHasFall
{
- get { return SqliteJumpType.HasFall("jumpType", type); } //jumpType is the table name
+ get { return SqliteGeneral.SqliteJumpType.HasFall("jumpType", type); } //jumpType is the
table name
}
/*
@@ -1040,7 +1040,7 @@ public class JumpRjExecute : JumpExecute
if(tempTable)
- SqliteJumpRj.Insert(false, Constants.TempJumpRjTable, "NULL", personID, sessionID,
+ SqliteGeneral.SqliteJumpRj.Insert(false, Constants.TempJumpRjTable, "NULL", personID,
sessionID,
type, Util.GetMax(tvString), Util.GetMax(tcString),
fall, weight, description,
Util.GetAverage(tvString), Util.GetAverage(tcString),
@@ -1048,7 +1048,7 @@ public class JumpRjExecute : JumpExecute
jumps, Util.GetTotalTime(tcString, tvString), limitString,
angleString, Util.BoolToNegativeInt(simulated)
);
else {
- uniqueID = SqliteJumpRj.Insert(false, Constants.JumpRjTable, "NULL", personID,
sessionID,
+ uniqueID = SqliteGeneral.SqliteJumpRj.Insert(false, Constants.JumpRjTable, "NULL",
personID, sessionID,
type, Util.GetMax(tvString), Util.GetMax(tcString),
fall, weight, description,
Util.GetAverage(tvString), Util.GetAverage(tcString),
@@ -1085,13 +1085,13 @@ public class JumpRjExecute : JumpExecute
public override bool TypeHasWeight
{
- get { return SqliteJumpType.HasWeight("jumpRjType", type); }
+ get { return SqliteGeneral.SqliteJumpType.HasWeight("jumpRjType", type); }
}
public override bool TypeHasFall
{
- get { return SqliteJumpType.HasFall("jumpRjType", type); } //jumpRjType is the table name
+ get { return SqliteGeneral.SqliteJumpType.HasFall("jumpRjType", type); } //jumpRjType is the
table name
}
diff --git a/src/execute/multiChronopic.cs b/src/execute/multiChronopic.cs
index 0f1f071..37e428f 100644
--- a/src/execute/multiChronopic.cs
+++ b/src/execute/multiChronopic.cs
@@ -590,7 +590,7 @@ public class MultiChronopicExecute : EventExecute
if(tempTable) //TODO
- uniqueID = SqliteMultiChronopic.Insert(false, Constants.TempMultiChronopicTable,
"NULL",
+ uniqueID = SqliteGeneral.SqliteMultiChronopic.Insert(false,
Constants.TempMultiChronopicTable, "NULL",
personID, sessionID, type,
Util.BoolToInt(cp1StartedIn), Util.BoolToInt(cp2StartedIn),
Util.BoolToInt(cp3StartedIn), Util.BoolToInt(cp4StartedIn),
@@ -600,7 +600,7 @@ public class MultiChronopicExecute : EventExecute
description, Util.BoolToNegativeInt(simulated)
);
else {
- uniqueID = SqliteMultiChronopic.Insert(false, Constants.MultiChronopicTable, "NULL",
+ uniqueID = SqliteGeneral.SqliteMultiChronopic.Insert(false,
Constants.MultiChronopicTable, "NULL",
personID, sessionID, type,
Util.BoolToInt(cp1StartedIn), Util.BoolToInt(cp2StartedIn),
Util.BoolToInt(cp3StartedIn), Util.BoolToInt(cp4StartedIn),
diff --git a/src/execute/pulse.cs b/src/execute/pulse.cs
index 54c1e91..8a8a375 100644
--- a/src/execute/pulse.cs
+++ b/src/execute/pulse.cs
@@ -343,7 +343,7 @@ public class PulseExecute : EventExecute
totalPulsesNum = Util.GetNumberOfJumps(timesString, false);
- uniqueID = SqlitePulse.Insert(false, Constants.PulseTable, "NULL", personID, sessionID, type,
+ uniqueID = SqliteGeneral.SqlitePulse.Insert(false, Constants.PulseTable, "NULL", personID,
sessionID, type,
fixedPulse, totalPulsesNum, timesString,
"", Util.BoolToNegativeInt(simulated) //description
);
diff --git a/src/execute/reactionTime.cs b/src/execute/reactionTime.cs
index eced1e7..f67ae82 100644
--- a/src/execute/reactionTime.cs
+++ b/src/execute/reactionTime.cs
@@ -292,7 +292,7 @@ public class ReactionTimeExecute : EventExecute
string table = Constants.ReactionTimeTable;
- uniqueID = SqliteReactionTime.Insert(
+ uniqueID = SqliteGeneral.SqliteReactionTime.Insert(
false, table,
"NULL", personID, sessionID, type,
time, description, Util.BoolToNegativeInt(simulated));
diff --git a/src/execute/run.cs b/src/execute/run.cs
index 9224fbf..7a9cb4e 100644
--- a/src/execute/run.cs
+++ b/src/execute/run.cs
@@ -402,7 +402,7 @@ public class RunExecute : EventExecute
// P = W * 9.8 * D / t
// W: person weight
// D: distance between 3d and 9th stair
- double weight = SqlitePersonSession.SelectAttribute(false, personID, sessionID,
Constants.Weight);
+ double weight = SqliteGeneral.SqlitePersonSession.SelectAttribute(false, personID,
sessionID, Constants.Weight);
double distanceMeters = distance / 1000;
description = "P = " + Util.TrimDecimals ( (weight * 9.8 * distanceMeters /
time).ToString(), pDN) + " (Watts)";
} else if(type == "Gesell-DBT")
@@ -411,7 +411,7 @@ public class RunExecute : EventExecute
string table = Constants.RunTable;
- uniqueID = SqliteRun.Insert(false, table, "NULL", personID, sessionID,
+ uniqueID = SqliteGeneral.SqliteRun.Insert(false, table, "NULL", personID, sessionID,
type, distance, time, description,
Util.BoolToNegativeInt(simulated),
!startIn //initialSpeed true if not startIn
@@ -435,7 +435,7 @@ public class RunExecute : EventExecute
public string RunnerName
{
- get { return SqlitePerson.SelectAttribute(personID, Constants.Name); }
+ get { return SqliteGeneral.SqlitePerson.SelectAttribute(personID, Constants.Name); }
}
~RunExecute() {}
@@ -484,7 +484,7 @@ public class RunIntervalExecute : RunExecute
//if distances are variable
distancesString = "";
if(distanceInterval == -1) {
- RunType runType = SqliteRunIntervalType.SelectAndReturnRunIntervalType(type, false);
+ RunType runType =
SqliteGeneral.SqliteRunIntervalType.SelectAndReturnRunIntervalType(type, false);
distancesString = runType.DistancesString;
}
@@ -919,7 +919,7 @@ public class RunIntervalExecute : RunExecute
if(tempTable)
- SqliteRunInterval.Insert(false, Constants.TempRunIntervalTable, "NULL", personID,
sessionID, type,
+ SqliteGeneral.SqliteRunInterval.Insert(false, Constants.TempRunIntervalTable, "NULL",
personID, sessionID, type,
distanceTotal, timeTotal,
distanceInterval, intervalTimesString, tracksHere,
description,
@@ -928,7 +928,7 @@ public class RunIntervalExecute : RunExecute
!startIn //initialSpeed true if not startIn
);
else {
- uniqueID = SqliteRunInterval.Insert(false, Constants.RunIntervalTable, "NULL",
personID, sessionID, type,
+ uniqueID = SqliteGeneral.SqliteRunInterval.Insert(false, Constants.RunIntervalTable,
"NULL", personID, sessionID, type,
distanceTotal, timeTotal,
distanceInterval, intervalTimesString, tracksHere,
description,
diff --git a/src/executeAuto.cs b/src/executeAuto.cs
index 2c36d94..41c7c24 100644
--- a/src/executeAuto.cs
+++ b/src/executeAuto.cs
@@ -172,10 +172,10 @@ public class ExecuteAutoSQL
public bool SaveToSQL()
{
- if(Sqlite.Exists(false, Constants.ExecuteAutoTable, name))
+ if(SqliteGeneral.Sqlite.Exists(false, Constants.ExecuteAutoTable, name))
return false; //not saved because name exists
- SqliteExecuteAuto.Insert(false, this);
+ SqliteGeneral.SqliteExecuteAuto.Insert(false, this);
return true; //saved
}
diff --git a/src/exportSession.cs b/src/exportSession.cs
index 048e57f..3433367 100644
--- a/src/exportSession.cs
+++ b/src/exportSession.cs
@@ -161,26 +161,26 @@ public class ExportSession
protected virtual void getData()
{
- myPersonsAndPS = SqlitePersonSession.SelectCurrentSessionPersons(mySession.UniqueID, true);
+ myPersonsAndPS =
SqliteGeneral.SqlitePersonSession.SelectCurrentSessionPersons(mySession.UniqueID, true);
//Leave SQL opened in all this process
- Sqlite.Open(); // ------------------------------
+ SqliteGeneral.Sqlite.Open(); // ------------------------------
- myJumps= SqliteJump.SelectJumps(true, mySession.UniqueID, -1, "", "",
+ myJumps= SqliteGeneral.SqliteJump.SelectJumps(true, mySession.UniqueID, -1, "", "",
Sqlite.Orders_by.DEFAULT, -1);
- myJumpsRj = SqliteJumpRj.SelectJumps(true, mySession.UniqueID, -1, "", "");
- myRuns= SqliteRun.SelectRuns(true, mySession.UniqueID, -1, "",
+ myJumpsRj = SqliteGeneral.SqliteJumpRj.SelectJumps(true, mySession.UniqueID, -1, "", "");
+ myRuns= SqliteGeneral.SqliteRun.SelectRuns(true, mySession.UniqueID, -1, "",
Sqlite.Orders_by.DEFAULT, -1);
- myRunsInterval = SqliteRunInterval.SelectRuns(true, mySession.UniqueID, -1, "");
- myReactionTimes = SqliteReactionTime.SelectReactionTimes(true, mySession.UniqueID, -1, "",
+ myRunsInterval = SqliteGeneral.SqliteRunInterval.SelectRuns(true, mySession.UniqueID, -1, "");
+ myReactionTimes = SqliteGeneral.SqliteReactionTime.SelectReactionTimes(true,
mySession.UniqueID, -1, "",
Sqlite.Orders_by.DEFAULT, -1);
- myPulses = SqlitePulse.SelectPulses(true, mySession.UniqueID, -1);
- myMCs = SqliteMultiChronopic.SelectTests(true, mySession.UniqueID, -1);
+ myPulses = SqliteGeneral.SqlitePulse.SelectPulses(true, mySession.UniqueID, -1);
+ myMCs = SqliteGeneral.SqliteMultiChronopic.SelectTests(true, mySession.UniqueID, -1);
- Sqlite.Close(); // ------------------------------
+ SqliteGeneral.Sqlite.Close(); // ------------------------------
}
protected virtual void printTitles(string title) {
@@ -250,10 +250,10 @@ public class ExportSession
Catalog.GetString ("Level") + ":" + Catalog.GetString ("Comments")
);
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
foreach (PersonAndPS paps in myPersonsAndPS) {
- string sportName = (SqliteSport.Select(true, paps.ps.SportID)).Name;
- string speciallityName = SqliteSpeciallity.Select(true, paps.ps.SpeciallityID);
+ string sportName = (SqliteGeneral.SqliteSport.Select(true, paps.ps.SportID)).Name;
+ string speciallityName = SqliteGeneral.SqliteSpeciallity.Select(true,
paps.ps.SpeciallityID);
myData.Add(
paps.p.UniqueID.ToString() + ":" + paps.p.Name + ":" +
@@ -265,7 +265,7 @@ public class ExportSession
Util.RemoveNewLine(paps.ps.Comments, true)
);
}
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
writeData(myData);
writeData("VERTICAL-SPACE");
@@ -588,7 +588,7 @@ public class ExportSession
if(myRunsInterval.Length > 0)
printTitles(title);
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
foreach (string runString in myRunsInterval)
{
if(showSubruns) {
@@ -620,7 +620,7 @@ public class ExportSession
string myRunTypeString = myStr[4];
string myRunDistanceInterval = myStr[7];
if(myRunDistanceInterval == "-1" || myRunDistanceInterval == "-1.0") {
- myRunType = SqliteRunIntervalType.SelectAndReturnRunIntervalType(
+ myRunType =
SqliteGeneral.SqliteRunIntervalType.SelectAndReturnRunIntervalType(
myRunTypeString, true);
}
myData.Add (
@@ -681,7 +681,7 @@ public class ExportSession
writeData("VERTICAL-SPACE");
}
}
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
//if not showSubruns write data at last for not having every row as TH
if(! showSubruns) {
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 96f70f5..d1e8f98 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -551,7 +551,7 @@ public partial class ChronoJumpWindow
//put videoOn as false before loading preferences to start always without the camera
//this is good if camera produces crash
- SqlitePreferences.Update("videoOn", "False", false);
+ SqliteGeneral.SqlitePreferences.Update("videoOn", "False", false);
//preferencesLoaded is a fix to a gtk#-net-windows-bug where radiobuttons raise signals
//at initialization of chronojump and gives problems if this signals are raised while
preferences are loading
@@ -934,7 +934,7 @@ public partial class ChronoJumpWindow
* now since 0.53 svn, we use mono on windows and linux, then this is not used
*
private void languageChange () {
- string myLanguage = SqlitePreferences.Select("language");
+ string myLanguage = SqliteGeneral.SqlitePreferences.Select("language");
if ( myLanguage != "0") {
try {
Log.WriteLine("myLanguage: {0}", myLanguage);
@@ -1050,37 +1050,37 @@ public partial class ChronoJumpWindow
treeviewPersonsContextMenu(currentPerson);
} else if(myTv == treeview_jumps) {
if (myTreeViewJumps.EventSelectedID > 0) {
- Jump myJump = SqliteJump.SelectJumpData(
myTreeViewJumps.EventSelectedID, false );
+ Jump myJump = SqliteGeneral.SqliteJump.SelectJumpData(
myTreeViewJumps.EventSelectedID, false );
treeviewJumpsContextMenu(myJump);
}
} else if(myTv == treeview_jumps_rj) {
if (myTreeViewJumpsRj.EventSelectedID > 0) {
- JumpRj myJump = SqliteJumpRj.SelectJumpData( "jumpRj",
myTreeViewJumpsRj.EventSelectedID, false );
+ JumpRj myJump = SqliteGeneral.SqliteJumpRj.SelectJumpData( "jumpRj",
myTreeViewJumpsRj.EventSelectedID, false );
treeviewJumpsRjContextMenu(myJump);
}
} else if(myTv == treeview_runs) {
if (myTreeViewRuns.EventSelectedID > 0) {
- Run myRun = SqliteRun.SelectRunData( myTreeViewRuns.EventSelectedID,
false );
+ Run myRun = SqliteGeneral.SqliteRun.SelectRunData(
myTreeViewRuns.EventSelectedID, false );
treeviewRunsContextMenu(myRun);
}
} else if(myTv == treeview_runs_interval) {
if (myTreeViewRunsInterval.EventSelectedID > 0) {
- RunInterval myRun = SqliteRunInterval.SelectRunData(
Constants.RunIntervalTable, myTreeViewRunsInterval.EventSelectedID, false );
+ RunInterval myRun = SqliteGeneral.SqliteRunInterval.SelectRunData(
Constants.RunIntervalTable, myTreeViewRunsInterval.EventSelectedID, false );
treeviewRunsIntervalContextMenu(myRun);
}
} else if(myTv == treeview_reaction_times) {
if (myTreeViewReactionTimes.EventSelectedID > 0) {
- ReactionTime myRt = SqliteReactionTime.SelectReactionTimeData(
myTreeViewReactionTimes.EventSelectedID, false );
+ ReactionTime myRt =
SqliteGeneral.SqliteReactionTime.SelectReactionTimeData( myTreeViewReactionTimes.EventSelectedID, false );
treeviewReactionTimesContextMenu(myRt);
}
} else if(myTv == treeview_pulses) {
if (myTreeViewPulses.EventSelectedID > 0) {
- Pulse myPulse = SqlitePulse.SelectPulseData(
myTreeViewPulses.EventSelectedID, false );
+ Pulse myPulse = SqliteGeneral.SqlitePulse.SelectPulseData(
myTreeViewPulses.EventSelectedID, false );
treeviewPulsesContextMenu(myPulse);
}
} else if(myTv == treeview_multi_chronopic) {
if (myTreeViewMultiChronopic.EventSelectedID > 0) {
- MultiChronopic mc = SqliteMultiChronopic.SelectMultiChronopicData(
myTreeViewMultiChronopic.EventSelectedID, false );
+ MultiChronopic mc =
SqliteGeneral.SqliteMultiChronopic.SelectMultiChronopicData( myTreeViewMultiChronopic.EventSelectedID, false
);
treeviewMultiChronopicContextMenu(mc);
}
} else
@@ -1099,7 +1099,7 @@ public partial class ChronoJumpWindow
}
private void fillTreeView_persons () {
- ArrayList myPersons = SqlitePersonSession.SelectCurrentSessionPersons(
+ ArrayList myPersons = SqliteGeneral.SqlitePersonSession.SelectCurrentSessionPersons(
currentSession.UniqueID,
false); //means: do not returnPersonAndPSlist
@@ -1129,8 +1129,8 @@ public partial class ChronoJumpWindow
TreeIter iter;
if (tv.Selection.GetSelected (out model, out iter)) {
string selectedID = (string) model.GetValue (iter, 0); //ID, Name
- currentPerson = SqlitePerson.Select(Convert.ToInt32(selectedID));
- currentPersonSession = SqlitePersonSession.Select(Convert.ToInt32(selectedID),
currentSession.UniqueID);
+ currentPerson = SqliteGeneral.SqlitePerson.Select(Convert.ToInt32(selectedID));
+ currentPersonSession =
SqliteGeneral.SqlitePersonSession.Select(Convert.ToInt32(selectedID), currentSession.UniqueID);
label_person_change();
return true;
@@ -1160,8 +1160,8 @@ public partial class ChronoJumpWindow
if (((TreeSelection)o).GetSelected(out model, out iter)) {
string selectedID = (string) model.GetValue (iter, 0); //ID, Name
- currentPerson = SqlitePerson.Select(Convert.ToInt32(selectedID));
- currentPersonSession = SqlitePersonSession.Select(Convert.ToInt32(selectedID),
currentSession.UniqueID);
+ currentPerson = SqliteGeneral.SqlitePerson.Select(Convert.ToInt32(selectedID));
+ currentPersonSession =
SqliteGeneral.SqlitePersonSession.Select(Convert.ToInt32(selectedID), currentSession.UniqueID);
label_person_change();
personChanged();
@@ -1223,7 +1223,7 @@ public partial class ChronoJumpWindow
//evaluator stuff
//Server.ServerUploadEvaluator();
string evalMessage = "";
- int evalSID = Convert.ToInt32(SqlitePreferences.Select("evaluatorServerID"));
+ int evalSID = Convert.ToInt32(SqliteGeneral.SqlitePreferences.Select("evaluatorServerID"));
if(evalSID == Constants.ServerUndefinedID)
evalMessage = Catalog.GetString("Please, first fill evaluator data.");
else
@@ -1258,7 +1258,7 @@ public partial class ChronoJumpWindow
LogB.SQL(myServer.DisConnectDatabase());
- string [] statsMine = SqliteServer.StatsMine();
+ string [] statsMine = SqliteGeneral.SqliteServer.StatsMine();
new DialogServerStats(statsServer, statsMine);
}
@@ -1300,7 +1300,7 @@ public partial class ChronoJumpWindow
*/
private void server_evaluator_data () {
- ServerEvaluator myEval = SqliteServer.SelectEvaluator(1);
+ ServerEvaluator myEval = SqliteGeneral.SqliteServer.SelectEvaluator(1);
evalWin = EvaluatorWindow.Show(myEval);
evalWin.FakeButtonAccept.Clicked += new EventHandler(on_evaluator_done);
}
@@ -1355,8 +1355,8 @@ public partial class ChronoJumpWindow
ArrayList undefinedCountry = new ArrayList(1); //country is required for server
ArrayList undefinedSport = new ArrayList(1);
- ArrayList notToUpload = SqlitePersonSessionNotUpload.SelectAll(currentSession.UniqueID);
- ArrayList persons = SqlitePersonSession.SelectCurrentSessionPersons(
+ ArrayList notToUpload =
SqliteGeneral.SqlitePersonSessionNotUpload.SelectAll(currentSession.UniqueID);
+ ArrayList persons = SqliteGeneral.SqlitePersonSession.SelectCurrentSessionPersons(
currentSession.UniqueID,
false); //means: do not returnPersonAndPSlist
@@ -1364,8 +1364,8 @@ public partial class ChronoJumpWindow
{
if(! Util.FoundInArrayList(notToUpload, person.UniqueID.ToString()))
{
- //TODO: this is not needed if true at
SqlitePersonSession.SelectCurrentSessionPersons
- PersonSession ps = SqlitePersonSession.Select(person.UniqueID,
currentSession.UniqueID);
+ //TODO: this is not needed if true at
SqliteGeneral.SqlitePersonSession.SelectCurrentSessionPersons
+ PersonSession ps = SqliteGeneral.SqlitePersonSession.Select(person.UniqueID,
currentSession.UniqueID);
if(ps.Weight <= 10 || ps.Weight >= 300)
impossibleWeight.Add(person);
if(person.CountryID == Constants.CountryUndefinedID)
@@ -1438,7 +1438,7 @@ public partial class ChronoJumpWindow
private void server_upload_session ()
{
- int evalSID = Convert.ToInt32(SqlitePreferences.Select("evaluatorServerID"));
+ int evalSID = Convert.ToInt32(SqliteGeneral.SqlitePreferences.Select("evaluatorServerID"));
if(evalSID != Constants.ServerUndefinedID) {
if(!checkPersonsMissingData()) {
string message1 = "";
@@ -1481,7 +1481,7 @@ public partial class ChronoJumpWindow
}
//Leave SQL opened in all this process
- Sqlite.Open(); // ------------------------------
+ SqliteGeneral.Sqlite.Open(); // ------------------------------
//load the jumps treeview
treeview_jumps_storeReset();
@@ -1513,7 +1513,7 @@ public partial class ChronoJumpWindow
//close SQL opened in all this process
- Sqlite.Close(); // ------------------------------
+ SqliteGeneral.Sqlite.Close(); // ------------------------------
}
@@ -1540,7 +1540,7 @@ public partial class ChronoJumpWindow
private void fillTreeView_jumps (string filter, bool dbconOpened) {
string [] myJumps;
- myJumps = SqliteJump.SelectJumps(dbconOpened, currentSession.UniqueID, -1, "", "",
+ myJumps = SqliteGeneral.SqliteJump.SelectJumps(dbconOpened, currentSession.UniqueID, -1, "",
"",
Sqlite.Orders_by.DEFAULT, -1);
myTreeViewJumps.Fill(myJumps, filter);
@@ -1626,7 +1626,7 @@ public partial class ChronoJumpWindow
}
private void fillTreeView_jumps_rj (string filter, bool dbconOpened) {
string [] myJumps;
- myJumps = SqliteJumpRj.SelectJumps(dbconOpened, currentSession.UniqueID, -1, "", "");
+ myJumps = SqliteGeneral.SqliteJumpRj.SelectJumps(dbconOpened, currentSession.UniqueID, -1,
"", "");
myTreeViewJumpsRj.Fill(myJumps, filter);
expandOrMinimizeTreeView((TreeViewEvent) myTreeViewJumpsRj, treeview_jumps_rj);
@@ -1715,7 +1715,7 @@ public partial class ChronoJumpWindow
fillTreeView_runs (filter, false);
}
private void fillTreeView_runs (string filter, bool dbconOpened) {
- string [] myRuns = SqliteRun.SelectRuns(dbconOpened, currentSession.UniqueID, -1, "",
+ string [] myRuns = SqliteGeneral.SqliteRun.SelectRuns(dbconOpened, currentSession.UniqueID,
-1, "",
Sqlite.Orders_by.DEFAULT, -1);
myTreeViewRuns.Fill(myRuns, filter);
@@ -1795,7 +1795,7 @@ public partial class ChronoJumpWindow
fillTreeView_runs_interval (filter, false);
}
private void fillTreeView_runs_interval (string filter, bool dbconOpened) {
- string [] myRuns = SqliteRunInterval.SelectRuns(dbconOpened, currentSession.UniqueID, -1, "");
+ string [] myRuns = SqliteGeneral.SqliteRunInterval.SelectRuns(dbconOpened,
currentSession.UniqueID, -1, "");
myTreeViewRunsInterval.Fill(myRuns, filter);
expandOrMinimizeTreeView((TreeViewEvent) myTreeViewRunsInterval, treeview_runs_interval);
}
@@ -1883,7 +1883,7 @@ public partial class ChronoJumpWindow
fillTreeView_reaction_times (filter, false);
}
private void fillTreeView_reaction_times (string filter, bool dbconOpened) {
- string [] myRTs = SqliteReactionTime.SelectReactionTimes(dbconOpened,
currentSession.UniqueID, -1, "",
+ string [] myRTs = SqliteGeneral.SqliteReactionTime.SelectReactionTimes(dbconOpened,
currentSession.UniqueID, -1, "",
Sqlite.Orders_by.DEFAULT, -1);
myTreeViewReactionTimes.Fill(myRTs, filter);
@@ -1963,7 +1963,7 @@ public partial class ChronoJumpWindow
fillTreeView_pulses (filter, false);
}
private void fillTreeView_pulses (string filter, bool dbconOpened) {
- string [] myPulses = SqlitePulse.SelectPulses(dbconOpened, currentSession.UniqueID, -1);
+ string [] myPulses = SqliteGeneral.SqlitePulse.SelectPulses(dbconOpened,
currentSession.UniqueID, -1);
myTreeViewPulses.Fill(myPulses, filter);
expandOrMinimizeTreeView((TreeViewEvent) myTreeViewPulses, treeview_pulses);
}
@@ -2042,7 +2042,7 @@ public partial class ChronoJumpWindow
//myTreeViewMultiChronopic is a TreeViewMultiChronopic instance
if(definedSession)
myTreeViewMultiChronopic = new TreeViewMultiChronopic( tv, preferences.digitsNumber,
- TreeViewEvent.ExpandStates.MINIMIZED,
SqliteMultiChronopic.MaxCPs(dbconOpened, currentSession.UniqueID) );
+ TreeViewEvent.ExpandStates.MINIMIZED,
SqliteGeneral.SqliteMultiChronopic.MaxCPs(dbconOpened, currentSession.UniqueID) );
else
myTreeViewMultiChronopic = new TreeViewMultiChronopic( tv, preferences.digitsNumber,
TreeViewEvent.ExpandStates.MINIMIZED, 2);
@@ -2055,7 +2055,7 @@ public partial class ChronoJumpWindow
fillTreeView_multi_chronopic (false);
}
private void fillTreeView_multi_chronopic (bool dbconOpened) {
- string [] mcs = SqliteMultiChronopic.SelectTests(dbconOpened, currentSession.UniqueID, -1);
+ string [] mcs = SqliteGeneral.SqliteMultiChronopic.SelectTests(dbconOpened,
currentSession.UniqueID, -1);
myTreeViewMultiChronopic.Fill(mcs, "");
expandOrMinimizeTreeView((TreeViewEvent) myTreeViewMultiChronopic, treeview_multi_chronopic);
}
@@ -2075,7 +2075,7 @@ public partial class ChronoJumpWindow
myTreeViewMultiChronopic.RemoveColumns();
if(definedSession)
myTreeViewMultiChronopic = new TreeViewMultiChronopic( treeview_multi_chronopic,
preferences.digitsNumber,
- myTreeViewMultiChronopic.ExpandState,
SqliteMultiChronopic.MaxCPs(dbconOpened, currentSession.UniqueID) );
+ myTreeViewMultiChronopic.ExpandState,
SqliteGeneral.SqliteMultiChronopic.MaxCPs(dbconOpened, currentSession.UniqueID) );
else
myTreeViewMultiChronopic = new TreeViewMultiChronopic( treeview_multi_chronopic,
preferences.digitsNumber,
myTreeViewMultiChronopic.ExpandState, 2);
@@ -2152,7 +2152,7 @@ public partial class ChronoJumpWindow
if(create)
combo_select_jumps = ComboBox.NewText ();
- string [] jumpTypes = SqliteJumpType.SelectJumpTypes(false, "", "", false); //without
alljumpsname, without filter, not only name
+ string [] jumpTypes = SqliteGeneral.SqliteJumpType.SelectJumpTypes(false, "", "", false);
//without alljumpsname, without filter, not only name
selectJumpsString = new String [jumpTypes.Length];
string [] jumpNamesToCombo = new String [jumpTypes.Length];
int i =0;
@@ -2181,7 +2181,7 @@ public partial class ChronoJumpWindow
if(create)
combo_select_jumps_rj = ComboBox.NewText ();
- string [] jumpTypes = SqliteJumpType.SelectJumpRjTypes("", false); //without alljumpsname,
not only name
+ string [] jumpTypes = SqliteGeneral.SqliteJumpType.SelectJumpRjTypes("", false); //without
alljumpsname, not only name
selectJumpsRjString = new String [jumpTypes.Length];
string [] jumpNamesToCombo = new String [jumpTypes.Length];
int i =0;
@@ -2211,7 +2211,7 @@ public partial class ChronoJumpWindow
if(create)
combo_select_runs = ComboBox.NewText ();
- string [] runTypes = SqliteRunType.SelectRunTypes("", false); //without allrunsname, not only
name
+ string [] runTypes = SqliteGeneral.SqliteRunType.SelectRunTypes("", false); //without
allrunsname, not only name
selectRunsString = new String [runTypes.Length];
string [] runNamesToCombo = new String [runTypes.Length];
int i =0;
@@ -2240,7 +2240,7 @@ public partial class ChronoJumpWindow
if(create)
combo_select_runs_interval = ComboBox.NewText ();
- string [] runTypes = SqliteRunIntervalType.SelectRunIntervalTypes("", false); //without
allrunsname, not only name
+ string [] runTypes = SqliteGeneral.SqliteRunIntervalType.SelectRunIntervalTypes("", false);
//without allrunsname, not only name
selectRunsIntervalString = new String [runTypes.Length];
string [] runNamesToCombo = new String [runTypes.Length];
int i =0;
@@ -2272,7 +2272,7 @@ public partial class ChronoJumpWindow
private void createComboResultJumps() {
combo_result_jumps = ComboBox.NewText ();
UtilGtk.ComboUpdate(combo_result_jumps,
- SqliteJumpType.SelectJumpTypes(false, Constants.AllJumpsName, "", true),
//with alljumpsname, without filter, only select name
+ SqliteGeneral.SqliteJumpType.SelectJumpTypes(false, Constants.AllJumpsName,
"", true), //with alljumpsname, without filter, only select name
"");
combo_result_jumps.Active = 0;
@@ -2285,7 +2285,7 @@ public partial class ChronoJumpWindow
private void createComboResultJumpsRj() {
combo_result_jumps_rj = ComboBox.NewText();
- UtilGtk.ComboUpdate(combo_result_jumps_rj,
SqliteJumpType.SelectJumpRjTypes(Constants.AllJumpsName, true), ""); //only select name
+ UtilGtk.ComboUpdate(combo_result_jumps_rj,
SqliteGeneral.SqliteJumpType.SelectJumpRjTypes(Constants.AllJumpsName, true), ""); //only select name
combo_result_jumps_rj.Active = 0;
combo_result_jumps_rj.Changed += new EventHandler (on_combo_result_jumps_rj_changed);
@@ -2297,7 +2297,7 @@ public partial class ChronoJumpWindow
private void createComboResultRuns() {
combo_result_runs = ComboBox.NewText();
- UtilGtk.ComboUpdate(combo_result_runs, SqliteRunType.SelectRunTypes(Constants.AllRunsName,
true), ""); //without filter, only select name
+ UtilGtk.ComboUpdate(combo_result_runs,
SqliteGeneral.SqliteRunType.SelectRunTypes(Constants.AllRunsName, true), ""); //without filter, only select
name
combo_result_runs.Active = 0;
combo_result_runs.Changed += new EventHandler (on_combo_result_runs_changed);
@@ -2309,7 +2309,7 @@ public partial class ChronoJumpWindow
private void createComboResultRunsInterval() {
combo_result_runs_interval = ComboBox.NewText();
- UtilGtk.ComboUpdate(combo_result_runs_interval,
SqliteRunIntervalType.SelectRunIntervalTypes(Constants.AllRunsName, true), ""); //without filter, only select
name
+ UtilGtk.ComboUpdate(combo_result_runs_interval,
SqliteGeneral.SqliteRunIntervalType.SelectRunIntervalTypes(Constants.AllRunsName, true), ""); //without
filter, only select name
combo_result_runs_interval.Active = 0;
combo_result_runs_interval.Changed += new EventHandler
(on_combo_result_runs_interval_changed);
@@ -2323,7 +2323,7 @@ public partial class ChronoJumpWindow
private void createComboPulses() {
combo_pulses = ComboBox.NewText();
- UtilGtk.ComboUpdate(combo_pulses, SqlitePulseType.SelectPulseTypes(Constants.AllPulsesName,
true), ""); //without filter, only select name
+ UtilGtk.ComboUpdate(combo_pulses,
SqliteGeneral.SqlitePulseType.SelectPulseTypes(Constants.AllPulsesName, true), ""); //without filter, only
select name
combo_pulses.Active = 0;
combo_pulses.Changed += new EventHandler (on_combo_pulses_changed);
@@ -2666,7 +2666,7 @@ public partial class ChronoJumpWindow
private void on_delete_session_accepted (object o, EventArgs args)
{
new DialogMessage(Constants.MessageTypes.INFO, Catalog.GetString("Deleted session and all its
tests."));
- SqliteSession.DeleteAllStuff(currentSession.UniqueID.ToString());
+ SqliteGeneral.SqliteSession.DeleteAllStuff(currentSession.UniqueID.ToString());
sensitiveGuiNoSession();
definedSession = false;
@@ -2755,7 +2755,7 @@ public partial class ChronoJumpWindow
if (personAddModifyWin.CurrentPerson != null)
{
currentPerson = personAddModifyWin.CurrentPerson;
- currentPersonSession = SqlitePersonSession.Select(currentPerson.UniqueID,
currentSession.UniqueID);
+ currentPersonSession =
SqliteGeneral.SqlitePersonSession.Select(currentPerson.UniqueID, currentSession.UniqueID);
label_person_change();
myTreeViewPersons.Add(currentPerson.UniqueID.ToString(), currentPerson.Name);
@@ -2788,7 +2788,7 @@ public partial class ChronoJumpWindow
}
if(person_add_single_called_from_person_select_window) {
- ArrayList myPersons = SqlitePersonSession.SelectCurrentSessionPersons(
+ ArrayList myPersons =
SqliteGeneral.SqlitePersonSession.SelectCurrentSessionPersons(
currentSession.UniqueID,
false); //means: do not returnPersonAndPSlist
personSelectWin.Update(myPersons);
@@ -2806,7 +2806,7 @@ public partial class ChronoJumpWindow
if (personAddMultipleWin.CurrentPerson != null)
{
currentPerson = personAddMultipleWin.CurrentPerson;
- currentPersonSession = SqlitePersonSession.Select(currentPerson.UniqueID,
currentSession.UniqueID);
+ currentPersonSession =
SqliteGeneral.SqlitePersonSession.Select(currentPerson.UniqueID, currentSession.UniqueID);
label_person_change();
treeview_persons_storeReset();
fillTreeView_persons();
@@ -2847,7 +2847,7 @@ public partial class ChronoJumpWindow
if (personAddModifyWin.CurrentPerson != null)
{
currentPerson = personAddModifyWin.CurrentPerson;
- currentPersonSession = SqlitePersonSession.Select(currentPerson.UniqueID,
currentSession.UniqueID);
+ currentPersonSession =
SqliteGeneral.SqlitePersonSession.Select(currentPerson.UniqueID, currentSession.UniqueID);
label_person_change();
treeview_persons_storeReset();
fillTreeView_persons();
@@ -2873,7 +2873,7 @@ public partial class ChronoJumpWindow
// personAddModifyWin.Destroy();
if(person_edit_single_called_from_person_select_window) {
- ArrayList myPersons = SqlitePersonSession.SelectCurrentSessionPersons(
+ ArrayList myPersons =
SqliteGeneral.SqlitePersonSession.SelectCurrentSessionPersons(
currentSession.UniqueID,
false); //means: do not returnPersonAndPSlist
personSelectWin.Update(myPersons);
@@ -2899,7 +2899,7 @@ public partial class ChronoJumpWindow
private void on_delete_current_person_from_session_accepted (object o, EventArgs args)
{
new DialogMessage(Constants.MessageTypes.INFO, Catalog.GetString("Deleted person and all
his/her tests on this session."));
- SqlitePersonSession.DeletePersonFromSessionAndTests(
+ SqliteGeneral.SqlitePersonSession.DeletePersonFromSessionAndTests(
currentSession.UniqueID.ToString(), currentPerson.UniqueID.ToString());
resetAllTreeViews(true); //boolean means: "also persons"
@@ -2920,7 +2920,7 @@ public partial class ChronoJumpWindow
private void on_button_encoder_person_change_clicked (object o, EventArgs args)
{
- ArrayList myPersons = SqlitePersonSession.SelectCurrentSessionPersons(
+ ArrayList myPersons = SqliteGeneral.SqlitePersonSession.SelectCurrentSessionPersons(
currentSession.UniqueID,
false); //means: do not returnPersonAndPSlist
@@ -2949,7 +2949,7 @@ public partial class ChronoJumpWindow
//without confirm, because it's already confirmed on PersonSelect
on_delete_current_person_from_session_accepted (o, args);
- ArrayList myPersons = SqlitePersonSession.SelectCurrentSessionPersons(
+ ArrayList myPersons = SqliteGeneral.SqlitePersonSession.SelectCurrentSessionPersons(
currentSession.UniqueID,
false); //means: do not returnPersonAndPSlist
personSelectWin.Update(myPersons);
@@ -2958,7 +2958,7 @@ public partial class ChronoJumpWindow
private void on_button_encoder_person_change_done(object o, EventArgs args)
{
currentPerson = personSelectWin.SelectedPerson;
- currentPersonSession = SqlitePersonSession.Select(currentPerson.UniqueID,
currentSession.UniqueID);
+ currentPersonSession = SqliteGeneral.SqlitePersonSession.Select(currentPerson.UniqueID,
currentSession.UniqueID);
label_person_change();
personChanged();
@@ -3566,10 +3566,10 @@ public partial class ChronoJumpWindow
private void on_checkbutton_video_clicked(object o, EventArgs args) {
if(checkbutton_video.Active) {
preferences.videoOn = true;
- SqlitePreferences.Update("videoOn", "True", false);
+ SqliteGeneral.SqlitePreferences.Update("videoOn", "True", false);
} else {
preferences.videoOn = false;
- SqlitePreferences.Update("videoOn", "False", false);
+ SqliteGeneral.SqlitePreferences.Update("videoOn", "False", false);
}
//change encoder checkbox but don't raise the signal
checkbutton_video_encoder.Clicked -= new EventHandler(on_checkbutton_video_encoder_clicked);
@@ -3584,10 +3584,10 @@ public partial class ChronoJumpWindow
private void on_checkbutton_video_encoder_clicked(object o, EventArgs args) {
if(checkbutton_video_encoder.Active) {
preferences.videoOn = true;
- SqlitePreferences.Update("videoOn", "True", false);
+ SqliteGeneral.SqlitePreferences.Update("videoOn", "True", false);
} else {
preferences.videoOn = false;
- SqlitePreferences.Update("videoOn", "False", false);
+ SqliteGeneral.SqlitePreferences.Update("videoOn", "False", false);
}
//change contacts checkbox but don't raise the signal
checkbutton_video.Clicked -= new EventHandler(on_checkbutton_video_clicked);
@@ -3842,7 +3842,7 @@ public partial class ChronoJumpWindow
//if this multichronopic has more chronopics than other in session, then reload
treeview, else simply add
- if(currentMultiChronopic.CPs() !=
SqliteMultiChronopic.MaxCPs(currentSession.UniqueID)) {
+ if(currentMultiChronopic.CPs() !=
SqliteGeneral.SqliteMultiChronopic.MaxCPs(currentSession.UniqueID)) {
treeview_multi_chronopic_storeReset(false);
fillTreeView_multi_chronopic();
} else
@@ -4129,7 +4129,7 @@ public partial class ChronoJumpWindow
//but show the input cm
notebook_options_after_execute.CurrentPage = 1;
}
- SqliteJump.UpdateDescription(Constants.JumpTable,
+ SqliteGeneral.SqliteJump.UpdateDescription(Constants.JumpTable,
currentJump.UniqueID, currentJump.Description);
}
@@ -4330,7 +4330,7 @@ public partial class ChronoJumpWindow
chronopicDisconnectedWhileExecuting();
//delete the temp tables if exists
- Sqlite.DeleteTempEvents("tempJumpRj");
+ SqliteGeneral.Sqlite.DeleteTempEvents("tempJumpRj");
}
/* ---------------------------------------------------------
@@ -4586,7 +4586,7 @@ public partial class ChronoJumpWindow
chronopicDisconnectedWhileExecuting();
//delete the temp tables if exists
- Sqlite.DeleteTempEvents("tempRunInterval");
+ SqliteGeneral.Sqlite.DeleteTempEvents("tempRunInterval");
}
/* ---------------------------------------------------------
@@ -5159,7 +5159,7 @@ LogB.Debug("W");
LogB.Debug("W2");
//if this multichronopic has more chronopics than other in session, then reload
treeview, else simply add
- if(currentMultiChronopic.CPs() != SqliteMultiChronopic.MaxCPs(false,
currentSession.UniqueID)) {
+ if(currentMultiChronopic.CPs() != SqliteGeneral.SqliteMultiChronopic.MaxCPs(false,
currentSession.UniqueID)) {
treeview_multi_chronopic_storeReset(false);
fillTreeView_multi_chronopic();
} else
@@ -5197,7 +5197,7 @@ LogB.Debug("X");
if(lastRunIsSimple && radio_mode_runs_small.Active)
PrepareRunSimpleGraph(currentEventExecute.PrepareEventGraphRunSimpleObject, false);
else if(radio_mode_runs_intervallic_small.Active) {
- RunType runType =
SqliteRunIntervalType.SelectAndReturnRunIntervalType(currentRunInterval.Type, false);
+ RunType runType =
SqliteGeneral.SqliteRunIntervalType.SelectAndReturnRunIntervalType(currentRunInterval.Type, false);
double distanceTotal =
Util.GetRunITotalDistance(currentRunInterval.DistanceInterval,
runType.DistancesString,
currentRunInterval.Tracks);
@@ -5264,7 +5264,7 @@ LogB.Debug("X");
//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) {
//3.- obtain the data of the selected jump
- Jump myJump = SqliteJump.SelectJumpData( myTreeViewJumps.EventSelectedID, false );
+ Jump myJump = SqliteGeneral.SqliteJump.SelectJumpData(
myTreeViewJumps.EventSelectedID, false );
eventOldPerson = myJump.PersonID;
//4.- edit this jump
@@ -5280,7 +5280,7 @@ LogB.Debug("X");
//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 (myTreeViewJumpsRj.EventSelectedID > 0) {
//3.- obtain the data of the selected jump
- JumpRj myJump = SqliteJumpRj.SelectJumpData( "jumpRj",
myTreeViewJumpsRj.EventSelectedID, false );
+ JumpRj myJump = SqliteGeneral.SqliteJumpRj.SelectJumpData( "jumpRj",
myTreeViewJumpsRj.EventSelectedID, false );
eventOldPerson = myJump.PersonID;
//4.- edit this jump
@@ -5292,12 +5292,12 @@ LogB.Debug("X");
private void on_edit_selected_jump_accepted (object o, EventArgs args) {
LogB.Information("edit selected jump accepted");
- Jump myJump = SqliteJump.SelectJumpData( myTreeViewJumps.EventSelectedID, false );
+ Jump myJump = SqliteGeneral.SqliteJump.SelectJumpData( myTreeViewJumps.EventSelectedID, false
);
//if person changed, fill treeview again, if not, only update it's line
if(eventOldPerson == myJump.PersonID) {
if(! preferences.weightStatsPercent) {
- double personWeight = SqlitePersonSession.SelectAttribute(
+ double personWeight = SqliteGeneral.SqlitePersonSession.SelectAttribute(
false, myJump.PersonID, currentSession.UniqueID,
Constants.Weight);
myJump.Weight = Util.WeightFromPercentToKg(myJump.Weight, personWeight);
}
@@ -5317,12 +5317,12 @@ LogB.Debug("X");
private void on_edit_selected_jump_rj_accepted (object o, EventArgs args) {
LogB.Information("edit selected jump RJ accepted");
- JumpRj myJump = SqliteJumpRj.SelectJumpData( "jumpRj", myTreeViewJumpsRj.EventSelectedID,
false );
+ JumpRj myJump = SqliteGeneral.SqliteJumpRj.SelectJumpData( "jumpRj",
myTreeViewJumpsRj.EventSelectedID, false );
//if person changed, fill treeview again, if not, only update it's line
if(eventOldPerson == myJump.PersonID) {
if(! preferences.weightStatsPercent) {
- double personWeight = SqlitePersonSession.SelectAttribute(
+ double personWeight = SqliteGeneral.SqlitePersonSession.SelectAttribute(
false, myJump.PersonID, currentSession.UniqueID,
Constants.Weight);
myJump.Weight = Util.WeightFromPercentToKg(myJump.Weight, personWeight);
}
@@ -5344,7 +5344,7 @@ LogB.Debug("X");
//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) {
//3.- obtain the data of the selected run
- Run myRun = SqliteRun.SelectRunData( myTreeViewRuns.EventSelectedID, false );
+ Run myRun = SqliteGeneral.SqliteRun.SelectRunData( myTreeViewRuns.EventSelectedID,
false );
myRun.MetersSecondsPreferred = preferences.metersSecondsPreferred;
eventOldPerson = myRun.PersonID;
@@ -5361,7 +5361,7 @@ LogB.Debug("X");
//2.- check that this line is a run and not a person (check also if it's not a individual
subrun, the pass the parent run)
if (myTreeViewRunsInterval.EventSelectedID > 0) {
//3.- obtain the data of the selected run
- RunInterval myRun = SqliteRunInterval.SelectRunData( Constants.RunIntervalTable,
myTreeViewRunsInterval.EventSelectedID, false );
+ RunInterval myRun = SqliteGeneral.SqliteRunInterval.SelectRunData(
Constants.RunIntervalTable, myTreeViewRunsInterval.EventSelectedID, false );
eventOldPerson = myRun.PersonID;
//4.- edit this run
@@ -5373,7 +5373,7 @@ LogB.Debug("X");
private void on_edit_selected_run_accepted (object o, EventArgs args) {
LogB.Information("edit selected run accepted");
- Run myRun = SqliteRun.SelectRunData( myTreeViewRuns.EventSelectedID, false );
+ Run myRun = SqliteGeneral.SqliteRun.SelectRunData( myTreeViewRuns.EventSelectedID, false );
//if person changed, fill treeview again, if not, only update it's line
if(eventOldPerson == myRun.PersonID)
@@ -5392,7 +5392,7 @@ LogB.Debug("X");
private void on_edit_selected_run_interval_accepted (object o, EventArgs args) {
LogB.Information("edit selected run interval accepted");
- RunInterval myRun = SqliteRunInterval.SelectRunData( Constants.RunIntervalTable,
myTreeViewRunsInterval.EventSelectedID, false );
+ RunInterval myRun = SqliteGeneral.SqliteRunInterval.SelectRunData(
Constants.RunIntervalTable, myTreeViewRunsInterval.EventSelectedID, false );
//if person changed, fill treeview again, if not, only update it's line
if(eventOldPerson == myRun.PersonID)
@@ -5413,7 +5413,7 @@ LogB.Debug("X");
//2.- check that this line is a event and not a person
if (myTreeViewReactionTimes.EventSelectedID > 0) {
//3.- obtain the data of the selected event
- ReactionTime myRT = SqliteReactionTime.SelectReactionTimeData(
myTreeViewReactionTimes.EventSelectedID, false );
+ ReactionTime myRT = SqliteGeneral.SqliteReactionTime.SelectReactionTimeData(
myTreeViewReactionTimes.EventSelectedID, false );
eventOldPerson = myRT.PersonID;
//4.- edit this event
@@ -5425,7 +5425,7 @@ LogB.Debug("X");
private void on_edit_selected_reaction_time_accepted (object o, EventArgs args) {
LogB.Information("edit selected reaction time accepted");
- ReactionTime myRT = SqliteReactionTime.SelectReactionTimeData(
myTreeViewReactionTimes.EventSelectedID, false);
+ ReactionTime myRT = SqliteGeneral.SqliteReactionTime.SelectReactionTimeData(
myTreeViewReactionTimes.EventSelectedID, false);
//if person changed, fill treeview again, if not, only update it's line
if(eventOldPerson == myRT.PersonID)
@@ -5445,7 +5445,7 @@ LogB.Debug("X");
//2.- check that this line is a event and not a person
if (myTreeViewPulses.EventSelectedID > 0) {
//3.- obtain the data of the selected event
- Pulse myPulse = SqlitePulse.SelectPulseData( myTreeViewPulses.EventSelectedID, false
);
+ Pulse myPulse = SqliteGeneral.SqlitePulse.SelectPulseData(
myTreeViewPulses.EventSelectedID, false );
eventOldPerson = myPulse.PersonID;
//4.- edit this event
@@ -5457,7 +5457,7 @@ LogB.Debug("X");
private void on_edit_selected_pulse_accepted (object o, EventArgs args) {
LogB.Information("edit selected pulse accepted");
- Pulse myPulse = SqlitePulse.SelectPulseData( myTreeViewPulses.EventSelectedID, false );
+ Pulse myPulse = SqliteGeneral.SqlitePulse.SelectPulseData( myTreeViewPulses.EventSelectedID,
false );
//if person changed, fill treeview again, if not, only update it's line
if(eventOldPerson == myPulse.PersonID)
@@ -5475,7 +5475,7 @@ LogB.Debug("X");
//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 (myTreeViewMultiChronopic.EventSelectedID > 0) {
//3.- obtain the data of the selected test
- MultiChronopic mc = SqliteMultiChronopic.SelectMultiChronopicData(
myTreeViewMultiChronopic.EventSelectedID, false );
+ MultiChronopic mc = SqliteGeneral.SqliteMultiChronopic.SelectMultiChronopicData(
myTreeViewMultiChronopic.EventSelectedID, false );
eventOldPerson = mc.PersonID;
//4.- edit this jump
@@ -5487,7 +5487,7 @@ LogB.Debug("X");
private void on_edit_selected_multi_chronopic_accepted (object o, EventArgs args) {
LogB.Information("edit selected multi chronopic accepted");
- MultiChronopic mc = SqliteMultiChronopic.SelectMultiChronopicData(
myTreeViewMultiChronopic.EventSelectedID, false );
+ MultiChronopic mc = SqliteGeneral.SqliteMultiChronopic.SelectMultiChronopicData(
myTreeViewMultiChronopic.EventSelectedID, false );
//if person changed, fill treeview again, if not, only update it's line
if(eventOldPerson == mc.PersonID)
@@ -5712,7 +5712,7 @@ LogB.Debug("X");
LogB.Information("accept delete this jump");
int id = myTreeViewJumps.EventSelectedID;
- Sqlite.Delete(false, Constants.JumpTable, id);
+ SqliteGeneral.Sqlite.Delete(false, Constants.JumpTable, id);
myTreeViewJumps.DelEvent(id);
showHideActionEventButtons(false, "Jump");
@@ -5746,7 +5746,7 @@ LogB.Debug("X");
LogB.Information("accept delete this jump");
int id = myTreeViewJumpsRj.EventSelectedID;
- Sqlite.Delete(false, Constants.JumpRjTable, id);
+ SqliteGeneral.Sqlite.Delete(false, Constants.JumpRjTable, id);
myTreeViewJumpsRj.DelEvent(id);
showHideActionEventButtons(false, "JumpRj");
@@ -5803,7 +5803,7 @@ LogB.Debug("X");
LogB.Information("accept delete this run");
int id = myTreeViewRuns.EventSelectedID;
- Sqlite.Delete(false, Constants.RunTable, id);
+ SqliteGeneral.Sqlite.Delete(false, Constants.RunTable, id);
myTreeViewRuns.DelEvent(id);
showHideActionEventButtons(false, "Run");
@@ -5827,7 +5827,7 @@ LogB.Debug("X");
LogB.Information("accept delete this run");
int id = myTreeViewRunsInterval.EventSelectedID;
- Sqlite.Delete(false, Constants.RunIntervalTable, id);
+ SqliteGeneral.Sqlite.Delete(false, Constants.RunIntervalTable, id);
myTreeViewRunsInterval.DelEvent(id);
showHideActionEventButtons(false, "RunInterval");
@@ -5867,7 +5867,7 @@ LogB.Debug("X");
LogB.Information("accept delete this reaction time");
int id = myTreeViewReactionTimes.EventSelectedID;
- Sqlite.Delete(false, Constants.ReactionTimeTable, id);
+ SqliteGeneral.Sqlite.Delete(false, Constants.ReactionTimeTable, id);
myTreeViewReactionTimes.DelEvent(id);
showHideActionEventButtons(false, "ReactionTime");
@@ -5906,7 +5906,7 @@ LogB.Debug("X");
LogB.Information("accept delete this pulse");
int id = myTreeViewPulses.EventSelectedID;
- Sqlite.Delete(false, Constants.PulseTable, id);
+ SqliteGeneral.Sqlite.Delete(false, Constants.PulseTable, id);
myTreeViewPulses.DelEvent(id);
showHideActionEventButtons(false, "Pulse");
@@ -5941,7 +5941,7 @@ LogB.Debug("X");
LogB.Information("accept delete this multi chronopic");
int id = myTreeViewMultiChronopic.EventSelectedID;
- Sqlite.Delete(false, Constants.MultiChronopicTable, id);
+ SqliteGeneral.Sqlite.Delete(false, Constants.MultiChronopicTable, id);
myTreeViewMultiChronopic.DelEvent(id);
showHideActionEventButtons(false, Constants.MultiChronopicName);
@@ -5985,13 +5985,13 @@ LogB.Debug("X");
createComboSelectJumps(false); //this will update also the selectJumpsString
UtilGtk.ComboUpdate(combo_result_jumps,
- SqliteJumpType.SelectJumpTypes(false, Constants.AllJumpsName, "",
true), ""); //without filter, only select name
+ SqliteGeneral.SqliteJumpType.SelectJumpTypes(false,
Constants.AllJumpsName, "", true), ""); //without filter, only select name
new DialogMessage(Constants.MessageTypes.INFO, Catalog.GetString("Added simple
jump."));
} else {
createComboSelectJumpsRj(false); //this will update also the selectJumpsRjString
UtilGtk.ComboUpdate(combo_result_jumps_rj,
- SqliteJumpType.SelectJumpRjTypes(Constants.AllJumpsName, true), "");
//without filter, only select name
+
SqliteGeneral.SqliteJumpType.SelectJumpRjTypes(Constants.AllJumpsName, true), ""); //without filter, only
select name
new DialogMessage(Constants.MessageTypes.INFO, Catalog.GetString("Added reactive
jump."));
}
updateComboStats();
@@ -6021,13 +6021,13 @@ LogB.Debug("X");
createComboSelectRuns(false); //this will update also the selectRunsString
UtilGtk.ComboUpdate(combo_result_runs,
- SqliteRunType.SelectRunTypes(Constants.AllRunsName, true), "");
//without filter, only select name
+ SqliteGeneral.SqliteRunType.SelectRunTypes(Constants.AllRunsName,
true), ""); //without filter, only select name
new DialogMessage(Constants.MessageTypes.INFO, Catalog.GetString("Added simple
run."));
} else {
createComboSelectRunsInterval(false); //this will update also the
selectRunsIntervalString
UtilGtk.ComboUpdate(combo_result_runs_interval,
- SqliteRunIntervalType.SelectRunIntervalTypes(Constants.AllRunsName,
true), ""); //without filter, only select name
+
SqliteGeneral.SqliteRunIntervalType.SelectRunIntervalTypes(Constants.AllRunsName, true), ""); //without
filter, only select name
new DialogMessage(Constants.MessageTypes.INFO, Catalog.GetString("Added intervallic
run."));
}
updateComboStats();
@@ -6125,7 +6125,7 @@ LogB.Debug("X");
//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 (myTreeViewJumpsRj.EventSelectedID > 0) {
//3.- obtain the data of the selected jump
- JumpRj myJump = SqliteJumpRj.SelectJumpData( "jumpRj",
myTreeViewJumpsRj.EventSelectedID, false );
+ JumpRj myJump = SqliteGeneral.SqliteJumpRj.SelectJumpData( "jumpRj",
myTreeViewJumpsRj.EventSelectedID, false );
//4.- edit this jump
repairJumpRjWin = RepairJumpRjWindow.Show(app1, myJump, preferences.digitsNumber);
@@ -6152,7 +6152,7 @@ LogB.Debug("X");
//(check also if it's not a individual run interval, then pass the parent run interval)
if (myTreeViewRunsInterval.EventSelectedID > 0) {
//3.- obtain the data of the selected run
- RunInterval myRun = SqliteRunInterval.SelectRunData( Constants.RunIntervalTable,
myTreeViewRunsInterval.EventSelectedID, false );
+ RunInterval myRun = SqliteGeneral.SqliteRunInterval.SelectRunData(
Constants.RunIntervalTable, myTreeViewRunsInterval.EventSelectedID, false );
//4.- edit this run
repairRunIntervalWin = RepairRunIntervalWindow.Show(app1, myRun,
preferences.digitsNumber);
@@ -6179,7 +6179,7 @@ LogB.Debug("X");
//(check also if it's not a individual pulse, then pass the parent pulse)
if (myTreeViewPulses.EventSelectedID > 0) {
//3.- obtain the data of the selected pulse
- Pulse myPulse = SqlitePulse.SelectPulseData( myTreeViewPulses.EventSelectedID, false
);
+ Pulse myPulse = SqliteGeneral.SqlitePulse.SelectPulseData(
myTreeViewPulses.EventSelectedID, false );
//4.- edit this pulse
repairPulseWin = RepairPulseWindow.Show(app1, myPulse, preferences.digitsNumber);
diff --git a/src/gui/chronopic.cs b/src/gui/chronopic.cs
index 6fe1234..11f7aad 100644
--- a/src/gui/chronopic.cs
+++ b/src/gui/chronopic.cs
@@ -821,7 +821,7 @@ public class ChronopicWindow
{
if(currentCp == 1) {
// simulated = false;
- // SqlitePreferences.Update("simulated", simulated.ToString(), false);
+ // SqliteGeneral.SqlitePreferences.Update("simulated", simulated.ToString(), false);
if(connected)
return;
}
diff --git a/src/gui/convertWeight.cs b/src/gui/convertWeight.cs
index 447c92e..1569b36 100644
--- a/src/gui/convertWeight.cs
+++ b/src/gui/convertWeight.cs
@@ -283,7 +283,7 @@ public class ConvertWeightWindow
if ( (string) treeview1.Model.GetValue(iter, 1) == reactiveString )
tableName = "jumpRj";
- SqliteJump.UpdateWeight(tableName, jumpID, percent);
+ SqliteGeneral.SqliteJump.UpdateWeight(tableName, jumpID, percent);
}
}
}
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index f2b38ea..9443958 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -385,7 +385,7 @@ public partial class ChronoJumpWindow
encoder_pulsebar_analyze.Text = "";
//read from SQL
- encoderConfigurationCurrent = SqliteEncoder.LoadEncoderConfiguration();
+ encoderConfigurationCurrent = SqliteGeneral.SqliteEncoder.LoadEncoderConfiguration();
encoderCaptureListStore = new Gtk.ListStore (typeof (EncoderCurve));
@@ -403,7 +403,7 @@ public partial class ChronoJumpWindow
check_encoder_analyze_eccon_together.Sensitive = false;
//spin_encoder_capture_inertial.Value = Convert.ToDouble(Util.ChangeDecimalSeparator(
- // SqlitePreferences.Select("inertialmomentum")));
+ // SqliteGeneral.SqlitePreferences.Select("inertialmomentum")));
//initialize capture and analyze classes
encoderRProcCapture = new EncoderRProcCapture();
@@ -704,7 +704,7 @@ public partial class ChronoJumpWindow
//array1RM variable is not local because we need to perform calculations at each change on
displaced_weight
void array1RMUpdate (bool returnPersonNameAndExerciseName)
{
- array1RM = SqliteEncoder.Select1RM(
+ array1RM = SqliteGeneral.SqliteEncoder.Select1RM(
false, currentPerson.UniqueID, -1, //-1: currentSession = all sessions
getExerciseIDFromCombo(exerciseCombos.CAPTURE),
returnPersonNameAndExerciseName);
}
@@ -755,7 +755,7 @@ public partial class ChronoJumpWindow
genericWin.SetButtonMiddleLabel(Catalog.GetString("Add 1RM value"));
//find all persons in current session
- ArrayList personsPre = SqlitePersonSession.SelectCurrentSessionPersons(
+ ArrayList personsPre = SqliteGeneral.SqlitePersonSession.SelectCurrentSessionPersons(
currentSession.UniqueID,
false); //means: do not returnPersonAndPSlist
@@ -789,7 +789,7 @@ public partial class ChronoJumpWindow
LogB.Information("row adding at encoder 1RM");
double d = genericWin.SpinDouble2Selected;
- int uniqueID = SqliteEncoder.Insert1RM(false, currentPerson.UniqueID,
currentSession.UniqueID,
+ int uniqueID = SqliteGeneral.SqliteEncoder.Insert1RM(false, currentPerson.UniqueID,
currentSession.UniqueID,
getExerciseIDFromCombo (exerciseCombos.CAPTURE),
genericWin.SpinDouble2Selected);
genericWin.Row_add(new string[] {
@@ -810,7 +810,7 @@ public partial class ChronoJumpWindow
int uniqueID = genericWin.TreeviewSelectedUniqueID;
LogB.Information(uniqueID.ToString());
- Sqlite.Delete(false, Constants.Encoder1RMTable, Convert.ToInt32(uniqueID));
+ SqliteGeneral.Sqlite.Delete(false, Constants.Encoder1RMTable, Convert.ToInt32(uniqueID));
array1RMUpdate(false);
encoder_change_displaced_weight_and_1RM ();
@@ -867,7 +867,7 @@ public partial class ChronoJumpWindow
void on_button_encoder_signal_save_comment_clicked (object o, EventArgs args) {
LogB.Debug(encoderSignalUniqueID);
if(encoderSignalUniqueID != null && Convert.ToInt32(encoderSignalUniqueID) > 0) {
- Sqlite.Update(false, Constants.EncoderTable, "description", "",
+ SqliteGeneral.Sqlite.Update(false, Constants.EncoderTable, "description", "",
Util.RemoveTildeAndColonAndDot(textview_encoder_signal_comment.Buffer.Text),
"uniqueID", encoderSignalUniqueID);
button_encoder_signal_save_comment.Label = Catalog.GetString("Saved comment.");
@@ -1100,7 +1100,7 @@ public partial class ChronoJumpWindow
EncoderSQL eSQL = new EncoderSQL();
try {
- eSQL = (EncoderSQL) SqliteEncoder.Select(dbconOpened, uniqueID, 0, 0,
Constants.EncoderGI.ALL,
+ eSQL = (EncoderSQL) SqliteGeneral.SqliteEncoder.Select(dbconOpened, uniqueID, 0, 0,
Constants.EncoderGI.ALL,
-1, "", EncoderSQL.Eccons.ALL, false, true)[0];
} catch {
eSQLfound = false;
@@ -1111,13 +1111,13 @@ public partial class ChronoJumpWindow
if(eSQLfound)
Util.FileDelete(eSQL.GetFullURL(false)); //don't convertPathToR
- Sqlite.Delete(dbconOpened, Constants.EncoderTable, Convert.ToInt32(uniqueID));
+ SqliteGeneral.Sqlite.Delete(dbconOpened, Constants.EncoderTable, Convert.ToInt32(uniqueID));
- ArrayList escArray = SqliteEncoder.SelectSignalCurve(dbconOpened,
+ ArrayList escArray = SqliteGeneral.SqliteEncoder.SelectSignalCurve(dbconOpened,
-1, Convert.ToInt32(uniqueID), //signal, curve
-1, -1); //msStart, msEnd
if(eSQLfound)
- SqliteEncoder.DeleteSignalCurveWithCurveID(dbconOpened,
+ SqliteGeneral.SqliteEncoder.DeleteSignalCurveWithCurveID(dbconOpened,
Convert.ToInt32(eSQL.uniqueID)); //delete by curveID on SignalCurve
table
//if deleted curve is from current signal, uncheck it in encoderCaptureCurves
if(escArray.Count > 0) {
@@ -1142,7 +1142,7 @@ public partial class ChronoJumpWindow
//separated to be called also from guiT
ArrayList encoderLoadSignalData() {
- return SqliteEncoder.Select(
+ return SqliteGeneral.SqliteEncoder.Select(
false, -1, currentPerson.UniqueID, currentSession.UniqueID, getEncoderGI(),
-1, "signal", EncoderSQL.Eccons.ALL,
false, true);
@@ -1192,7 +1192,7 @@ public partial class ChronoJumpWindow
genericWin.SetTreeview(columnsString, false, dataPrint, new ArrayList(),
Constants.ContextMenu.EDITDELETE, true);
//find all persons in current session
- ArrayList personsPre =
SqlitePersonSession.SelectCurrentSessionPersons(currentSession.UniqueID,
+ ArrayList personsPre =
SqliteGeneral.SqlitePersonSession.SelectCurrentSessionPersons(currentSession.UniqueID,
false); //means: do not returnPersonAndPSlist
string [] persons = new String[personsPre.Count];
@@ -1230,7 +1230,7 @@ public partial class ChronoJumpWindow
genericWin.HideAndNull();
- ArrayList data = SqliteEncoder.Select(
+ ArrayList data = SqliteGeneral.SqliteEncoder.Select(
false, uniqueID, currentPerson.UniqueID, currentSession.UniqueID,
Constants.EncoderGI.ALL,
-1, "signal", EncoderSQL.Eccons.ALL,
false, true);
@@ -1292,7 +1292,7 @@ public partial class ChronoJumpWindow
LogB.Information("row edit apply at load signal");
int curveID = genericWin.TreeviewSelectedUniqueID;
- EncoderSQL eSQL = (EncoderSQL) SqliteEncoder.Select(false, curveID, 0, 0,
Constants.EncoderGI.ALL,
+ EncoderSQL eSQL = (EncoderSQL) SqliteGeneral.SqliteEncoder.Select(false, curveID, 0, 0,
Constants.EncoderGI.ALL,
-1, "", EncoderSQL.Eccons.ALL, false, true)[0];
//if changed comment, update SQL, and update treeview
@@ -1300,7 +1300,7 @@ public partial class ChronoJumpWindow
string comment = Util.RemoveTildeAndColonAndDot(genericWin.EntryEditRow);
if(comment != eSQL.description) {
eSQL.description = comment;
- SqliteEncoder.Update(false, eSQL);
+ SqliteGeneral.SqliteEncoder.Update(false, eSQL);
//update treeview
genericWin.on_edit_selected_done_update_treeview();
@@ -1311,7 +1311,7 @@ public partial class ChronoJumpWindow
int newPersonID = Util.FetchID(genericWin.GetComboSelected);
if(newPersonID != currentPerson.UniqueID) {
EncoderSQL eSQLChangedPerson = eSQL.ChangePerson(genericWin.GetComboSelected);
- SqliteEncoder.Update(false, eSQLChangedPerson);
+ SqliteGeneral.SqliteEncoder.Update(false, eSQLChangedPerson);
genericWin.RemoveSelectedRow();
}
@@ -1338,7 +1338,7 @@ public partial class ChronoJumpWindow
if(signalID == Convert.ToInt32(encoderSignalUniqueID))
on_button_encoder_delete_signal_accepted (o, args);
else {
- EncoderSQL eSQL = (EncoderSQL) SqliteEncoder.Select(
+ EncoderSQL eSQL = (EncoderSQL) SqliteGeneral.SqliteEncoder.Select(
false, signalID, 0, 0, Constants.EncoderGI.ALL,
-1, "signal", EncoderSQL.Eccons.ALL, false, true)[0];
@@ -1382,17 +1382,17 @@ public partial class ChronoJumpWindow
bool deletedOk = Util.FileDelete(signalURL);
//delete signal from encoder table
- Sqlite.Delete(false, Constants.EncoderTable, signalID);
+ SqliteGeneral.Sqlite.Delete(false, Constants.EncoderTable, signalID);
//find related curves using encoderSignalCurve table
- ArrayList linkedCurves = SqliteEncoder.SelectSignalCurve(
+ ArrayList linkedCurves = SqliteGeneral.SqliteEncoder.SelectSignalCurve(
false, signalID, -1, -1, -1); //DBopened, signal, curve, msStart, msEnd
//delete related curves: files and records from encoder table
foreach(EncoderSignalCurve esc in linkedCurves)
{
//select related curves to find URL
- EncoderSQL eSQL = (EncoderSQL) SqliteEncoder.Select(
+ EncoderSQL eSQL = (EncoderSQL) SqliteGeneral.SqliteEncoder.Select(
false, esc.curveID, -1, -1, Constants.EncoderGI.ALL,
-1, "curve", EncoderSQL.Eccons.ALL, false, true)[0];
@@ -1400,11 +1400,11 @@ public partial class ChronoJumpWindow
Util.FileDelete(eSQL.GetFullURL(false)); //don't convertPathToR
//delete curve from encoder table
- Sqlite.Delete(false, Constants.EncoderTable, esc.curveID);
+ SqliteGeneral.Sqlite.Delete(false, Constants.EncoderTable, esc.curveID);
}
//delete related records from encoderSignalCurve table
- Sqlite.DeleteSelectingField(false, Constants.EncoderSignalCurveTable,
+ SqliteGeneral.Sqlite.DeleteSelectingField(false, Constants.EncoderSignalCurveTable,
"signalID", signalID.ToString());
}
@@ -1427,7 +1427,7 @@ public partial class ChronoJumpWindow
void on_menuitem_encoder_session_overview_activate (object o, EventArgs args)
{
- ArrayList dataPrint = SqliteEncoder.SelectSessionOverview(false, currentEncoderGI,
currentSession.UniqueID);
+ ArrayList dataPrint = SqliteGeneral.SqliteEncoder.SelectSessionOverview(false,
currentEncoderGI, currentSession.UniqueID);
string title = "";
string [] columnsString;
@@ -1681,7 +1681,7 @@ public partial class ChronoJumpWindow
void on_button_encoder_delete_signal_accepted (object o, EventArgs args)
{
- EncoderSQL eSQL = (EncoderSQL) SqliteEncoder.Select(
+ EncoderSQL eSQL = (EncoderSQL) SqliteGeneral.SqliteEncoder.Select(
false, Convert.ToInt32(encoderSignalUniqueID), 0, 0, Constants.EncoderGI.ALL,
-1, "signal", EncoderSQL.Eccons.ALL, false, true)[0];
@@ -1719,7 +1719,7 @@ public partial class ChronoJumpWindow
updateComboEncoderAnalyzeCurveNumFromCurrentSet ();
else if(radio_encoder_analyze_individual_current_session.Active)
{
- ArrayList data = SqliteEncoder.Select(
+ ArrayList data = SqliteGeneral.SqliteEncoder.Select(
dbconOpened, -1, currentPerson.UniqueID, currentSession.UniqueID,
getEncoderGI(),
getExerciseIDFromCombo(exerciseCombos.ANALYZE),
"curve", EncoderSQL.Eccons.ALL,
@@ -1856,11 +1856,11 @@ public partial class ChronoJumpWindow
LogB.Information(curveStart + "->" + duration);
int curveIDMax;
- int countCurveIDs = Sqlite.Count(Constants.EncoderTable, dbconOpened);
+ int countCurveIDs = SqliteGeneral.Sqlite.Count(Constants.EncoderTable, dbconOpened);
if(countCurveIDs == 0)
curveIDMax = 0;
else
- curveIDMax = Sqlite.Max(Constants.EncoderTable, "uniqueID", dbconOpened);
+ curveIDMax = SqliteGeneral.Sqlite.Max(Constants.EncoderTable, "uniqueID",
dbconOpened);
//save raw file to hard disk
fileSaved = UtilEncoder.EncoderSaveCurve(UtilEncoder.GetEncoderDataTempFileName(),
@@ -1874,7 +1874,7 @@ public partial class ChronoJumpWindow
return "";
//save it to SQL (encoderSignalCurve table)
- SqliteEncoder.SignalCurveInsert(dbconOpened,
+ SqliteGeneral.SqliteEncoder.SignalCurveInsert(dbconOpened,
Convert.ToInt32(encoderSignalUniqueID), curveIDMax +1,
Convert.ToInt32(curveStart + (duration /2)));
@@ -1914,7 +1914,7 @@ public partial class ChronoJumpWindow
//we know it because encoderUniqueID is != than "-1" if we loaded something from database
//This also saves curves
if(myID == "-1") {
- myID = SqliteEncoder.Insert(dbconOpened, eSQL).ToString(); //Adding on SQL
+ myID = SqliteGeneral.SqliteEncoder.Insert(dbconOpened, eSQL).ToString(); //Adding on
SQL
if(mode == "signal") {
encoderSignalUniqueID = myID;
feedback = Catalog.GetString("Set saved");
@@ -1930,7 +1930,7 @@ public partial class ChronoJumpWindow
Convert.ToInt32(encoderSignalUniqueID));
//need assign uniqueID to update and add the URL of video
eSQL.uniqueID = encoderSignalUniqueID;
- SqliteEncoder.Update(dbconOpened, eSQL);
+ SqliteGeneral.SqliteEncoder.Update(dbconOpened, eSQL);
//notebook_video_encoder.CurrentPage = 1;
radiobutton_video_encoder_play.Active = true;
@@ -1948,7 +1948,7 @@ public partial class ChronoJumpWindow
LogB.Warning("TOSTRING1");
eSQL.ToString();
//only signal is updated
- SqliteEncoder.Update(dbconOpened, eSQL); //Adding on SQL
+ SqliteGeneral.SqliteEncoder.Update(dbconOpened, eSQL); //Adding on SQL
LogB.Warning("TOSTRING2");
eSQL.ToString();
feedback = Catalog.GetString("Set updated");
@@ -1964,7 +1964,7 @@ public partial class ChronoJumpWindow
//if userCurves and no data, return
if( ! radio_encoder_analyze_individual_current_set.Active)
{
- ArrayList data = SqliteEncoder.Select(
+ ArrayList data = SqliteGeneral.SqliteEncoder.Select(
false, -1, currentPerson.UniqueID, currentSession.UniqueID,
getEncoderGI(),
-1, "curve", EncoderSQL.Eccons.ALL,
false, true);
@@ -2235,7 +2235,7 @@ public partial class ChronoJumpWindow
//select currentPerson, currentSession curves
//onlyActive is false to have all the curves
//this is a need for "single" to select on display correct curve
- data = SqliteEncoder.Select(
+ data = SqliteGeneral.SqliteEncoder.Select(
false, -1, currentPerson.UniqueID, currentSession.UniqueID,
getEncoderGI(),
getExerciseIDFromCombo(exerciseCombos.ANALYZE),
"curve", ecconSelect,
@@ -2244,7 +2244,7 @@ public partial class ChronoJumpWindow
else if(radio_encoder_analyze_groupal_current_session.Active)
{
for (int i=0 ; i < encSelReps.EncoderCompareInter.Count ; i ++) {
- ArrayList dataPre = SqliteEncoder.Select(
+ ArrayList dataPre = SqliteGeneral.SqliteEncoder.Select(
false, -1,
Util.FetchID(encSelReps.EncoderCompareInter[i].ToString()),
currentSession.UniqueID,
@@ -2264,7 +2264,7 @@ public partial class ChronoJumpWindow
} else if(radio_encoder_analyze_individual_all_sessions.Active)
{
for (int i=0 ; i < encSelReps.EncoderCompareInter.Count ; i ++) {
- ArrayList dataPre = SqliteEncoder.Select(
+ ArrayList dataPre = SqliteGeneral.SqliteEncoder.Select(
false, -1,
currentPerson.UniqueID,
Util.FetchID(encSelReps.EncoderCompareInter[i].ToString()),
@@ -2307,12 +2307,12 @@ public partial class ChronoJumpWindow
if(my1RMName == "1RM Any exercise") {
//get speed1RM (from exercise of curve on SQL, not from combo)
- EncoderExercise exTemp = (EncoderExercise)
SqliteEncoder.SelectEncoderExercises(
+ EncoderExercise exTemp = (EncoderExercise)
SqliteGeneral.SqliteEncoder.SelectEncoderExercises(
false , exID, false)[0];
sendAnalysis = "1RMAnyExercise";
analysisVariables = Util.ConvertToPoint(exTemp.speed1RM) + ";" +
- SqlitePreferences.Select("encoder1RMMethod");
+ SqliteGeneral.SqlitePreferences.Select("encoder1RMMethod");
analysisOptions = "p";
}
}
@@ -2343,7 +2343,7 @@ public partial class ChronoJumpWindow
writer.WriteLine("status,seriesName,exerciseName,massBody,massExtra,dateTime,fullURL,eccon,percentBodyWeight,"
+
"econfName, econfd, econfD, econfAnglePush, econfAngleWeight,
econfInertia, econfGearedDown, laterality");
- ArrayList eeArray = SqliteEncoder.SelectEncoderExercises(false, -1, false);
+ ArrayList eeArray = SqliteGeneral.SqliteEncoder.SelectEncoderExercises(false, -1,
false);
EncoderExercise ex = new EncoderExercise();
LogB.Information("AT ANALYZE");
@@ -2353,7 +2353,7 @@ public partial class ChronoJumpWindow
double iteratingMassBody = -1;
int countSeries = 1;
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
foreach(EncoderSQL eSQL in data) {
foreach(EncoderExercise eeSearch in eeArray)
if(eSQL.exerciseID == eeSearch.uniqueID)
@@ -2362,7 +2362,7 @@ public partial class ChronoJumpWindow
LogB.Debug(" AT ANALYZE 1.1 ");
//massBody change if we are comparing different persons or sessions
if(eSQL.personID != iteratingPerson || eSQL.sessionID != iteratingSession) {
- iteratingMassBody = SqlitePersonSession.SelectAttribute(
+ iteratingMassBody = SqliteGeneral.SqlitePersonSession.SelectAttribute(
true, eSQL.personID, eSQL.sessionID,
Constants.Weight);
}
LogB.Debug(" AT ANALYZE 1.2 ");
@@ -2425,18 +2425,18 @@ public partial class ChronoJumpWindow
LogB.Debug(" disposing writer ");
((IDisposable)writer).Dispose();
LogB.Debug(" AT ANALYZE 2 ");
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
} else { //current set
if(encoderAnalysis == "1RM") {
if(my1RMName == "1RM Any exercise") {
//get speed1RM (from combo)
- EncoderExercise ex = (EncoderExercise)
SqliteEncoder.SelectEncoderExercises(
+ EncoderExercise ex = (EncoderExercise)
SqliteGeneral.SqliteEncoder.SelectEncoderExercises(
false,
getExerciseIDFromCombo(exerciseCombos.CAPTURE), false)[0];
sendAnalysis = "1RMAnyExercise";
analysisVariables = Util.ConvertToPoint(ex.speed1RM) + ";" +
- SqlitePreferences.Select("encoder1RMMethod");
+ SqliteGeneral.SqlitePreferences.Select("encoder1RMMethod");
analysisOptions = "p";
}
else if(my1RMName == "1RM Indirect") {
@@ -3098,7 +3098,7 @@ public partial class ChronoJumpWindow
//this is called also when an exercise is deleted to update the combo and the string []
protected void createEncoderComboExerciseAndAnalyze() {
- ArrayList encoderExercises = SqliteEncoder.SelectEncoderExercises(false, -1, false);
+ ArrayList encoderExercises = SqliteGeneral.SqliteEncoder.SelectEncoderExercises(false, -1,
false);
encoderExercisesTranslationAndBodyPWeight = new String [encoderExercises.Count];
string [] exerciseNamesToCombo = new String [encoderExercises.Count];
int i =0;
@@ -3384,7 +3384,7 @@ public partial class ChronoJumpWindow
}
double load1RMWithoutPerson = massWithoutPerson(load1RM, exerciseName);
- SqliteEncoder.Insert1RM(false, currentPerson.UniqueID, currentSession.UniqueID,
+ SqliteGeneral.SqliteEncoder.Insert1RM(false, currentPerson.UniqueID, currentSession.UniqueID,
exerciseID, load1RMWithoutPerson);
string myString = Catalog.GetString("Saved.");
@@ -3470,7 +3470,7 @@ public partial class ChronoJumpWindow
//info is now info and edit (all values can be changed), and detete (there's delete button)
void on_button_encoder_exercise_edit_clicked (object o, EventArgs args)
{
- EncoderExercise ex = (EncoderExercise) SqliteEncoder.SelectEncoderExercises(
+ EncoderExercise ex = (EncoderExercise) SqliteGeneral.SqliteEncoder.SelectEncoderExercises(
false, getExerciseIDFromCombo(exerciseCombos.CAPTURE), false)[0];
ArrayList bigArray = new ArrayList();
@@ -3609,22 +3609,22 @@ public partial class ChronoJumpWindow
if(name == "")
genericWin.SetLabelError(Catalog.GetString("Error: Missing name of exercise."));
- else if (adding && Sqlite.Exists(false, Constants.EncoderExerciseTable, name))
+ else if (adding && SqliteGeneral.Sqlite.Exists(false, Constants.EncoderExerciseTable, name))
genericWin.SetLabelError(string.Format(Catalog.GetString(
"Error: An exercise named '{0}' already exists."),
name));
else {
if(adding)
- SqliteEncoder.InsertExercise(false, name, genericWin.SpinIntSelected,
+ SqliteGeneral.SqliteEncoder.InsertExercise(false, name,
genericWin.SpinIntSelected,
genericWin.Entry2Selected, genericWin.Entry3Selected,
Util.ConvertToPoint(genericWin.SpinDouble2Selected)
);
else
- SqliteEncoder.UpdateExercise(false, genericWin.nameUntranslated, name,
genericWin.SpinIntSelected,
+ SqliteGeneral.SqliteEncoder.UpdateExercise(false,
genericWin.nameUntranslated, name, genericWin.SpinIntSelected,
genericWin.Entry2Selected, genericWin.Entry3Selected,
Util.ConvertToPoint(genericWin.SpinDouble2Selected)
);
- ArrayList encoderExercises = SqliteEncoder.SelectEncoderExercises(false,-1, false);
+ ArrayList encoderExercises =
SqliteGeneral.SqliteEncoder.SelectEncoderExercises(false,-1, false);
encoderExercisesTranslationAndBodyPWeight = new String [encoderExercises.Count];
string [] exerciseNamesToCombo = new String [encoderExercises.Count];
int i =0;
@@ -3654,14 +3654,14 @@ public partial class ChronoJumpWindow
void on_button_encoder_exercise_delete (object o, EventArgs args)
{
- EncoderExercise ex = (EncoderExercise) SqliteEncoder.SelectEncoderExercises(
+ EncoderExercise ex = (EncoderExercise) SqliteGeneral.SqliteEncoder.SelectEncoderExercises(
false, genericWin.uniqueID, false)[0];
if(ex.IsPredefined()) {
new DialogMessage(Constants.MessageTypes.WARNING, Catalog.GetString("Sorry,
predefined exercises cannot be deleted."));
return;
}
- ArrayList array = SqliteEncoder.SelectEncoderRowsOfAnExercise(false, genericWin.uniqueID);
//dbconOpened, exerciseID
+ ArrayList array = SqliteGeneral.SqliteEncoder.SelectEncoderRowsOfAnExercise(false,
genericWin.uniqueID); //dbconOpened, exerciseID
if(array.Count > 0) {
//there are some records of this exercise on encoder table, do not delete
@@ -3690,9 +3690,9 @@ public partial class ChronoJumpWindow
} else {
//encoder table has not records of this exercise
//delete exercise
- Sqlite.Delete(false, Constants.EncoderExerciseTable, genericWin.uniqueID);
+ SqliteGeneral.Sqlite.Delete(false, Constants.EncoderExerciseTable,
genericWin.uniqueID);
//delete 1RM records of this exercise
- Sqlite.DeleteFromAnInt(false, Constants.Encoder1RMTable, "exerciseID",
genericWin.uniqueID);
+ SqliteGeneral.Sqlite.DeleteFromAnInt(false, Constants.Encoder1RMTable, "exerciseID",
genericWin.uniqueID);
genericWin.HideAndNull();
@@ -5440,16 +5440,16 @@ public partial class ChronoJumpWindow
* (4) close Sqlite
*/
- Sqlite.Open(); // (0)
+ SqliteGeneral.Sqlite.Open(); // (0)
bool deletedUserCurves = false;
- EncoderSQL currentSignalSQL = (EncoderSQL) SqliteEncoder.Select(
+ EncoderSQL currentSignalSQL = (EncoderSQL)
SqliteGeneral.SqliteEncoder.Select(
true, Convert.ToInt32(encoderSignalUniqueID), 0, 0,
getEncoderGI(),
-1, "", EncoderSQL.Eccons.ALL,
false, true)[0];
- ArrayList data = SqliteEncoder.Select(
+ ArrayList data = SqliteGeneral.SqliteEncoder.Select(
true, -1, currentPerson.UniqueID,
currentSession.UniqueID, getEncoderGI(),
-1, "curve", EncoderSQL.Eccons.ALL,
false, true);
@@ -5462,29 +5462,29 @@ public partial class ChronoJumpWindow
encoderConfigurationCurrent.name !=
eSQL.encoderConfiguration.name)
{
Util.FileDelete(eSQL.GetFullURL(false));
// (1a1)
- Sqlite.Delete(true, Constants.EncoderTable,
Convert.ToInt32(eSQL.uniqueID)); // (1a2)
-
SqliteEncoder.DeleteSignalCurveWithCurveID(true, Convert.ToInt32(eSQL.uniqueID)); // (1a3)
+ SqliteGeneral.Sqlite.Delete(true,
Constants.EncoderTable, Convert.ToInt32(eSQL.uniqueID)); // (1a2)
+
SqliteGeneral.SqliteEncoder.DeleteSignalCurveWithCurveID(true, Convert.ToInt32(eSQL.uniqueID)); // (1a3)
deletedUserCurves = true;
} else {
// (1b)
if(currentSignalSQL.exerciseID !=
eSQL.exerciseID)
- Sqlite.Update(true,
Constants.EncoderTable, "exerciseID",
+ SqliteGeneral.Sqlite.Update(true,
Constants.EncoderTable, "exerciseID",
"",
currentSignalSQL.exerciseID.ToString(),
"uniqueID",
eSQL.uniqueID.ToString());
if(currentSignalSQL.extraWeight !=
eSQL.extraWeight)
- Sqlite.Update(true,
Constants.EncoderTable, "extraWeight",
+ SqliteGeneral.Sqlite.Update(true,
Constants.EncoderTable, "extraWeight",
"",
currentSignalSQL.extraWeight,
"uniqueID",
eSQL.uniqueID.ToString());
if(currentSignalSQL.laterality !=
eSQL.laterality)
- Sqlite.Update(true,
Constants.EncoderTable, "laterality",
+ SqliteGeneral.Sqlite.Update(true,
Constants.EncoderTable, "laterality",
"",
currentSignalSQL.laterality,
"uniqueID",
eSQL.uniqueID.ToString());
if(
currentSignalSQL.encoderConfiguration.ToStringOutput(EncoderConfiguration.Outputs.SQL) !=
eSQL.encoderConfiguration.ToStringOutput(EncoderConfiguration.Outputs.SQL) )
{
- Sqlite.Update(true,
Constants.EncoderTable, "encoderConfiguration",
+ SqliteGeneral.Sqlite.Update(true,
Constants.EncoderTable, "encoderConfiguration",
"",
currentSignalSQL.encoderConfiguration.ToStringOutput(
EncoderConfiguration.Outputs.SQL),
"uniqueID",
eSQL.uniqueID.ToString());
@@ -5500,7 +5500,7 @@ public partial class ChronoJumpWindow
// (3) update meanPower on SQL encoder
findAndMarkSavedCurves(true, true); //SQL opened; update curve SQL
records (like future1: meanPower)
- Sqlite.Close(); // (4)
+ SqliteGeneral.Sqlite.Close(); // (4)
}
@@ -5695,10 +5695,10 @@ public partial class ChronoJumpWindow
{
//run this method with SQL opened to not be closing and opening a lot on the following
foreachs
if(! dbconOpened)
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
//find the saved curves
- ArrayList linkedCurves = SqliteEncoder.SelectSignalCurve(true,
+ ArrayList linkedCurves = SqliteGeneral.SqliteEncoder.SelectSignalCurve(true,
Convert.ToInt32(encoderSignalUniqueID), //signal
-1, -1, -1); //curve, msStart,msEnd
//LogB.Information("SAVED CURVES FOUND");
@@ -5730,7 +5730,7 @@ public partial class ChronoJumpWindow
if(updateSQLRecords) {
//update the future1
- Sqlite.Update(true, Constants.EncoderTable, "future1",
+ SqliteGeneral.Sqlite.Update(true, Constants.EncoderTable,
"future1",
"", curve.MeanPower,
"uniqueID", esc.curveID.ToString());
}
@@ -5742,7 +5742,7 @@ public partial class ChronoJumpWindow
}
if(! dbconOpened)
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
}
diff --git a/src/gui/encoderSelectRepetitions.cs b/src/gui/encoderSelectRepetitions.cs
index eae751a..a87f22c 100644
--- a/src/gui/encoderSelectRepetitions.cs
+++ b/src/gui/encoderSelectRepetitions.cs
@@ -188,7 +188,7 @@ public class EncoderSelectRepetitionsIndividualCurrentSession : EncoderSelectRep
protected override void getData()
{
- data = SqliteEncoder.Select(
+ data = SqliteGeneral.SqliteEncoder.Select(
false, -1, currentPerson.UniqueID, currentSession.UniqueID, encoderGI,
exerciseID, "curve", EncoderSQL.Eccons.ALL,
false, true);
@@ -267,7 +267,7 @@ public class EncoderSelectRepetitionsIndividualCurrentSession : EncoderSelectRep
genericWinESR.MarkActiveCurves(checkboxes);
//find all persons in current session
- ArrayList personsPre = SqlitePersonSession.SelectCurrentSessionPersons(
+ ArrayList personsPre = SqliteGeneral.SqlitePersonSession.SelectCurrentSessionPersons(
currentSession.UniqueID,
false); //means: do not returnPersonAndPSlist
@@ -330,14 +330,14 @@ public class EncoderSelectRepetitionsIndividualCurrentSession : EncoderSelectRep
//get selected/deselected rows
checkboxes = genericWinESR.GetColumn(1, false);
- ArrayList data = SqliteEncoder.Select(
+ ArrayList data = SqliteGeneral.SqliteEncoder.Select(
false, -1, currentPerson.UniqueID, currentSession.UniqueID, encoderGI,
exerciseID, "curve", EncoderSQL.Eccons.ALL,
false, true);
//update on database the curves that have been selected/deselected
//doing it as a transaction: FAST
- RepsActive = SqliteEncoder.UpdateTransaction(data, checkboxes);
+ RepsActive = SqliteGeneral.SqliteEncoder.UpdateTransaction(data, checkboxes);
RepsAll = data.Count;
FakeButtonDone.Click();
@@ -354,7 +354,7 @@ public class EncoderSelectRepetitionsIndividualCurrentSession : EncoderSelectRep
protected void on_show_repetitions_row_edit_apply (object o, EventArgs args) {
int curveID = genericWinESR.TreeviewSelectedUniqueID;
- EncoderSQL eSQL = (EncoderSQL) SqliteEncoder.Select(
+ EncoderSQL eSQL = (EncoderSQL) SqliteGeneral.SqliteEncoder.Select(
false, curveID, 0, 0, encoderGI,
-1, "", EncoderSQL.Eccons.ALL,
false, true)[0];
@@ -364,7 +364,7 @@ public class EncoderSelectRepetitionsIndividualCurrentSession : EncoderSelectRep
string comment = Util.RemoveTildeAndColonAndDot(genericWinESR.EntryEditRow);
if(comment != eSQL.description) {
eSQL.description = comment;
- SqliteEncoder.Update(false, eSQL);
+ SqliteGeneral.SqliteEncoder.Update(false, eSQL);
//update treeview
genericWinESR.on_edit_selected_done_update_treeview();
@@ -375,7 +375,7 @@ public class EncoderSelectRepetitionsIndividualCurrentSession : EncoderSelectRep
int newPersonID = Util.FetchID(genericWinESR.GetComboSelected);
if(newPersonID != currentPerson.UniqueID) {
EncoderSQL eSQLChangedPerson = eSQL.ChangePerson(genericWinESR.GetComboSelected);
- SqliteEncoder.Update(false, eSQLChangedPerson);
+ SqliteGeneral.SqliteEncoder.Update(false, eSQLChangedPerson);
genericWinESR.RemoveSelectedRow();
}
@@ -444,7 +444,7 @@ public class EncoderSelectRepetitionsIndividualAllSessions : EncoderSelectRepeti
protected override void getData()
{
- data = SqliteEncoder.SelectCompareIntersession(false, encoderGI, exerciseID,
currentPerson.UniqueID);
+ data = SqliteGeneral.SqliteEncoder.SelectCompareIntersession(false, encoderGI, exerciseID,
currentPerson.UniqueID);
}
protected override void createBigArray()
@@ -591,14 +591,14 @@ public class EncoderSelectRepetitionsGroupalCurrentSession : EncoderSelectRepeti
protected override void getData()
{
- ArrayList dataPre = SqlitePersonSession.SelectCurrentSessionPersons(currentSession.UniqueID,
+ ArrayList dataPre =
SqliteGeneral.SqlitePersonSession.SelectCurrentSessionPersons(currentSession.UniqueID,
false); //means: do not returnPersonAndPSlist
data = new ArrayList();
nonSensitiveRows = new ArrayList();
int j = 0; //list of added persons
foreach(Person p in dataPre) {
- ArrayList eSQLarray = SqliteEncoder.Select(
+ ArrayList eSQLarray = SqliteGeneral.SqliteEncoder.Select(
false, -1, p.UniqueID, currentSession.UniqueID, encoderGI,
exerciseID, "curve", EncoderSQL.Eccons.ALL,
false, true);
diff --git a/src/gui/encoderTreeviews.cs b/src/gui/encoderTreeviews.cs
index 0e47c2a..5f9ba30 100644
--- a/src/gui/encoderTreeviews.cs
+++ b/src/gui/encoderTreeviews.cs
@@ -252,7 +252,7 @@ public partial class ChronoJumpWindow
Convert.ToDouble(curveNext.Duration);
}
- ArrayList signalCurves = SqliteEncoder.SelectSignalCurve(dbconOpened,
+ ArrayList signalCurves = SqliteGeneral.SqliteEncoder.SelectSignalCurve(dbconOpened,
Convert.ToInt32(encoderSignalUniqueID), -1,
msStart, msEnd);
foreach(EncoderSignalCurve esc in signalCurves)
@@ -363,7 +363,7 @@ public partial class ChronoJumpWindow
//need to open Sqlite because if more than 50 curves are saved/deleted, it will crash if
open/close connnections all the time
//TODO: do as a transaction, but code need to be refactored
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
bool changeTo;
while(iterOk) {
@@ -425,7 +425,7 @@ public partial class ChronoJumpWindow
iterOk = encoderCaptureListStore.IterNext (ref iter);
}
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
prepareAnalyzeRepetitions();
@@ -525,7 +525,7 @@ public partial class ChronoJumpWindow
totalMass = findMass(Constants.MassType.DISPLACED);
} else { //not current set
//TODO:
- curvesData = SqliteEncoder.Select(
+ curvesData = SqliteGeneral.SqliteEncoder.Select(
false, -1, currentPerson.UniqueID, currentSession.UniqueID,
currentEncoderGI,
-1, "curve", EncoderSQL.Eccons.ALL,
true, true);
diff --git a/src/gui/error.cs b/src/gui/error.cs
index 53cdb39..d68a7a3 100644
--- a/src/gui/error.cs
+++ b/src/gui/error.cs
@@ -93,7 +93,7 @@ public class ErrorWindow
string emailStored;
public void Show_send_log()
{
- emailStored = SqlitePreferences.Select("email");
+ emailStored = SqliteGeneral.SqlitePreferences.Select("email");
if(emailStored != null && emailStored != "" && emailStored != "0")
entry_send_log.Text = emailStored;
@@ -110,7 +110,7 @@ public class ErrorWindow
//1st save email on sqlite
if(email != null && email != "" && email != "0" && email != emailStored)
- SqlitePreferences.Update("email", email, false);
+ SqliteGeneral.SqlitePreferences.Update("email", email, false);
//2nd if there are comments, add them at the beginning of the file
string comments = textview_comments.Buffer.Text;
diff --git a/src/gui/eventExecute.cs b/src/gui/eventExecute.cs
index 20dcaf3..a1e76e9 100644
--- a/src/gui/eventExecute.cs
+++ b/src/gui/eventExecute.cs
@@ -562,11 +562,11 @@ public partial class ChronoJumpWindow
string [] str;
string testName;
if(radio_mode_jumps_small.Active) {
- str = SqliteJump.SelectTestMaxStuff(currentPerson.UniqueID, currentJumpType);
+ str = SqliteGeneral.SqliteJump.SelectTestMaxStuff(currentPerson.UniqueID,
currentJumpType);
testName = currentJumpType.Name;
}
else if(radio_mode_runs_small.Active) {
- str = SqliteRun.SelectTestMaxStuff(currentPerson.UniqueID, currentRunType);
+ str = SqliteGeneral.SqliteRun.SelectTestMaxStuff(currentPerson.UniqueID,
currentRunType);
testName = currentRunType.Name;
} else
return;
diff --git a/src/gui/jump.cs b/src/gui/jump.cs
index c605366..c5166c2 100644
--- a/src/gui/jump.cs
+++ b/src/gui/jump.cs
@@ -409,7 +409,7 @@ public class EditJumpWindow : EditEventWindow
//only for jump
double jumpPercentWeightForNewPerson = updateWeight(personID, sessionID);
- SqliteJump.Update(eventID, UtilGtk.ComboGetActive(combo_eventType), entryTv, entryTc,
entryFall, personID, jumpPercentWeightForNewPerson, description, Convert.ToDouble(entryAngle));
+ SqliteGeneral.SqliteJump.Update(eventID, UtilGtk.ComboGetActive(combo_eventType), entryTv,
entryTc, entryFall, personID, jumpPercentWeightForNewPerson, description, Convert.ToDouble(entryAngle));
}
@@ -559,7 +559,7 @@ public class EditJumpRjWindow : EditJumpWindow
//only for jumps
double jumpPercentWeightForNewPerson = updateWeight(personID, sessionID);
- SqliteJumpRj.Update(eventID, personID, entryFall, jumpPercentWeightForNewPerson, description);
+ SqliteGeneral.SqliteJumpRj.Update(eventID, personID, entryFall,
jumpPercentWeightForNewPerson, description);
}
}
@@ -930,7 +930,7 @@ public class RepairJumpRjWindow
Sqlite.Delete(false, Constants.JumpRjTable, jumpRj.UniqueID);
jumpRj.InsertAtDB(false, Constants.JumpRjTable);
/*
- SqliteJump.InsertRj("jumpRj", jumpRj.UniqueID.ToString(), jumpRj.PersonID, jumpRj.SessionID,
+ SqliteGeneral.SqliteJump.InsertRj("jumpRj", jumpRj.UniqueID.ToString(), jumpRj.PersonID,
jumpRj.SessionID,
jumpRj.Type, Util.GetMax(tvString), Util.GetMax(tcString),
jumpRj.Fall, jumpRj.Weight, jumpRj.Description,
Util.GetAverage(tvString), Util.GetAverage(tcString),
@@ -1041,11 +1041,11 @@ partial class ChronoJumpWindow
if(! t.IsPredefined) {
if(simple) {
- t = SqliteJumpType.SelectAndReturnJumpType(name, false);
- t.ImageFileName = SqliteEvent.GraphLinkSelectFileName(Constants.JumpTable,
name);
+ t = SqliteGeneral.SqliteJumpType.SelectAndReturnJumpType(name, false);
+ t.ImageFileName =
SqliteGeneral.SqliteEvent.GraphLinkSelectFileName(Constants.JumpTable, name);
} else {
- t = SqliteJumpType.SelectAndReturnJumpRjType(name, false);
- t.ImageFileName = SqliteEvent.GraphLinkSelectFileName(Constants.JumpRjTable,
name);
+ t = SqliteGeneral.SqliteJumpType.SelectAndReturnJumpRjType(name, false);
+ t.ImageFileName =
SqliteGeneral.SqliteEvent.GraphLinkSelectFileName(Constants.JumpRjTable, name);
}
}
return t;
@@ -1264,7 +1264,7 @@ partial class ChronoJumpWindow
private void on_extra_window_checkbutton_allow_finish_rj_after_time_toggled(object o, EventArgs args)
{
- SqlitePreferences.Update("allowFinishRjAfterTime",
checkbutton_allow_finish_rj_after_time.Active.ToString(), false);
+ SqliteGeneral.SqlitePreferences.Update("allowFinishRjAfterTime",
checkbutton_allow_finish_rj_after_time.Active.ToString(), false);
}
private void on_more_jumps_update_test (object o, EventArgs args) {
@@ -1426,7 +1426,7 @@ partial class ChronoJumpWindow
" " + distance.ToString() +
" " + angle.ToString();
- SqliteJump.UpdateDescription(Constants.JumpTable,
+ SqliteGeneral.SqliteJump.UpdateDescription(Constants.JumpTable,
currentJump.UniqueID, currentJump.Description);
myTreeViewJumps.Update(currentJump);
@@ -1602,7 +1602,7 @@ public class JumpsMoreWindow : EventMoreWindow
}
protected override string [] findTestTypesInSessions() {
- return SqliteJump.SelectJumps(false, -1, -1, "", selectedEventName,
+ return SqliteGeneral.SqliteJump.SelectJumps(false, -1, -1, "", selectedEventName,
Sqlite.Orders_by.DEFAULT, -1);
}
@@ -1879,7 +1879,7 @@ public class JumpsRjMoreWindow : EventMoreWindow
}
protected override string [] findTestTypesInSessions() {
- return SqliteJumpRj.SelectJumps(false, -1, -1, "", selectedEventName);
+ return SqliteGeneral.SqliteJumpRj.SelectJumps(false, -1, -1, "", selectedEventName);
}
void on_button_cancel_clicked (object o, EventArgs args)
diff --git a/src/gui/multiChronopic.cs b/src/gui/multiChronopic.cs
index 593ae87..2bee561 100644
--- a/src/gui/multiChronopic.cs
+++ b/src/gui/multiChronopic.cs
@@ -184,7 +184,7 @@ public class EditMultiChronopicWindow : EditEventWindow
protected override void updateEvent(int eventID, int personID, string description) {
- SqliteMultiChronopic.Update(eventID, personID, entryDistance, description);
+ SqliteGeneral.SqliteMultiChronopic.Update(eventID, personID, entryDistance, description);
}
protected override void on_button_cancel_clicked (object o, EventArgs args)
diff --git a/src/gui/networks.cs b/src/gui/networks.cs
index 277a292..70c7290 100644
--- a/src/gui/networks.cs
+++ b/src/gui/networks.cs
@@ -178,14 +178,14 @@ public partial class ChronoJumpWindow
main_menu.Visible = false;
button_preferences_not_menu.Visible = true;
- if(! Sqlite.Exists(false, Constants.SessionTable, "session")) {
+ if(! SqliteGeneral.Sqlite.Exists(false, Constants.SessionTable, "session")) {
//this creates the session and inserts at DB
currentSession = new Session(
"session", "", DateTime.Today, //name, place, dateTime
Constants.SportUndefinedID, Constants.SpeciallityUndefinedID,
Constants.LevelUndefinedID,
"", Constants.ServerUndefinedID); //comments, serverID
} else
- currentSession = SqliteSession.SelectByName("session");
+ currentSession = SqliteGeneral.SqliteSession.SelectByName("session");
on_load_session_accepted();
}
diff --git a/src/gui/person.cs b/src/gui/person.cs
index c1fdd48..fdf7442 100644
--- a/src/gui/person.cs
+++ b/src/gui/person.cs
@@ -553,18 +553,18 @@ public class PersonsRecuperateFromOtherSessionWindow : PersonRecuperateWindow
List <PersonSession> personSessions = new List<PersonSession>();
int psID;
- int countPersonSessions = Sqlite.Count(Constants.PersonSessionTable, false);
+ int countPersonSessions = SqliteGeneral.Sqlite.Count(Constants.PersonSessionTable, false);
if(countPersonSessions == 0)
psID = 1;
else {
- //Sqlite.Max will return NULL if there are no values, for this reason we use the
Sqlite.Count before
- int maxPSUniqueID = Sqlite.Max(Constants.PersonSessionTable, "uniqueID", false);
+ //SqliteGeneral.Sqlite.Max will return NULL if there are no values, for this reason
we use the SqliteGeneral.Sqlite.Count before
+ int maxPSUniqueID = SqliteGeneral.Sqlite.Max(Constants.PersonSessionTable,
"uniqueID", false);
psID = maxPSUniqueID + 1;
}
if (store.GetIterFirst(out iter))
{
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
do {
val = (bool) store.GetValue (iter, 0);
//if checkbox of person is true
@@ -584,7 +584,7 @@ public class PersonsRecuperateFromOtherSessionWindow : PersonRecuperateWindow
}
} while ( store.IterNext(ref iter) );
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
//do the transaction
SqlitePersonSessionTransaction psTr = new
SqlitePersonSessionTransaction(personSessions);
@@ -712,7 +712,7 @@ public class PersonNotUploadWindow : PersonsRecuperateFromOtherSessionWindow
private void fillTreeView (Gtk.TreeView tv, TreeStore store, int sessionID, ArrayList
initiallyUnchecked )
{
/*
- this is a bit weird because we use Sqlite.SelectAllPersonsRecuperable as inherithed
methods
+ this is a bit weird because we use SqliteGeneral.Sqlite.SelectAllPersonsRecuperable as
inherithed methods
that slq method needs a session where we want to search and a session not to search
(current session)
now here is different, we want to select persons from this session.
we continue using method SelectAllPersonsRecuperable because we want same output columns
@@ -1491,7 +1491,7 @@ public class PersonAddModifyWindow
private void on_sport_add_accepted (object o, EventArgs args) {
genericWin.Button_accept.Clicked -= new EventHandler(on_sport_add_accepted);
string newSportName = genericWin.EntrySelected;
- if(Sqlite.Exists(false, Constants.SportTable, newSportName) ||
+ if(SqliteGeneral.Sqlite.Exists(false, Constants.SportTable, newSportName) ||
newSportName == Catalog.GetString(Constants.SportUndefined) || //let's save
problems
newSportName == Catalog.GetString(Constants.SportNone) //let's save
problems
)
@@ -1541,7 +1541,7 @@ public class PersonAddModifyWindow
bool personExists;
if(adding)
- personExists = Sqlite.Exists (false, Constants.PersonTable,
Util.RemoveTilde(personName));
+ personExists = SqliteGeneral.Sqlite.Exists (false, Constants.PersonTable,
Util.RemoveTilde(personName));
else
personExists = SqlitePerson.ExistsAndItsNotMe (currentPerson.UniqueID,
Util.RemoveTilde(personName));
@@ -1552,9 +1552,9 @@ public class PersonAddModifyWindow
//if weight has changed
if(!adding && (double) spinbutton_weight.Value != weightIni) {
//see if this person has done jumps with weight
- string [] myJumpsNormal = SqliteJump.SelectJumps(false,
currentSession.UniqueID, currentPerson.UniqueID, "withWeight", "",
- Sqlite.Orders_by.DEFAULT, -1);
- string [] myJumpsReactive = SqliteJumpRj.SelectJumps(false,
currentSession.UniqueID, currentPerson.UniqueID, "withWeight", "");
+ string [] myJumpsNormal = SqliteGeneral.SqliteJump.SelectJumps(false,
currentSession.UniqueID, currentPerson.UniqueID, "withWeight", "",
+ SqliteGeneral.Sqlite.Orders_by.DEFAULT, -1);
+ string [] myJumpsReactive = SqliteGeneral.SqliteJumpRj.SelectJumps(false,
currentSession.UniqueID, currentPerson.UniqueID, "withWeight", "");
if(myJumpsNormal.Length > 0 || myJumpsReactive.Length > 0) {
//create the convertWeight Window
@@ -1591,15 +1591,15 @@ public class PersonAddModifyWindow
double weight = (double) spinbutton_weight.Value;
//convert margarias (it's power is calculated using weight and it's written on description)
- string [] myMargarias = SqliteRun.SelectRuns(false, currentSession.UniqueID,
currentPerson.UniqueID, "Margaria",
- Sqlite.Orders_by.DEFAULT, -1);
+ string [] myMargarias = SqliteGeneral.SqliteRun.SelectRuns(false, currentSession.UniqueID,
currentPerson.UniqueID, "Margaria",
+ SqliteGeneral.Sqlite.Orders_by.DEFAULT, -1);
foreach(string myStr in myMargarias) {
string [] margaria = myStr.Split(new char[] {':'});
- Run mRun = SqliteRun.SelectRunData(Convert.ToInt32(margaria[1]), false);
+ Run mRun = SqliteGeneral.SqliteRun.SelectRunData(Convert.ToInt32(margaria[1]), false);
double distanceMeters = mRun.Distance / 1000;
mRun.Description = "P = " + Util.TrimDecimals ( (weight * 9.8 * distanceMeters /
mRun.Time).ToString(), pDN) + " (Watts)";
- SqliteRun.Update(mRun.UniqueID, mRun.Type, mRun.Distance.ToString(),
mRun.Time.ToString(), mRun.PersonID, mRun.Description);
+ SqliteGeneral.SqliteRun.Update(mRun.UniqueID, mRun.Type, mRun.Distance.ToString(),
mRun.Time.ToString(), mRun.PersonID, mRun.Description);
}
@@ -2130,10 +2130,10 @@ public class PersonAddMultipleWindow {
errorRepeatedEntryString = "";
personsCreatedCount = 0;
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
for (int i = 0; i < rows; i ++)
checkEntries(i, ((Gtk.Entry)entries[i]).Text.ToString(), (int)
((Gtk.SpinButton)spins[i]).Value);
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
checkAllEntriesAreDifferent();
@@ -2152,7 +2152,7 @@ public class PersonAddMultipleWindow {
private void checkEntries(int count, string name, double weight) {
if(name.Length > 0) {
- bool personExists = Sqlite.Exists (true, Constants.PersonTable,
Util.RemoveTilde(name));
+ bool personExists = SqliteGeneral.Sqlite.Exists (true, Constants.PersonTable,
Util.RemoveTilde(name));
if(personExists) {
errorExistsString += "[" + (count+1) + "] " + name + "\n";
}
@@ -2203,22 +2203,22 @@ public class PersonAddMultipleWindow {
void processAllNonBlankRows()
{
int pID;
- int countPersons = Sqlite.Count(Constants.PersonTable, false);
+ int countPersons = SqliteGeneral.Sqlite.Count(Constants.PersonTable, false);
if(countPersons == 0)
pID = 1;
else {
- //Sqlite.Max will return NULL if there are no values, for this reason we use the
Sqlite.Count before
- int maxPUniqueID = Sqlite.Max(Constants.PersonTable, "uniqueID", false);
+ //SqliteGeneral.Sqlite.Max will return NULL if there are no values, for this reason
we use the SqliteGeneral.Sqlite.Count before
+ int maxPUniqueID = SqliteGeneral.Sqlite.Max(Constants.PersonTable, "uniqueID", false);
pID = maxPUniqueID + 1;
}
int psID;
- int countPersonSessions = Sqlite.Count(Constants.PersonSessionTable, false);
+ int countPersonSessions = SqliteGeneral.Sqlite.Count(Constants.PersonSessionTable, false);
if(countPersonSessions == 0)
psID = 1;
else {
- //Sqlite.Max will return NULL if there are no values, for this reason we use the
Sqlite.Count before
- int maxPSUniqueID = Sqlite.Max(Constants.PersonSessionTable, "uniqueID", false);
+ //SqliteGeneral.Sqlite.Max will return NULL if there are no values, for this reason
we use the SqliteGeneral.Sqlite.Count before
+ int maxPSUniqueID = SqliteGeneral.Sqlite.Max(Constants.PersonSessionTable,
"uniqueID", false);
psID = maxPSUniqueID + 1;
}
diff --git a/src/gui/preferences.cs b/src/gui/preferences.cs
index ddbd1fe..b92e69f 100644
--- a/src/gui/preferences.cs
+++ b/src/gui/preferences.cs
@@ -815,25 +815,25 @@ public class PreferencesWindow {
}
private void on_SQL_stress_test_not_safe_short_clicked (object o, EventArgs args) {
LogB.Information("start not safe short stress test ---->");
- Sqlite.SafeClose = false;
+ SqliteGeneral.Sqlite.SafeClose = false;
sql_stress_test(1000);
- Sqlite.SafeClose = true;
+ SqliteGeneral.Sqlite.SafeClose = true;
}
private void on_SQL_stress_test_not_safe_long_clicked (object o, EventArgs args) {
LogB.Information("start not safe long stress test ---->");
- Sqlite.SafeClose = false;
+ SqliteGeneral.Sqlite.SafeClose = false;
sql_stress_test(4000);
- Sqlite.SafeClose = true;
+ SqliteGeneral.Sqlite.SafeClose = true;
}
private void sql_stress_test (int times) {
Stopwatch sw = new Stopwatch();
sw.Start();
- //trying if new way of Sqlite.Close disposing dbcmd fixes problems when multiple open / close
connection
+ //trying if new way of SqliteGeneral.Sqlite.Close disposing dbcmd fixes problems when
multiple open / close connection
for(int i=0 ; i < times; i++) {
LogB.Debug (" i=" + i.ToString());
- LogB.Debug(SqlitePreferences.Select("databaseVersion"));
+ LogB.Debug(SqliteGeneral.SqlitePreferences.Select("databaseVersion"));
}
sw.Stop();
@@ -894,68 +894,68 @@ public class PreferencesWindow {
//change stuff in Sqlite and in preferences object that will be retrieved by GetPreferences
void on_button_accept_clicked (object o, EventArgs args)
{
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
if( preferences.digitsNumber != Convert.ToInt32(UtilGtk.ComboGetActive(combo_decimals)) ) {
- SqlitePreferences.Update("digitsNumber", UtilGtk.ComboGetActive(combo_decimals),
true);
+ SqliteGeneral.SqlitePreferences.Update("digitsNumber",
UtilGtk.ComboGetActive(combo_decimals), true);
preferences.digitsNumber = Convert.ToInt32(UtilGtk.ComboGetActive(combo_decimals));
}
if( preferences.showPower != PreferencesWindowBox.checkbutton_power.Active ) {
- SqlitePreferences.Update("showPower",
PreferencesWindowBox.checkbutton_power.Active.ToString(), true);
+ SqliteGeneral.SqlitePreferences.Update("showPower",
PreferencesWindowBox.checkbutton_power.Active.ToString(), true);
preferences.showPower = PreferencesWindowBox.checkbutton_power.Active;
}
if( preferences.showStiffness != PreferencesWindowBox.checkbutton_stiffness.Active ) {
- SqlitePreferences.Update("showStiffness",
PreferencesWindowBox.checkbutton_stiffness.Active.ToString(), true);
+ SqliteGeneral.SqlitePreferences.Update("showStiffness",
PreferencesWindowBox.checkbutton_stiffness.Active.ToString(), true);
preferences.showStiffness = PreferencesWindowBox.checkbutton_stiffness.Active;
}
if( preferences.showInitialSpeed != PreferencesWindowBox.checkbutton_initial_speed.Active ) {
- SqlitePreferences.Update("showInitialSpeed",
PreferencesWindowBox.checkbutton_initial_speed.Active.ToString(), true);
+ SqliteGeneral.SqlitePreferences.Update("showInitialSpeed",
PreferencesWindowBox.checkbutton_initial_speed.Active.ToString(), true);
preferences.showInitialSpeed = PreferencesWindowBox.checkbutton_initial_speed.Active;
}
if( preferences.showAngle != PreferencesWindowBox.checkbutton_angle.Active ) {
- SqlitePreferences.Update("showAngle",
PreferencesWindowBox.checkbutton_angle.Active.ToString(), true);
+ SqliteGeneral.SqlitePreferences.Update("showAngle",
PreferencesWindowBox.checkbutton_angle.Active.ToString(), true);
preferences.showAngle = PreferencesWindowBox.checkbutton_angle.Active;
}
if(PreferencesWindowBox.checkbutton_show_tv_tc_index.Active) {
- SqlitePreferences.Update("showQIndex",
PreferencesWindowBox.radiobutton_show_q_index.Active.ToString(), true);
- SqlitePreferences.Update("showDjIndex",
PreferencesWindowBox.radiobutton_show_dj_index.Active.ToString(), true);
+ SqliteGeneral.SqlitePreferences.Update("showQIndex",
PreferencesWindowBox.radiobutton_show_q_index.Active.ToString(), true);
+ SqliteGeneral.SqlitePreferences.Update("showDjIndex",
PreferencesWindowBox.radiobutton_show_dj_index.Active.ToString(), true);
preferences.showQIndex = PreferencesWindowBox.radiobutton_show_q_index.Active;
preferences.showDjIndex = PreferencesWindowBox.radiobutton_show_dj_index.Active;
} else {
- SqlitePreferences.Update("showQIndex", "False", true);
- SqlitePreferences.Update("showDjIndex", "False", true);
+ SqliteGeneral.SqlitePreferences.Update("showQIndex", "False", true);
+ SqliteGeneral.SqlitePreferences.Update("showDjIndex", "False", true);
preferences.showQIndex = false;
preferences.showDjIndex = false;
}
if( preferences.askDeletion != PreferencesWindowBox.checkbutton_ask_deletion.Active ) {
- SqlitePreferences.Update("askDeletion",
PreferencesWindowBox.checkbutton_ask_deletion.Active.ToString(), true);
+ SqliteGeneral.SqlitePreferences.Update("askDeletion",
PreferencesWindowBox.checkbutton_ask_deletion.Active.ToString(), true);
preferences.askDeletion = PreferencesWindowBox.checkbutton_ask_deletion.Active;
}
if( preferences.weightStatsPercent != PreferencesWindowBox.radio_weight_percent.Active ) {
- SqlitePreferences.Update("weightStatsPercent",
PreferencesWindowBox.radio_weight_percent.Active.ToString(), true);
+ SqliteGeneral.SqlitePreferences.Update("weightStatsPercent",
PreferencesWindowBox.radio_weight_percent.Active.ToString(), true);
preferences.weightStatsPercent = PreferencesWindowBox.radio_weight_percent.Active;
}
if( preferences.heightPreferred != PreferencesWindowBox.radio_elevation_height.Active ) {
- SqlitePreferences.Update("heightPreferred",
PreferencesWindowBox.radio_elevation_height.Active.ToString(), true);
+ SqliteGeneral.SqlitePreferences.Update("heightPreferred",
PreferencesWindowBox.radio_elevation_height.Active.ToString(), true);
preferences.heightPreferred = PreferencesWindowBox.radio_elevation_height.Active;
}
if( preferences.metersSecondsPreferred != PreferencesWindowBox.radio_speed_ms.Active ) {
- SqlitePreferences.Update("metersSecondsPreferred",
PreferencesWindowBox.radio_speed_ms.Active.ToString(), true);
+ SqliteGeneral.SqlitePreferences.Update("metersSecondsPreferred",
PreferencesWindowBox.radio_speed_ms.Active.ToString(), true);
preferences.metersSecondsPreferred = PreferencesWindowBox.radio_speed_ms.Active;
}
if( preferences.runSpeedStartArrival !=
PreferencesWindowBox.radio_runs_speed_start_arrival.Active ) {
- SqlitePreferences.Update("runSpeedStartArrival",
PreferencesWindowBox.radio_runs_speed_start_arrival.Active.ToString(), true);
+ SqliteGeneral.SqlitePreferences.Update("runSpeedStartArrival",
PreferencesWindowBox.radio_runs_speed_start_arrival.Active.ToString(), true);
preferences.runSpeedStartArrival =
PreferencesWindowBox.radio_runs_speed_start_arrival.Active;
}
@@ -967,7 +967,7 @@ public class PreferencesWindow {
if( (preferences.runDoubleContactsMode != Constants.DoubleContact.NONE) &&
! PreferencesWindowBox.checkbutton_runs_prevent_double_contact.Active)
{
- SqlitePreferences.Update("runDoubleContactsMode",
Constants.DoubleContact.NONE.ToString(), true);
+ SqliteGeneral.SqlitePreferences.Update("runDoubleContactsMode",
Constants.DoubleContact.NONE.ToString(), true);
preferences.runDoubleContactsMode = Constants.DoubleContact.NONE;
}
else if(PreferencesWindowBox.checkbutton_runs_prevent_double_contact.Active)
@@ -975,22 +975,22 @@ public class PreferencesWindow {
//1.2 mode has changed between FIRST, AVERAGE or LAST
if( PreferencesWindowBox.radio_runs_prevent_double_contact_first.Active &&
(preferences.runDoubleContactsMode != Constants.DoubleContact.FIRST)
) {
- SqlitePreferences.Update("runDoubleContactsMode",
Constants.DoubleContact.FIRST.ToString(), true);
+ SqliteGeneral.SqlitePreferences.Update("runDoubleContactsMode",
Constants.DoubleContact.FIRST.ToString(), true);
preferences.runDoubleContactsMode = Constants.DoubleContact.FIRST;
}
else if( PreferencesWindowBox.radio_runs_prevent_double_contact_average.Active &&
(preferences.runDoubleContactsMode !=
Constants.DoubleContact.AVERAGE) ) {
- SqlitePreferences.Update("runDoubleContactsMode",
Constants.DoubleContact.AVERAGE.ToString(), true);
+ SqliteGeneral.SqlitePreferences.Update("runDoubleContactsMode",
Constants.DoubleContact.AVERAGE.ToString(), true);
preferences.runDoubleContactsMode = Constants.DoubleContact.AVERAGE;
}
else if( PreferencesWindowBox.radio_runs_prevent_double_contact_last.Active &&
(preferences.runDoubleContactsMode != Constants.DoubleContact.LAST) )
{
- SqlitePreferences.Update("runDoubleContactsMode",
Constants.DoubleContact.LAST.ToString(), true);
+ SqliteGeneral.SqlitePreferences.Update("runDoubleContactsMode",
Constants.DoubleContact.LAST.ToString(), true);
preferences.runDoubleContactsMode = Constants.DoubleContact.LAST;
}
if(preferences.runDoubleContactsMS != (int)
PreferencesWindowBox.spinbutton_runs_prevent_double_contact.Value) {
- SqlitePreferences.Update("runDoubleContactsMS",
+ SqliteGeneral.SqlitePreferences.Update("runDoubleContactsMS",
PreferencesWindowBox.spinbutton_runs_prevent_double_contact.Value.ToString(), true); //saved as string
preferences.runDoubleContactsMS = (int)
spinbutton_runs_prevent_double_contact.Value;
}
@@ -1002,7 +1002,7 @@ public class PreferencesWindow {
if( (preferences.runIDoubleContactsMode != Constants.DoubleContact.NONE) &&
! PreferencesWindowBox.checkbutton_runs_i_prevent_double_contact.Active)
{
- SqlitePreferences.Update("runIDoubleContactsMode",
Constants.DoubleContact.NONE.ToString(), true);
+ SqliteGeneral.SqlitePreferences.Update("runIDoubleContactsMode",
Constants.DoubleContact.NONE.ToString(), true);
preferences.runIDoubleContactsMode = Constants.DoubleContact.NONE;
}
else if(PreferencesWindowBox.checkbutton_runs_i_prevent_double_contact.Active)
@@ -1010,22 +1010,22 @@ public class PreferencesWindow {
//2.2 mode has changed between FIRST, AVERAGE or LAST
if( PreferencesWindowBox.radio_runs_i_prevent_double_contact_first.Active &&
(preferences.runIDoubleContactsMode != Constants.DoubleContact.FIRST)
) {
- SqlitePreferences.Update("runIDoubleContactsMode",
Constants.DoubleContact.FIRST.ToString(), true);
+ SqliteGeneral.SqlitePreferences.Update("runIDoubleContactsMode",
Constants.DoubleContact.FIRST.ToString(), true);
preferences.runIDoubleContactsMode = Constants.DoubleContact.FIRST;
}
else if( PreferencesWindowBox.radio_runs_i_prevent_double_contact_average.Active &&
(preferences.runIDoubleContactsMode !=
Constants.DoubleContact.AVERAGE) ) {
- SqlitePreferences.Update("runIDoubleContactsMode",
Constants.DoubleContact.AVERAGE.ToString(), true);
+ SqliteGeneral.SqlitePreferences.Update("runIDoubleContactsMode",
Constants.DoubleContact.AVERAGE.ToString(), true);
preferences.runIDoubleContactsMode = Constants.DoubleContact.AVERAGE;
}
else if( PreferencesWindowBox.radio_runs_i_prevent_double_contact_last.Active &&
(preferences.runIDoubleContactsMode != Constants.DoubleContact.LAST)
) {
- SqlitePreferences.Update("runIDoubleContactsMode",
Constants.DoubleContact.LAST.ToString(), true);
+ SqliteGeneral.SqlitePreferences.Update("runIDoubleContactsMode",
Constants.DoubleContact.LAST.ToString(), true);
preferences.runIDoubleContactsMode = Constants.DoubleContact.LAST;
}
if(preferences.runIDoubleContactsMS != (int)
PreferencesWindowBox.spinbutton_runs_i_prevent_double_contact.Value) {
- SqlitePreferences.Update("runIDoubleContactsMS",
+ SqliteGeneral.SqlitePreferences.Update("runIDoubleContactsMS",
PreferencesWindowBox.spinbutton_runs_i_prevent_double_contact.Value.ToString(), true); //saved as string
preferences.runIDoubleContactsMS = (int)
spinbutton_runs_i_prevent_double_contact.Value;
}
@@ -1049,7 +1049,7 @@ public class PreferencesWindow {
Constants.EncoderVariablesCapture mainVariable = Constants.SetEncoderVariablesCapture(
UtilGtk.ComboGetActive(PreferencesWindowBox.combo_main_variable));
if( preferences.encoderCaptureMainVariable != mainVariable ) {
- SqlitePreferences.Update("encoderCaptureMainVariable", mainVariable.ToString(), true);
+ SqliteGeneral.SqlitePreferences.Update("encoderCaptureMainVariable",
mainVariable.ToString(), true);
preferences.encoderCaptureMainVariable = mainVariable;
}
@@ -1074,19 +1074,19 @@ public class PreferencesWindow {
(int) PreferencesWindowBox.spin_encoder_capture_fully_extended.Value);
if(PreferencesWindowBox.radio_encoder_auto_save_curve_best.Active) {
- SqlitePreferences.Update("encoderAutoSaveCurve",
Constants.EncoderAutoSaveCurve.BEST.ToString(), true);
+ SqliteGeneral.SqlitePreferences.Update("encoderAutoSaveCurve",
Constants.EncoderAutoSaveCurve.BEST.ToString(), true);
preferences.encoderAutoSaveCurve = Constants.EncoderAutoSaveCurve.BEST;
}
else if(PreferencesWindowBox.radio_encoder_auto_save_curve_4top.Active) {
- SqlitePreferences.Update("encoderAutoSaveCurve",
Constants.EncoderAutoSaveCurve.FROM4TOPENULTIMATE.ToString(), true);
+ SqliteGeneral.SqlitePreferences.Update("encoderAutoSaveCurve",
Constants.EncoderAutoSaveCurve.FROM4TOPENULTIMATE.ToString(), true);
preferences.encoderAutoSaveCurve = Constants.EncoderAutoSaveCurve.FROM4TOPENULTIMATE;
}
else if(PreferencesWindowBox.radio_encoder_auto_save_curve_all.Active) {
- SqlitePreferences.Update("encoderAutoSaveCurve",
Constants.EncoderAutoSaveCurve.ALL.ToString(), true);
+ SqliteGeneral.SqlitePreferences.Update("encoderAutoSaveCurve",
Constants.EncoderAutoSaveCurve.ALL.ToString(), true);
preferences.encoderAutoSaveCurve = Constants.EncoderAutoSaveCurve.ALL;
}
else {
- SqlitePreferences.Update("encoderAutoSaveCurve",
Constants.EncoderAutoSaveCurve.NONE.ToString(), true);
+ SqliteGeneral.SqlitePreferences.Update("encoderAutoSaveCurve",
Constants.EncoderAutoSaveCurve.NONE.ToString(), true);
preferences.encoderAutoSaveCurve = Constants.EncoderAutoSaveCurve.NONE;
}
@@ -1120,29 +1120,29 @@ public class PreferencesWindow {
else // (PreferencesWindowBox.radio_encoder_1RM_weighted3.Active)
encoder1RMMethod = Constants.Encoder1RMMethod.WEIGHTED3;
- SqlitePreferences.Update("encoder1RMMethod", encoder1RMMethod.ToString(), true);
+ SqliteGeneral.SqlitePreferences.Update("encoder1RMMethod", encoder1RMMethod.ToString(), true);
preferences.encoder1RMMethod = encoder1RMMethod;
//---- end of encoder other
//multimedia ----
if( preferences.volumeOn != PreferencesWindowBox.checkbutton_volume.Active ) {
- SqlitePreferences.Update("volumeOn",
PreferencesWindowBox.checkbutton_volume.Active.ToString(), true);
+ SqliteGeneral.SqlitePreferences.Update("volumeOn",
PreferencesWindowBox.checkbutton_volume.Active.ToString(), true);
preferences.volumeOn = PreferencesWindowBox.checkbutton_volume.Active;
}
if( preferences.videoDeviceNum != UtilGtk.ComboGetActivePos(combo_camera) ) {
- SqlitePreferences.Update("videoDevice",
UtilGtk.ComboGetActivePos(combo_camera).ToString(), true);
+ SqliteGeneral.SqlitePreferences.Update("videoDevice",
UtilGtk.ComboGetActivePos(combo_camera).ToString(), true);
preferences.videoDeviceNum = UtilGtk.ComboGetActivePos(combo_camera);
}
if(PreferencesWindowBox.radio_export_latin.Active) {
- SqlitePreferences.Update("CSVExportDecimalSeparator","COMMA", true);
+ SqliteGeneral.SqlitePreferences.Update("CSVExportDecimalSeparator","COMMA", true);
preferences.CSVExportDecimalSeparator = "COMMA";
}
else {
- SqlitePreferences.Update("CSVExportDecimalSeparator","POINT", true);
+ SqliteGeneral.SqlitePreferences.Update("CSVExportDecimalSeparator","POINT", true);
preferences.CSVExportDecimalSeparator = "POINT";
}
@@ -1150,30 +1150,30 @@ public class PreferencesWindow {
//if there was a language on SQL but now "detected" is selected, put "" in language on SQL
if(preferences.language != "" && radio_language_detected.Active) {
- SqlitePreferences.Update("language", "", true);
+ SqliteGeneral.SqlitePreferences.Update("language", "", true);
preferences.language = "";
}
//if force a language, and SQL language is != than selected language, change language on SQL
else if(radio_language_force.Active && preferences.language != selectedLanguage) {
- SqlitePreferences.Update("language", selectedLanguage, true);
+ SqliteGeneral.SqlitePreferences.Update("language", selectedLanguage, true);
preferences.language = selectedLanguage;
}
if( preferences.RGraphsTranslate != PreferencesWindowBox.radio_graphs_translate.Active ) {
- SqlitePreferences.Update("RGraphsTranslate",
+ SqliteGeneral.SqlitePreferences.Update("RGraphsTranslate",
PreferencesWindowBox.radio_graphs_translate.Active.ToString(), true);
preferences.RGraphsTranslate = PreferencesWindowBox.radio_graphs_translate.Active;
}
if( preferences.useHeightsOnJumpIndexes !=
PreferencesWindowBox.radio_use_heights_on_jump_indexes.Active ) {
- SqlitePreferences.Update("useHeightsOnJumpIndexes",
+ SqliteGeneral.SqlitePreferences.Update("useHeightsOnJumpIndexes",
PreferencesWindowBox.radio_use_heights_on_jump_indexes.Active.ToString(), true);
preferences.useHeightsOnJumpIndexes =
PreferencesWindowBox.radio_use_heights_on_jump_indexes.Active;
}
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
PreferencesWindowBox.preferences_win.Hide();
PreferencesWindowBox = null;
@@ -1182,21 +1182,21 @@ public class PreferencesWindow {
private bool preferencesChange(string prefName, bool prefValue, bool bNew)
{
if(prefValue != bNew)
- SqlitePreferences.Update(prefName, bNew.ToString(), true);
+ SqliteGeneral.SqlitePreferences.Update(prefName, bNew.ToString(), true);
return bNew;
}
private int preferencesChange(string prefName, int prefValue, int iNew)
{
if(prefValue != iNew)
- SqlitePreferences.Update(prefName, iNew.ToString(), true);
+ SqliteGeneral.SqlitePreferences.Update(prefName, iNew.ToString(), true);
return iNew;
}
private double preferencesChange(string prefName, double prefValue, double dNew)
{
if(prefValue != dNew)
- SqlitePreferences.Update(prefName, Util.ConvertToPoint(dNew), true);
+ SqliteGeneral.SqlitePreferences.Update(prefName, Util.ConvertToPoint(dNew), true);
return dNew;
}
diff --git a/src/gui/pulse.cs b/src/gui/pulse.cs
index 528d169..5157ec1 100644
--- a/src/gui/pulse.cs
+++ b/src/gui/pulse.cs
@@ -92,7 +92,7 @@ public class EditPulseWindow : EditEventWindow
}
protected override void updateEvent(int eventID, int personID, string description) {
- SqlitePulse.Update(eventID, personID, description);
+ SqliteGeneral.SqlitePulse.Update(eventID, personID, description);
}
protected override void on_button_cancel_clicked (object o, EventArgs args)
@@ -460,7 +460,7 @@ public class RepairPulseWindow
myPulse.InsertAtDB(false, Constants.PulseTable);
/*
- SqlitePulse.Insert(myPulse.UniqueID.ToString(),
+ SqliteGeneral.SqlitePulse.Insert(myPulse.UniqueID.ToString(),
myPulse.PersonID, myPulse.SessionID,
myPulse.Type, myPulse.FixedPulse, totalPulsesNum,
timeString, myPulse.Description
diff --git a/src/gui/reactionTime.cs b/src/gui/reactionTime.cs
index 221049c..c31717c 100644
--- a/src/gui/reactionTime.cs
+++ b/src/gui/reactionTime.cs
@@ -393,7 +393,7 @@ public class EditReactionTimeWindow : EditEventWindow
}
protected override void updateEvent(int eventID, int personID, string description) {
- SqliteReactionTime.Update(eventID, type, entryTime, personID, description);
+ SqliteGeneral.SqliteReactionTime.Update(eventID, type, entryTime, personID, description);
}
protected override void on_button_cancel_clicked (object o, EventArgs args)
diff --git a/src/gui/run.cs b/src/gui/run.cs
index 85ab20f..7f13a17 100644
--- a/src/gui/run.cs
+++ b/src/gui/run.cs
@@ -183,7 +183,7 @@ public class EditRunWindow : EditEventWindow
protected override void updateEvent(int eventID, int personID, string description) {
- SqliteRun.Update(eventID, UtilGtk.ComboGetActive(combo_eventType), entryDistance, entryTime,
personID, description);
+ SqliteGeneral.SqliteRun.Update(eventID, UtilGtk.ComboGetActive(combo_eventType),
entryDistance, entryTime, personID, description);
}
protected override void on_button_cancel_clicked (object o, EventArgs args)
@@ -535,7 +535,7 @@ public class EditRunIntervalWindow : EditRunWindow
protected override void updateEvent(int eventID, int personID, string description) {
- SqliteRunInterval.Update(eventID, personID, description);
+ SqliteGeneral.SqliteRunInterval.Update(eventID, personID, description);
}
protected override void on_button_cancel_clicked (object o, EventArgs args)
@@ -844,7 +844,7 @@ public class RepairRunIntervalWindow
Sqlite.Delete(false, Constants.RunIntervalTable, runInterval.UniqueID);
runInterval.InsertAtDB(false, Constants.RunIntervalTable);
/*
- SqliteRun.InsertInterval(false, Constants.RunIntervalTable, runInterval.UniqueID.ToString(),
+ SqliteGeneral.SqliteRun.InsertInterval(false, Constants.RunIntervalTable,
runInterval.UniqueID.ToString(),
runInterval.PersonID, runInterval.SessionID,
runInterval.Type,
runs * runInterval.DistanceInterval, //distanceTotal
@@ -917,11 +917,11 @@ partial class ChronoJumpWindow
if(! t.IsPredefined) {
if(simple) {
- t = SqliteRunType.SelectAndReturnRunType(name, false);
- t.ImageFileName = SqliteEvent.GraphLinkSelectFileName(Constants.RunTable,
name);
+ t = SqliteGeneral.SqliteRunType.SelectAndReturnRunType(name, false);
+ t.ImageFileName =
SqliteGeneral.SqliteEvent.GraphLinkSelectFileName(Constants.RunTable, name);
} else {
- t = SqliteRunIntervalType.SelectAndReturnRunIntervalType(name, false);
- t.ImageFileName =
SqliteEvent.GraphLinkSelectFileName(Constants.RunIntervalTable, name);
+ t = SqliteGeneral.SqliteRunIntervalType.SelectAndReturnRunIntervalType(name,
false);
+ t.ImageFileName =
SqliteGeneral.SqliteEvent.GraphLinkSelectFileName(Constants.RunIntervalTable, name);
}
}
return t;
@@ -1287,7 +1287,7 @@ public class RunsMoreWindow : EventMoreWindow
}
protected override string [] findTestTypesInSessions() {
- return SqliteRun.SelectRuns(false, -1, -1, selectedEventName,
+ return SqliteGeneral.SqliteRun.SelectRuns(false, -1, -1, selectedEventName,
Sqlite.Orders_by.DEFAULT, -1);
}
@@ -1552,7 +1552,7 @@ public class RunsIntervalMoreWindow : EventMoreWindow
}
protected override string [] findTestTypesInSessions() {
- return SqliteRunInterval.SelectRuns(false, -1, -1, selectedEventName);
+ return SqliteGeneral.SqliteRunInterval.SelectRuns(false, -1, -1, selectedEventName);
}
diff --git a/src/gui/stats.cs b/src/gui/stats.cs
index 68fcc3f..0ea56fc 100644
--- a/src/gui/stats.cs
+++ b/src/gui/stats.cs
@@ -599,7 +599,7 @@ public partial class ChronoJumpWindow {
//by default show all simple nonTC jumps, but if combo_stats_subtype changed
//updateComboStatsSubType() will do the work
UtilGtk.ComboUpdate(combo_stats_stat_apply_to,
- SqliteJumpType.SelectJumpTypes(false, Constants.AllJumpsName, "nonTC", true),
""); //only select name
+ SqliteGeneral.SqliteJumpType.SelectJumpTypes(false, Constants.AllJumpsName,
"nonTC", true), ""); //only select name
combo_stats_stat_apply_to.Sensitive = true;
combo_stats_stat_apply_to.Active = 0;
}
@@ -613,7 +613,7 @@ public partial class ChronoJumpWindow {
combo_stats_stat_subtype.Active = 0;
UtilGtk.ComboUpdate(combo_stats_stat_apply_to,
- SqliteJumpType.SelectJumpTypes(false, Constants.AllJumpsName, "TC", true),
""); //only select name
+ SqliteGeneral.SqliteJumpType.SelectJumpTypes(false, Constants.AllJumpsName,
"TC", true), ""); //only select name
combo_stats_stat_apply_to.Sensitive = true;
combo_stats_stat_apply_to.Active = 0;
}
@@ -627,7 +627,7 @@ public partial class ChronoJumpWindow {
combo_stats_stat_subtype.Active = 0;
UtilGtk.ComboUpdate(combo_stats_stat_apply_to,
- SqliteJumpType.SelectJumpRjTypes(Constants.AllJumpsName, true), ""); //only
select name
+ SqliteGeneral.SqliteJumpType.SelectJumpRjTypes(Constants.AllJumpsName, true),
""); //only select name
combo_stats_stat_apply_to.Sensitive = true;
combo_stats_stat_apply_to.Active = 0;
}
@@ -673,7 +673,7 @@ public partial class ChronoJumpWindow {
{
if(UtilGtk.ComboGetActive(combo_stats_stat_subtype) == Catalog.GetString("No
indexes")) {
UtilGtk.ComboUpdate(combo_stats_stat_apply_to,
- SqliteJumpType.SelectJumpTypes(false, Constants.AllJumpsName,
"nonTC", true), ""); //only select name
+ SqliteGeneral.SqliteJumpType.SelectJumpTypes(false,
Constants.AllJumpsName, "nonTC", true), ""); //only select name
combo_stats_stat_apply_to.Sensitive = true;
combo_stats_stat_apply_to.Active = 0;
} else if (UtilGtk.ComboGetActive(combo_stats_stat_subtype) ==
Constants.ChronojumpProfile) {
@@ -703,9 +703,9 @@ public partial class ChronoJumpWindow {
combo_stats_stat_apply_to.Sensitive = false;
} else if (UtilGtk.ComboGetActive(combo_stats_stat_subtype) ==
Catalog.GetString(Constants.SubtractionBetweenTests)) {
UtilGtk.ComboUpdate(combo_subtraction_between_1,
- SqliteJumpType.SelectJumpTypes(false, "", "", true), ""); //only
select name
+ SqliteGeneral.SqliteJumpType.SelectJumpTypes(false, "", "", true),
""); //only select name
UtilGtk.ComboUpdate(combo_subtraction_between_2,
- SqliteJumpType.SelectJumpTypes(false, "", "", true), ""); //only
select name
+ SqliteGeneral.SqliteJumpType.SelectJumpTypes(false, "", "", true),
""); //only select name
//subtraction_between_tests_show(true);
showSubtractionBetweenTests = true;
label_apply_to.Visible = false;
@@ -714,7 +714,7 @@ public partial class ChronoJumpWindow {
} else if (UtilGtk.ComboGetActive(combo_stats_stat_subtype) ==
Constants.PotencySayersSJFormulaShort) {
combo_stats_stat_apply_to.Active =
UtilGtk.ComboUpdate(combo_stats_stat_apply_to,
- SqliteJumpType.SelectJumpTypes(false, "", "nonTC",
true), //only select name
+ SqliteGeneral.SqliteJumpType.SelectJumpTypes(false,
"", "nonTC", true), //only select name
"SJ"); //default value
combo_stats_stat_apply_to.Sensitive = false;
} else {/*
@@ -733,7 +733,7 @@ public partial class ChronoJumpWindow {
*/
combo_stats_stat_apply_to.Active =
UtilGtk.ComboUpdate(combo_stats_stat_apply_to,
- SqliteJumpType.SelectJumpTypes(false, "", "nonTC",
true), //only select name
+ SqliteGeneral.SqliteJumpType.SelectJumpTypes(false,
"", "nonTC", true), //only select name
"CMJ"); //default value
combo_stats_stat_apply_to.Sensitive = false;
}
@@ -741,7 +741,7 @@ public partial class ChronoJumpWindow {
else if (UtilGtk.ComboGetActive(combo_stats_stat_type) == Constants.TypeJumpsSimpleWithTC )
{
UtilGtk.ComboUpdate(combo_stats_stat_apply_to,
- SqliteJumpType.SelectJumpTypes(false, Constants.AllJumpsName, "TC", true),
""); //only select name
+ SqliteGeneral.SqliteJumpType.SelectJumpTypes(false, Constants.AllJumpsName,
"TC", true), ""); //only select name
combo_stats_stat_apply_to.Sensitive = true;
combo_stats_stat_apply_to.Active = 0;
}
diff --git a/src/gui/usefulObjects.cs b/src/gui/usefulObjects.cs
index 4d1e828..972ff58 100644
--- a/src/gui/usefulObjects.cs
+++ b/src/gui/usefulObjects.cs
@@ -78,7 +78,7 @@ public class PrepareEventGraphJumpSimple {
Sqlite.Open();
//select data from SQL to update graph
- jumpsAtSQL = SqliteJump.SelectJumps(true, sessionID, personID, "", type,
+ jumpsAtSQL = SqliteGeneral.SqliteJump.SelectJumps(true, sessionID, personID, "", type,
Sqlite.Orders_by.ID_DESC, 10); //select only last 10
string sqlSelect = "";
@@ -149,7 +149,7 @@ public class PrepareEventGraphRunSimple {
Sqlite.Open();
//obtain data
- runsAtSQL = SqliteRun.SelectRuns(true, sessionID, personID, type,
+ runsAtSQL = SqliteGeneral.SqliteRun.SelectRuns(true, sessionID, personID, type,
Sqlite.Orders_by.ID_DESC, 10); //select only last 10
@@ -237,7 +237,7 @@ public class PrepareEventGraphReactionTime {
Sqlite.Open();
//obtain data
- rtsAtSQL = SqliteReactionTime.SelectReactionTimes(true, sessionID, personID, type,
+ rtsAtSQL = SqliteGeneral.SqliteReactionTime.SelectReactionTimes(true, sessionID, personID,
type,
Sqlite.Orders_by.ID_DESC, 10); //select only last 10
personMAXAtSQL = SqliteSession.SelectMAXEventsOfAType(
diff --git a/src/jump.cs b/src/jump.cs
index 4611a2a..92044d6 100644
--- a/src/jump.cs
+++ b/src/jump.cs
@@ -55,7 +55,7 @@ public class Jump : Event
this.simulated = simulated;
}
- //used to select a jump at SqliteJump.SelectNormalJumpData and at Sqlite.converTables
+ //used to select a jump at SqliteGeneral.SqliteJump.SelectNormalJumpData and at Sqlite.converTables
public Jump(string [] eventString)
{
this.uniqueID = Convert.ToInt32(eventString[0]);
@@ -73,7 +73,7 @@ public class Jump : Event
public override int InsertAtDB (bool dbconOpened, string tableName) {
- return SqliteJump.Insert(dbconOpened, tableName,
+ return SqliteGeneral.SqliteJump.Insert(dbconOpened, tableName,
uniqueID.ToString(),
personID, sessionID,
type, tv, tc, fall,
@@ -92,11 +92,11 @@ public class Jump : Event
}
public virtual bool TypeHasWeight {
- get { return SqliteJumpType.HasWeight("jumpType", type); }
+ get { return SqliteGeneral.SqliteJumpType.HasWeight("jumpType", type); }
}
public virtual bool TypeHasFall {
- get { return SqliteJumpType.HasFall("jumpType", type); } //jumpType is the table name
+ get { return SqliteGeneral.SqliteJumpType.HasFall("jumpType", type); } //jumpType is the
table name
}
public double Tv {
@@ -168,7 +168,7 @@ public class JumpRj : Jump
this.simulated = simulated;
}
- //used to select a jump at SqliteJump.SelectRjJumpData and at Sqlite.convertTables
+ //used to select a jump at SqliteGeneral.SqliteJump.SelectRjJumpData and at Sqlite.convertTables
public JumpRj(string [] eventString)
{
//foreach(string myStr in eventString)
@@ -193,7 +193,7 @@ public class JumpRj : Jump
public override int InsertAtDB (bool dbconOpened, string tableName) {
- return SqliteJumpRj.Insert(dbconOpened, tableName,
+ return SqliteGeneral.SqliteJumpRj.Insert(dbconOpened, tableName,
uniqueID.ToString(),
personID, sessionID,
type, TvMax, TcMax, fall, weight,
@@ -217,12 +217,12 @@ public class JumpRj : Jump
public override bool TypeHasWeight
{
- get { return SqliteJumpType.HasWeight("jumpRjType", type); }
+ get { return SqliteGeneral.SqliteJumpType.HasWeight("jumpRjType", type); }
}
public override bool TypeHasFall
{
- get { return SqliteJumpType.HasFall("jumpRjType", type); } //jumpRjType is the table name
+ get { return SqliteGeneral.SqliteJumpType.HasFall("jumpRjType", type); } //jumpRjType is the
table name
}
public double TvMax
diff --git a/src/jumpType.cs b/src/jumpType.cs
index c7a9c68..010d97e 100644
--- a/src/jumpType.cs
+++ b/src/jumpType.cs
@@ -251,9 +251,9 @@ public class JumpType : EventType
return hasWeight;
} else {
if(isRepetitive)
- return SqliteJumpType.HasWeight("jumpRjType", name);
+ return SqliteGeneral.SqliteJumpType.HasWeight("jumpRjType", name);
else
- return SqliteJumpType.HasWeight("jumpType", name);
+ return SqliteGeneral.SqliteJumpType.HasWeight("jumpType", name);
}
}
set { hasWeight = value; }
@@ -269,9 +269,9 @@ public class JumpType : EventType
return ! startIn;
} else {
if(isRepetitive)
- return SqliteJumpType.HasFall("jumpRjType", name);
+ return SqliteGeneral.SqliteJumpType.HasFall("jumpRjType", name);
else
- return SqliteJumpType.HasFall("jumpType", name);
+ return SqliteGeneral.SqliteJumpType.HasFall("jumpType", name);
}
}
}
diff --git a/src/jumpsProfile.cs b/src/jumpsProfile.cs
index 626b461..140e7aa 100644
--- a/src/jumpsProfile.cs
+++ b/src/jumpsProfile.cs
@@ -127,7 +127,7 @@ public class JumpsProfile
public void Calculate (int personID, int sessionID)
{
- List<Double> l = SqliteJump.SelectChronojumpProfile(personID, sessionID);
+ List<Double> l = SqliteGeneral.SqliteJump.SelectChronojumpProfile(personID, sessionID);
double sj = l[0];
double sjl = l[1];
diff --git a/src/multiChronopic.cs b/src/multiChronopic.cs
index a098145..2b5fcb8 100644
--- a/src/multiChronopic.cs
+++ b/src/multiChronopic.cs
@@ -76,7 +76,7 @@ public class MultiChronopic : Event
arrayDone = false;
}
- //used to select a event at SqliteMultiChronopic.SelectMultiChronopicData and at Sqlite.convertTables
+ //used to select a event at SqliteGeneral.SqliteMultiChronopic.SelectMultiChronopicData and at
Sqlite.convertTables
//Util.ConvertToPointIfNeeded is used because multichronopic data is recorded by mistake as ','
instead of '.' on database
public MultiChronopic(string [] eventString) {
this.uniqueID = Convert.ToInt32(eventString[0]);
@@ -102,7 +102,7 @@ public class MultiChronopic : Event
public override int InsertAtDB (bool dbconOpened, string tableName) {
- return SqliteMultiChronopic.Insert(dbconOpened, tableName,
+ return SqliteGeneral.SqliteMultiChronopic.Insert(dbconOpened, tableName,
uniqueID.ToString(),
personID, sessionID,
type,
diff --git a/src/oldCodeNeedToDBConvert/sqlite/personSession.cs
b/src/oldCodeNeedToDBConvert/sqlite/personSession.cs
index 95f36d3..be19d3a 100644
--- a/src/oldCodeNeedToDBConvert/sqlite/personSession.cs
+++ b/src/oldCodeNeedToDBConvert/sqlite/personSession.cs
@@ -89,7 +89,7 @@ class SqlitePersonSessionOld : Sqlite
* conversion from database 0.52 to 0.53 (add weight into personSession)
* now weight of a person can change every session
*/
- protected internal static void moveOldTableToNewTable()
+ protected internal void moveOldTableToNewTable()
{
string tp = Constants.PersonOldTable;
string tps1 = Constants.PersonSessionOldTable;
diff --git a/src/person.cs b/src/person.cs
index d280a26..6477102 100644
--- a/src/person.cs
+++ b/src/person.cs
@@ -93,7 +93,7 @@ public partial class Person {
}
public int InsertAtDB (bool dbconOpened, string tableName) {
- int myID = SqlitePerson.Insert(dbconOpened,
+ int myID = SqliteGeneral.SqlitePerson.Insert(dbconOpened,
uniqueID.ToString(), name, sex, dateBorn, race, countryID,
description, serverUniqueID);
return myID;
diff --git a/src/personSession.cs b/src/personSession.cs
index 315afab..f9cb621 100644
--- a/src/personSession.cs
+++ b/src/personSession.cs
@@ -86,7 +86,7 @@ public partial class PersonSession {
}
public int InsertAtDB (bool dbconOpened, string tableName) {
- int myID = SqlitePersonSession.Insert(dbconOpened,
+ int myID = SqliteGeneral.SqlitePersonSession.Insert(dbconOpened,
uniqueID.ToString(),
personID, sessionID, height, weight,
sportID, speciallityID,
diff --git a/src/preferences.cs b/src/preferences.cs
index 00f315f..29c1469 100644
--- a/src/preferences.cs
+++ b/src/preferences.cs
@@ -81,7 +81,7 @@ public class Preferences
public string databaseVersion;
/*
- * these are unused on SqlitePreferences.SelectAll
+ * these are unused on SqliteGeneral.SqlitePreferences.SelectAll
*/
//public string chronopicPort;
@@ -95,7 +95,7 @@ public class Preferences
}
public static Preferences LoadAllFromSqlite() {
- return SqlitePreferences.SelectAll();
+ return SqliteGeneral.SqlitePreferences.SelectAll();
}
public int EncoderCaptureMinHeight(bool inertial) {
diff --git a/src/pulse.cs b/src/pulse.cs
index 059fe32..7f6cc58 100644
--- a/src/pulse.cs
+++ b/src/pulse.cs
@@ -51,7 +51,7 @@ public class Pulse : Event
this.simulated = simulated;
}
- //used to select a event at SqlitePulse.SelectPulseData and at Sqlite.convertTables
+ //used to select a event at SqliteGeneral.SqlitePulse.SelectPulseData and at Sqlite.convertTables
public Pulse(string [] eventString) {
this.uniqueID = Convert.ToInt32(eventString[0]);
this.personID = Convert.ToInt32(eventString[1]);
@@ -65,7 +65,7 @@ public class Pulse : Event
}
public override int InsertAtDB (bool dbconOpened, string tableName) {
- return SqlitePulse.Insert(dbconOpened, tableName,
+ return SqliteGeneral.SqlitePulse.Insert(dbconOpened, tableName,
uniqueID.ToString(),
personID, sessionID,
type, fixedPulse, totalPulsesNum, timesString,
diff --git a/src/reactionTime.cs b/src/reactionTime.cs
index b6a1fe6..7cab71d 100644
--- a/src/reactionTime.cs
+++ b/src/reactionTime.cs
@@ -40,7 +40,7 @@ public class ReactionTime : Event
this.simulated = simulated;
}
- //used to select a event at SqliteReactionTime.SelectReactionTimeData and at Sqlite.convertTables
+ //used to select a event at SqliteGeneral.SqliteReactionTime.SelectReactionTimeData and at
Sqlite.convertTables
public ReactionTime(string [] eventString) {
this.uniqueID = Convert.ToInt32(eventString[0]);
this.personID = Convert.ToInt32(eventString[1]);
@@ -52,7 +52,7 @@ public class ReactionTime : Event
}
public override int InsertAtDB (bool dbconOpened, string tableName) {
- return SqliteReactionTime.Insert(dbconOpened, tableName,
+ return SqliteGeneral.SqliteReactionTime.Insert(dbconOpened, tableName,
uniqueID.ToString(),
personID, sessionID,
type, time,
diff --git a/src/report.cs b/src/report.cs
index 0b66d3c..9a84e4a 100644
--- a/src/report.cs
+++ b/src/report.cs
@@ -68,7 +68,7 @@ public class Report : ExportSession
StatisticsData = new ArrayList(1);
- mySession = SqliteSession.Select(sessionID.ToString());
+ mySession = SqliteGeneral.SqliteSession.Select(sessionID.ToString());
}
@@ -96,35 +96,35 @@ public class Report : ExportSession
}
if(ShowCurrentSessionJumpers) {
- myPersonsAndPS = SqlitePersonSession.SelectCurrentSessionPersons(sessionID, true);
+ myPersonsAndPS =
SqliteGeneral.SqlitePersonSession.SelectCurrentSessionPersons(sessionID, true);
}
//Leave SQL opened in all this process
- Sqlite.Open(); // ------------------------------
+ SqliteGeneral.Sqlite.Open(); // ------------------------------
if(ShowSimpleJumps) {
- myJumps= SqliteJump.SelectJumps(true, sessionID, -1, "", "",
+ myJumps= SqliteGeneral.SqliteJump.SelectJumps(true, sessionID, -1, "", "",
Sqlite.Orders_by.DEFAULT, -1);
}
if(ShowReactiveJumps) {
- myJumpsRj = SqliteJumpRj.SelectJumps(true, sessionID, -1, "", "");
+ myJumpsRj = SqliteGeneral.SqliteJumpRj.SelectJumps(true, sessionID, -1, "", "");
}
if(ShowSimpleRuns) {
- myRuns= SqliteRun.SelectRuns(true, sessionID, -1, "",
+ myRuns= SqliteGeneral.SqliteRun.SelectRuns(true, sessionID, -1, "",
Sqlite.Orders_by.DEFAULT, -1);
}
if (ShowIntervalRuns) {
- myRunsInterval = SqliteRunInterval.SelectRuns(true, sessionID, -1, "");
+ myRunsInterval = SqliteGeneral.SqliteRunInterval.SelectRuns(true, sessionID, -1, "");
}
if(ShowReactionTimes) {
- myReactionTimes= SqliteReactionTime.SelectReactionTimes(true, sessionID, -1, "",
+ myReactionTimes= SqliteGeneral.SqliteReactionTime.SelectReactionTimes(true,
sessionID, -1, "",
Sqlite.Orders_by.DEFAULT, -1);
}
if(ShowPulses) {
- myPulses= SqlitePulse.SelectPulses(true, sessionID, -1);
+ myPulses= SqliteGeneral.SqlitePulse.SelectPulses(true, sessionID, -1);
}
- Sqlite.Close(); // ------------------------------
+ SqliteGeneral.Sqlite.Close(); // ------------------------------
}
protected override void printTitles(string title) {
@@ -262,7 +262,7 @@ public class Report : ExportSession
ArrayList sendSelectedSessions = new ArrayList(1);
string [] sessionsStrFull = sessionsString.Split(new char[] {':'});
for (int j=0; j < sessionsStrFull.Length ; j++) {
- Session tempSession = SqliteSession.Select(sessionsStrFull[j]);
+ Session tempSession = SqliteGeneral.SqliteSession.Select(sessionsStrFull[j]);
sendSelectedSessions.Add(tempSession.UniqueID + ":" + tempSession.Name + ":" +
tempSession.DateShort);
}
return sendSelectedSessions;
@@ -405,7 +405,7 @@ public class Report : ExportSession
public int SessionID {
set {
sessionID = value;
- mySession = SqliteSession.Select(sessionID.ToString());
+ mySession = SqliteGeneral.SqliteSession.Select(sessionID.ToString());
}
}
diff --git a/src/run.cs b/src/run.cs
index fe9f603..3c6163e 100644
--- a/src/run.cs
+++ b/src/run.cs
@@ -64,7 +64,7 @@ public class Run : Event
this.initialSpeed = initialSpeed;
}
- //used to select a run at SqliteRun.SelectNormalRunData and at Sqlite.convertTables
+ //used to select a run at SqliteGeneral.SqliteRun.SelectNormalRunData and at Sqlite.convertTables
public Run(string [] eventString)
{
this.uniqueID = Convert.ToInt32(eventString[0]);
@@ -80,7 +80,7 @@ public class Run : Event
public override int InsertAtDB (bool dbconOpened, string tableName) {
- return SqliteRun.Insert(dbconOpened, tableName,
+ return SqliteGeneral.SqliteRun.Insert(dbconOpened, tableName,
uniqueID.ToString(),
personID, sessionID,
type, distance, time,
@@ -160,7 +160,7 @@ public class RunInterval : Run
this.initialSpeed = initialSpeed;
}
- //used to select a run at SqliteRun.SelectIntervalRunData and at Sqlite.convertTables
+ //used to select a run at SqliteGeneral.SqliteRun.SelectIntervalRunData and at Sqlite.convertTables
public RunInterval(string [] eventString)
{
this.uniqueID = Convert.ToInt32(eventString[0]);
@@ -180,7 +180,7 @@ public class RunInterval : Run
public override int InsertAtDB (bool dbconOpened, string tableName) {
- return SqliteRunInterval.Insert(dbconOpened, tableName,
+ return SqliteGeneral.SqliteRunInterval.Insert(dbconOpened, tableName,
uniqueID.ToString(),
personID, sessionID,
type, distanceTotal, timeTotal,
diff --git a/src/runType.cs b/src/runType.cs
index 6f69ebd..2cfe997 100644
--- a/src/runType.cs
+++ b/src/runType.cs
@@ -470,13 +470,13 @@ public class RunType : EventType
name, distance, tracksLimited, fixedValue,
unlimited, description);
*/
- return SqliteRunIntervalType.Insert(this, tableName, dbconOpened);
+ return SqliteGeneral.SqliteRunIntervalType.Insert(this, tableName, dbconOpened);
else
/*
return SqliteRunType.Insert(dbconOpened, tableName,
name, distance, description);
*/
- return SqliteRunType.Insert(this, tableName, dbconOpened);
+ return SqliteGeneral.SqliteRunType.Insert(this, tableName, dbconOpened);
}
diff --git a/src/server.cs b/src/server.cs
index eb1997d..5fc9af5 100644
--- a/src/server.cs
+++ b/src/server.cs
@@ -57,8 +57,8 @@ public class Server
ChronojumpServer myServer = new ChronojumpServer();
LogB.Information(myServer.ConnectDatabase());
- int evalSID = Convert.ToInt32(SqlitePreferences.Select("evaluatorServerID"));
- string machineID = SqlitePreferences.Select("machineID");
+ int evalSID =
Convert.ToInt32(SqliteGeneral.SqlitePreferences.Select("evaluatorServerID"));
+ string machineID = SqliteGeneral.SqlitePreferences.Select("machineID");
ServerPing myPing = new ServerPing(evalSID, progName + " " + progVersion,
UtilAll.GetOS(),
//getIP(), DateTime.Now); //evaluator IP, date
@@ -161,7 +161,7 @@ public class Server
private static void on_server_upload_session_started ()
{
- int evalSID = Convert.ToInt32(SqlitePreferences.Select("evaluatorServerID"));
+ int evalSID = Convert.ToInt32(SqliteGeneral.SqlitePreferences.Select("evaluatorServerID"));
try {
ChronojumpServer myServer = new ChronojumpServer();
@@ -254,13 +254,13 @@ public class Server
int countE = 0;
int countS = 0;
- string [] jumps = SqliteJump.SelectJumps(false, currentSession.UniqueID,
person.UniqueID, "", "",
+ string [] jumps = SqliteGeneral.SqliteJump.SelectJumps(false,
currentSession.UniqueID, person.UniqueID, "", "",
Sqlite.Orders_by.DEFAULT, -1);
Sqlite.Open();
foreach(string myJump in jumps) {
string [] js = myJump.Split(new char[] {':'});
//select jump
- Jump test = SqliteJump.SelectJumpData(Convert.ToInt32(js[1]), true);
//uniqueID
+ Jump test =
SqliteGeneral.SqliteJump.SelectJumpData(Convert.ToInt32(js[1]), true); //uniqueID
//fix it to server person, session keys
test.PersonID = person.ServerUniqueID;
test.SessionID = currentSession.ServerUniqueID;
@@ -324,12 +324,12 @@ public class Server
countE = 0;
countS = 0;
- string [] jumpsRj = SqliteJumpRj.SelectJumps(false, currentSession.UniqueID,
person.UniqueID, "", "");
+ string [] jumpsRj = SqliteGeneral.SqliteJumpRj.SelectJumps(false,
currentSession.UniqueID, person.UniqueID, "", "");
Sqlite.Open();
foreach(string myJump in jumpsRj) {
string [] js = myJump.Split(new char[] {':'});
//select jump
- JumpRj test = SqliteJumpRj.SelectJumpData(Constants.JumpRjTable,
Convert.ToInt32(js[1]), true); //uniqueID
+ JumpRj test =
SqliteGeneral.SqliteJumpRj.SelectJumpData(Constants.JumpRjTable, Convert.ToInt32(js[1]), true); //uniqueID
//fix it to server person, session keys
test.PersonID = person.ServerUniqueID;
test.SessionID = currentSession.ServerUniqueID;
@@ -368,14 +368,14 @@ public class Server
countE = 0;
countS = 0;
- string [] runs = SqliteRun.SelectRuns(false, currentSession.UniqueID,
person.UniqueID, "",
+ string [] runs = SqliteGeneral.SqliteRun.SelectRuns(false,
currentSession.UniqueID, person.UniqueID, "",
Sqlite.Orders_by.DEFAULT, -1);
Sqlite.Open();
foreach(string myRun in runs) {
string [] js = myRun.Split(new char[] {':'});
//select run
- Run test = SqliteRun.SelectRunData(Convert.ToInt32(js[1]), true);
//uniqueID
+ Run test =
SqliteGeneral.SqliteRun.SelectRunData(Convert.ToInt32(js[1]), true); //uniqueID
//fix it to server person, session keys
test.PersonID = person.ServerUniqueID;
test.SessionID = currentSession.ServerUniqueID;
@@ -414,12 +414,12 @@ public class Server
countE = 0;
countS = 0;
- string [] runsI = SqliteRunInterval.SelectRuns(false,
currentSession.UniqueID, person.UniqueID, "");
+ string [] runsI = SqliteGeneral.SqliteRunInterval.SelectRuns(false,
currentSession.UniqueID, person.UniqueID, "");
Sqlite.Open();
foreach(string myRun in runsI) {
string [] js = myRun.Split(new char[] {':'});
//select run
- RunInterval test =
SqliteRunInterval.SelectRunData(Constants.RunIntervalTable, Convert.ToInt32(js[1]), true); //uniqueID
+ RunInterval test =
SqliteGeneral.SqliteRunInterval.SelectRunData(Constants.RunIntervalTable, Convert.ToInt32(js[1]), true);
//uniqueID
//fix it to server person, session keys
test.PersonID = person.ServerUniqueID;
test.SessionID = currentSession.ServerUniqueID;
@@ -457,14 +457,14 @@ public class Server
countE = 0;
countS = 0;
- string [] rts = SqliteReactionTime.SelectReactionTimes(false,
currentSession.UniqueID, person.UniqueID, "",
+ string [] rts = SqliteGeneral.SqliteReactionTime.SelectReactionTimes(false,
currentSession.UniqueID, person.UniqueID, "",
Sqlite.Orders_by.DEFAULT, -1);
Sqlite.Open();
foreach(string myRt in rts) {
string [] js = myRt.Split(new char[] {':'});
//select rt
- ReactionTime test =
SqliteReactionTime.SelectReactionTimeData(Convert.ToInt32(js[1]), true); //uniqueID
+ ReactionTime test =
SqliteGeneral.SqliteReactionTime.SelectReactionTimeData(Convert.ToInt32(js[1]), true); //uniqueID
//fix it to server person, session keys
test.PersonID = person.ServerUniqueID;
test.SessionID = currentSession.ServerUniqueID;
@@ -490,12 +490,12 @@ public class Server
countE = 0;
countS = 0;
- string [] pulses = SqlitePulse.SelectPulses(false, currentSession.UniqueID,
person.UniqueID);
+ string [] pulses = SqliteGeneral.SqlitePulse.SelectPulses(false,
currentSession.UniqueID, person.UniqueID);
Sqlite.Open();
foreach(string myPulse in pulses) {
string [] js = myPulse.Split(new char[] {':'});
//select pulse
- Pulse test = SqlitePulse.SelectPulseData(Convert.ToInt32(js[1]),
true); //uniqueID
+ Pulse test =
SqliteGeneral.SqlitePulse.SelectPulseData(Convert.ToInt32(js[1]), true); //uniqueID
//fix it to server person, session keys
test.PersonID = person.ServerUniqueID;
test.SessionID = currentSession.ServerUniqueID;
@@ -521,12 +521,12 @@ public class Server
countE = 0;
countS = 0;
- string [] mcs = SqliteMultiChronopic.SelectTests(false,
currentSession.UniqueID, person.UniqueID);
+ string [] mcs = SqliteGeneral.SqliteMultiChronopic.SelectTests(false,
currentSession.UniqueID, person.UniqueID);
Sqlite.Open();
foreach(string mc in mcs) {
string [] js = mc.Split(new char[] {':'});
//select mc
- MultiChronopic test =
SqliteMultiChronopic.SelectMultiChronopicData(Convert.ToInt32(js[1]), true); //uniqueID
+ MultiChronopic test =
SqliteGeneral.SqliteMultiChronopic.SelectMultiChronopicData(Convert.ToInt32(js[1]), true); //uniqueID
//fix it to server person, session keys
test.PersonID = person.ServerUniqueID;
test.SessionID = currentSession.ServerUniqueID;
@@ -655,7 +655,7 @@ public class Server
ServerEvaluator myEval = SqliteServer.SelectEvaluator(1);
bool success = false;
- int evalSID = Convert.ToInt32(SqlitePreferences.Select("evaluatorServerID"));
+ int evalSID =
Convert.ToInt32(SqliteGeneral.SqlitePreferences.Select("evaluatorServerID"));
if(evalSID == Constants.ServerUndefinedID) {
string idCode = myServer.UploadEvaluator(myEval);
myEval.Code = Util.FetchName(idCode);
@@ -663,7 +663,7 @@ public class Server
myEval.Update(false);
evalSID = Util.FetchID(idCode);
- SqlitePreferences.Update("evaluatorServerID", evalSID.ToString(), false);
+ SqliteGeneral.SqlitePreferences.Update("evaluatorServerID",
evalSID.ToString(), false);
success = true;
} else
success = myServer.EditEvaluator(myEval, evalSID);
diff --git a/src/serverEvaluator.cs b/src/serverEvaluator.cs
index cff26f2..e88e6e0 100644
--- a/src/serverEvaluator.cs
+++ b/src/serverEvaluator.cs
@@ -85,13 +85,13 @@ public partial class ServerEvaluator
}
public int InsertAtDB(bool dbconOpened){
- int myID = SqliteServer.InsertEvaluator(dbconOpened, code, name, email, dateBorn, countryID,
chronometer, device, comments, confiable);
+ int myID = SqliteGeneral.SqliteServer.InsertEvaluator(dbconOpened, code, name, email,
dateBorn, countryID, chronometer, device, comments, confiable);
return myID;
}
public int Update (bool dbconOpened){
//confiable will not get updated
- SqliteServer.UpdateEvaluator(dbconOpened, uniqueID, code, name, email, dateBorn, countryID,
chronometer, device, comments, confiable);
+ SqliteGeneral.SqliteServer.UpdateEvaluator(dbconOpened, uniqueID, code, name, email,
dateBorn, countryID, chronometer, device, comments, confiable);
return uniqueID;
}
diff --git a/src/serverPing.cs b/src/serverPing.cs
index 6e47a2f..6f6e6df 100644
--- a/src/serverPing.cs
+++ b/src/serverPing.cs
@@ -47,7 +47,7 @@ public partial class ServerPing
}
public int InsertAtDB(bool dbconOpened){
- int myID = SqliteServer.InsertPing(dbconOpened, evaluatorID, cjVersion, osVersion, ip, date);
+ int myID = SqliteGeneral.SqliteServer.InsertPing(dbconOpened, evaluatorID, cjVersion,
osVersion, ip, date);
return myID;
}
diff --git a/src/session.cs b/src/session.cs
index 146642f..9d11c71 100644
--- a/src/session.cs
+++ b/src/session.cs
@@ -108,7 +108,7 @@ public partial class Session {
}
public virtual int InsertAtDB (bool dbconOpened, string tableName) {
- int myID = SqliteSession.Insert(dbconOpened, tableName,
+ int myID = SqliteGeneral.SqliteSession.Insert(dbconOpened, tableName,
uniqueID.ToString(), name,
place, date,
personsSportID,
@@ -235,7 +235,7 @@ public partial class ServerSession : Session
}
public override int InsertAtDB (bool dbconOpened, string tableName) {
- int myID = SqliteServerSession.Insert(dbconOpened, tableName,
+ int myID = SqliteGeneral.SqliteServerSession.Insert(dbconOpened, tableName,
//uniqueID.ToString(),
name,
place, date,
diff --git a/src/sport.cs b/src/sport.cs
index e5fdd61..8df6fab 100644
--- a/src/sport.cs
+++ b/src/sport.cs
@@ -58,7 +58,7 @@ public partial class Sport
//currently only used from server at uploadSport
//if used in other places, the "-1" maybe should be another value
public int InsertAtDB (bool dbconOpened) {
- int myID = SqliteSport.Insert(dbconOpened, "-1", name,
+ int myID = SqliteGeneral.SqliteSport.Insert(dbconOpened, "-1", name,
userDefined, hasSpeciallities, graphLink);
return myID;
}
diff --git a/src/sqlite/encoder.cs b/src/sqlite/encoder.cs
index c176b42..f187fee 100644
--- a/src/sqlite/encoder.cs
+++ b/src/sqlite/encoder.cs
@@ -27,7 +27,7 @@ using Mono.Data.Sqlite;
using Mono.Unix;
-class SqliteEncoder : Sqlite
+public class SqliteEncoder : Sqlite
{
public SqliteEncoder() {
}
@@ -1056,7 +1056,7 @@ class SqliteEncoder : Sqlite
//called on startup to load last encoderConfiguration
public EncoderConfiguration LoadEncoderConfiguration()
{
- string ecStr = SqlitePreferences.Select("encoderConfiguration", false);
+ string ecStr = SqliteGeneral.SqlitePreferences.Select("encoderConfiguration", false);
//1.5.1 and previous don't store encoderConfiguration on SqlitePreferences
if(ecStr == null || ecStr.Length == 0 || ecStr == "0" || ecStr == "")
diff --git a/src/sqlite/event.cs b/src/sqlite/event.cs
index fdb0fbd..49bd4be 100644
--- a/src/sqlite/event.cs
+++ b/src/sqlite/event.cs
@@ -24,7 +24,7 @@ using Mono.Data.Sqlite;
/* this class has some initializations used for all events */
-class SqliteEvent : Sqlite
+public class SqliteEvent : Sqlite
{
/*
* create and initialize tables
diff --git a/src/sqlite/executeAuto.cs b/src/sqlite/executeAuto.cs
index 9268f42..2f8614d 100644
--- a/src/sqlite/executeAuto.cs
+++ b/src/sqlite/executeAuto.cs
@@ -25,7 +25,7 @@ using System.Collections; //ArrayList
using System.Collections.Generic; //List<T>
using Mono.Data.Sqlite;
-class SqliteExecuteAuto : Sqlite
+public class SqliteExecuteAuto : Sqlite
{
public SqliteExecuteAuto() {
}
diff --git a/src/sqlite/jump.cs b/src/sqlite/jump.cs
index 87f7090..7dc7826 100644
--- a/src/sqlite/jump.cs
+++ b/src/sqlite/jump.cs
@@ -26,7 +26,7 @@ using System.Collections.Generic; //List<T>
using Mono.Data.Sqlite;
-class SqliteJump : Sqlite
+public class SqliteJump : Sqlite
{
public SqliteJump() {
}
diff --git a/src/sqlite/jumpRj.cs b/src/sqlite/jumpRj.cs
index 26c0882..591844f 100644
--- a/src/sqlite/jumpRj.cs
+++ b/src/sqlite/jumpRj.cs
@@ -25,7 +25,7 @@ using System.Collections; //ArrayList
using Mono.Data.Sqlite;
-class SqliteJumpRj : SqliteJump
+public class SqliteJumpRj : SqliteJump
{
public SqliteJumpRj() {
}
diff --git a/src/sqlite/jumpType.cs b/src/sqlite/jumpType.cs
index 9516e6c..6ef416d 100644
--- a/src/sqlite/jumpType.cs
+++ b/src/sqlite/jumpType.cs
@@ -25,7 +25,7 @@ using System.Collections; //ArrayList
using Mono.Data.Sqlite;
-class SqliteJumpType : Sqlite
+public class SqliteJumpType : Sqlite
{
/*
* create and initialize tables
diff --git a/src/sqlite/main.cs b/src/sqlite/main.cs
index 30ae343..78afeee 100644
--- a/src/sqlite/main.cs
+++ b/src/sqlite/main.cs
@@ -27,28 +27,229 @@ using System.Diagnostics; //for launching other process
using Mono.Unix;
-public sealed class SqliteForUser
+public sealed class SqliteGeneral
{
- private static readonly Sqlite instance = new Sqlite();
+ private static Sqlite m_sqliteGeneral;
+ private static SqlitePreferences m_sqlitePreferences;
+ private static SqliteJumpRj m_sqliteJumpRj;
+ private static SqliteJump m_sqliteJump;
+ private static SqliteRunInterval m_sqliteRunInterval;
+ private static SqlitePerson m_sqlitePerson;
+ private static SqliteExecuteAuto m_sqliteExecuteAuto;
+ private static SqlitePersonSession m_sqlitePersonSession;
+ private static SqliteRun m_sqliteRun;
+ private static SqliteRunIntervalType m_sqliteRunIntervalType;
+ private static SqliteRunType m_sqliteRunType;
+ private static SqliteReactionTime m_sqliteReactionTime;
+ private static SqlitePulse m_sqlitePulse;
+ private static SqlitePulseType m_sqlitePulseType;
+ private static SqliteMultiChronopic m_sqliteMultiChronopic;
+ private static SqliteSport m_sqliteSport;
+ private static SqliteSpeciallity m_sqliteSpeciallity;
+ private static SqliteJumpType m_sqliteJumpType;
+ private static SqliteSession m_sqliteSession;
+ private static SqliteServer m_sqliteServer;
+ private static SqliteServerSession m_sqliteServerSession;
+ private static SqlitePersonSessionNotUpload m_sqlitePersonSessionNotUpload;
+ private static SqliteEncoder m_sqliteEncoder;
+ private static SqliteEvent m_sqliteEvent;
+
+ public SqliteGeneral()
+ {
+ m_sqliteGeneral = new Sqlite();
+ m_sqlitePreferences = new SqlitePreferences();
+ // TODO create the other ones!
+
+ }
+
+ public static Sqlite Sqlite
+ {
+ get
+ {
+ return m_sqliteGeneral;
+ }
+ }
+
+ public static SqlitePreferences SqlitePreferences
+ {
+ get
+ {
+ return m_sqlitePreferences;
+ }
+ }
+
+ public static SqliteJumpRj SqliteJumpRj
+ {
+ get
+ {
+ return m_sqliteJumpRj;
+ }
+ }
+
+ public static SqliteJump SqliteJump
+ {
+ get
+ {
+ return m_sqliteJump;
+ }
+ }
+
+ public static SqliteRunInterval SqliteRunInterval
+ {
+ get
+ {
+ return m_sqliteRunInterval;
+ }
+ }
+
+ public static SqlitePerson SqlitePerson
+ {
+ get
+ {
+ return m_sqlitePerson;
+ }
+ }
+
+ public static SqliteExecuteAuto SqliteExecuteAuto
+ {
+ get
+ {
+ return m_sqliteExecuteAuto;
+ }
+ }
+
+ public static SqlitePersonSession SqlitePersonSession
+ {
+ get
+ {
+ return m_sqlitePersonSession;
+ }
+ }
+
+ public static SqliteRun SqliteRun
+ {
+ get
+ {
+ return m_sqliteRun;
+ }
+ }
+
+ public static SqliteRunIntervalType SqliteRunIntervalType
+ {
+ get
+ {
+ return m_sqliteRunIntervalType;
+ }
+ }
+
+ public static SqliteRunType SqliteRunType
+ {
+ get
+ {
+ return m_sqliteRunType;
+ }
+ }
+ public static SqliteReactionTime SqliteReactionTime
+ {
+
+ get
+ {
+ return m_sqliteReactionTime;
+ }
+ }
+
+ public static SqlitePulse SqlitePulse
+ {
+ get
+ {
+ return m_sqlitePulse;
+ }
+ }
+
+ public static SqlitePulseType SqlitePulseType
+ {
+ get
+ {
+ return m_sqlitePulseType;
+ }
+ }
+
+ public static SqliteMultiChronopic SqliteMultiChronopic
+ {
+ get
+ {
+ return m_sqliteMultiChronopic;
+ }
+ }
+
+ public static SqliteSport SqliteSport
+ {
+ get
+ {
+ return m_sqliteSport;
+ }
+ }
- // Explicit static constructor to tell C# compiler
- // not to mark type as beforefieldinit
- static SqliteForUser()
+ public static SqliteSpeciallity SqliteSpeciallity
{
+ get
+ {
+ return m_sqliteSpeciallity;
+ }
}
- private SqliteForUser()
+ public static SqliteJumpType SqliteJumpType
{
+ get
+ {
+ return m_sqliteJumpType;
+ }
}
- public static Sqlite Instance
+ public static SqliteSession SqliteSession
+ {
+ get
+ {
+ return m_sqliteSession;
+ }
+ }
+
+ public static SqliteServer SqliteServer
+ {
+ get
+ {
+ return m_sqliteServer;
+ }
+ }
+ public static SqliteServerSession SqliteServerSession
{
get
{
- return instance;
+ return m_sqliteServerSession;
}
}
-}
+ public static SqlitePersonSessionNotUpload SqlitePersonSessionNotUpload
+ {
+ get
+ {
+ return m_sqlitePersonSessionNotUpload;
+ }
+ }
+ public static SqliteEncoder SqliteEncoder
+ {
+ get
+ {
+ return m_sqliteEncoder;
+ }
+ }
+ public static SqliteEvent SqliteEvent
+ {
+ get
+ {
+ return m_sqliteEvent;
+ }
+ }
+}
public class Sqlite
{
@@ -335,12 +536,12 @@ public class Sqlite
public bool IsSqlite3() {
if(sqlite3SelectWorks()){
LogB.SQL("SQLITE3");
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
return true;
}
else if(sqlite2SelectWorks()) {
LogB.SQL("SQLITE2");
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
//write sqlFile path on data/databasePath.txt
//TODO
//
@@ -349,27 +550,27 @@ public class Sqlite
}
else {
LogB.SQL("ERROR in sqlite detection");
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
return false;
}
}
private bool sqlite3SelectWorks() {
try {
- SqlitePreferences.Select("chronopicPort");
+ SqliteGeneral.SqlitePreferences.Select("chronopicPort");
} catch {
/*
try {
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
if(File.Exists(Util.GetDatabaseDir() + Path.DirectorySeparatorChar +
"chronojump.db"))
File.Move(Util.GetDatabaseDir() + Path.DirectorySeparatorChar +
"chronojump.db",
Util.GetDatabaseTempDir() +
Path.DirectorySeparatorChar + "chronojump.db");
dbcon.ConnectionString = connectionStringTemp;
dbcmd = dbcon.CreateCommand();
- Sqlite.Open();
- SqlitePreferences.Select("chronopicPort");
+ SqliteGeneral.Sqlite.Open();
+ SqliteGeneral.SqlitePreferences.Select("chronopicPort");
} catch {
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
if(File.Exists(Util.GetDatabaseTempDir() + Path.DirectorySeparatorChar +
"chronojump.db"))
File.Move(Util.GetDatabaseTempDir() + Path.DirectorySeparatorChar +
"chronojump.db",
Util.GetDatabaseDir() + Path.DirectorySeparatorChar +
"chronojump.db");
@@ -384,14 +585,14 @@ public class Sqlite
/*
*it says:
Unhandled Exception: System.NotSupportedException: Only Sqlite Version 3 is supported at
this time
- at Mono.Data.Sqlite.SqliteConnection.Open () [0x00000]
+ at Mono.Data.SqliteGeneral.Sqlite.SqliteConnection.Open () [0x00000]
*
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
connectionString = "version=2; URI=file:" + sqlFile;
dbcon.ConnectionString = connectionString;
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
try {
- SqlitePreferences.Select("chronopicPort");
+ SqliteGeneral.SqlitePreferences.Select("chronopicPort");
} catch {
return false;
}
@@ -507,7 +708,7 @@ public class Sqlite
addChronopicPortNameIfNotExists();
- currentVersion = SqlitePreferences.Select("databaseVersion");
+ currentVersion = SqliteGeneral.SqlitePreferences.Select("databaseVersion");
//LogB.SQL("lastDB: {0}", Convert.ToDouble(lastChronojumpDatabaseVersion));
//LogB.SQL("currentVersion: {0}", Convert.ToDouble(currentVersion));
@@ -539,86 +740,86 @@ public class Sqlite
SqlitePersonSessionOld sqlitePersonSessionOldObject = new SqlitePersonSessionOld();
if(currentVersion == "0.41") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
- //SqlitePulse.createTable(Constants.PulseTable);
+ //SqliteGeneral.SqlitePulse.createTable(Constants.PulseTable);
sqlitePulseObject.createTable(Constants.PulseTable);
SqlitePulseType.createTablePulseType();
SqlitePulseType.initializeTablePulseType();
- SqlitePreferences.Update ("databaseVersion", "0.42", true);
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.42", true);
LogB.SQL("Converted DB to 0.42 (added pulse and pulseType tables)");
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.42";
}
if(currentVersion == "0.42") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
SqlitePulseType.Insert ("Free:-1:-1:free PulseStep mode", true);
- SqlitePreferences.Insert ("language", "es-ES");
- SqlitePreferences.Update ("databaseVersion", "0.43", true);
+ SqliteGeneral.SqlitePreferences.Insert ("language", "es-ES");
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.43", true);
LogB.SQL("Converted DB to 0.43 (added 'free' pulseType & language
peference)");
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.43";
}
if(currentVersion == "0.43") {
- Sqlite.Open();
- SqlitePreferences.Insert ("showQIndex", "False");
- SqlitePreferences.Insert ("showDjIndex", "False");
- SqlitePreferences.Update ("databaseVersion", "0.44", true);
+ SqliteGeneral.Sqlite.Open();
+ SqliteGeneral.SqlitePreferences.Insert ("showQIndex", "False");
+ SqliteGeneral.SqlitePreferences.Insert ("showDjIndex", "False");
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.44", true);
LogB.SQL("Converted DB to 0.44 (added showQIndex, showDjIndex)");
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.44";
}
if(currentVersion == "0.44") {
- Sqlite.Open();
- SqlitePreferences.Insert ("allowFinishRjAfterTime", "True");
- SqlitePreferences.Update ("databaseVersion", "0.45", true);
+ SqliteGeneral.Sqlite.Open();
+ SqliteGeneral.SqlitePreferences.Insert ("allowFinishRjAfterTime", "True");
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.45", true);
LogB.SQL("Converted DB to 0.45 (added allowFinishRjAfterTime)");
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.45";
}
if(currentVersion == "0.45") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
SqliteJumpType.JumpTypeInsert ("Free:1:0:Free jump", true);
- SqlitePreferences.Update ("databaseVersion", "0.46", true);
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.46", true);
LogB.SQL("Added Free jump type");
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.46";
}
if(currentVersion == "0.46") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
- //SqliteReactionTime.createTable(Constants.ReactionTimeTable);
+ //SqliteGeneral.SqliteReactionTime.createTable(Constants.ReactionTimeTable);
sqliteReactionTimeObject.createTable(Constants.ReactionTimeTable);
- SqlitePreferences.Update ("databaseVersion", "0.47", true);
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.47", true);
LogB.SQL("Added reaction time table");
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.47";
}
if(currentVersion == "0.47") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
- //SqliteJumpRj.createTable(Constants.TempJumpRjTable);
+ //SqliteGeneral.SqliteJumpRj.createTable(Constants.TempJumpRjTable);
sqliteJumpRjObject.createTable(Constants.TempJumpRjTable);
- //SqliteRun.intervalCreateTable(Constants.TempRunIntervalTable);
+ //SqliteGeneral.SqliteRun.intervalCreateTable(Constants.TempRunIntervalTable);
sqliteRunIntervalObject.createTable(Constants.TempRunIntervalTable);
- SqlitePreferences.Update ("databaseVersion", "0.48", true);
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.48", true);
LogB.SQL("created tempJumpReactive and tempRunInterval tables");
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.48";
}
if(currentVersion == "0.48") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
SqliteJumpType.JumpTypeInsert ("Rocket:1:0:Rocket jump", true);
@@ -642,66 +843,66 @@ public class Sqlite
SqliteEvent.createGraphLinkTable();
SqliteRunType.AddGraphLinksRunSimpleAgility();
- SqlitePreferences.Update ("databaseVersion", "0.49", true);
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.49", true);
LogB.SQL("Added graphLinkTable, added Rocket jump and 5 agility tests:
(20Yard, 505, Illinois, Shuttle-Run & ZigZag. Added graphs pof the 5 agility tests)");
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.49";
}
if(currentVersion == "0.49") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
SqliteJumpType.Update ("SJ+", "SJl");
SqliteJumpType.Update ("CMJ+", "CJl");
SqliteJumpType.Update ("ABK+", "ABKl");
- SqliteJump.ChangeWeightToL();
+ SqliteGeneral.SqliteJump.ChangeWeightToL();
SqliteJumpType.AddGraphLinks();
SqliteJumpType.AddGraphLinksRj();
- SqlitePreferences.Update ("databaseVersion", "0.50", true);
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.50", true);
LogB.SQL("changed SJ+ to SJl, same for CMJ+ and ABK+, added jump and jumpRj
graph links");
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.50";
}
if(currentVersion == "0.50") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
SqliteRunType.AddGraphLinksRunSimple();
SqliteRunIntervalType.AddGraphLinksRunInterval();
- SqlitePreferences.Update ("databaseVersion", "0.51", true);
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.51", true);
LogB.SQL("added graphLinks for run simple and interval");
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.51";
}
if(currentVersion == "0.51") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
SqliteJumpType.Update ("CJl", "CMJl");
SqliteEvent.GraphLinkInsert (Constants.JumpTable, "CMJl", "jump_cmj_l.png",
true);
SqliteEvent.GraphLinkInsert (Constants.JumpTable, "ABKl", "jump_abk_l.png",
true);
- SqlitePreferences.Update ("databaseVersion", "0.52", true);
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.52", true);
LogB.SQL("added graphLinks for cmj_l and abk_l, fixed CMJl name");
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.52";
}
if(currentVersion == "0.52") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
sqlitePersonSessionOldObject.createTable ();
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
//this needs the dbCon closed
SqlitePersonSessionOld.moveOldTableToNewTable ();
- Sqlite.Open();
- SqlitePreferences.Update ("databaseVersion", "0.53", true);
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Open();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.53", true);
+ SqliteGeneral.Sqlite.Close();
LogB.SQL("created weightSession table. Moved person weight data to
weightSession table for each session that has performed");
currentVersion = "0.53";
}
if(currentVersion == "0.53") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
SqliteSport.createTable();
SqliteSport.initialize();
@@ -711,36 +912,36 @@ public class Sqlite
//SqlitePersonOld.convertTableToSportRelated ();
needToConvertPersonToSport = true;
- SqlitePreferences.Update ("databaseVersion", "0.54", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.54", true);
+ SqliteGeneral.Sqlite.Close();
LogB.SQL("Created sport tables. Added sport data, speciallity and level of
practice to person table");
currentVersion = "0.54";
}
if(currentVersion == "0.54") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
SqliteSpeciallity.InsertUndefined(true);
- SqlitePreferences.Update ("databaseVersion", "0.55", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.55", true);
+ SqliteGeneral.Sqlite.Close();
LogB.SQL("Added undefined to speciallity table");
currentVersion = "0.55";
}
if(currentVersion == "0.55") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
SqliteSessionOld.convertTableAddingSportStuff();
- SqlitePreferences.Update ("databaseVersion", "0.56", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.56", true);
+ SqliteGeneral.Sqlite.Close();
LogB.SQL("Added session default sport stuff into session table");
currentVersion = "0.56";
}
if(currentVersion == "0.56") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
//jump and jumpRj
ArrayList arrayAngleAndSimulated = new ArrayList(1);
@@ -776,9 +977,9 @@ public class Sqlite
//reacreate temp tables for have also the simulated column
conversionRate ++;
- Sqlite.dropTable(Constants.TempJumpRjTable);
+ SqliteGeneral.Sqlite.dropTable(Constants.TempJumpRjTable);
sqliteJumpRjObject.createTable(Constants.TempJumpRjTable);
- Sqlite.dropTable(Constants.TempRunIntervalTable);
+ SqliteGeneral.Sqlite.dropTable(Constants.TempRunIntervalTable);
sqliteRunIntervalObject.createTable(Constants.TempRunIntervalTable);
conversionRate ++;
@@ -801,20 +1002,20 @@ public class Sqlite
arrayPersonRaceCountryServerID.Add(Constants.ServerUndefinedID.ToString());
convertTables(new SqlitePersonOld(), Constants.PersonOldTable, columnsBefore,
arrayPersonRaceCountryServerID, putDescriptionInMiddle);
- SqlitePreferences.Update ("databaseVersion", "0.57", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.57", true);
+ SqliteGeneral.Sqlite.Close();
LogB.SQL("Added simulated column to each event table on client. Added to
person: race, country, serverUniqueID. Convert to sport related done here if needed. Added also run and
runInterval initial speed");
currentVersion = "0.57";
}
if(currentVersion == "0.57") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
//check if "republic" is in country table
if(SqliteCountry.TableHasOldRepublicStuff()){
conversionRateTotal = 4;
conversionRate = 1;
- Sqlite.dropTable(Constants.CountryTable);
+ SqliteGeneral.Sqlite.dropTable(Constants.CountryTable);
conversionRate ++;
SqliteCountry.createTable();
conversionRate ++;
@@ -823,36 +1024,36 @@ public class Sqlite
LogB.SQL("Countries without kingdom or republic (except when
needed)");
}
- SqlitePreferences.Update ("databaseVersion", "0.58", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.58", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.58";
}
if(currentVersion == "0.58") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
conversionRateTotal = 2;
conversionRate = 1;
- SqlitePreferences.Insert ("showAngle", "False");
+ SqliteGeneral.SqlitePreferences.Insert ("showAngle", "False");
alterTableColumn(new SqliteJump(), Constants.JumpTable, 11);
//jump fall is also converted to double (don't need to do at conversion to
0.76)
jumpFallAsDouble = true;
- SqlitePreferences.Update ("databaseVersion", "0.59", true);
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.59", true);
LogB.SQL("Converted DB to 0.59 (added 'showAngle' to preferences, changed
angle on jump to double)");
conversionRate = 2;
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.59";
}
if(currentVersion == "0.59") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
conversionRateTotal = 4;
conversionRate = 1;
- SqlitePreferences.Insert ("volumeOn", "True");
- SqlitePreferences.Insert ("evaluatorServerID", "-1");
+ SqliteGeneral.SqlitePreferences.Insert ("volumeOn", "True");
+ SqliteGeneral.SqlitePreferences.Insert ("evaluatorServerID", "-1");
conversionRate = 2;
@@ -864,16 +1065,16 @@ public class Sqlite
conversionRate = 3;
SqliteEvent.SimulatedConvertToNegative();
- SqlitePreferences.Update ("databaseVersion", "0.60", true);
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.60", true);
LogB.SQL("Converted DB to 0.60 (added volumeOn and evaluatorServerID to
preferences. session has now serverUniqueID. Simulated now are -1, because 0 is real and positive is
serverUniqueID)");
conversionRate = 4;
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.60";
}
if(currentVersion == "0.60") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
conversionRateTotal = 3;
conversionRate = 1;
@@ -894,31 +1095,31 @@ public class Sqlite
type.DistancesString = "1-7-19";
SqliteRunIntervalType.Insert(type, Constants.RunIntervalTypeTable, true);
- SqlitePreferences.Update ("databaseVersion", "0.61", true);
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.61", true);
LogB.SQL("Converted DB to 0.61 added RunIntervalType distancesString (now we
van have interval tests with different distances of tracks). Added MTGUG");
conversionRate = 3;
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.61";
}
if(currentVersion == "0.61") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
SqliteJumpType.JumpRjTypeInsert ("RJ(hexagon):1:0:1:18:Reactive Jump on a
hexagon until three full revolutions are done", true);
- SqlitePreferences.Update ("databaseVersion", "0.62", true);
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.62", true);
LogB.SQL("Converted DB to 0.62 added hexagon");
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.62";
}
if(currentVersion == "0.62") {
- Sqlite.Open();
- SqlitePreferences.Insert ("versionAvailable", "");
- SqlitePreferences.Update ("databaseVersion", "0.63", true);
+ SqliteGeneral.Sqlite.Open();
+ SqliteGeneral.SqlitePreferences.Insert ("versionAvailable", "");
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.63", true);
LogB.SQL("Converted DB to 0.63 (added 'versionAvailable' to preferences)");
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.63";
}
if(currentVersion == "0.63") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
RunType type = new RunType();
type.Name = "Margaria";
@@ -927,60 +1128,60 @@ public class Sqlite
SqliteRunType.Insert(type, Constants.RunTypeTable, true);
SqliteEvent.GraphLinkInsert (Constants.RunTable, "Margaria", "margaria.png",
true);
- SqlitePreferences.Update ("databaseVersion", "0.64", true);
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.64", true);
LogB.SQL("Converted DB to 0.64 (added margaria test)");
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.64";
}
if(currentVersion == "0.64") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
SqliteServer sqliteServerObject = new SqliteServer();
//user has also an evaluator table with a row (it's row)
sqliteServerObject.CreateEvaluatorTable();
- SqlitePreferences.Update ("databaseVersion", "0.65", true);
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.65", true);
LogB.SQL("Converted DB to 0.65 (added Sevaluator on client)");
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.65";
}
if(currentVersion == "0.65") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
//now runAnalysis is a multiChronopic event
//SqliteJumpType.JumpRjTypeInsert ("RunAnalysis:0:0:1:-1:Run between two
photocells recording contact and flight times in contact platform/s. Until finish button is clicked.", true);
- SqlitePreferences.Update ("databaseVersion", "0.66", true);
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.66", true);
//LogB.SQL("Converted DB to 0.66 (added RunAnalysis Reactive jump)");
LogB.SQL("Converted DB to 0.66 (done nothing)");
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.66";
}
if(currentVersion == "0.66") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
SqliteJumpType.JumpTypeInsert ("TakeOff:0:0:Take off", true);
SqliteJumpType.JumpTypeInsert ("TakeOffWeight:0:0:Take off with weight",
true);
- SqlitePreferences.Update ("databaseVersion", "0.67", true);
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.67", true);
LogB.SQL("Converted DB to 0.67 (added TakeOff jumps)");
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.67";
}
if(currentVersion == "0.67") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
sqliteMultiChronopicObject.createTable(Constants.MultiChronopicTable);
- SqlitePreferences.Update ("databaseVersion", "0.68", true);
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.68", true);
LogB.SQL("Converted DB to 0.68 (added multiChronopic tests table)");
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.68";
}
if(currentVersion == "0.68") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
RunType type = new RunType();
type.Name = "Gesell-DBT";
@@ -989,51 +1190,51 @@ public class Sqlite
SqliteRunType.Insert(type, Constants.RunTypeTable, true);
SqliteEvent.GraphLinkInsert (Constants.RunTable, "Gesell-DBT",
"gesell_dbt.png", true);
- SqlitePreferences.Update ("databaseVersion", "0.69", true);
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.69", true);
LogB.SQL("Converted DB to 0.69 (added Gesell-DBT test)");
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.69";
}
if(currentVersion == "0.69") {
- Sqlite.Open();
- SqlitePreferences.Insert ("showPower", "True");
- SqlitePreferences.Update ("databaseVersion", "0.70", true);
+ SqliteGeneral.Sqlite.Open();
+ SqliteGeneral.SqlitePreferences.Insert ("showPower", "True");
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.70", true);
LogB.SQL("Converted DB to 0.70 (added showPower)");
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.70";
}
if(currentVersion == "0.70") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
SqlitePersonSessionNotUpload.CreateTable();
- SqlitePreferences.Update ("databaseVersion", "0.71", true);
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.71", true);
LogB.SQL("Converted DB to 0.71 (created personNotUploadTable on client)");
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.71";
}
if(currentVersion == "0.71") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
datesToYYYYMMDD();
- SqlitePreferences.Update ("databaseVersion", "0.72", true);
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.72", true);
LogB.SQL("Converted DB to 0.72 (dates to YYYY-MM-DD)");
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.72";
}
if(currentVersion == "0.72") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
deleteOrphanedPersonsOld();
- SqlitePreferences.Update ("databaseVersion", "0.73", true);
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.73", true);
LogB.SQL("Converted DB to 0.73 (deleted orphaned persons (in person table but
not in personSessionWeight table)");
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.73";
}
if(currentVersion == "0.73") {
@@ -1041,34 +1242,34 @@ public class Sqlite
convertDJInDJna();
- SqlitePreferences.Update ("databaseVersion", "0.74", true);
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.74", true);
LogB.SQL("Converted DB to 0.74 (All DJ converted to DJna)");
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.74";
}
if(currentVersion == "0.74") {
conversionRateTotal = 3;
conversionRate = 1;
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
convertTables(new SqlitePersonOld(), Constants.PersonOldTable, 13, new
ArrayList(), false);
conversionRate++;
convertTables(new SqlitePersonSessionOld(),
Constants.PersonSessionOldWeightTable, 4, new ArrayList(), false);
- SqlitePreferences.Update ("databaseVersion", "0.75", true);
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.75", true);
conversionRate++;
LogB.SQL("Converted DB to 0.75 (person, and personSessionWeight have height
and weight as double)");
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.75";
}
if(currentVersion == "0.75") {
conversionRateTotal = 3;
conversionRate = 1;
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
if(!jumpFallAsDouble)
alterTableColumn(new SqliteJump(), Constants.JumpTable, 11);
@@ -1077,51 +1278,51 @@ public class Sqlite
alterTableColumn(new SqliteJumpRj(), Constants.JumpRjTable, 18);
- SqlitePreferences.Update ("databaseVersion", "0.76", true);
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.76", true);
conversionRate++;
LogB.SQL("Converted DB to 0.76 (jump & jumpRj falls as double)");
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.76";
}
if(currentVersion == "0.76") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
convertPersonAndPersonSessionTo77();
- SqlitePreferences.Update ("databaseVersion", "0.77", true);
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.77", true);
LogB.SQL("Converted DB to 0.77 (person77, personSession77)");
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.77";
}
if(currentVersion == "0.77") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
SqliteJumpType.UpdateOther ("weight", Constants.TakeOffWeightName, "1");
Random rnd = new Random();
string machineID = rnd.Next().ToString();
- SqlitePreferences.Insert ("machineID", machineID);
+ SqliteGeneral.SqlitePreferences.Insert ("machineID", machineID);
- SqlitePreferences.Update ("databaseVersion", "0.78", true);
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.78", true);
LogB.SQL("Converted DB to 0.78 (Added machineID to preferences, takeOffWeight
has no weight in db conversions since 0.66)");
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.78";
}
if(currentVersion == "0.78") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
- SqlitePreferences.Insert ("multimediaStorage",
Constants.MultimediaStorage.BYSESSION.ToString());
+ SqliteGeneral.SqlitePreferences.Insert ("multimediaStorage",
Constants.MultimediaStorage.BYSESSION.ToString());
- SqlitePreferences.Update ("databaseVersion", "0.79", true);
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.79", true);
LogB.SQL("Converted DB to 0.79 (Added multimediaStorage structure id)");
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.79";
}
if(currentVersion == "0.79") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
if(! runAndRunIntervalInitialSpeedAdded) {
ArrayList myArray = new ArrayList(1);
@@ -1136,45 +1337,45 @@ public class Sqlite
LogB.SQL("Converted DB to 0.80 Added run and runInterval initial
speed (if not done in 0.56 conversion)");
}
- SqlitePreferences.Update ("databaseVersion", "0.80", true);
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.80", true);
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.80";
}
if(currentVersion == "0.80") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
ArrayList myArray = new ArrayList(1);
myArray.Add("0"); //initial speed
conversionRateTotal = 2;
conversionRate = 1;
- Sqlite.dropTable(Constants.TempRunIntervalTable);
+ SqliteGeneral.Sqlite.dropTable(Constants.TempRunIntervalTable);
sqliteRunIntervalObject.createTable(Constants.TempRunIntervalTable);
conversionRate ++;
LogB.SQL("Converted DB to 0.81 Added tempRunInterval initial speed");
- SqlitePreferences.Update ("databaseVersion", "0.81", true);
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.81", true);
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.81";
}
if(currentVersion == "0.81") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
conversionRateTotal = 2;
conversionRate = 1;
- SqlitePreferences.Insert ("videoOn", "False");
+ SqliteGeneral.SqlitePreferences.Insert ("videoOn", "False");
conversionRate = 2;
LogB.SQL("Converted DB to 0.82 Added videoOn");
- SqlitePreferences.Update ("databaseVersion", "0.82", true);
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.82", true);
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.82";
}
if(currentVersion == "0.82") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
conversionRateTotal = 2;
conversionRate = 1;
@@ -1184,12 +1385,12 @@ public class Sqlite
conversionRate = 2;
LogB.SQL("Created encoder tables.");
- SqlitePreferences.Update ("databaseVersion", "0.83", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.83", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.83";
}
if(currentVersion == "0.83") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
RunType type = new RunType();
type.Name = "RSA 8-4-R3-5";
@@ -1203,39 +1404,39 @@ public class Sqlite
LogB.SQL("Added 1st RSA test.");
- SqlitePreferences.Update ("databaseVersion", "0.84", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.84", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.84";
}
if(currentVersion == "0.84") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
SqliteJumpType.JumpTypeInsert ("slCMJ:1:0:Single-leg CMJ jump", true);
- SqlitePreferences.Update ("databaseVersion", "0.85", true);
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.85", true);
LogB.SQL("Converted DB to 0.85 (added slCMJ jump)");
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.85";
}
if(currentVersion == "0.85") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
LogB.SQL("Converted DB to 0.86 videoOn: TRUE");
- SqlitePreferences.Update("videoOn", "True", true);
- SqlitePreferences.Update ("databaseVersion", "0.86", true);
+ SqliteGeneral.SqlitePreferences.Update("videoOn", "True", true);
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.86", true);
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.86";
}
if(currentVersion == "0.86") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
LogB.SQL("Added run speed start preferences on sqlite");
- SqlitePreferences.Insert ("runSpeedStartArrival", "True");
- SqlitePreferences.Insert ("runISpeedStartArrival", "True");
- SqlitePreferences.Update ("databaseVersion", "0.87", true);
+ SqliteGeneral.SqlitePreferences.Insert ("runSpeedStartArrival", "True");
+ SqliteGeneral.SqlitePreferences.Insert ("runISpeedStartArrival", "True");
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.87", true);
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.87";
}
if(currentVersion == "0.87") {
@@ -1243,7 +1444,7 @@ public class Sqlite
SqliteRunIntervalType.Delete("RSA 8-4-R3-5");
//delete all it's runs
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
dbcmd.CommandText = "DELETE FROM " + Constants.RunIntervalTable +
" WHERE type == \"RSA 8-4-R3-5\"";
LogB.SQL(dbcmd.CommandText.ToString());
@@ -1255,95 +1456,95 @@ public class Sqlite
LogB.SQL("Deleted fake RSA test and added known RSA tests.");
- SqlitePreferences.Update ("databaseVersion", "0.88", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.88", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.88";
}
if(currentVersion == "0.88") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
SqliteEncoder.addEncoderFreeExercise();
LogB.SQL("Added encoder exercise: Free");
- SqlitePreferences.Update ("databaseVersion", "0.89", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.89", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.89";
}
if(currentVersion == "0.89") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
- SqlitePreferences.Insert("encoderPropulsive", "True");
- SqlitePreferences.Insert("encoderSmoothEccCon", "0.6");
- SqlitePreferences.Insert("encoderSmoothCon", "0.7");
+ SqliteGeneral.SqlitePreferences.Insert("encoderPropulsive", "True");
+ SqliteGeneral.SqlitePreferences.Insert("encoderSmoothEccCon", "0.6");
+ SqliteGeneral.SqlitePreferences.Insert("encoderSmoothCon", "0.7");
LogB.SQL("Preferences added propulsive and encoder smooth");
- SqlitePreferences.Update ("databaseVersion", "0.90", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.90", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.90";
}
if(currentVersion == "0.90") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
SqliteEncoder.UpdateExercise(true, "Squat", "Squat", 100, "weight bar", "",
"");
LogB.SQL("Encoder Squat 75% -> 100%");
- SqlitePreferences.Update ("databaseVersion", "0.91", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.91", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.91";
}
if(currentVersion == "0.91") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
- SqlitePreferences.Insert("videoDevice", "0");
+ SqliteGeneral.SqlitePreferences.Insert("videoDevice", "0");
LogB.SQL("Added videoDevice to preferences");
- SqlitePreferences.Update ("databaseVersion", "0.92", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.92", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.92";
}
if(currentVersion == "0.92") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
SqliteEncoder.UpdateExercise(true, "Bench press", "Bench press", 0, "weight
bar", "","0.185");
SqliteEncoder.UpdateExercise(true, "Squat", "Squat", 100, "weight bar",
"","0.31");
LogB.SQL("Added speed1RM on encoder exercise");
- SqlitePreferences.Update ("databaseVersion", "0.93", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.93", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.93";
}
if(currentVersion == "0.93") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
SqliteEncoder.createTable1RM();
LogB.SQL("Added encoder1RM table");
- SqlitePreferences.Update ("databaseVersion", "0.94", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.94", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.94";
}
if(currentVersion == "0.94") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
- SqlitePreferences.Insert ("encoder1RMMethod",
+ SqliteGeneral.SqlitePreferences.Insert ("encoder1RMMethod",
Constants.Encoder1RMMethod.WEIGHTED2.ToString());
LogB.SQL("Added encoder1RMMethod");
- SqlitePreferences.Update ("databaseVersion", "0.95", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.95", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.95";
}
if(currentVersion == "0.95") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
Update(true, Constants.EncoderTable, "future3", "",
Constants.EncoderConfigurationNames.LINEAR.ToString(),
"signalOrCurve", "signal");
@@ -1354,24 +1555,24 @@ public class Sqlite
LogB.SQL("Encoder signal future3 three modes");
- SqlitePreferences.Update ("databaseVersion", "0.96", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.96", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.96";
}
if(currentVersion == "0.96") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
- SqlitePreferences.Insert ("inertialmomentum", "0.01");
+ SqliteGeneral.SqlitePreferences.Insert ("inertialmomentum", "0.01");
LogB.SQL("Added inertialmomentum in preferences");
- SqlitePreferences.Update ("databaseVersion", "0.97", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.97", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.97";
}
if(currentVersion == "0.97") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
Update(true, Constants.EncoderTable, "laterality", "both", "RL", "", "");
Update(true, Constants.EncoderTable, "laterality", "Both", "RL", "", "");
@@ -1384,13 +1585,13 @@ public class Sqlite
Update(true, Constants.EncoderTable, "laterality", Catalog.GetString("Left"),
"L", "", "");
LogB.SQL("Fixed encoder laterality");
- SqlitePreferences.Update ("databaseVersion", "0.98", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.98", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.98";
}
if(currentVersion == "0.98") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
ArrayList array =
SqliteOldConvert.EncoderSelect098(true,-1,-1,-1,"all",false);
@@ -1428,37 +1629,37 @@ public class Sqlite
conversionRate = count;
LogB.SQL("Encoder table improved");
- SqlitePreferences.Update ("databaseVersion", "0.99", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "0.99", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "0.99";
}
if(currentVersion == "0.99") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
SqliteEncoder.putEncoderExerciseAnglesAt90();
SqliteEncoder.addEncoderJumpExercise();
SqliteEncoder.addEncoderInclinedExercises();
LogB.SQL("Added Free and inclinedExercises");
- SqlitePreferences.Update ("databaseVersion", "1.00", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "1.00", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "1.00";
}
if(currentVersion == "1.00") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
- SqlitePreferences.Insert ("CSVExportDecimalSeparator",
Util.GetDecimalSeparatorFromLocale());
+ SqliteGeneral.SqlitePreferences.Insert ("CSVExportDecimalSeparator",
Util.GetDecimalSeparatorFromLocale());
LogB.SQL("Added export to CSV configuration on preferences");
- SqlitePreferences.Update ("databaseVersion", "1.01", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "1.01", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "1.01";
}
if(currentVersion == "1.01") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
RunType type = new RunType("Agility-T-Test");
SqliteRunType.Insert(type, Constants.RunTypeTable, true);
@@ -1466,25 +1667,25 @@ public class Sqlite
SqliteRunIntervalType.Insert(type, Constants.RunIntervalTypeTable, true);
LogB.SQL("Added Agility Tests: Agility-T-Test, Agility-3l3R");
- SqlitePreferences.Update ("databaseVersion", "1.02", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "1.02", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "1.02";
}
if(currentVersion == "1.02") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
DeleteFromName(true, Constants.EncoderExerciseTable, "Inclinated plane
Custom");
SqliteEncoder.removeEncoderExerciseAngles();
LogB.SQL("Updated encoder exercise, angle is now on encoder configuration");
- SqlitePreferences.Update ("databaseVersion", "1.03", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "1.03", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "1.03";
}
if(currentVersion == "1.03") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
ArrayList array =
SqliteOldConvert.EncoderSelect103(true,-1,-1,-1,"all",false);
@@ -1525,13 +1726,13 @@ public class Sqlite
conversionRate = count;
LogB.SQL("Encoder table improved");
- SqlitePreferences.Update ("databaseVersion", "1.04", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "1.04", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "1.04";
}
if(currentVersion == "1.04") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
dbcmd.CommandText = "DELETE FROM " + Constants.EncoderTable +
" WHERE encoderConfiguration LIKE \"%INERTIAL%\" AND " +
@@ -1540,13 +1741,13 @@ public class Sqlite
dbcmd.ExecuteNonQuery();
LogB.SQL("Removed inertial curves, because sign was not checked on 1.04 when
saving curves");
- SqlitePreferences.Update ("databaseVersion", "1.05", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "1.05", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "1.05";
}
if(currentVersion == "1.05") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
SqliteEncoder.createTableEncoderSignalCurve();
@@ -1597,7 +1798,7 @@ public class Sqlite
exists = true;
if(exists) {
//delete this (newer will not be deleted)
- Sqlite.Delete(true,
+ SqliteGeneral.Sqlite.Delete(true,
Constants.EncoderTable,
Convert.ToInt32(c.uniqueID));
} else {
curvesStored.Add(msCentral);
@@ -1611,47 +1812,47 @@ public class Sqlite
conversionSubRate ++;
conversionRate ++;
LogB.SQL("Curves are now linked to signals");
- SqlitePreferences.Update ("databaseVersion", "1.06", true);
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "1.06", true);
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
currentVersion = "1.06";
}
if(currentVersion == "1.06") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
Update(true, Constants.GraphLinkTable, "graphFileName", "jump_dj.png",
"jump_dj_a.png",
"eventName", "DJa");
LogB.SQL("Added jump_dj_a.png");
- SqlitePreferences.Update ("databaseVersion", "1.07", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "1.07", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "1.07";
}
if(currentVersion == "1.07") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
LogB.SQL("Added translate statistics graph option to preferences");
- SqlitePreferences.Insert ("RGraphsTranslate", "True");
- SqlitePreferences.Update ("databaseVersion", "1.08", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Insert ("RGraphsTranslate", "True");
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "1.08", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "1.08";
}
if(currentVersion == "1.08") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
LogB.SQL("Added option on preferences to useHeightsOnJumpIndexes (default) or
not");
- SqlitePreferences.Insert ("useHeightsOnJumpIndexes", "True");
- SqlitePreferences.Update ("databaseVersion", "1.09", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Insert ("useHeightsOnJumpIndexes", "True");
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "1.09", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "1.09";
}
if(currentVersion == "1.09") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
LogB.SQL("Added RSA RAST on runType");
@@ -1675,138 +1876,138 @@ public class Sqlite
addedRSA = true;
}
- SqlitePreferences.Update ("databaseVersion", "1.10", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "1.10", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "1.10";
}
if(currentVersion == "1.10") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
LogB.SQL("Added option on autosave curves on capture
(all/bestmeanpower/none)");
- SqlitePreferences.Insert ("encoderAutoSaveCurve",
Constants.EncoderAutoSaveCurve.BEST.ToString());
- SqlitePreferences.Update ("databaseVersion", "1.11", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Insert ("encoderAutoSaveCurve",
Constants.EncoderAutoSaveCurve.BEST.ToString());
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "1.11", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "1.11";
}
if(currentVersion == "1.11") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
LogB.SQL("URLs from absolute to relative)");
SqliteOldConvert.ConvertAbsolutePathsToRelative();
- SqlitePreferences.Update ("databaseVersion", "1.12", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "1.12", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "1.12";
}
if(currentVersion == "1.12") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
LogB.SQL("Added ExecuteAuto table");
SqliteExecuteAuto.createTableExecuteAuto();
- SqlitePreferences.Update ("databaseVersion", "1.13", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "1.13", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "1.13";
}
if(currentVersion == "1.13") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
LogB.SQL("slCMJ -> slCMJleft, slCMJright");
SqliteOldConvert.slCMJDivide();
- SqlitePreferences.Update ("databaseVersion", "1.14", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "1.14", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "1.14";
}
if(currentVersion == "1.14") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
LogB.SQL("added Chronojump profile and bilateral profile");
SqliteExecuteAuto.addChronojumpProfileAndBilateral();
- SqlitePreferences.Update ("databaseVersion", "1.15", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "1.15", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "1.15";
}
if(currentVersion == "1.15") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
LogB.SQL("Cyprus moved to Europe");
Update(true, Constants.CountryTable, "continent", "Asia", "Europe", "code",
"CYP");
- SqlitePreferences.Update ("databaseVersion", "1.16", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "1.16", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "1.16";
}
if(currentVersion == "1.16") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
LogB.SQL("Deleting Max jump");
Update(true, Constants.JumpTable, "type", "Max", "Free", "", "");
DeleteFromName(true, Constants.JumpTypeTable, "Max");
- SqlitePreferences.Update ("databaseVersion", "1.17", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "1.17", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "1.17";
}
if(currentVersion == "1.17") {
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
LogB.SQL("Deleted Negative runInterval runs (bug from last version)");
SqliteOldConvert.deleteNegativeRuns();
- SqlitePreferences.Update ("databaseVersion", "1.18", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "1.18", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "1.18";
}
if(currentVersion == "1.18") {
LogB.SQL("Preferences deleted showHeight, added showStiffness");
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
DeleteFromName(true, Constants.PreferencesTable, "showHeight");
- SqlitePreferences.Insert ("showStiffness", "True");
- SqlitePreferences.Update ("databaseVersion", "1.19", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Insert ("showStiffness", "True");
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "1.19", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "1.19";
}
if(currentVersion == "1.19") {
LogB.SQL("Preferences: added user email");
- Sqlite.Open();
- SqlitePreferences.Insert ("email", "");
- SqlitePreferences.Update ("databaseVersion", "1.20", true);
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Open();
+ SqliteGeneral.SqlitePreferences.Insert ("email", "");
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "1.20", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "1.20";
}
if(currentVersion == "1.20") {
LogB.SQL("Fixing loosing of encoder videoURL after recalculate");
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
SqliteOldConvert.ConvertAbsolutePathsToRelative(); //videoURLs got absolute
again
SqliteOldConvert.FixLostVideoURLAfterEncoderRecalculate();
- SqlitePreferences.Update ("databaseVersion", "1.21", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "1.21", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "1.21";
}
if(currentVersion == "1.21") {
LogB.SQL("Encoder laterality in english again");
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
if(Catalog.GetString("RL") != "RL")
Update(true, Constants.EncoderTable, "laterality",
Catalog.GetString("RL"), "RL", "", "");
@@ -1817,18 +2018,18 @@ public class Sqlite
if(Catalog.GetString("L") != "L")
Update(true, Constants.EncoderTable, "laterality",
Catalog.GetString("L"), "L", "", "");
- SqlitePreferences.Update ("databaseVersion", "1.22", true);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "1.22", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "1.22";
}
if(currentVersion == "1.22") {
LogB.SQL("Added encoder configuration");
- Sqlite.Open();
- SqlitePreferences.Insert ("encoderConfiguration", new
EncoderConfiguration().ToStringOutput(EncoderConfiguration.Outputs.SQL));
- SqlitePreferences.Update ("databaseVersion", "1.23", true);
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Open();
+ SqliteGeneral.SqlitePreferences.Insert ("encoderConfiguration", new
EncoderConfiguration().ToStringOutput(EncoderConfiguration.Outputs.SQL));
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", "1.23", true);
+ SqliteGeneral.Sqlite.Close();
currentVersion = "1.23";
}
@@ -1841,23 +2042,23 @@ public class Sqlite
LogB.SQL("Leaving Sqlite opened before DB updates");
bool sqliteOpened = true;
- Sqlite.Open(); //------------------------------------------------
+ SqliteGeneral.Sqlite.Open(); //------------------------------------------------
if(currentVersion == "1.23") {
LogB.SQL("Delete runISpeedStartArrival and add 4 double contacts configs");
DeleteFromName(true, Constants.PreferencesTable, "runISpeedStartArrival");
- SqlitePreferences.Insert ("runDoubleContactsMode",
Constants.DoubleContact.LAST.ToString());
- SqlitePreferences.Insert ("runDoubleContactsMS", "1000");
- SqlitePreferences.Insert ("runIDoubleContactsMode",
Constants.DoubleContact.AVERAGE.ToString());
- SqlitePreferences.Insert ("runIDoubleContactsMS", "1000");
+ SqliteGeneral.SqlitePreferences.Insert ("runDoubleContactsMode",
Constants.DoubleContact.LAST.ToString());
+ SqliteGeneral.SqlitePreferences.Insert ("runDoubleContactsMS", "1000");
+ SqliteGeneral.SqlitePreferences.Insert ("runIDoubleContactsMode",
Constants.DoubleContact.AVERAGE.ToString());
+ SqliteGeneral.SqlitePreferences.Insert ("runIDoubleContactsMS", "1000");
currentVersion = updateVersion("1.24");
}
if(currentVersion == "1.24") {
LogB.SQL("Language defaults to (empty string), means detected");
- SqlitePreferences.Update("language", "", true);
+ SqliteGeneral.SqlitePreferences.Update("language", "", true);
currentVersion = updateVersion("1.25");
}
@@ -1870,8 +2071,8 @@ public class Sqlite
}
if(currentVersion == "1.26") {
LogB.SQL("Changing runDoubleContactsMS and runIDoubleContactsMS from 1000ms
to 300ms");
- SqlitePreferences.Update("runDoubleContactsMS", "300", true);
- SqlitePreferences.Update("runIDoubleContactsMS", "300", true);
+ SqliteGeneral.SqlitePreferences.Update("runDoubleContactsMS", "300", true);
+ SqliteGeneral.SqlitePreferences.Update("runIDoubleContactsMS", "300", true);
currentVersion = updateVersion("1.27");
}
@@ -1898,20 +2099,20 @@ public class Sqlite
if(currentVersion == "1.30") {
LogB.SQL("Insert encoderCaptureCheckFullyExtended and ...Value at
preferences");
- SqlitePreferences.Insert ("encoderCaptureCheckFullyExtended", "True");
- SqlitePreferences.Insert ("encoderCaptureCheckFullyExtendedValue", "4");
+ SqliteGeneral.SqlitePreferences.Insert ("encoderCaptureCheckFullyExtended",
"True");
+ SqliteGeneral.SqlitePreferences.Insert
("encoderCaptureCheckFullyExtendedValue", "4");
currentVersion = updateVersion("1.31");
}
if(currentVersion == "1.31") {
LogB.SQL("encoderCaptureOptionsWin -> preferences");
- SqlitePreferences.Insert ("encoderCaptureTime", "60");
- SqlitePreferences.Insert ("encoderCaptureInactivityEndTime", "3");
- SqlitePreferences.Insert ("encoderCaptureMainVariable",
Constants.EncoderVariablesCapture.MeanPower.ToString());
- SqlitePreferences.Insert ("encoderCaptureMinHeightGravitatory", "20");
- SqlitePreferences.Insert ("encoderCaptureMinHeightInertial", "5");
- SqlitePreferences.Insert ("encoderShowStartAndDuration", "False");
+ SqliteGeneral.SqlitePreferences.Insert ("encoderCaptureTime", "60");
+ SqliteGeneral.SqlitePreferences.Insert ("encoderCaptureInactivityEndTime",
"3");
+ SqliteGeneral.SqlitePreferences.Insert ("encoderCaptureMainVariable",
Constants.EncoderVariablesCapture.MeanPower.ToString());
+ SqliteGeneral.SqlitePreferences.Insert ("encoderCaptureMinHeightGravitatory",
"20");
+ SqliteGeneral.SqlitePreferences.Insert ("encoderCaptureMinHeightInertial",
"5");
+ SqliteGeneral.SqlitePreferences.Insert ("encoderShowStartAndDuration",
"False");
currentVersion = updateVersion("1.32");
}
@@ -1927,7 +2128,7 @@ public class Sqlite
LogB.SQL("Closing Sqlite after DB updates");
sqliteOpened = false;
- Sqlite.Close(); //------------------------------------------------
+ SqliteGeneral.Sqlite.Close(); //------------------------------------------------
}
//if changes are made here, remember to change also in CreateTables()
@@ -1937,12 +2138,12 @@ public class Sqlite
}
private string updateVersion(string newVersion) {
- SqlitePreferences.Update ("databaseVersion", newVersion, true);
+ SqliteGeneral.SqlitePreferences.Update ("databaseVersion", newVersion, true);
return newVersion;
}
public bool ChangeDjToDJna() {
- string v = SqlitePreferences.Select("databaseVersion");
+ string v = SqliteGeneral.SqlitePreferences.Select("databaseVersion");
LogB.SQL(Convert.ToDouble(Util.ChangeDecimalSeparator(v)).ToString());
if(Convert.ToDouble(Util.ChangeDecimalSeparator(v)) <
Convert.ToDouble(Util.ChangeDecimalSeparator("0.74")))
return true;
@@ -1950,15 +2151,15 @@ public class Sqlite
}
private void addChronopicPortNameIfNotExists() {
- string myPort = SqlitePreferences.Select("chronopicPort");
+ string myPort = SqliteGeneral.SqlitePreferences.Select("chronopicPort");
if(myPort == "0") {
//if doesn't exist (for any reason, like old database)
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
if(UtilAll.IsWindows() || creatingBlankDatabase)
- SqlitePreferences.Insert ("chronopicPort",
Constants.ChronopicDefaultPortWindows);
+ SqliteGeneral.SqlitePreferences.Insert ("chronopicPort",
Constants.ChronopicDefaultPortWindows);
else
- SqlitePreferences.Insert ("chronopicPort",
Constants.ChronopicDefaultPortLinux);
- Sqlite.Close();
+ SqliteGeneral.SqlitePreferences.Insert ("chronopicPort",
Constants.ChronopicDefaultPortLinux);
+ SqliteGeneral.Sqlite.Close();
LogB.SQL("Added Chronopic port");
}
@@ -1966,7 +2167,7 @@ public class Sqlite
public void CreateTables(bool server)
{
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
creationTotal = 14;
creationRate = 1;
@@ -2069,8 +2270,8 @@ public class Sqlite
sqlitePersonSessionObject.createTable(Constants.PersonSessionTable);
creationRate ++;
- SqlitePreferences.createTable();
- SqlitePreferences.initializeTable(lastChronojumpDatabaseVersion, creatingBlankDatabase);
+ SqliteGeneral.SqlitePreferences.createTable();
+ SqliteGeneral.SqlitePreferences.initializeTable(lastChronojumpDatabaseVersion,
creatingBlankDatabase);
creationRate ++;
SqliteCountry.createTable();
@@ -2174,14 +2375,14 @@ public class Sqlite
//0.4 - 0.41: jump, jumpRj weight is double (always a percent)
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
creationRate ++;
}
public bool Exists(bool dbconOpened, string tableName, string findName)
{
if(!dbconOpened)
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
dbcmd.CommandText = "SELECT uniqueID FROM " + tableName +
" WHERE LOWER(name) == LOWER(\"" + findName + "\")" ;
@@ -2200,7 +2401,7 @@ public class Sqlite
reader.Close();
if(!dbconOpened)
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
return exists;
}
@@ -2276,7 +2477,7 @@ public class Sqlite
{
//tableName can be tempJumpRj or tempRunInterval
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
dbcmd.CommandText = "SELECT MAX(uniqueID) FROM " + tableName;
LogB.SQL(dbcmd.CommandText.ToString());
@@ -2294,7 +2495,7 @@ public class Sqlite
}
LogB.SQL(string.Format("exists = {0}", exists.ToString()));
reader.Close();
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
return exists;
}
@@ -2303,12 +2504,12 @@ public class Sqlite
{
//tableName can be tempJumpRj or tempRunInterval
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
//dbcmd.CommandText = "Delete FROM tempJumpRj";
dbcmd.CommandText = "DELETE FROM " + tableName;
LogB.SQL(dbcmd.CommandText.ToString());
dbcmd.ExecuteNonQuery();
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
}
protected void dropTable(string tableName) {
@@ -2368,8 +2569,8 @@ public class Sqlite
}
//drop old tables
- Sqlite.dropTable(Constants.PersonOldTable);
- Sqlite.dropTable(Constants.PersonSessionOldWeightTable);
+ SqliteGeneral.Sqlite.dropTable(Constants.PersonOldTable);
+ SqliteGeneral.Sqlite.dropTable(Constants.PersonSessionOldWeightTable);
}
@@ -2549,7 +2750,7 @@ public class Sqlite
}
//no opened before because Exists is for closed dbcon
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
//create new jump types
SqliteJumpType.JumpTypeInsert ("DJa:0:0:DJ jump using arms", true);
@@ -2688,7 +2889,7 @@ LogB.SQL("1" + tableName);
LogB.SQL("2" + tableName);
//3rd drop desired table
- Sqlite.dropTable(tableName);
+ SqliteGeneral.Sqlite.dropTable(tableName);
LogB.SQL("3" + tableName);
//4d create desired table (now with new columns)
@@ -2727,7 +2928,7 @@ LogB.SQL("4" + tableName);
LogB.SQL("5" + tableName);
//6th drop temp table
- Sqlite.dropTable(Constants.ConvertTempTable);
+ SqliteGeneral.Sqlite.dropTable(Constants.ConvertTempTable);
}
/*
@@ -2798,7 +2999,7 @@ LogB.SQL("5" + tableName);
}
//3rd drop desired table
- Sqlite.dropTable(tableName);
+ SqliteGeneral.Sqlite.dropTable(tableName);
//4d create desired table (now with new columns)
sqliteObject.createTable(tableName);
@@ -2810,7 +3011,7 @@ LogB.SQL("5" + tableName);
}
//6th drop temp table
- Sqlite.dropTable(Constants.ConvertTempTable);
+ SqliteGeneral.Sqlite.dropTable(Constants.ConvertTempTable);
}
protected string [] DataReaderToStringArray (SqliteDataReader reader, int columns) {
@@ -2885,7 +3086,7 @@ LogB.SQL("5" + tableName);
public int Max (string tableName, string column, bool dbconOpened)
{
if(!dbconOpened)
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
dbcmd.CommandText = "SELECT MAX(" + column + ") FROM " + tableName ;
LogB.SQL(dbcmd.CommandText.ToString());
@@ -2900,14 +3101,14 @@ LogB.SQL("5" + tableName);
reader.Close();
if(!dbconOpened)
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
return myReturn;
}
public int Count (string tableName, bool dbconOpened)
{
if(!dbconOpened)
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
dbcmd.CommandText = "SELECT COUNT(*) FROM " + tableName ;
LogB.SQL(dbcmd.CommandText.ToString());
@@ -2921,13 +3122,13 @@ LogB.SQL("5" + tableName);
reader.Close();
if(!dbconOpened)
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
return myReturn;
}
public int CountCondition (string tableName, bool dbconOpened, string condition, string operand,
string myValue) {
if(!dbconOpened)
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
dbcmd.CommandText = "SELECT COUNT(*) FROM " + tableName +
" WHERE " + condition + " " + operand + " " + myValue;
@@ -2942,7 +3143,7 @@ LogB.SQL("5" + tableName);
reader.Close();
if(!dbconOpened)
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
return myReturn;
}
@@ -2953,7 +3154,7 @@ LogB.SQL("5" + tableName);
string columnNameCondition2, string searchValueCondition2)
{
if( ! dbconOpened)
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
bool whereDone = false;
string cond1 = "";
@@ -2983,13 +3184,13 @@ LogB.SQL("5" + tableName);
dbcmd.ExecuteNonQuery();
if( ! dbconOpened)
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
}
public void Delete(bool dbconOpened, string tableName, int uniqueID)
{
if( ! dbconOpened)
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
dbcmd.CommandText = "DELETE FROM " + tableName +
" WHERE uniqueID == " + uniqueID.ToString();
@@ -2997,13 +3198,13 @@ LogB.SQL("5" + tableName);
dbcmd.ExecuteNonQuery();
if( ! dbconOpened)
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
}
public void DeleteSelectingField(bool dbconOpened, string tableName, string fieldName, string id)
{
if( ! dbconOpened)
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
dbcmd.CommandText = "DELETE FROM " + tableName +
" WHERE " + fieldName + " == " + id;
@@ -3011,14 +3212,14 @@ LogB.SQL("5" + tableName);
dbcmd.ExecuteNonQuery();
if( ! dbconOpened)
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
}
public void DeleteFromName(bool dbconOpened, string tableName, string name)
{
if( ! dbconOpened)
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
dbcmd.CommandText = "DELETE FROM " + tableName +
" WHERE name == \"" + name + "\"";
@@ -3026,13 +3227,13 @@ LogB.SQL("5" + tableName);
dbcmd.ExecuteNonQuery();
if( ! dbconOpened)
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
}
public void DeleteFromAnInt(bool dbconOpened, string tableName, string colName, int id)
{
if( ! dbconOpened)
- Sqlite.Open();
+ SqliteGeneral.Sqlite.Open();
dbcmd.CommandText = "DELETE FROM " + tableName +
" WHERE " + colName + " == " + id;
@@ -3040,7 +3241,7 @@ LogB.SQL("5" + tableName);
dbcmd.ExecuteNonQuery();
if( ! dbconOpened)
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
}
@@ -3069,7 +3270,7 @@ LogB.SQL("5" + tableName);
public bool DisConnect() {
try {
- Sqlite.Close();
+ SqliteGeneral.Sqlite.Close();
} catch {
return false;
}
diff --git a/src/sqlite/multiChronopic.cs b/src/sqlite/multiChronopic.cs
index 327b680..8281ca2 100644
--- a/src/sqlite/multiChronopic.cs
+++ b/src/sqlite/multiChronopic.cs
@@ -25,7 +25,7 @@ using System.Collections; //ArrayList
using Mono.Data.Sqlite;
-class SqliteMultiChronopic : Sqlite
+public class SqliteMultiChronopic : Sqlite
{
public SqliteMultiChronopic() {
}
diff --git a/src/sqlite/person.cs b/src/sqlite/person.cs
index 6ba152a..32e2dd4 100644
--- a/src/sqlite/person.cs
+++ b/src/sqlite/person.cs
@@ -25,7 +25,7 @@ using System.Collections; //ArrayList
using Mono.Data.Sqlite;
-class SqlitePerson : Sqlite
+public class SqlitePerson : Sqlite
{
public SqlitePerson() {
}
diff --git a/src/sqlite/personSession.cs b/src/sqlite/personSession.cs
index d16deab..3a61fee 100644
--- a/src/sqlite/personSession.cs
+++ b/src/sqlite/personSession.cs
@@ -27,7 +27,7 @@ using Mono.Unix;
using System.Collections.Generic; //List<T>
-class SqlitePersonSession : Sqlite
+public class SqlitePersonSession : Sqlite
{
public SqlitePersonSession() {
}
diff --git a/src/sqlite/personSessionNotUpload.cs b/src/sqlite/personSessionNotUpload.cs
index 6d097f6..45ba5a3 100644
--- a/src/sqlite/personSessionNotUpload.cs
+++ b/src/sqlite/personSessionNotUpload.cs
@@ -24,7 +24,7 @@ using System.IO;
using System.Collections; //ArrayList
using Mono.Data.Sqlite;
-class SqlitePersonSessionNotUpload : Sqlite
+public class SqlitePersonSessionNotUpload : Sqlite
{
protected internal void CreateTable()
{
diff --git a/src/sqlite/preferences.cs b/src/sqlite/preferences.cs
index 827faa0..d353b99 100644
--- a/src/sqlite/preferences.cs
+++ b/src/sqlite/preferences.cs
@@ -24,7 +24,7 @@ using System.IO;
using Mono.Data.Sqlite;
-class SqlitePreferences : Sqlite
+public class SqlitePreferences : Sqlite
{
protected internal void createTable()
{
diff --git a/src/sqlite/pulse.cs b/src/sqlite/pulse.cs
index 9a2366e..5a66eaf 100644
--- a/src/sqlite/pulse.cs
+++ b/src/sqlite/pulse.cs
@@ -25,7 +25,7 @@ using System.Collections; //ArrayList
using Mono.Data.Sqlite;
-class SqlitePulse : Sqlite
+public class SqlitePulse : Sqlite
{
public SqlitePulse() {
}
diff --git a/src/sqlite/pulseType.cs b/src/sqlite/pulseType.cs
index f844136..f522bf7 100644
--- a/src/sqlite/pulseType.cs
+++ b/src/sqlite/pulseType.cs
@@ -25,7 +25,7 @@ using System.Collections; //ArrayList
using Mono.Data.Sqlite;
-class SqlitePulseType : Sqlite
+public class SqlitePulseType : Sqlite
{
/*
* create and initialize tables
diff --git a/src/sqlite/reactionTime.cs b/src/sqlite/reactionTime.cs
index a9034b6..0f938f8 100644
--- a/src/sqlite/reactionTime.cs
+++ b/src/sqlite/reactionTime.cs
@@ -25,7 +25,7 @@ using System.Collections; //ArrayList
using Mono.Data.Sqlite;
-class SqliteReactionTime : Sqlite
+public class SqliteReactionTime : Sqlite
{
public SqliteReactionTime() {
}
diff --git a/src/sqlite/run.cs b/src/sqlite/run.cs
index 79bae90..6a912c9 100644
--- a/src/sqlite/run.cs
+++ b/src/sqlite/run.cs
@@ -25,7 +25,7 @@ using System.Collections; //ArrayList
using Mono.Data.Sqlite;
-class SqliteRun : Sqlite
+public class SqliteRun : Sqlite
{
public SqliteRun() {
}
diff --git a/src/sqlite/runInterval.cs b/src/sqlite/runInterval.cs
index 6b1dbfb..44d5d22 100644
--- a/src/sqlite/runInterval.cs
+++ b/src/sqlite/runInterval.cs
@@ -25,7 +25,7 @@ using System.Collections; //ArrayList
using Mono.Data.Sqlite;
-class SqliteRunInterval : SqliteRun
+public class SqliteRunInterval : SqliteRun
{
public SqliteRunInterval() {
}
diff --git a/src/sqlite/runType.cs b/src/sqlite/runType.cs
index d91588c..70da879 100644
--- a/src/sqlite/runType.cs
+++ b/src/sqlite/runType.cs
@@ -25,7 +25,7 @@ using System.Collections; //ArrayList
using Mono.Data.Sqlite;
-class SqliteRunType : Sqlite
+public class SqliteRunType : Sqlite
{
public SqliteRunType() {
}
@@ -307,7 +307,7 @@ class SqliteRunType : Sqlite
}
-class SqliteRunIntervalType : SqliteRunType
+public class SqliteRunIntervalType : SqliteRunType
{
public SqliteRunIntervalType() {
}
diff --git a/src/sqlite/server.cs b/src/sqlite/server.cs
index 810bcef..d8c949b 100644
--- a/src/sqlite/server.cs
+++ b/src/sqlite/server.cs
@@ -26,7 +26,7 @@ using Mono.Data.Sqlite;
using Mono.Unix; //Catalog
-class SqliteServer : Sqlite
+public class SqliteServer : Sqlite
{
public SqliteServer() {
}
diff --git a/src/sqlite/session.cs b/src/sqlite/session.cs
index 9afbc84..d840a67 100644
--- a/src/sqlite/session.cs
+++ b/src/sqlite/session.cs
@@ -26,7 +26,7 @@ using Mono.Data.Sqlite;
using Mono.Unix;
-class SqliteSession : Sqlite
+public class SqliteSession : Sqlite
{
public SqliteSession() {
}
@@ -743,7 +743,7 @@ class SqliteSession : Sqlite
}
-class SqliteServerSession : SqliteSession
+public class SqliteServerSession : SqliteSession
{
public SqliteServerSession() {
}
diff --git a/src/sqlite/speciallity.cs b/src/sqlite/speciallity.cs
index db349f5..e2a709a 100644
--- a/src/sqlite/speciallity.cs
+++ b/src/sqlite/speciallity.cs
@@ -28,7 +28,7 @@ using Mono.Data.Sqlite;
using Mono.Unix;
-class SqliteSpeciallity : Sqlite
+public class SqliteSpeciallity : Sqlite
{
protected internal void createTable()
{
diff --git a/src/sqlite/sport.cs b/src/sqlite/sport.cs
index f459ca9..d7fd1bb 100644
--- a/src/sqlite/sport.cs
+++ b/src/sqlite/sport.cs
@@ -27,7 +27,7 @@ using Mono.Data.Sqlite;
using Mono.Unix;
-class SqliteSport : Sqlite
+public class SqliteSport : Sqlite
{
protected internal void createTable()
{
diff --git a/src/treeViewRun.cs b/src/treeViewRun.cs
index f24d6b9..d17ea03 100644
--- a/src/treeViewRun.cs
+++ b/src/treeViewRun.cs
@@ -158,7 +158,7 @@ public class TreeViewRunsInterval : TreeViewRuns
myRunI.Simulated = Convert.ToInt32(myStringOfData[12].ToString());
//speed is not needed to define
- runType = SqliteRunIntervalType.SelectAndReturnRunIntervalType(myRunI.Type, Sqlite.IsOpened);
+ runType = SqliteGeneral.SqliteRunIntervalType.SelectAndReturnRunIntervalType(myRunI.Type,
SqliteGeneral.Sqlite.IsOpened);
return myRunI;
}
@@ -198,7 +198,7 @@ public class TreeViewRunsInterval : TreeViewRuns
int count = 0;
if(newRunI.DistanceInterval == -1) {
- runType = SqliteRunIntervalType.SelectAndReturnRunIntervalType(newRunI.Type,
Sqlite.IsOpened);
+ runType =
SqliteGeneral.SqliteRunIntervalType.SelectAndReturnRunIntervalType(newRunI.Type,
SqliteGeneral.Sqlite.IsOpened);
myData[count++] = (lineCount + 1).ToString() +
" (" + Util.GetRunIVariableDistancesStringRow(runType.DistancesString,
lineCount).ToString() + "m)";
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
