From 3861a043f4dd435b75c80e534992cfd89f050f25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20Skowro=C5=84ski?= Date: Fri, 22 Nov 2024 11:32:41 +0100 Subject: [PATCH 1/3] Changed scaling of the CoR --- cura/NavlibClient.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cura/NavlibClient.py b/cura/NavlibClient.py index f991a007d87..ae355a8a69b 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, "3dx_pivot.png"), size=2.5) def pick(self, x, y, check_selection = False, radius = 0.): @@ -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) From 6fc2b6d8dce146dc0872b644df41d050d5b90869 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20Skowro=C5=84ski?= Date: Wed, 27 Nov 2024 14:28:13 +0100 Subject: [PATCH 2/3] Changed the CoR icon --- cura/NavlibClient.py | 2 +- resources/images/3dx_pivot.png | Bin 1365 -> 0 bytes resources/images/cor.png | Bin 0 -> 5186 bytes 3 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 resources/images/3dx_pivot.png create mode 100644 resources/images/cor.png diff --git a/cura/NavlibClient.py b/cura/NavlibClient.py index ae355a8a69b..62c56de2053 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=2.5) + 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.): diff --git a/resources/images/3dx_pivot.png b/resources/images/3dx_pivot.png deleted file mode 100644 index 98525adc860781c9f85ec9b426c95367135aa3f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1365 zcmeAS@N?(olHy`uVBq!ia0vp^JRmj)8<3o<+3y6TBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFe_z-M3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWfo`&anSp|tp`M|! ziMhGCj)IYap@F`Ek-njkuA#Y=v5}R5fdUjL0c|TvNwW%aaf8|g1^l#~=$>Fbx5 zm+O@q>*W`v>l<2HT7t|lGSUUA&@HaaD@m--%_~-hnc$LIoLrPyP?DLSrvNfBF)6>a z#8wIDQivCF3*g4)6+?pw7-0Gpi3R$GdIlgb!4&%X;#ZoR3s+rS5|oN?FIIz#Ln;eW z^@CE2^Gl18ff1Lc46>@g%DE^tu_V7JBtJg~7K#BG`6cH#s~$ri|gC;ZerU}`S{ChKf|!F&b= z#*>~djv*DdN+vmaOfHl-R{#He?)|9w-r0@0a%`@Oho?ABUs1}@w9B)d>9l7%-^Sp$ zBhhoGEbuw3U=Wc~+8MiRnju^11P&d=h)E}(1?^|G+V8)A?Z4Xl;XJWl4^&sqdtO^{ z|NDP;FVAGdKZ^hK?`b}i`sZ+G24}G0{J^cdI9s{i+%?x(zjgV|wz<6iYjrjoTQW8J z|M=^k@hNuU&ZpLOy2|=L+y3QM; ztnuk=e7R=Fvu8|gc1d3T^ziAU o_r-snpI_K~?!IislR8cVhFh!NN1pO!;{X+Op00i_>zopr01c@A@c;k- diff --git a/resources/images/cor.png b/resources/images/cor.png new file mode 100644 index 0000000000000000000000000000000000000000..9648b720cb00751d318ed1f9ac07f21290b81196 GIT binary patch literal 5186 zcmeHK4QvzV8NQGuAt59wBMBV^u1*mRt$jZ}`_5N8X<{2Glzin+#asIEZPq^vcZ}&aZPOYDN z<(}u7nX|h)zPs>E)vP%kj(2O9_PZzI^oF$^hr38k`x@q{u0vAU$*c(rwqLk^*^1K# zO3uA$(S7;W?U_@vW5P94ujSh_-5B9I-dC~Z!NjSBOMhO_;;DSTyJ@ohqovK3;L`JJ zuHOIo+}XvQ&(>A$ESi66<=Y>8dTDCY+kfR~zeJ(gXw)49G$_j%r? zJM8t9B_*cS=2!B+%HBU^%F8FddZl{TZ_4*2%-7RzCmy+;`85-pnfLUoe?pM7R?%v8 zIjq*f#9_J{o1eE-edwCnx@fWea9hiaHdc7Ey2xg~>!HHc%eU+(e7pfqoS#LBRqoom zGLEijDPR3?RrO&pO?wG5_(#sm=8de)8Mg%d5I-UY}mn zpV@!$_1B`O=H$J*uA^Y{j~7k*GumHr6l^%n6wfG%`#$@)51U%?uM;3UE5dwXkEeGuRcr8{awM9WhEck+79tE zZ*d1V-?L$1Cppbj;ZU z>%Ttn_&KH-A*r{{Oz-I_n1;Ep?m4*kXAhja+V|3tn@=Mb=R}Tv9N)MXc4(srJ8_9~ zAYi>7byehn%L7R{puC+-YeL7iCD6akBy zsy%#DJ#P{;AAwnBXgk&zR z4Mj^7iUAHAi1HCJEQ?YIRX91X)F4|l8aR#)#up4bokR4YXi^2J2NvhT7@@Sh)djwJzeZyjnh)o$$(@6~kx)1S=Ko91wf+5Q3WNi}PpoHhJSv1Q0 ztRV5Cz^b=AAiWH!7qmtrO=>Bhk=8Oa@6#G^ilT5%FEBWsLgffWWiG@6g$k1EM94$n zCV}wboR-mheOiiO7_FB!l3K<9OcXE~8H%7%C>BLT*p*x$H7bQlfK)U`^E|~fTBC`k zwUnTTEWih}9D{qkw3i|Y!l+USJUdT{1UXnvG06D=77qE<0Yz}O!sW1NNZml-s>K!H zWFK^ZYd{PMQY<~0PY{jh8?tvqcj6BFto{Q;$iU&u%8&8QOgKCyfc{$dJ~T8aojMH zJu3O+7#9H*eyAhV3O1;!6?$*7RHY;Fu{xmC0ZOJN2%S&f&hW<+2*Ed?82nUvDZKni_?eaIeQ3T7xvl(O-uFg3v}A{?9*ZJ~u0%Q0 z;;)rALSvTfaN4taCrzJpr)Fi@Urs{Pow9w2Y?Xq_J2|4hC;|bEiE66FQG-OoVgh9Z6a{YgFPD@oaRkT!v{}twk6KvGt nE8(YxnwmmtYCl}q|D!X1mX(`%>-4q@iii$-wXL&q`HFu4yZ8qr literal 0 HcmV?d00001 From c374c9808a8ca2945f60e502b7b0f79e53cb5e24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20Skowro=C5=84ski?= Date: Thu, 12 Dec 2024 10:24:19 +0100 Subject: [PATCH 3/3] Fixed QuickZoom to support variable scaling (high DPI screens) --- cura/NavlibClient.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/NavlibClient.py b/cura/NavlibClient.py index 62c56de2053..49bcb92131e 100644 --- a/cura/NavlibClient.py +++ b/cura/NavlibClient.py @@ -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