← Back to branch summary

~ubuntu-branches/ubuntu/utopic/python-chaco/utopic

« back to all changes in this revision

Viewing changes to chaco/jitterplot.py

  • Committer: Package Import Robot
  • Author(s): Andrew Starr-Bochicchio
  • Date: 2014-06-01 17:04:08 UTC
  • mfrom: (7.2.5 sid)
  • Revision ID: package-import@ubuntu.com-20140601170408-m86xvdjd83a4qon0
Tags: 4.4.1-1ubuntu1
* Merge from Debian unstable. Remaining Ubuntu changes:
 - Let the binary-predeb target work on the usr/lib/python* directory
   as we don't have usr/share/pyshared anymore.

Show diffs side-by-side

added added

removed removed

Lines of Context:
chaco/jitterplot.py
71
71
    # The color of the outline to draw around the marker.
72
72
    outline_color = black_color_trait
73
73
 
74
 
    # Override the base class default for **origin**, which specifies corners.
75
 
    # Since this is a 1D plot, it only makes sense to have the origin at the
76
 
    # edges.
77
 
    origin = Enum("bottom", "top", "left", "right")
78
 
 
79
74
    #------------------------------------------------------------------------
80
75
    # Built-in selection handling
81
76
    #------------------------------------------------------------------------
342
337
        y = self.y
343
338
        y2 = self.y2
344
339
 
345
 
        if "left" in self.origin:
 
340
        if "left" in self.origin and self.orientation == 'h':
346
341
            mapper.screen_bounds = (x, x2)
347
 
        elif "right" in self.origin:
 
342
        elif "right" in self.origin and self.orientation == 'h':
348
343
            mapper.screen_bounds = (x2, x)
349
 
        elif "bottom" in self.origin:
 
344
        elif "bottom" in self.origin  and self.orientation == 'v':
350
345
            mapper.screen_bounds = (y, y2)
351
 
        elif "top" in self.origin:
 
346
        elif "top" in self.origin  and self.orientation == 'v':
352
347
            mapper.screen_bounds = (y2, y)
353
348
 
354
349
        self.invalidate_draw()