From 294939f471a82e0f91892e19e6adda1685a5c444 Mon Sep 17 00:00:00 2001 From: Przemo Firszt Date: Thu, 23 Apr 2015 22:13:14 +0100 Subject: [PATCH] FEM: Rename CalculixLib to ccxFrdReader Signed-off-by: Przemo Firszt --- src/Mod/Fem/App/CMakeLists.txt | 2 +- src/Mod/Fem/CMakeLists.txt | 2 +- src/Mod/Fem/Init.py | 2 +- src/Mod/Fem/MechanicalAnalysis.py | 4 ++-- src/Mod/Fem/{CalculixLib.py => ccxFrdReader.py} | 0 5 files changed, 5 insertions(+), 5 deletions(-) rename src/Mod/Fem/{CalculixLib.py => ccxFrdReader.py} (100%) diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt index ec6ea9d1b..d18d74d62 100755 --- a/src/Mod/Fem/App/CMakeLists.txt +++ b/src/Mod/Fem/App/CMakeLists.txt @@ -69,7 +69,7 @@ SOURCE_GROUP("Module" FILES ${Mod_SRCS}) SET(FemScripts_SRCS convert2TetGen.py - CalculixLib.py + ccxFrdReader.py ccxInpWriter.py MechanicalAnalysis.ui MechanicalAnalysis.py diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index 083a9dd92..253811ed9 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -10,7 +10,7 @@ INSTALL( Init.py InitGui.py convert2TetGen.py - CalculixLib.py + ccxFrdReader.py ccxInpWriter.py FemExample.py MechanicalAnalysis.py diff --git a/src/Mod/Fem/Init.py b/src/Mod/Fem/Init.py index a1de6c055..2507b989b 100755 --- a/src/Mod/Fem/Init.py +++ b/src/Mod/Fem/Init.py @@ -29,5 +29,5 @@ FreeCAD.addExportType("TetGen file (*.poly)","convert2TetGen") FreeCAD.addImportType("FEM formats (*.unv *.med *.dat *.bdf)","Fem") FreeCAD.addExportType("FEM formats (*.unv *.med *.dat *.inp)","Fem") -FreeCAD.addImportType("CalculiX result (*.frd)","CalculixLib") +FreeCAD.addImportType("CalculiX result (*.frd)","ccxFrdReader") FreeCAD.addImportType("Abaqus file (*.inp)","FemGui") diff --git a/src/Mod/Fem/MechanicalAnalysis.py b/src/Mod/Fem/MechanicalAnalysis.py index 6b98e50df..3826fb9f9 100644 --- a/src/Mod/Fem/MechanicalAnalysis.py +++ b/src/Mod/Fem/MechanicalAnalysis.py @@ -20,7 +20,7 @@ #* * #*************************************************************************** -import CalculixLib +import ccxFrdReader import FreeCAD import os import sys @@ -341,7 +341,7 @@ class _JobControlTaskPanel: if os.path.isfile(self.base_name + '.frd'): QApplication.setOverrideCursor(Qt.WaitCursor) - CalculixLib.importFrd(self.base_name + '.frd', FemGui.getActiveAnalysis()) + ccxFrdReader.importFrd(self.base_name + '.frd', FemGui.getActiveAnalysis()) QApplication.restoreOverrideCursor() self.femConsoleMessage("Loading results done!", "#00AA00") else: diff --git a/src/Mod/Fem/CalculixLib.py b/src/Mod/Fem/ccxFrdReader.py similarity index 100% rename from src/Mod/Fem/CalculixLib.py rename to src/Mod/Fem/ccxFrdReader.py