Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CursorTool issue with LogMapper #803

Merged
merged 8 commits into from
Jul 7, 2021
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions chaco/tools/cursor_tool.py
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ def draw(self, gc, view_bounds=None):
if plot is None:
return

sx, sy = plot.map_screen(self.current_position)
sx, sy = plot.map_screen(self.current_position)[0]
orientation = plot.orientation

if orientation == "h" and sx is not None:
Expand All @@ -221,7 +221,7 @@ def is_draggable(self, x, y):
plot = self.component
if plot is not None:
orientation = plot.orientation
sx, sy = plot.map_screen(self.current_position)
sx, sy = plot.map_screen(self.current_position)[0]
if orientation == "h" and numpy.abs(sx - x) <= self.threshold:
return True
elif orientation == "v" and numpy.abs(sy - y) <= self.threshold:
Expand Down
53 changes: 53 additions & 0 deletions chaco/tools/tests/test_cursor_tool.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
import unittest
aaronayres35 marked this conversation as resolved.
Show resolved Hide resolved

import numpy as np

from enable.api import ComponentEditor
from enable.testing import EnableTestAssistant
from traits.api import HasTraits, Instance
from traits.etsconfig.api import ETSConfig
from traitsui.api import Item, View
from traitsui.testing.api import UITester

from chaco.api import ArrayPlotData, Plot
from chaco.tools.cursor_tool import CursorTool


class TestCursorTool(unittest.TestCase, EnableTestAssistant):

# regression test for enthought/chaco#289
@unittest.skipIf(ETSConfig.toolkit == "null", "Skip on 'null' toolkit")
def test_use_with_log_mappers(self):
class TestCursor(HasTraits):
plot = Instance(Plot)

traits_view = View(
Item('plot', editor=ComponentEditor(), show_label=False),
width=500,
height=500,
resizable=True
)

def _plot_default(self):
arr = np.logspace(0, 10, num=10)
data = ArrayPlotData(x=arr, y=arr)
plot = Plot(data)
renderer = plot.plot(
("x", "y"),
index_scale="log",
value_scale="log"
)[0]

cursor = CursorTool(renderer)

renderer.overlays.append(cursor)

return plot

tester = UITester()
test_cursor = TestCursor()
with tester.create_ui(test_cursor):
# should not fail
self.mouse_move(
test_cursor.plot, 10, 10
)