From 8a9fcd33dfcd622adc09ddce192dca75171ae265 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Thu, 5 Oct 2017 05:58:45 +0100 Subject: [PATCH] FEM: move observer into PyGui --- src/Mod/Fem/App/CMakeLists.txt | 2 +- src/Mod/Fem/CMakeLists.txt | 2 +- src/Mod/Fem/{ => PyGui}/FemSelectionObserver.py | 0 src/Mod/Fem/PyGui/_TaskPanelFemElementFluid1D.py | 2 +- src/Mod/Fem/PyGui/_TaskPanelFemElementGeometry1D.py | 2 +- src/Mod/Fem/PyGui/_TaskPanelFemElementGeometry2D.py | 2 +- src/Mod/Fem/PyGui/_TaskPanelFemMaterial.py | 2 +- src/Mod/Fem/PyGui/_TaskPanelFemMeshBoundaryLayer.py | 2 +- src/Mod/Fem/PyGui/_TaskPanelFemMeshGroup.py | 2 +- src/Mod/Fem/PyGui/_TaskPanelFemMeshRegion.py | 2 +- 10 files changed, 9 insertions(+), 9 deletions(-) rename src/Mod/Fem/{ => PyGui}/FemSelectionObserver.py (100%) diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt index a76fcd227a..c7eea1aaee 100644 --- a/src/Mod/Fem/App/CMakeLists.txt +++ b/src/Mod/Fem/App/CMakeLists.txt @@ -91,7 +91,6 @@ SET(FemScripts_SRCS FemMesh2Mesh.py FemMeshTools.py FemResultTools.py - FemSelectionObserver.py FemTools.py FemToolsCcx.py FemToolsZ88.py @@ -120,6 +119,7 @@ SET(FemObjectsScripts_SRCS SET(FemGuiScripts_SRCS PyGui/FemCommands.py + PyGui/FemSelectionObserver.py PyGui/__init__.py PyGui/_CommandFemAnalysis.py PyGui/_CommandFemConstraintSelfWeight.py diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index 25926922b1..f6d1adb974 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -39,7 +39,6 @@ INSTALL( FemMesh2Mesh.py FemMeshTools.py FemResultTools.py - FemSelectionObserver.py FemTools.py FemToolsCcx.py FemToolsZ88.py @@ -73,6 +72,7 @@ INSTALL( INSTALL( FILES PyGui/FemCommands.py + PyGui/FemSelectionObserver.py PyGui/__init__.py PyGui/_CommandFemAnalysis.py PyGui/_CommandFemConstraintSelfWeight.py diff --git a/src/Mod/Fem/FemSelectionObserver.py b/src/Mod/Fem/PyGui/FemSelectionObserver.py similarity index 100% rename from src/Mod/Fem/FemSelectionObserver.py rename to src/Mod/Fem/PyGui/FemSelectionObserver.py diff --git a/src/Mod/Fem/PyGui/_TaskPanelFemElementFluid1D.py b/src/Mod/Fem/PyGui/_TaskPanelFemElementFluid1D.py index 70825cbe79..36636b95d5 100644 --- a/src/Mod/Fem/PyGui/_TaskPanelFemElementFluid1D.py +++ b/src/Mod/Fem/PyGui/_TaskPanelFemElementFluid1D.py @@ -365,7 +365,7 @@ class _TaskPanelFemElementFluid1D: if not self.sel_server: # if we do not check, we would start a new SelectionObserver on every click on addReference button # but close only one SelectionObserver on leaving the task panel - import FemSelectionObserver + from . import FemSelectionObserver self.sel_server = FemSelectionObserver.FemSelectionObserver(self.selectionParser, print_message) def selectionParser(self, selection): diff --git a/src/Mod/Fem/PyGui/_TaskPanelFemElementGeometry1D.py b/src/Mod/Fem/PyGui/_TaskPanelFemElementGeometry1D.py index a66df91d98..ea6a0b5265 100644 --- a/src/Mod/Fem/PyGui/_TaskPanelFemElementGeometry1D.py +++ b/src/Mod/Fem/PyGui/_TaskPanelFemElementGeometry1D.py @@ -164,7 +164,7 @@ class _TaskPanelFemElementGeometry1D: if not self.sel_server: # if we do not check, we would start a new SelectionObserver on every click on addReference button # but close only one SelectionObserver on leaving the task panel - import FemSelectionObserver + from . import FemSelectionObserver self.sel_server = FemSelectionObserver.FemSelectionObserver(self.selectionParser, print_message) def selectionParser(self, selection): diff --git a/src/Mod/Fem/PyGui/_TaskPanelFemElementGeometry2D.py b/src/Mod/Fem/PyGui/_TaskPanelFemElementGeometry2D.py index 2cf173cebe..714ebad80c 100644 --- a/src/Mod/Fem/PyGui/_TaskPanelFemElementGeometry2D.py +++ b/src/Mod/Fem/PyGui/_TaskPanelFemElementGeometry2D.py @@ -122,7 +122,7 @@ class _TaskPanelFemElementGeometry2D: if not self.sel_server: # if we do not check, we would start a new SelectionObserver on every click on addReference button # but close only one SelectionObserver on leaving the task panel - import FemSelectionObserver + from . import FemSelectionObserver self.sel_server = FemSelectionObserver.FemSelectionObserver(self.selectionParser, print_message) def selectionParser(self, selection): diff --git a/src/Mod/Fem/PyGui/_TaskPanelFemMaterial.py b/src/Mod/Fem/PyGui/_TaskPanelFemMaterial.py index ab58a2941b..a45e12debe 100644 --- a/src/Mod/Fem/PyGui/_TaskPanelFemMaterial.py +++ b/src/Mod/Fem/PyGui/_TaskPanelFemMaterial.py @@ -549,7 +549,7 @@ class _TaskPanelFemMaterial: if not self.sel_server: # if we do not check, we would start a new SelectionObserver on every click on addReference button # but close only one SelectionObserver on leaving the task panel - import FemSelectionObserver + from . import FemSelectionObserver self.sel_server = FemSelectionObserver.FemSelectionObserver(self.selectionParser, print_message) def selectionParser(self, selection): diff --git a/src/Mod/Fem/PyGui/_TaskPanelFemMeshBoundaryLayer.py b/src/Mod/Fem/PyGui/_TaskPanelFemMeshBoundaryLayer.py index 3a5540d484..d34049157a 100644 --- a/src/Mod/Fem/PyGui/_TaskPanelFemMeshBoundaryLayer.py +++ b/src/Mod/Fem/PyGui/_TaskPanelFemMeshBoundaryLayer.py @@ -151,7 +151,7 @@ class _TaskPanelFemMeshBoundaryLayer: print_message = self.selection_mode_solid_print_message else: print_message = self.selection_mode_std_print_message - import FemSelectionObserver + from . import FemSelectionObserver self.sel_server = FemSelectionObserver.FemSelectionObserver(self.selectionParser, print_message) def selectionParser(self, selection): diff --git a/src/Mod/Fem/PyGui/_TaskPanelFemMeshGroup.py b/src/Mod/Fem/PyGui/_TaskPanelFemMeshGroup.py index decbbdf8a6..148206a90c 100644 --- a/src/Mod/Fem/PyGui/_TaskPanelFemMeshGroup.py +++ b/src/Mod/Fem/PyGui/_TaskPanelFemMeshGroup.py @@ -145,7 +145,7 @@ class _TaskPanelFemMeshGroup: if not self.sel_server: # if we do not check, we would start a new SelectionObserver on every click on addReference button # but close only one SelectionObserver on leaving the task panel - import FemSelectionObserver + from . import FemSelectionObserver self.sel_server = FemSelectionObserver.FemSelectionObserver(self.selectionParser, print_message) def selectionParser(self, selection): diff --git a/src/Mod/Fem/PyGui/_TaskPanelFemMeshRegion.py b/src/Mod/Fem/PyGui/_TaskPanelFemMeshRegion.py index 4d45cf3e43..8012b0e5cc 100644 --- a/src/Mod/Fem/PyGui/_TaskPanelFemMeshRegion.py +++ b/src/Mod/Fem/PyGui/_TaskPanelFemMeshRegion.py @@ -140,7 +140,7 @@ class _TaskPanelFemMeshRegion: if not self.sel_server: # if we do not check, we would start a new SelectionObserver on every click on addReference button # but close only one SelectionObserver on leaving the task panel - import FemSelectionObserver + from . import FemSelectionObserver self.sel_server = FemSelectionObserver.FemSelectionObserver(self.selectionParser, print_message) def selectionParser(self, selection):