Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
FEM: rename ObjectsTaskPanel into TaskPanelObjects
  • Loading branch information
berndhahnebach committed Nov 7, 2015
1 parent 7847c6f commit d10d18b
Show file tree
Hide file tree
Showing 14 changed files with 33 additions and 32 deletions.
10 changes: 5 additions & 5 deletions src/Mod/Fem/App/CMakeLists.txt
Expand Up @@ -78,8 +78,8 @@ SET(FemScripts_SRCS
MechanicalAnalysis.py
ShowDisplacement.ui
FemCommands.py
_ResultControlTaskPanel.py
_JobControlTaskPanel.py
_TaskPanelResultControl.py
_TaskPanelJobControl.py
_ViewProviderFemAnalysis.py
_FemAnalysis.py
_CommandMechanicalShowResult.py
Expand All @@ -93,21 +93,21 @@ SET(FemScripts_SRCS
_ViewProviderFemBeamSection.py
FemBeamSection.py
_CommandFemBeamSection.py
_FemBeamSectionTaskPanel.py
_TaskPanelFemBeamSection.py
FemBeamSection.ui

_FemShellThickness.py
_ViewProviderFemShellThickness.py
FemShellThickness.py
_CommandFemShellThickness.py
_FemShellThicknessTaskPanel.py
_TaskPanelFemShellThickness.py
FemShellThickness.ui

_MechanicalMaterial.py
_ViewProviderMechanicalMaterial.py
MechanicalMaterial.py
_CommandMechanicalMaterial.py
_MechanicalMaterialTaskPanel.py
_TaskPanelMechanicalMaterial.py
MechanicalMaterial.ui
)
#SOURCE_GROUP("Scripts" FILES ${FemScripts_SRCS})
Expand Down
11 changes: 6 additions & 5 deletions src/Mod/Fem/CMakeLists.txt
Expand Up @@ -7,6 +7,7 @@ endif(BUILD_GUI)

INSTALL(
FILES
# changes on the file list here needs to be made in App/CMakeLists.txt as well
Init.py
InitGui.py
convert2TetGen.py
Expand All @@ -20,8 +21,8 @@ INSTALL(
MechanicalAnalysis.ui
ShowDisplacement.ui
FemCommands.py
_ResultControlTaskPanel.py
_JobControlTaskPanel.py
_TaskPanelResultControl.py
_TaskPanelJobControl.py
_ViewProviderFemAnalysis.py
_FemAnalysis.py
_CommandMechanicalShowResult.py
Expand All @@ -35,21 +36,21 @@ INSTALL(
_ViewProviderFemBeamSection.py
FemBeamSection.py
_CommandFemBeamSection.py
_FemBeamSectionTaskPanel.py
_TaskPanelFemBeamSection.py
FemBeamSection.ui

_FemShellThickness.py
_ViewProviderFemShellThickness.py
FemShellThickness.py
_CommandFemShellThickness.py
_FemShellThicknessTaskPanel.py
_TaskPanelFemShellThickness.py
FemShellThickness.ui

_MechanicalMaterial.py
_ViewProviderMechanicalMaterial.py
MechanicalMaterial.py
_CommandMechanicalMaterial.py
_MechanicalMaterialTaskPanel.py
_TaskPanelMechanicalMaterial.py
MechanicalMaterial.ui

DESTINATION
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/Fem/_CommandMechanicalJobControl.py
Expand Up @@ -44,8 +44,8 @@ def __init__(self):
self.is_active = 'with_analysis'

def Activated(self):
import _JobControlTaskPanel
taskd = _JobControlTaskPanel._JobControlTaskPanel(FemGui.getActiveAnalysis())
import _TaskPanelJobControl
taskd = _TaskPanelJobControl._TaskPanelJobControl(FemGui.getActiveAnalysis())
#taskd.obj = vobj.Object
taskd.update()
FreeCADGui.Control.showDialog(taskd)
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/Fem/_CommandMechanicalShowResult.py
Expand Up @@ -49,8 +49,8 @@ def Activated(self):
QtGui.QMessageBox.critical(None, "Missing prerequisite", "No result found in active Analysis")
return

import _ResultControlTaskPanel
taskd = _ResultControlTaskPanel._ResultControlTaskPanel()
import _TaskPanelResultControl
taskd = _TaskPanelResultControl._TaskPanelResultControl()
FreeCADGui.Control.showDialog(taskd)


Expand Down
4 changes: 2 additions & 2 deletions src/Mod/Fem/_CommandQuickAnalysis.py
Expand Up @@ -62,8 +62,8 @@ def load_results(ret_code):
def show_results_on_mesh(self):
#FIXME proprer mesh refreshing as per FreeCAD.FEM_dialog settings required
# or confirmation that it's safe to call restore_result_dialog
import _ResultControlTaskPanel
tp = _ResultControlTaskPanel._ResultControlTaskPanel()
import _TaskPanelResultControl
tp = _TaskPanelResultControl._TaskPanelResultControl()
tp.restore_result_dialog()


Expand Down
Expand Up @@ -20,7 +20,7 @@
# * *
# ***************************************************************************

__title__ = "_FemBeamSectionTaskPanel"
__title__ = "_TaskPanelFemBeamSection"
__author__ = "Bernd Hahnebach"
__url__ = "http://www.freecadweb.org"

Expand All @@ -31,7 +31,7 @@
from PySide import QtCore


class _FemBeamSectionTaskPanel:
class _TaskPanelFemBeamSection:
'''The TaskPanel for editing References property of FemBeamSection objects'''
def __init__(self, obj):
FreeCADGui.Selection.clearSelection()
Expand Down
Expand Up @@ -20,7 +20,7 @@
# * *
# ***************************************************************************

__title__ = "_FemShellThicknessTaskPanel"
__title__ = "_TaskPanelFemShellThickness"
__author__ = "Bernd Hahnebach"
__url__ = "http://www.freecadweb.org"

Expand All @@ -31,7 +31,7 @@
from PySide import QtCore


class _FemShellThicknessTaskPanel:
class _TaskPanelFemShellThickness:
'''The TaskPanel for editing References property of FemShellThickness objects'''
def __init__(self, obj):
FreeCADGui.Selection.clearSelection()
Expand Down
Expand Up @@ -38,7 +38,7 @@
from PySide.QtGui import QApplication


class _JobControlTaskPanel:
class _TaskPanelJobControl:
def __init__(self, analysis_object):
self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/MechanicalAnalysis.ui")
self.fem_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem")
Expand Down
Expand Up @@ -20,7 +20,7 @@
# * *
# ***************************************************************************

__title__ = "_MechanicalMaterialTaskPanel"
__title__ = "_TaskPanelMechanicalMaterial"
__author__ = "Juergen Riegel, Bernd Hahnebach"
__url__ = "http://www.freecadweb.org"

Expand All @@ -31,7 +31,7 @@
from PySide import QtCore


class _MechanicalMaterialTaskPanel:
class _TaskPanelMechanicalMaterial:
'''The editmode TaskPanel for MechanicalMaterial objects'''
def __init__(self, obj):
FreeCADGui.Selection.clearSelection()
Expand Down
Expand Up @@ -36,7 +36,7 @@
from PySide.QtGui import QApplication


class _ResultControlTaskPanel:
class _TaskPanelResultControl:
'''The control for the displacement post-processing'''
def __init__(self):
self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/ShowDisplacement.ui")
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/Fem/_ViewProviderFemAnalysis.py
Expand Up @@ -33,8 +33,8 @@ def doubleClicked(self, vobj):
FemGui.setActiveAnalysis(self.Object)
return True
else:
import _JobControlTaskPanel
taskd = _JobControlTaskPanel(self.Object)
import _TaskPanelJobControl
taskd = _TaskPanelJobControl(self.Object)
FreeCADGui.Control.showDialog(taskd)
return True

Expand Down
4 changes: 2 additions & 2 deletions src/Mod/Fem/_ViewProviderFemBeamSection.py
Expand Up @@ -57,8 +57,8 @@ def onChanged(self, vobj, prop):
return

def setEdit(self, vobj, mode=0):
import _FemBeamSectionTaskPanel
taskd = _FemBeamSectionTaskPanel._FemBeamSectionTaskPanel(self.Object)
import _TaskPanelFemBeamSection
taskd = _TaskPanelFemBeamSection._TaskPanelFemBeamSection(self.Object)
taskd.obj = vobj.Object
FreeCADGui.Control.showDialog(taskd)
return True
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/Fem/_ViewProviderFemShellThickness.py
Expand Up @@ -57,8 +57,8 @@ def onChanged(self, vobj, prop):
return

def setEdit(self, vobj, mode=0):
import _FemShellThicknessTaskPanel
taskd = _FemShellThicknessTaskPanel._FemShellThicknessTaskPanel(self.Object)
import _TaskPanelFemShellThickness
taskd = _TaskPanelFemShellThickness._TaskPanelFemShellThickness(self.Object)
taskd.obj = vobj.Object
FreeCADGui.Control.showDialog(taskd)
return True
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/Fem/_ViewProviderMechanicalMaterial.py
Expand Up @@ -49,8 +49,8 @@ def onChanged(self, vobj, prop):
return

def setEdit(self, vobj, mode):
import _MechanicalMaterialTaskPanel
taskd = _MechanicalMaterialTaskPanel._MechanicalMaterialTaskPanel(self.Object)
import _TaskPanelMechanicalMaterial
taskd = _TaskPanelMechanicalMaterial._TaskPanelMechanicalMaterial(self.Object)
taskd.obj = vobj.Object
FreeCADGui.Control.showDialog(taskd)
return True
Expand Down

0 comments on commit d10d18b

Please sign in to comment.