From 03a8954f6b726129a7e66b76a222a0e7915e93f5 Mon Sep 17 00:00:00 2001 From: 0penBrain <48731257+0penBrain@users.noreply.github.com> Date: Sat, 24 Jun 2023 09:45:09 +0200 Subject: [PATCH 1/3] [Bugfix]Sketcher: fix cross section side switch not working except for XY plane --- src/Mod/Show/mTempoVis.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Mod/Show/mTempoVis.py b/src/Mod/Show/mTempoVis.py index 1e40a2dc44..24ade4251e 100644 --- a/src/Mod/Show/mTempoVis.py +++ b/src/Mod/Show/mTempoVis.py @@ -450,9 +450,7 @@ class TempoVis(object): toggle = {False: 0, True: 1, None: -1}[enable] if reverted: - skNorm = pla.Rotation.multVec(App.Vector(0,0,1)) - skInvNorm = skNorm.negative() - pla = pla * App.Rotation(skNorm, skInvNorm) + pla = pla * App.Rotation(0, 1, 0, 0) if enable: # clip plane shall be disabled so new placement can be applied self.modify(ClipPlane(doc, 0)) From 1e130fa9c3d2793084e93887fdde94bbdd21c524 Mon Sep 17 00:00:00 2001 From: 0penBrain <48731257+0penBrain@users.noreply.github.com> Date: Sat, 24 Jun 2023 10:05:45 +0200 Subject: [PATCH 2/3] [Bugfix]Sketcher: fix vertex selection from backside not working anymore Regression introduced with a6adfc58 --- src/Mod/Sketcher/Gui/EditModeGeometryCoinManager.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Mod/Sketcher/Gui/EditModeGeometryCoinManager.cpp b/src/Mod/Sketcher/Gui/EditModeGeometryCoinManager.cpp index 88ccb53866..f71b3d653e 100644 --- a/src/Mod/Sketcher/Gui/EditModeGeometryCoinManager.cpp +++ b/src/Mod/Sketcher/Gui/EditModeGeometryCoinManager.cpp @@ -279,7 +279,7 @@ void EditModeGeometryCoinManager::updateGeometryColor(const GeoListFacade& geoli pcolor[preselectpointmfid.fieldIndex] = drawingParameters.PreselectColor; - raisePoint(pverts[preselectpointmfid.fieldIndex], drawingParameters.zHighlight); + raisePoint(pverts[preselectpointmfid.fieldIndex], viewOrientationFactor * drawingParameters.zHighlight); } } @@ -292,7 +292,8 @@ void EditModeGeometryCoinManager::updateGeometryColor(const GeoListFacade& geoli layerId = l, &coinMapping = coinMapping, drawingParameters = this->drawingParameters, - raisePoint](const int i) { + raisePoint, + viewOrientationFactor](const int i) { auto pointindex = coinMapping.getIndexLayer(i); if (layerId == pointindex.layerId && pointindex.fieldIndex >= 0 && pointindex.fieldIndex < PtNum) { @@ -300,7 +301,7 @@ void EditModeGeometryCoinManager::updateGeometryColor(const GeoListFacade& geoli ? drawingParameters.PreselectSelectedColor : drawingParameters.SelectColor; - raisePoint(pverts[pointindex.fieldIndex], drawingParameters.zHighlight); + raisePoint(pverts[pointindex.fieldIndex], viewOrientationFactor * drawingParameters.zHighlight); } }); From 6e6f4bb1ebf252a00c50f0bf1c41db52fe997caa Mon Sep 17 00:00:00 2001 From: 0penBrain <48731257+0penBrain@users.noreply.github.com> Date: Sat, 24 Jun 2023 10:17:47 +0200 Subject: [PATCH 3/3] Sketcher: improve Z layering in edit mode Especially when using cross section there was cases where sketcher elements ... ... wasn't guaranteed to be visible because hidden by other objects --- src/Mod/Show/mTempoVis.py | 2 +- src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Mod/Show/mTempoVis.py b/src/Mod/Show/mTempoVis.py index 24ade4251e..28de095b4a 100644 --- a/src/Mod/Show/mTempoVis.py +++ b/src/Mod/Show/mTempoVis.py @@ -455,7 +455,7 @@ class TempoVis(object): if enable: # clip plane shall be disabled so new placement can be applied self.modify(ClipPlane(doc, 0)) - self.modify(ClipPlane(doc, toggle, pla, 0.02)) + self.modify(ClipPlane(doc, toggle, pla, 0.001)) sketch.ViewObject.SectionView = enable if enable is not None else not sketch.ViewObject.SectionView def activateWorkbench(self, wb_name): diff --git a/src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.h b/src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.h index 90ae4386eb..93a14816c7 100644 --- a/src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.h +++ b/src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.h @@ -67,8 +67,8 @@ struct DrawingParameters /** @name Rendering Heights - virtual height introduced in the scenegraph to determine what is * drawn on top of what*/ //@{ - const float zEdit = 0.001f; // Height used by temporal edit curves - const float zCross = 0.001f; // Height used by the Axes + const float zEdit = 0.002f; // Height used by temporal edit curves + const float zCross = 0.002f; // Height used by the Axes const float zInfo = 0.004f; // Height used by the Overlay information layer const float zLowLines = 0.005f; // Height used for bottom rendered lines const float zMidLines = 0.006f; // Height used for in-the-middle rendered lines