diff --git a/cura/NavlibClient.py b/cura/NavlibClient.py index f991a007d87..49bcb92131e 100644 --- a/cura/NavlibClient.py +++ b/cura/NavlibClient.py @@ -17,7 +17,7 @@ def __init__(self, scene, renderer) -> None: self._was_pick = False self._hit_selection_only = False self._picking_pass = None - self._pivot_node = OverlayNode(node=SceneNode(), image_path=Resources.getPath(Resources.Images, "3dx_pivot.png"), size=3.) + self._pivot_node = OverlayNode(node=SceneNode(), image_path=Resources.getPath(Resources.Images, "cor.png"), size=2.5) def pick(self, x, y, check_selection = False, radius = 0.): @@ -70,8 +70,8 @@ def get_pointer_position(self)->pynav.NavlibVector: from UM.Qt.QtApplication import QtApplication main_window = QtApplication.getInstance().getMainWindow() - x_n = 2. * main_window._mouse_x / self._scene.getActiveCamera().getViewportWidth() - 1. - y_n = 2. * main_window._mouse_y / self._scene.getActiveCamera().getViewportHeight() - 1. + x_n = 2. * main_window._mouse_x / main_window.width() - 1. + y_n = 2. * main_window._mouse_y / main_window.height() - 1. if self.get_is_view_perspective(): self._was_pick = True @@ -226,8 +226,6 @@ def set_camera_matrix(self, matrix : pynav.NavlibMatrix): camera_position = active_camera.getWorldPosition() dist = (camera_position - self._pivot_node.getWorldPosition()).length() scale = dist / 400. - if scale < 1.: - scale = scale * scale else: view_width = active_camera.getViewportWidth() current_size = view_width + (2. * active_camera.getZoomFactor() * view_width) diff --git a/resources/images/3dx_pivot.png b/resources/images/3dx_pivot.png deleted file mode 100644 index 98525adc860..00000000000 Binary files a/resources/images/3dx_pivot.png and /dev/null differ diff --git a/resources/images/cor.png b/resources/images/cor.png new file mode 100644 index 00000000000..9648b720cb0 Binary files /dev/null and b/resources/images/cor.png differ