From e0ebd94d0aecdc1a8d63200b99b5469d67ff814c Mon Sep 17 00:00:00 2001 From: Manuel Huber Date: Sat, 7 Dec 2024 17:01:44 +0100 Subject: [PATCH 1/3] fix VtkViewerNew for VTK 9.4.0 --- src/pyg4ometry/visualisation/VtkViewerNew.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pyg4ometry/visualisation/VtkViewerNew.py b/src/pyg4ometry/visualisation/VtkViewerNew.py index e0908074b..7f503f09e 100644 --- a/src/pyg4ometry/visualisation/VtkViewerNew.py +++ b/src/pyg4ometry/visualisation/VtkViewerNew.py @@ -56,7 +56,6 @@ def clear(self): self.clippers = [] # clip filters self.axes = [] # axes actors - self.pdNameDict = {} # polydata to LV name self.instanceNameDict = {} # instance transformation to PV name self.bBuiltPipelines = False @@ -326,7 +325,6 @@ def buildPipelinesAppend(self): pd = _Convert.pycsgMeshToVtkPolyData(self.localmeshes[k]) # pd.SetObjectName(k) self.polydata[k] = pd - self.pdNameDict[pd] = k appFltDict = {} visOptDict = {} @@ -708,7 +706,9 @@ def rightButtonPressEvent(self, obj, event): pdmin = pd pdamin = pda - lvName = self.vtkviewer.pdNameDict[pdamin.GetInputAlgorithm().GetInput()] + for name, pd in self.vtkviewer.polydata.items(): + if pd == pdamin.GetInputAlgorithm().GetInput(): + lvName = name pvName = self.vtkviewer.instanceNameDict[pdamin] pvTrans = pdamin.GetTransform() [mtra, tra] = _Convert.vtkTransformation2PyG4(pvTrans.GetConcatenatedTransform(0)) From db7a914bfcef02f3cd07220f7d744bdce0893f17 Mon Sep 17 00:00:00 2001 From: Manuel Huber Date: Sat, 7 Dec 2024 17:14:17 +0100 Subject: [PATCH 2/3] fix to sphinx-autoapi < 3.4.0 [skip ci] --- .readthedocs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index b28cbe7e1..12d03efc6 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -13,4 +13,4 @@ build: python: "3.10" jobs: post_install: - - pip install --upgrade --upgrade-strategy only-if-needed furo sphinx>=7.2.2 sphinx-autoapi sphinx-copybutton sphinx-inline-tabs + - pip install --upgrade --upgrade-strategy only-if-needed furo sphinx>=7.2.2 sphinx-autoapi<3.4.0 sphinx-copybutton sphinx-inline-tabs From 79a06cb71f068f368698ca3975b07ce3b0441a20 Mon Sep 17 00:00:00 2001 From: Manuel Huber Date: Sat, 7 Dec 2024 17:15:42 +0100 Subject: [PATCH 3/3] Update .readthedocs.yaml [skip ci] --- .readthedocs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 12d03efc6..606f05439 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -13,4 +13,4 @@ build: python: "3.10" jobs: post_install: - - pip install --upgrade --upgrade-strategy only-if-needed furo sphinx>=7.2.2 sphinx-autoapi<3.4.0 sphinx-copybutton sphinx-inline-tabs + - pip install --upgrade --upgrade-strategy only-if-needed furo "sphinx>=7.2.2" "sphinx-autoapi<3.4.0" sphinx-copybutton sphinx-inline-tabs