# HG changeset patch
# User Nicolas Saunier <nicolas.saunier@polymtl.ca>
# Date 1457033473 18000
# Node ID 30bd0f2223b71d3623d8aa77d121c3d2258b944a
# Parent  f1040d739bbf4ddeb76ffa6db1ca42d2da4bcf85
tweaking curvilinear trajectory loading

diff -r f1040d739bbf -r 30bd0f2223b7 python/storage.py
--- a/python/storage.py	Wed Mar 02 17:50:05 2016 -0500
+++ b/python/storage.py	Thu Mar 03 14:31:13 2016 -0500
@@ -267,16 +267,19 @@
         printDBError(error)
         return []
     
+    missingObjectNumbers = []
     objNum = None
     for row in cursor:
         if objNum != row[0]:
             objNum = row[0]
-            if objNum < len(objects):
+            if objNum in objects:
                 objects[objNum].curvilinearPositions = moving.CurvilinearTrajectory()
             else:
-                print('There are more curvilinear trajectories than objects')
-                break
-        objects[objNum].curvilinearPositions.addPositionSYL(row[2],row[3],row[4])
+                missingObjectNumbers.append(objNum)
+        if objNum in objects:
+            objects[objNum].curvilinearPositions.addPositionSYL(row[2],row[3],row[4])
+    if len(missingObjectNumbers) > 0:
+        print('List of missing objects to attach corresponding curvilinear trajectories: {}'.format(missingObjectNumbers))
 
 def saveTrajectoriesToSqlite(outputFilename, objects, trajectoryType, withFeatures = False):
     '''Writes features, ie the trajectories positions (and velocities if exist)