[chronojump] Import trigger on RaceAnalyzer. Test import session w encoder, RA triggers
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Import trigger on RaceAnalyzer. Test import session w encoder, RA triggers
- Date: Thu, 7 May 2020 09:31:17 +0000 (UTC)
commit d3e45cc6a960dbf62ea471cc2f71b0bd858751a3
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu May 7 11:30:14 2020 +0200
Import trigger on RaceAnalyzer. Test import session w encoder,RA triggers
src/chronojump-importer/chronojump_importer.py | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/src/chronojump-importer/chronojump_importer.py b/src/chronojump-importer/chronojump_importer.py
index fb29e980..993dd5e8 100755
--- a/src/chronojump-importer/chronojump_importer.py
+++ b/src/chronojump-importer/chronojump_importer.py
@@ -426,9 +426,13 @@ class ImportSession:
self._import_jumps()
self._import_runs()
self._import_pulse()
- self._import_encoder()
+ trigger = self._import_encoder()
self._import_forceSensor()
- self._import_runEncoder()
+ triggerRunEncoder = self._import_runEncoder()
+
+ trigger.concatenate_table(triggerRunEncoder)
+ trigger.remove_duplicates()
+ self.destination_db.write(table=trigger, matches_columns=None)
self._print_status(self, "allData")
@@ -678,7 +682,7 @@ class ImportSession:
join_clause="LEFT JOIN Encoder ON Encoder.uniqueID=trigger.modeID")
trigger.update_ids("modeID", encoder, "uniqueID", "new_uniqueID")
- self.destination_db.write(table=trigger, matches_columns=None)
+ return trigger #to be concatenated and written after forceSensor and runEncoder
def _import_forceSensor(self):
@@ -753,8 +757,7 @@ class ImportSession:
join_clause="LEFT JOIN RunEncoder ON RunEncoder.uniqueID=trigger.modeID")
trigger.update_ids("modeID", runEncoder, "uniqueID", "new_uniqueID")
- self.destination_db.write(table=trigger, matches_columns=None)
- # TODO: check that this write does not erase previous write of encoder trigger
+ return trigger
if(DEBUGTOFILE):
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]