Merge pull request #215 from bwagner/master

fixed module hierarchy for Trajectory
Zulko · Feb 21, 2017 · ce38d41 · ce38d41
2 parents e4d9032 + 2153c20
commit ce38d41
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/moviepy/video/tools/interpolators.py b/moviepy/video/tools/interpolators.py
@@ -41,7 +41,7 @@ def addx(self, x):
 
     def addy(self, y):
 
-        return Trajectory(self.tt, self.xx+y, self.yy)
+        return Trajectory(self.tt, self.xx, self.yy+y)
 
     def update_interpolators(self):
         self.xi =  Interpolator(self.tt, self.xx)

diff --git a/moviepy/video/tools/tracking.py b/moviepy/video/tools/tracking.py
@@ -70,7 +70,7 @@ def manual_tracking(clip, t1=None, t2=None, fps=None, nobjects = 1,
                                        nobjects=3, savefile="track.txt")
     >>> # ...
     >>> # LATER, IN ANOTHER SCRIPT, RECOVER THESE TRAJECTORIES
-    >>> from moviepy.tools.tracking import Trajectory
+    >>> from moviepy.video.tools.tracking import Trajectory
     >>> traj1, traj2, traj3 = Trajectory.load_list('track.txt')
     >>> # If ever you only have one object being tracked, recover it with
     >>> traj, =  Trajectory.load_list('track.txt')