From 56bf10afef48b6f2b5538842477391ec84567dfa Mon Sep 17 00:00:00 2001 From: Przemo Firszt Date: Thu, 2 Apr 2015 23:17:00 +0100 Subject: [PATCH] FEM: Replace duplicated code with print_mat_data function Signed-off-by: Przemo Firszt --- src/Mod/Fem/MechanicalMaterial.py | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/src/Mod/Fem/MechanicalMaterial.py b/src/Mod/Fem/MechanicalMaterial.py index fa232e4cb..8ed57fc80 100644 --- a/src/Mod/Fem/MechanicalMaterial.py +++ b/src/Mod/Fem/MechanicalMaterial.py @@ -134,6 +134,15 @@ class _MechanicalMaterialTaskPanel: self.update() + def print_mat_data(self, matmap): + print 'material data:' + if 'General_name' in matmap: + print ' Name = ', matmap['General_name'] + if 'Mechanical_youngsmodulus' in matmap: + print ' YM = ', matmap['Mechanical_youngsmodulus'] + if 'FEM_poissonratio' in matmap: + print ' PR = ', matmap['FEM_poissonratio'] + def transferTo(self): "Transfer from the dialog to the object" @@ -144,13 +153,7 @@ class _MechanicalMaterialTaskPanel: print self.form.comboBox_MaterialsInDir.currentText() self.obj.Material = matmap - print 'material data:' - if 'General_name' in matmap: - print ' Name = ', matmap['General_name'] - if 'Mechanical_youngsmodulus' in matmap: - print ' YM = ', matmap['Mechanical_youngsmodulus'] - if 'FEM_poissonratio' in matmap: - print ' PR = ', matmap['FEM_poissonratio'] + self.print_mat_data(matmap) def transferFrom(self): "Transfer from the object to the dialog" @@ -189,13 +192,7 @@ class _MechanicalMaterialTaskPanel: def reject(self): #print 'reject(self)' matmap = self.obj.Material - print 'material data:' - if 'General_name' in matmap: - print ' Name = ', matmap['General_name'] - if 'Mechanical_youngsmodulus' in matmap: - print ' YM = ', matmap['Mechanical_youngsmodulus'] - if 'FEM_poissonratio' in matmap: - print ' PR = ', matmap['FEM_poissonratio'] + self.print_mat_data(matmap) FreeCADGui.ActiveDocument.resetEdit() def saveMat(self):