[chronojump] DB: 1.81 preferences forceSensorCaptureFeedbackActive /At /Range
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] DB: 1.81 preferences forceSensorCaptureFeedbackActive /At /Range
- Date: Wed, 4 Dec 2019 10:20:22 +0000 (UTC)
commit 42082a942f6e930b2f3ac517b94a42d559f35f82
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Dec 4 11:09:59 2019 +0100
DB: 1.81 preferences forceSensorCaptureFeedbackActive /At /Range
src/sqlite/main.cs | 14 +++++++++++++-
src/sqlite/preferences.cs | 24 +++++++++++++++++++-----
2 files changed, 32 insertions(+), 6 deletions(-)
---
diff --git a/src/sqlite/main.cs b/src/sqlite/main.cs
index fc4523b9..b1d0ccbf 100644
--- a/src/sqlite/main.cs
+++ b/src/sqlite/main.cs
@@ -129,7 +129,7 @@ class Sqlite
/*
* Important, change this if there's any update to database
*/
- static string lastChronojumpDatabaseVersion = "1.80";
+ static string lastChronojumpDatabaseVersion = "1.81";
public Sqlite() {
}
@@ -2566,6 +2566,16 @@ class Sqlite
currentVersion = updateVersion("1.80");
}
+ if(currentVersion == "1.80")
+ {
+ LogB.SQL("Inserted forceSensorCaptureFeedbackActive /At /Range");
+
+ SqlitePreferences.Insert (SqlitePreferences.ForceSensorCaptureFeedbackActive,
"False");
+ SqlitePreferences.Insert (SqlitePreferences.ForceSensorCaptureFeedbackAt,
"100");
+ SqlitePreferences.Insert (SqlitePreferences.ForceSensorCaptureFeedbackRange,
"40");
+
+ currentVersion = updateVersion("1.81");
+ }
/*
@@ -2761,6 +2771,7 @@ class Sqlite
SqliteForceSensorRFD.createTable();
SqliteForceSensorRFD.InsertDefaultValues(true);
SqliteForceSensorElasticBand.createTable();
+ //SqliteForceSensorElasticBandGlue.createTable();
//runEncoder
SqliteRunEncoder.createTable();
@@ -2778,6 +2789,7 @@ class Sqlite
//changes [from - to - desc]
//just testing: 1.79 - 1.80 Converted DB to 1.80 Created table ForceSensorElasticBandGlue and moved
stiffnessString records there
//
+ //1.80 - 1.81 Converted DB to 1.81 Inserted forceSensorCaptureFeedbackActive /At /Range
//1.79 - 1.80 Converted DB to 1.80 Inserted forceSensorElasticEccMinDispl, ...
//1.78 - 1.79 Converted DB to 1.79 Inserted into preferences: encoderWorkKcal
//1.77 - 1.78 Converted DB to 1.78 Inserted into preferences: encoderAutoSaveCurveBestNValue
diff --git a/src/sqlite/preferences.cs b/src/sqlite/preferences.cs
index 2339b28b..969e1b4c 100644
--- a/src/sqlite/preferences.cs
+++ b/src/sqlite/preferences.cs
@@ -67,6 +67,9 @@ class SqlitePreferences : Sqlite
public const string ForceSensorCalibrationDateTimeStr = "forceSensorCalibrationDateTime";
public const string ForceSensorCalibrationWeightStr = "forceSensorCalibrationWeight";
public const string ForceSensorCalibrationFactorStr = "forceSensorCalibrationFactor";
+ public const string ForceSensorCaptureFeedbackActive = "forceSensorCaptureFeedbackActive";
+ public const string ForceSensorCaptureFeedbackAt = "forceSensorCaptureFeedbackAt";
+ public const string ForceSensorCaptureFeedbackRange = "forceSensorCaptureFeedbackRange";
protected internal static new void createTable()
{
@@ -199,6 +202,14 @@ class SqlitePreferences : Sqlite
Insert (ForceSensorNotElasticEccMinForce, "10", dbcmdTr);
Insert (ForceSensorNotElasticConMinForce, "10", dbcmdTr);
Insert (ForceSensorGraphsLineWidth, "2", dbcmdTr);
+ Insert (ForceSensorCaptureFeedbackActive, "False", dbcmdTr);
+ Insert (ForceSensorCaptureFeedbackAt, "100", dbcmdTr);
+ Insert (ForceSensorCaptureFeedbackRange, "40", dbcmdTr);
+ Insert (ForceSensorTareDateTimeStr, "", dbcmdTr);
+ Insert (ForceSensorTareStr, "-1", dbcmdTr); //result value from sensor.
Decimal is point!!
+ Insert (ForceSensorCalibrationDateTimeStr, "", dbcmdTr);
+ Insert (ForceSensorCalibrationWeightStr, "-1", dbcmdTr);
+ Insert (ForceSensorCalibrationFactorStr, "-1", dbcmdTr); //result value from
sensor. Decimal is point!!
//multimedia
Insert ("videoDevice", "", dbcmdTr); //first
@@ -206,6 +217,8 @@ class SqlitePreferences : Sqlite
Insert ("videoDeviceResolution", "", dbcmdTr);
Insert ("videoDeviceFramerate", "", dbcmdTr);
Insert ("videoStopAfter", "2", dbcmdTr);
+
+ //other
Insert ("inertialmomentum", "0.01", dbcmdTr);
Insert ("CSVExportDecimalSeparator", Util.GetDecimalSeparatorFromLocale(),
dbcmdTr);
Insert ("RGraphsTranslate", "True", dbcmdTr);
@@ -214,11 +227,6 @@ class SqlitePreferences : Sqlite
Insert (EncoderAutoSaveCurveBestNValue, "3", dbcmdTr);
Insert ("email", "", dbcmdTr);
Insert ("muteLogs", "False", dbcmdTr);
- Insert (ForceSensorTareDateTimeStr, "", dbcmdTr);
- Insert (ForceSensorTareStr, "-1", dbcmdTr); //result value from sensor.
Decimal is point!!
- Insert (ForceSensorCalibrationDateTimeStr, "", dbcmdTr);
- Insert (ForceSensorCalibrationWeightStr, "-1", dbcmdTr);
- Insert (ForceSensorCalibrationFactorStr, "-1", dbcmdTr); //result value from
sensor. Decimal is point!!
//removed on 1.37
//Insert ("encoderConfiguration", new
EncoderConfiguration().ToStringOutput(EncoderConfiguration.Outputs.SQL), dbcmdTr);
@@ -485,6 +493,12 @@ class SqlitePreferences : Sqlite
preferences.forceSensorNotElasticConMinForce =
Convert.ToInt32(reader[1].ToString());
else if(reader[0].ToString() == ForceSensorGraphsLineWidth)
preferences.forceSensorGraphsLineWidth =
Convert.ToInt32(reader[1].ToString());
+ else if(reader[0].ToString() == ForceSensorCaptureFeedbackActive)
+ preferences.forceSensorCaptureFeedbackActive = reader[1].ToString() == "True";
+ else if(reader[0].ToString() == ForceSensorCaptureFeedbackAt)
+ preferences.forceSensorCaptureFeedbackAt =
Convert.ToInt32(reader[1].ToString());
+ else if(reader[0].ToString() == ForceSensorCaptureFeedbackRange)
+ preferences.forceSensorCaptureFeedbackRange =
Convert.ToInt32(reader[1].ToString());
//force sensor tare
else if(reader[0].ToString() == ForceSensorTareDateTimeStr)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]