Skip to content

Commit

Permalink
FEM: Move _ViewProviderFemAnalysis class to separate file
Browse files Browse the repository at this point in the history
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
  • Loading branch information
PrzemoF authored and wwmayer committed Oct 11, 2015
1 parent 0f71211 commit c5d0fd8
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 42 deletions.
1 change: 1 addition & 0 deletions src/Mod/Fem/App/CMakeLists.txt
Expand Up @@ -84,6 +84,7 @@ SET(FemScripts_SRCS
ShowDisplacement.ui
_ResultControlTaskPanel.py
_JobControlTaskPanel.py
_ViewProviderFemAnalysis.py
)
#SOURCE_GROUP("Scripts" FILES ${FemScripts_SRCS})

Expand Down
1 change: 1 addition & 0 deletions src/Mod/Fem/CMakeLists.txt
Expand Up @@ -26,6 +26,7 @@ INSTALL(
ShowDisplacement.ui
_ResultControlTaskPanel.py
_JobControlTaskPanel.py
_ViewProviderFemAnalysis.py
DESTINATION
Mod/Fem
)
Expand Down
44 changes: 2 additions & 42 deletions src/Mod/Fem/MechanicalAnalysis.py
Expand Up @@ -37,7 +37,8 @@ def makeMechanicalAnalysis(name):
'''makeFemAnalysis(name): makes a Fem Analysis object'''
obj = FreeCAD.ActiveDocument.addObject("Fem::FemAnalysisPython", name)
_FemAnalysis(obj)
_ViewProviderFemAnalysis()
import _ViewProviderFemAnalysis
_ViewProviderFemAnalysis._ViewProviderFemAnalysis()
#FreeCAD.ActiveDocument.recompute()
return obj

Expand Down Expand Up @@ -244,47 +245,6 @@ def __setstate__(self, state):
if state:
self.Type = state


class _ViewProviderFemAnalysis:
"A View Provider for the FemAnalysis container object"

def __init__(self):
#vobj.addProperty("App::PropertyLength", "BubbleSize", "Base", str(translate("Fem", "The size of the axis bubbles")))
pass

def getIcon(self):
return ":/icons/fem-analysis.svg"

def attach(self, vobj):
self.ViewObject = vobj
self.Object = vobj.Object
self.bubbles = None

def updateData(self, obj, prop):
return

def onChanged(self, vobj, prop):
return

def doubleClicked(self, vobj):
if not FemGui.getActiveAnalysis() == self.Object:
if FreeCADGui.activeWorkbench().name() != 'FemWorkbench':
FreeCADGui.activateWorkbench("FemWorkbench")
FemGui.setActiveAnalysis(self.Object)
return True
else:
import _JobControlTaskPanel
taskd = _JobControlTaskPanel._JobControlTaskPanel(self.Object)
FreeCADGui.Control.showDialog(taskd)
return True

def __getstate__(self):
return None

def __setstate__(self, state):
return None


# Helpers


Expand Down
45 changes: 45 additions & 0 deletions src/Mod/Fem/_ViewProviderFemAnalysis.py
@@ -0,0 +1,45 @@
import FreeCAD

if FreeCAD.GuiUp:
import FreeCADGui
import FemGui


class _ViewProviderFemAnalysis:
"A View Provider for the FemAnalysis container object"

def __init__(self):
#vobj.addProperty("App::PropertyLength", "BubbleSize", "Base", str(translate("Fem", "The size of the axis bubbles")))
pass

def getIcon(self):
return ":/icons/fem-analysis.svg"

def attach(self, vobj):
self.ViewObject = vobj
self.Object = vobj.Object
self.bubbles = None

def updateData(self, obj, prop):
return

def onChanged(self, vobj, prop):
return

def doubleClicked(self, vobj):
if not FemGui.getActiveAnalysis() == self.Object:
if FreeCADGui.activeWorkbench().name() != 'FemWorkbench':
FreeCADGui.activateWorkbench("FemWorkbench")
FemGui.setActiveAnalysis(self.Object)
return True
else:
import _JobControlTaskPanel
taskd = _JobControlTaskPanel(self.Object)
FreeCADGui.Control.showDialog(taskd)
return True

def __getstate__(self):
return None

def __setstate__(self, state):
return None

0 comments on commit c5d0fd8

Please sign in to comment.