Mercurial Hosting > traffic-intelligence

diff python/storage.py @ 218:b5772df11b37

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
corrected bugs to load objects and display trajectories over videos
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Thu, 21 Jun 2012 18:04:11 -0400
parents 5e2983b05d4e
children 584613399513
line wrap: on
line diff
--- a/python/storage.py	Thu Jun 21 15:18:41 2012 -0400
+++ b/python/storage.py	Thu Jun 21 18:04:11 2012 -0400
@@ -81,18 +81,18 @@
             if type(objectNumbers) == int:
                 if objectNumbers == -1:
                     cursor.execute('SELECT * from positions order by trajectory_id, frame_number')
-            else:
-                cursor.execute('SELECT * from positions where trajectory_id between 0 and {0} order by trajectory_id, frame_number'.format(objectNumbers))
-        elif type(objectNumbers) == list:
-            cursor.execute('SELECT * from positions where trajectory_id in ('+', '.join([str(n) for n in objectNumbers])+') order by trajectory_id, frame_number')
+                else:
+                    cursor.execute('SELECT * from positions where trajectory_id between 0 and {0} order by trajectory_id, frame_number'.format(objectNumbers))
+            elif type(objectNumbers) == list:
+                cursor.execute('SELECT * from positions where trajectory_id in ('+', '.join([str(n) for n in objectNumbers])+') order by trajectory_id, frame_number')
         elif trajectoryType == 'object':
             if type(objectNumbers) == int:
                 if objectNumbers == -1:
                     cursor.execute('SELECT OF.object_id, P.frame_number, avg(P.x_coordinate), avg(P.y_coordinate) from positions P, objects_features OF where P.trajectory_id = OF.trajectory_id group by object_id, frame_number')
-            else:
-                cursor.execute('SELECT OF.object_id, P.frame_number, avg(P.x_coordinate), avg(P.y_coordinate) from positions P, objects_features OF where P.trajectory_id = OF.trajectory_id and trajectory_id between 0 and {0} group by object_id, frame_number'.format(objectNumbers))
-        elif type(objectNumbers) == list:
-            cursor.execute('SELECT OF.object_id, P.frame_number, avg(P.x_coordinate), avg(P.y_coordinate) from positions P, objects_features OF where P.trajectory_id = OF.trajectory_id and trajectory_id in ('+', '.join([str(n) for n in objectNumbers])+') group by object_id, frame_number')
+                else:
+                    cursor.execute('SELECT OF.object_id, P.frame_number, avg(P.x_coordinate), avg(P.y_coordinate) from positions P, objects_features OF where P.trajectory_id = OF.trajectory_id and OF.object_id between 0 and {0} group by object_id, frame_number'.format(objectNumbers))
+            elif type(objectNumbers) == list:
+                cursor.execute('SELECT OF.object_id, P.frame_number, avg(P.x_coordinate), avg(P.y_coordinate) from positions P, objects_features OF where P.trajectory_id = OF.trajectory_id and OF.object_id in ('+', '.join([str(n) for n in objectNumbers])+') group by object_id, frame_number')
         else:
             print('no trajectory type was chosen')
     except sqlite3.OperationalError as err: