[chronojump] Uses the same directories structure as it should be.
- From: Carles Pina i Estany <carlespina src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Uses the same directories structure as it should be.
- Date: Wed, 14 Dec 2016 13:24:00 +0000 (UTC)
commit 9722d75f83f84f9ed0c70accb7e41b4586cfb0fd
Author: Carles Pina i Estany <carles pina cat>
Date: Wed Dec 14 13:23:34 2016 +0000
Uses the same directories structure as it should be.
chronojump.csproj | 2 +-
src/chronojump-importer/chronojump_importer.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/chronojump.csproj b/chronojump.csproj
index 6403b20..9b394e4 100644
--- a/chronojump.csproj
+++ b/chronojump.csproj
@@ -78,7 +78,7 @@
<Reference Include="System.Drawing" />
<Reference Include="System.Xml" />
<Reference Include="System.Json">
- <HintPath>bin\Debug\System.Json.dll</HintPath>
+ <HintPath>..\..\..\..\usr\lib\mono\gac\System.Json\4.0.0.0__31bf3856ad364e35\System.Json.dll</HintPath>
</Reference>
<Reference Include="System.Web.Services" />
<Reference Include="FTD2XX_NET">
diff --git a/src/chronojump-importer/chronojump_importer.py b/src/chronojump-importer/chronojump_importer.py
index 7490327..3c7355f 100755
--- a/src/chronojump-importer/chronojump_importer.py
+++ b/src/chronojump-importer/chronojump_importer.py
@@ -605,14 +605,14 @@ class ImportSession:
@staticmethod
def _encoder_filename(person_id, original_filename):
- """ original_filename is like 1-Carmelo-2014-12-03_12-48-54.txt. It only replaces the person_id (1
in this case)"""
+ """ original_filename is like 1-Carmelo-89-2014-12-03_12-48-54.txt. It only replaces the person_id
(1 in this case)"""
filename=original_filename.split("-", 1)
filename[0] = str(person_id)
return "-".join(filename)
@staticmethod
def _encoder_url(session_id, signal_or_curve):
- return os.path.join("encoder", str(session_id), signal_or_curve)
+ return os.path.join("encoder", str(session_id), "data", signal_or_curve)
@staticmethod
def _normalize_path(path):
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]