FEM: import Z88 results, change module name to import...

FreeCAD · Jan 30, 2017 · 3f08dd5 · 3f08dd5
1 parent 469e391
commit 3f08dd5
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt
@@ -115,6 +115,7 @@ SET(FemScripts_SRCS
     importInpMesh.py
     importVTKResults.py
     importZ88Mesh.py
+    importZ88Results.py
     Init.py
     InitGui.py
     FemAnalysis.py
@@ -140,7 +141,6 @@ SET(FemScripts_SRCS
     FemMaterial.py
     FemSelectionObserver.py
     TestFem.py
-    z88DispReader.py
     TaskPanelFemBeamSection.ui
     TaskPanelFemMeshGmsh.ui
     TaskPanelFemMeshGroup.ui

diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt
@@ -116,7 +116,7 @@ INSTALL(
 
         # solver Z88
         importZ88Mesh.py
-        z88DispReader.py
+        importZ88Results.py
         FemInputWriterZ88.py
         FemToolsZ88.py
         FemSolverZ88.py

diff --git a/src/Mod/Fem/FemToolsZ88.py b/src/Mod/Fem/FemToolsZ88.py
@@ -190,11 +190,11 @@ def load_results(self):
 
     def load_results_o2(self):
         import os
-        import z88DispReader
+        import importZ88Results
         disp_result_file = self.working_dir + '/z88o2.txt'
         if os.path.isfile(disp_result_file):
             result_name_prefix = 'Z88_' + self.solver.AnalysisType + '_'
-            z88DispReader.import_z88_disp(disp_result_file, self.analysis, result_name_prefix)
+            importZ88Results.import_z88_disp(disp_result_file, self.analysis, result_name_prefix)
             for m in self.analysis.Member:
                 if m.isDerivedFrom("Fem::FemResultObject"):
                     self.results_present = True

diff --git a/src/Mod/Fem/Init.py b/src/Mod/Fem/Init.py
@@ -40,4 +40,4 @@
 FreeCAD.addImportType("Mesh from Calculix/Abaqus input file (*.inp)", "importInpMesh")
 FreeCAD.addImportType("Z88 mesh file (*.txt)", "importZ88Mesh")
 FreeCAD.addExportType("Z88 mesh file (*.txt)", "importZ88Mesh")
-FreeCAD.addImportType("Z88 displacement result file (*.txt)", "z88DispReader")
+FreeCAD.addImportType("Z88 result file (*.txt)", "importZ88Results")
diff --git a/src/Mod/Fem/z88DispReader.py → src/Mod/Fem/importZ88Results.py b/src/Mod/Fem/z88DispReader.py → src/Mod/Fem/importZ88Results.py
@@ -24,7 +24,7 @@
 __author__ = "Bernd Hahnebach "
 __url__ = "http://www.freecadweb.org"
 
-## @package z88DispReader
+## @package importZ88Results
 #  \ingroup FEM
 
 import FreeCAD
@@ -141,9 +141,9 @@ def read_z88_disp(z88_disp_input):
     pure usage:
     import FemToolsZ88
     fea = FemToolsZ88.FemToolsZ88()
-    import z88dispReader
+    import importZ88Results
     disp_file = '/pathtofile/z88o2.txt'
-    z88DispReader.import_z88_disp(disp_file , fea.analysis)
+    importZ88Results.import_z88_disp(disp_file , fea.analysis)
 
     The FreeCAD file needs to have an Analysis and an appropiate FEM Mesh
     '''