Skip to content

Commit

Permalink
FEM: python base VP, rename class and module
Browse files Browse the repository at this point in the history
  • Loading branch information
berndhahnebach committed May 21, 2020
1 parent d911361 commit 067659c
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion src/Mod/Fem/CMakeLists.txt
Expand Up @@ -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
Expand All @@ -345,7 +346,6 @@ SET(FemGuiViewObjects_SRCS

SET(FemGuiScripts_SRCS
femguiobjects/__init__.py
femguiobjects/ViewProviderBaseObject.py
femguiobjects/ViewProviderFemConstraint.py
)

Expand Down
4 changes: 2 additions & 2 deletions src/Mod/Fem/femguiobjects/ViewProviderFemConstraint.py
Expand Up @@ -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):
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/Fem/femtools/migrate_app.py
Expand Up @@ -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
Expand Down
Expand Up @@ -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

Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/Mod/Fem/femviewprovider/view_mesh_gmsh.py
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/Fem/femviewprovider/view_mesh_result.py
Expand Up @@ -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
"""
Expand Down

0 comments on commit 067659c

Please sign in to comment.