Mercurial Hosting > traffic-intelligence
diff scripts/display-synced-trajectories.py @ 836:7058a40a4bbc
updated metadata and code to merge features from different cameras
| author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
|---|---|
| date | Wed, 06 Jul 2016 10:18:35 -0400 |
| parents | 02f2809c2f66 |
| children | e01cabca4c55 |
line wrap: on
line diff
--- a/scripts/display-synced-trajectories.py Tue Jul 05 13:56:13 2016 -0400 +++ b/scripts/display-synced-trajectories.py Wed Jul 06 10:18:35 2016 -0400 @@ -28,13 +28,13 @@ dirname = os.path.split(args.metadataFilename)[0] startTime = datetime.strptime(args.startTime, utils.datetimeFormat) -# TODO issue with framerate if startTime > mergedSequence.startTime: - mergedFirstFrameNum = (startTime-mergedSequence.startTime).seconds* + mergedFirstFrameNum = (startTime-mergedSequence.startTime).seconds*mergedSequence.cameraView.cameraType.frameRate -videoSequences = session.query(VideoSequence).filter(VideoSequence.site == mergedSequence.site).filter(VideoSequence.startTime <= startTime).all() -videoSequences.remove(mergedSequence) -videoSequences = [v for v in videoSequences if v.containsInstant(startTime)] +cameraViews = session.query(CameraView).filter(CameraView.site == mergedSequence.site).filter(CameraView.virtual == False) +videoSequences = session.query(VideoSequence).filter(VideoSequence.virtual == False).filter(VideoSequence.startTime <= startTime).all() +#videoSequences.remove(mergedSequence) +videoSequences = [v for v in videoSequences if v.cameraView in cameraViews and v.containsInstant(startTime)] filenames = [dirname+os.path.sep+v.getVideoSequenceFilename() for v in videoSequences] firstFrameNums = [v.getFrameNum(startTime) for v in videoSequences] windowNames = [v.cameraView.description for v in videoSequences]