From 067659c23dfd66c930624f7e03e92ddf3a4a70db Mon Sep 17 00:00:00 2001
From: Bernd Hahnebach <bernd@bimstatik.org>
Date: Fri, 22 May 2020 01:08:12 +0200
Subject: [PATCH] FEM: python base VP, rename class and module

---
 src/Mod/Fem/CMakeLists.txt                                | 2 +-
 src/Mod/Fem/femguiobjects/ViewProviderFemConstraint.py    | 4 ++--
 src/Mod/Fem/femtools/migrate_app.py                       | 4 ++--
 .../view_base_femobject.py}                               | 8 ++++----
 src/Mod/Fem/femviewprovider/view_mesh_gmsh.py             | 6 +++---
 src/Mod/Fem/femviewprovider/view_mesh_result.py           | 4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)
 rename src/Mod/Fem/{femguiobjects/ViewProviderBaseObject.py => femviewprovider/view_base_femobject.py} (96%)

diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt
index b06fcbac5086..19e271b874fd 100755
--- a/src/Mod/Fem/CMakeLists.txt
+++ b/src/Mod/Fem/CMakeLists.txt
@@ -321,6 +321,7 @@ INSTALL(FILES ${FemObjectsScripts_SRCS} DESTINATION Mod/Fem/femobjects)
 # Python Gui packages and modules
 SET(FemGuiViewObjects_SRCS
     femviewprovider/__init__.py
+    femviewprovider/view_base_femobject.py
     femviewprovider/view_constraint_bodyheatsource.py
     femviewprovider/view_constraint_electrostaticpotential.py
     femviewprovider/view_constraint_flowvelocity.py
@@ -345,7 +346,6 @@ SET(FemGuiViewObjects_SRCS
 
 SET(FemGuiScripts_SRCS
     femguiobjects/__init__.py
-    femguiobjects/ViewProviderBaseObject.py
     femguiobjects/ViewProviderFemConstraint.py
 )
 
diff --git a/src/Mod/Fem/femguiobjects/ViewProviderFemConstraint.py b/src/Mod/Fem/femguiobjects/ViewProviderFemConstraint.py
index 7279172da143..9afa4f10393b 100644
--- a/src/Mod/Fem/femguiobjects/ViewProviderFemConstraint.py
+++ b/src/Mod/Fem/femguiobjects/ViewProviderFemConstraint.py
@@ -32,10 +32,10 @@
 
 from pivy import coin
 
-from . import ViewProviderBaseObject
+from femviewprovider import view_base_femobject
 
 
-class ViewProxy(ViewProviderBaseObject.ViewProxy):
+class ViewProxy(view_base_femobject.VPBaseFemObject):
     """Proxy View Provider for Pythons base constraint."""
 
     def attach(self, vobj):
diff --git a/src/Mod/Fem/femtools/migrate_app.py b/src/Mod/Fem/femtools/migrate_app.py
index 45b437ac2d2e..3d6a738eed24 100644
--- a/src/Mod/Fem/femtools/migrate_app.py
+++ b/src/Mod/Fem/femtools/migrate_app.py
@@ -364,8 +364,8 @@ def load_module(self, module):
             import femobjects.base_fempythonobject
             module._FemAnalysis = femobjects.base_fempythonobject.BaseFemPythonObject
             if FreeCAD.GuiUp:
-                import femguiobjects.ViewProviderBaseObject
-                module._ViewProviderFemAnalysis = femguiobjects.ViewProviderBaseObject.ViewProxy
+                import femviewprovider.view_base_femobject
+                module._ViewProviderFemAnalysis = femviewprovider.view_base_femobject.VPBaseFemObject
         if module.__name__ == "MechanicalMaterial":
             import femobjects.material_common
             module._MechanicalMaterial = femobjects.material_common.MaterialCommon
diff --git a/src/Mod/Fem/femguiobjects/ViewProviderBaseObject.py b/src/Mod/Fem/femviewprovider/view_base_femobject.py
similarity index 96%
rename from src/Mod/Fem/femguiobjects/ViewProviderBaseObject.py
rename to src/Mod/Fem/femviewprovider/view_base_femobject.py
index 0cf9fa0f5ff3..636ff140fdcb 100644
--- a/src/Mod/Fem/femguiobjects/ViewProviderBaseObject.py
+++ b/src/Mod/Fem/femviewprovider/view_base_femobject.py
@@ -26,9 +26,9 @@
 __author__ = "Markus Hovorka, Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
 
-## @package _BaseViewProvider
+## @package view_base_femobject
 #  \ingroup FEM
-#  \brief FreeCAD _Base ViewProvider for FEM workbench
+#  \brief view provider as base for all FEM objects
 
 from six import string_types
 
@@ -40,8 +40,8 @@
 False if FemGui.__name__ else True  # flake8, dummy FemGui usage
 
 
-class ViewProxy(object):
-    """Proxy View Provider for Pythons base constraint."""
+class VPBaseFemObject(object):
+    """Proxy View Provider for FEM FeaturePythons base constraint."""
 
     def __init__(self, vobj):
         vobj.Proxy = self
diff --git a/src/Mod/Fem/femviewprovider/view_mesh_gmsh.py b/src/Mod/Fem/femviewprovider/view_mesh_gmsh.py
index ac45cf44d23a..5ddc2c52f058 100644
--- a/src/Mod/Fem/femviewprovider/view_mesh_gmsh.py
+++ b/src/Mod/Fem/femviewprovider/view_mesh_gmsh.py
@@ -41,13 +41,13 @@
 import FreeCADGui
 
 import FemGui
-# from femguiobjects import ViewProviderBaseObject
+# from . import view_base_femobject
 from femobjects import mesh_gmsh
 from femtools.femutils import is_of_type
 
 
-# TODO use ViewProviderBaseObject see _ViewProviderFemMeshResult
-# class _ViewProviderFemMeshGmsh(ViewProviderBaseObject.ViewProxy):
+# TODO use VPBaseFemObject from view_base_femobject
+# class VPMeshGmsh(view_base_femobject.VPBaseFemObject):
 class VPMeshGmsh:
     """
     A View Provider for the MeshGmsh object
diff --git a/src/Mod/Fem/femviewprovider/view_mesh_result.py b/src/Mod/Fem/femviewprovider/view_mesh_result.py
index d4943eb4bc50..13d8b769b9a0 100644
--- a/src/Mod/Fem/femviewprovider/view_mesh_result.py
+++ b/src/Mod/Fem/femviewprovider/view_mesh_result.py
@@ -30,10 +30,10 @@
 #  \brief view provider for mesh result object
 
 
-from femguiobjects import ViewProviderBaseObject
+from . import view_base_femobject
 
 
-class VPFemMeshResult(ViewProviderBaseObject.ViewProxy):
+class VPFemMeshResult(view_base_femobject.VPBaseFemObject):
     """
     A View Provider for the MeshResult object
     """