← Back to branch summary

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

« back to all changes in this revision

Viewing changes to chaco/tools/line_segment_tool.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/tools/line_segment_tool.py
328
328
    def _map_data(self, point):
329
329
        """ Maps values from screen space into data space.
330
330
        """
331
 
        index_mapper = self.component.index_mapper
332
 
        value_mapper = self.component.value_mapper
 
331
        x_mapper = self.component.x_mapper
 
332
        y_mapper = self.component.y_mapper
333
333
        if self.component.orientation == 'h':
334
 
            ndx = index_mapper.map_data(point[0])
335
 
            val = value_mapper.map_data(point[1])
 
334
            ndx = x_mapper.map_data(point[0])
 
335
            val = y_mapper.map_data(point[1])
336
336
        else:
337
 
            ndx = index_mapper.map_data(point[1])
338
 
            val = value_mapper.map_data(point[0])
 
337
            val = x_mapper.map_data(point[0])
 
338
            ndx = y_mapper.map_data(point[1])
339
339
        return (ndx, val)
340
340
 
341
341
    def _map_screen(self, point):
342
342
        """ Maps values from data space into screen space.
343
343
        """
344
 
        index_mapper = self.component.index_mapper
345
 
        value_mapper = self.component.value_mapper
346
 
 
 
344
        x_mapper = self.component.x_mapper
 
345
        y_mapper = self.component.y_mapper
347
346
        if self.component.orientation == 'h':
348
 
            x = index_mapper.map_screen(point[0])
349
 
            y = value_mapper.map_screen(point[1])
 
347
            x = x_mapper.map_screen(point[0])
 
348
            y = y_mapper.map_screen(point[1])
350
349
        else:
351
 
            y = index_mapper.map_screen(point[0])
352
 
            x = value_mapper.map_screen(point[1])
 
350
            x = x_mapper.map_screen(point[1])
 
351
            y = y_mapper.map_screen(point[0])
353
352
        return (x, y)
354
353
 
355
354