3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 06:57:28 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch 'CURA-12261-3dconnectionmouse' into CURA-12404_add-exeption-when-lib-is-missing

Browse source
This commit is contained in:
HellAholic 2025-02-13 10:40:07 +01:00 • committed by GitHub
commit f85e8f73a4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cura/NavlibClient.py
View file

@ -28,7 +28,7 @@ class NavlibClient(parent_class):
self._was_pick = False self._was_pick = False
self._hit_selection_only = False self._hit_selection_only = False
self._picking_pass = None 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 put_profile_hint(self, hint) -> None: def put_profile_hint(self, hint) -> None:
if pynav: if pynav:
@ -89,8 +89,8 @@ class NavlibClient(parent_class):
from UM.Qt.QtApplication import QtApplication from UM.Qt.QtApplication import QtApplication
main_window = QtApplication.getInstance().getMainWindow() main_window = QtApplication.getInstance().getMainWindow()
x_n = 2. * main_window._mouse_x / self._scene.getActiveCamera().getViewportWidth() - 1. x_n = 2. * main_window._mouse_x / main_window.width() - 1.
y_n = 2. * main_window._mouse_y / self._scene.getActiveCamera().getViewportHeight() - 1. y_n = 2. * main_window._mouse_y / main_window.height() - 1.
if self.get_is_view_perspective(): if self.get_is_view_perspective():
self._was_pick = True self._was_pick = True
@ -245,8 +245,6 @@ class NavlibClient(parent_class):
camera_position = active_camera.getWorldPosition() camera_position = active_camera.getWorldPosition()
dist = (camera_position - self._pivot_node.getWorldPosition()).length() dist = (camera_position - self._pivot_node.getWorldPosition()).length()
scale = dist / 400. scale = dist / 400.
if scale < 1.:
scale = scale * scale
else: else:
view_width = active_camera.getViewportWidth() view_width = active_camera.getViewportWidth()
current_size = view_width + (2. * active_camera.getZoomFactor() * view_width) current_size = view_width + (2. * active_camera.getZoomFactor() * view_width)

BIN
resources/images/3dx_pivot.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
resources/images/cor.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.1 KiB