Mercurial Hosting > traffic-intelligence
diff python/moving.py @ 515:727e3c529519
renamed all draw functions to plot for consistency
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Fri, 06 Jun 2014 14:10:42 -0400 |
parents | a40c75f04903 |
children | bce1fe45d1b2 |
line wrap: on
line diff
--- a/python/moving.py Thu Jun 05 17:50:42 2014 -0400 +++ b/python/moving.py Fri Jun 06 14:10:42 2014 -0400 @@ -179,7 +179,7 @@ def multiply(self, alpha): return Point(self.x*alpha, self.y*alpha) - def draw(self, options = 'o', **kwargs): + def plot(self, options = 'o', **kwargs): from matplotlib.pylab import plot plot([self.x], [self.y], options, **kwargs) @@ -360,10 +360,10 @@ def multiply(self, alpha): return FlowVector(self.position.multiply(alpha), self.velocity.multiply(alpha)) - def draw(self, options = '', **kwargs): + def plot(self, options = '', **kwargs): from matplotlib.pylab import plot plot([self.position.x, self.position.x+self.velocity.x], [self.position.y, self.position.y+self.velocity.y], options, **kwargs) - self.position.draw(options+'x', **kwargs) + self.position.plot(options+'x', **kwargs) @staticmethod def similar(f1, f2, maxDistance2, maxDeltavelocity2): @@ -474,7 +474,7 @@ self.positions[1].append(self.positions[1][-1]) @staticmethod - def _draw(positions, options = '', withOrigin = False, lastCoordinate = None, timeStep = 1, **kwargs): + def _plot(positions, options = '', withOrigin = False, lastCoordinate = None, timeStep = 1, **kwargs): from matplotlib.pylab import plot if lastCoordinate == None: plot(positions[0][::timeStep], positions[1][::timeStep], options, **kwargs) @@ -486,17 +486,17 @@ def project(self, homography): return Trajectory(cvutils.projectTrajectory(homography, self.positions)) - def draw(self, options = '', withOrigin = False, timeStep = 1, **kwargs): - Trajectory._draw(self.positions, options, withOrigin, None, timeStep, **kwargs) + def plot(self, options = '', withOrigin = False, timeStep = 1, **kwargs): + Trajectory._plot(self.positions, options, withOrigin, None, timeStep, **kwargs) - def drawAt(self, lastCoordinate, options = '', withOrigin = False, timeStep = 1, **kwargs): - Trajectory._draw(self.positions, options, withOrigin, lastCoordinate, timeStep, **kwargs) + def plotAt(self, lastCoordinate, options = '', withOrigin = False, timeStep = 1, **kwargs): + Trajectory._plot(self.positions, options, withOrigin, lastCoordinate, timeStep, **kwargs) - def drawOnWorldImage(self, nPixelsPerUnitDistance, imageHeight, options = '', withOrigin = False, timeStep = 1, **kwargs): + def plotOnWorldImage(self, nPixelsPerUnitDistance, imageHeight, options = '', withOrigin = False, timeStep = 1, **kwargs): from matplotlib.pylab import plot imgPositions = [[x*nPixelsPerUnitDistance for x in self.positions[0]], [-x*nPixelsPerUnitDistance+imageHeight for x in self.positions[1]]] - Trajectory._draw(imgPositions, options, withOrigin, timeStep, **kwargs) + Trajectory._plot(imgPositions, options, withOrigin, timeStep, **kwargs) def getXCoordinates(self): return self.positions[0] @@ -747,11 +747,11 @@ def getYCoordinates(self): return self.positions.getYCoordinates() - def draw(self, options = '', withOrigin = False, timeStep = 1, **kwargs): - self.positions.draw(options, withOrigin, timeStep, **kwargs) + def plot(self, options = '', withOrigin = False, timeStep = 1, **kwargs): + self.positions.plot(options, withOrigin, timeStep, **kwargs) - def drawOnWorldImage(self, nPixelsPerUnitDistance, imageHeight, options = '', withOrigin = False, timeStep = 1, **kwargs): - self.positions.drawOnWorldImage(nPixelsPerUnitDistance, imageHeight, options, withOrigin, timeStep, **kwargs) + def plotOnWorldImage(self, nPixelsPerUnitDistance, imageHeight, options = '', withOrigin = False, timeStep = 1, **kwargs): + self.positions.plotOnWorldImage(nPixelsPerUnitDistance, imageHeight, options, withOrigin, timeStep, **kwargs) def play(self, videoFilename, homography = None): cvutils.displayTrajectories(videoFilename, [self], homography, self.getFirstInstant(), self.getLastInstant()) @@ -765,7 +765,7 @@ if display: from matplotlib.pyplot import figure, plot, axis figure(1) - self.draw() + self.plot() axis('equal') figure(2) plot(list(self.getTimeInterval()), speeds) @@ -844,7 +844,7 @@ from matplotlib.pyplot import figure, axis figure() for obj in objects: - obj.draw(colors.get(obj.userType)) + obj.plot(colors.get(obj.userType)) axis('equal')