From f469b70654aea76cacf26fca26d2078a246a9b92 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Thu, 30 Sep 2021 13:02:52 -0500 Subject: [PATCH 1/2] [Fem] Clean up Fem.ts to remove extra translations --- src/Mod/Fem/Gui/Resources/translations/Fem.ts | 5621 ++++++++++++----- 1 file changed, 3940 insertions(+), 1681 deletions(-) diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem.ts b/src/Mod/Fem/Gui/Resources/translations/Fem.ts index 4f4a6ffe68..d2d8413c0e 100755 --- a/src/Mod/Fem/Gui/Resources/translations/Fem.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem.ts @@ -4,17 +4,12 @@ BoundarySelector - + Select Faces/Edges/Vertexes - - To add references select them in the 3D view and then click "Add". - - - - + To add references: select them in the 3D view and click "Add". @@ -22,47 +17,47 @@ ControlWidget - + Solver Control - + Working Directory - + Write - + Edit - + Elapsed Time: - + Run - + Re-write - + Re-run - + Abort @@ -70,67 +65,32 @@ GeometryElementsSelection - + Geometry reference selector for a - - Geometry reference selector for a - - - - + Add - - - Click on "Add" and select geometric elements to add them to the list. If no geometry is added to the list, all remaining ones are used. The following geometry elements are allowed to select: - - - - - Click on "Add" and select geometric elements to add them to the list. - - - - - The following geometry elements are allowed to select: - - Click on "Add" and select geometric elements to add them to the list.{}The following geometry elements are allowed to select: {}{}{} - - - If no geometry is added to the list, all remaining ones are used. - - - - - Click on "Add" and select geometric elements to add to the list. - - - - - Click on 'Add' and select geometric elements to add them to the list. - - {}If no geometry is added to the list, all remaining ones are used. - + Selection mode - + Solid @@ -138,17 +98,12 @@ SolidSelector - + Select Solids - - Select elements part of the solid that shall be added to the list. To than add the solid click "Add". - - - - + Select elements part of the solid that shall be added to the list. To add the solid click "Add". @@ -156,1310 +111,1421 @@ _Selector - + Add - + Remove - - FEM_Analysis - - - Analysis container - - - - - Creates an analysis container with standard solver CalculiX - - - - - FEM_ClippingPlaneAdd - - - Clipping plane on face - - - - - Add a clipping plane on a selected face - - - - - FEM_ClippingPlaneRemoveAll - - - Remove all clipping planes - - - - - FEM_ConstraintBodyHeatSource - - - Constraint body heat source - - - - - Creates a FEM constraint body heat source - - - - - FEM_ConstraintElectrostaticPotential - - - Constraint electrostatic potential - - - - - Creates a FEM constraint electrostatic potential - - - - - FEM_ConstraintFlowVelocity - - - Constraint flow velocity - - - - - Creates a FEM constraint flow velocity - - - - - FEM_ConstraintInitialFlowVelocity - - - Constraint initial flow velocity - - - - - Creates a FEM constraint initial flow velocity - - - - - FEM_ConstraintSelfWeight - - - Constraint self weight - - - - - Creates a FEM constraint self weight - - - - - FEM_ElementFluid1D - - - Fluid section for 1D flow - - - - - Creates a FEM Fluid section for 1D flow - - - - - FEM_ElementGeometry1D - - - Beam cross section - - - - - Creates a FEM beam cross section - - - - - FEM_ElementGeometry2D - - - Shell plate thickness - - - - - Creates a FEM shell plate thickness - - - - - FEM_ElementRotation1D - - - Beam rotation - - - - - Creates a FEM beam rotation - - - - - FEM_EquationElasticity - - - Elasticity equation - - - - - Creates a FEM equation for elasticity - - - - - FEM_EquationElectrostatic - - - Electrostatic equation - - - - - Creates a FEM equation for electrostatic - - - - - FEM_EquationFlow - - - Flow equation - - - - - Creates a FEM equation for flow - - - - - FEM_EquationFluxsolver - - - Fluxsolver equation - - - - - Creates a FEM equation for fluxsolver - - - - - FEM_EquationHeat - - - Fluxsolver heat - - - - - FEM_FEMMesh2Mesh - - - FEM mesh to mesh - - - - - Convert the surface of a FEM mesh to a mesh - - - - - FEM_MaterialFluid - - - Material for fluid - - - - - FEM material for Fluid - - - - - Creates a FEM material for Fluid - - - - - FEM_MaterialMechanicalNonlinear - - - Nonlinear mechanical material - - - - - Creates a nonlinear mechanical material - - - - - FEM_MaterialReinforced - - - Reinforced material (concrete) - - - - - FEM_MaterialSolid - - - Material for solid - - - - - FEM material for solid - - - - - FEM_MeshBoundaryLayer - - - FEM mesh boundary layer - - - - - Creates a FEM mesh boundary layer - - - - - FEM_MeshClear - - - Clear FEM mesh - - - - - Clear the Mesh of a FEM mesh object - - - - - FEM_MeshDisplayInfo - - - Display FEM mesh info - - - - - FEM_MeshGmshFromShape - - - FEM mesh from shape by Gmsh - - - - - Create a FEM mesh from a shape by Gmsh mesher - - - - - FEM mesh from shape by GMSH - - - - - Create a FEM mesh from a shape by GMSH mesher - - - - - FEM_MeshGroup - - - FEM mesh group - - - - - Creates a FEM mesh group - - - - - FEM_MeshNetgenFromShape - - - FEM mesh from shape by Netgen - - - - - FEM_MeshRegion - - - FEM mesh region - - - - - Creates a FEM mesh region - - - - - FEM_ResultShow - - - Show result - - - - - Shows and visualizes selected result data - - - - - FEM_ResultsPurge - - - Purge results - - - - - Purges all results from active analysis - - - - - FEM_SolverCalculiX - - - Solver CalculiX (experimental) - - - - - Creates a FEM solver CalculiX (experimental) - - - - - FEM_SolverCalculix - - - Solver CalculiX Standard - - - - - Creates a standard FEM solver CalculiX with ccx tools - - - - - Solver CalculiX - - - - - Creates a FEM solver CalculiX - - - - - FEM_SolverControl - - - Solver job control - - - - - Changes solver attributes and runs the calculations for the selected solver - - - - - FEM_SolverElmer - - - Solver Elmer - - - - - FEM_SolverRun - - - Run solver calculations - - - - - Runs the calculations for the selected solver - - - - - FEM_SolverZ88 - - - Solver Z88 - - - - - Creates a FEM solver Z88 - - - - - Fem_Command - - - Default Fem Command MenuText - - - - - Default Fem Command ToolTip - - - - - Material_Editor - - - Material editor - - - - - Opens the FreeCAD material editor - - - - - FEM_MeshFromShape - - - FEM mesh from shape by Netgen - - - - - Create a FEM volume mesh from a solid or face shape by Netgen internal mesher - - - - - FEM_MeshPrintInfo - - - Print FEM mesh info - - - - - FEM_BeamSection - - - Beam cross section - - - - - Creates a FEM beam cross section - - - - - FEM_FluidSection - - - Fluid section for 1D flow - - - - - Creates a FEM Fluid section for 1D flow - - - - - FEM_ShellThickness - - - Shell plate thickness - - - - - Creates a FEM shell plate thickness - - - - - Fem_Analysis - - - Analysis container - - - - - Creates a analysis container with standard solver CalculiX - - - - - New mechanical analysis - - - - - Create a new mechanical analysis - - - - - Fem_BeamSection - - - Beam cross section - - - - - Creates a FEM beam cross section - - - - - FEM Beam Cross Section Definition ... - - - - - Creates a FEM Beam Cross Section - - - - - Fem_ClearMesh - - - Clear FEM mesh - - - - - Clear the Mesh of a FEM mesh object - - - - - Fem_ConstraintSelfWeight - - - Constraint self weigt - - - - - Creates a FEM constraint self weigt - - - - - Fem_ControlSolver - - - Solver job control - - - - - Changes solver attributes and runs the calculations for the selected solver - - - - - Fem_FemMesh2Mesh - - - FEM mesh to mesh - - - - - Convert the surface of a FEM mesh to a mesh - - - - - Fem_MaterialMechanicalNonlinear - - - Nonlinear mechanical material - - - - - Creates a nonlinear mechanical material - - - - - Fem_MechanicalMaterial - - - Mechanical material - - - - - Mechanical material... - - - - - Creates a mechanical material - - - - - Creates or edit the mechanical material definition. - - - - - Fem_MeshFromShape - - - FEM mesh from shape by Netgen - - - - - Create a FEM volume mesh from a solid or face shape by Netgen internal mesher - - - - - Fem_MeshGmshFromShape - - - FEM mesh from shape by GMSH - - - - - Create a FEM mesh from a shape by GMSH mesher - - - - - Fem_MeshRegion - - - FEM mesh region - - - - - Creates a FEM mesh region - - - - - Fem_PrintMeshInfo - - - Print FEM mesh info - - - - - Fem_PurgeResults - - - Purge results - - - - - Purge results from an analysis - - - - - Purges all results from active analysis - - - - - Fem_RunAnalysis - - - Run solver calculations - - - - - Runs the calculations for the selected solver - - - - - Fem_ShellThickness - - - Shell plate thickness - - - - - Creates a FEM shell plate thickness - - - - - FEM Shell Plate Thickness Definition ... - - - - - Creates a FEM Shell Thickness - - - - - Fem_ShowResult - - - Show result - - - - - Show result information of an analysis - - - - - Shows and visualizes selected result data - - - - - Fem_SolverCalculix - - - Solver CalculiX - - - - - Creates a FEM solver CalculiX - - - - - Create FEM Solver CalculiX ... - - - - - Creates FEM Solver CalculiX - - - - - Fem_SolverZ88 - - - Solver Z88 - - - - - Creates a FEM solver Z88 - - - - - Fem_CreateFromShape - - - Create FEM mesh - - - - - Create FEM mesh from shape - - - - - Fem_NewMechanicalAnalysis - - - New mechanical analysis - - - - - Create a new mechanical analysis - - - - - Fem_Quick_Analysis - - - Run CalculiX ccx - - - - - Write .inp file and run CalculiX ccx - - - - - Fem_SolverJobControl - - - Start solver job control - - - - - Dialog to start the calculation of the selected solver - - - - - Fem_JobControl - - - Start solver job control - - - - - Dialog to start the calculation of the selected solver - - - - - Fem_Material - - - Mechanical material... - - - - - Creates or edit the mechanical material definition. - - - - - Fem_Result - - - Show result - - - - - Show result information of an analysis - - - - - CmdFemAddPart - - - Fem - Fem - - - - - Add a part to the Analysis - Add a part to the Analysis - - CmdFemConstraintBearing - + Fem - Fem + - - Create FEM bearing constraint - Create FEM bearing constraint + + Constraint bearing + - - Create FEM constraint for a bearing - Create FEM constraint for a bearing + + Creates a FEM constraint for a bearing + + + + + CmdFemConstraintContact + + + Fem + + + + + Constraint contact + + + + + Creates a FEM constraint for contact between faces + CmdFemConstraintDisplacement - + Fem - Fem + - - Create FEM displacement constraint - Create FEM displacement constraint + + Constraint displacement + - - Create FEM constraint for a displacement acting on a face - Create FEM constraint for a displacement acting on a face + + Creates a FEM constraint for a displacement acting on a geometric entity + CmdFemConstraintFixed - + Fem - Fem + - - Create FEM fixed constraint - Create FEM fixed constraint + + Constraint fixed + - - Create FEM constraint for a fixed geometric entity - Create FEM constraint for a fixed geometric entity + + Creates a FEM constraint for a fixed geometric entity + + + + + CmdFemConstraintFluidBoundary + + + Fem + + + + + Fluid boundary condition + + + + + Create fluid boundary condition on face entity for Computional Fluid Dynamics + CmdFemConstraintForce - + Fem - Fem + - - Create FEM force constraint - Create FEM force constraint + + Constraint force + - - Create FEM constraint for a force acting on a geometric entity - Create FEM constraint for a force acting on a geometric entity + + Creates a FEM constraint for a force acting on a geometric entity + CmdFemConstraintGear - + Fem - Fem + - - Create FEM gear constraint - Create FEM gear constraint + + Constraint gear + - - Create FEM constraint for a gear - Create FEM constraint for a gear + + Creates a FEM constraint for a gear + + + + + CmdFemConstraintHeatflux + + + Fem + + + + + Constraint heatflux + + + + + Creates a FEM constraint for a heatflux acting on a face + + + + + CmdFemConstraintInitialTemperature + + + Fem + + + + + Constraint initial temperature + + + + + Creates a FEM constraint for initial temperature acting on a body + + + + + CmdFemConstraintPlaneRotation + + + Fem + + + + + Constraint plane rotation + + + + + Creates a FEM constraint for plane rotation face + CmdFemConstraintPressure - + Fem - Fem + - - Create FEM pressure constraint - Create FEM pressure constraint + + Constraint pressure + - - Create FEM constraint for a pressure acting on a face - Create FEM constraint for a pressure acting on a face + + Creates a FEM constraint for a pressure acting on a face + CmdFemConstraintPulley - + Fem - Fem + - - Create FEM pulley constraint - Create FEM pulley constraint + + Constraint pulley + - - Create FEM constraint for a pulley - Create FEM constraint for a pulley + + Creates a FEM constraint for a pulley + - CmdFemCreateAnalysis + CmdFemConstraintSpring - + Fem - Fem + - - - Create a FEM analysis - Create a FEM analysis + + Constraint spring + + + + + Creates a FEM constraint for a spring acting on a face + + + + + CmdFemConstraintTemperature + + + Fem + + + + + Constraint temperature + + + + + Creates a FEM constraint for a temperature/concentrated heat flux acting on a face + + + + + CmdFemConstraintTransform + + + Fem + + + + + Constraint transform + + + + + Create FEM constraint for transforming a face + CmdFemCreateNodesSet - + Fem - Fem + - - - Define/create a nodes set... - Define/create a nodes set... + + Nodes set + - + + Creates a FEM mesh nodes set + + + + Wrong selection - Verkeerde keuse + - + Select a single FEM mesh or nodes set, please. - Select a single FEM mesh or nodes set, please. - - - - CmdFemCreateSolver - - - Fem - Fem - - - - - Add a solver to the Analysis - Add a solver to the Analysis + CmdFemDefineNodesSet - + Fem - Fem + - - - + + Node set by poly + + + + + Create node set by Poly - Create node set by Poly + - FemGui::DlgSettingsFemImp + CmdFemPostApllyChanges - - FEM - FEM + + Fem + - + + Apply changes to pipeline + + + + + Apply changes to parameters directly and not on recompute only... + + + + + CmdFemPostClipFilter + + + Fem + + + + + Region clip filter + + + + + Define/create a clip filter which uses functions to define the cliped region + + + + + Wrong selection + + + + + Select a pipeline, please. + + + + + CmdFemPostCreateDataAtPointFilter + + + Data At Point + + + + + CmdFemPostCutFilter + + + Fem + + + + + Function cut filter + + + + + Cut the data along an implicit function + + + + + CmdFemPostDataAlongLineFilter + + + Fem + + + + + Line clip filter + + + + + Define/create a clip filter which clips a field along a line + + + + + CmdFemPostDataAtPointFilter + + + Fem + + + + + Data at point clip filter + + + + + Define/create a clip filter which clips a field data at point + + + + + CmdFemPostFunctions + + + Fem + + + + + Filter functions + + + + + Functions for use in postprocessing filter... + + + + + Plane + + + + + Sphere + + + + + CmdFemPostLinearizedStressesFilter + + + Fem + + + + + Stress linearization plot + + + + + Define/create stress linearization plots + + + + + + Wrong selection + + + + + + Select a Clip filter which clips a STRESS field along a line, please. + + + + + CmdFemPostPipelineFromResult + + + Fem + + + + + Post pipeline from result + + + + + Creates a post processing pipeline from a result object + + + + + Wrong selection type + + + + + Select a result object, please. + + + + + CmdFemPostScalarClipFilter + + + Fem + + + + + Scalar clip filter + + + + + Define/create a clip filter which clips a field with a scalar value + + + + + CmdFemPostWarpVectorFilter + + + Fem + + + + + Warp filter + + + + + Warp the geometry along a vector field by a certain factor + + + + + Command + + + Make FEM constraint for bearing + + + + + Make FEM constraint contact on face + + + + + Make FEM constraint displacement on face + + + + + Make FEM constraint fixed geometry + + + + + Create fluid boundary condition + + + + + Make FEM constraint force on geometry + + + + + Make FEM constraint for gear + + + + + Make FEM constraint heatflux on face + + + + + Make FEM constraint initial temperature on body + + + + + Make FEM constraint Plane Rotation face + + + + + Make FEM constraint pressure on face + + + + + Make FEM constraint spring on face + + + + + Make FEM constraint for pulley + + + + + Make FEM constraint temperature on face + + + + + Make FEM constraint transform on face + + + + + Place robot + + + + + Edit nodes set + + + + + Create nodes set + + + + + Create filter + + + + + Create function + + + + + Create pipeline from result + + + + + Edit Mirror + + + + + Dialog + + + + + Dialog + + + + + Mesh groups detected. Please choose values for the different groups. + + + + + Id + + + + + Label + + + + + Elements + + + + + Not Marked + + + + + Marked + + + + + Select the vertices, lines and surfaces: + + + + + + Temperature: + + + + + + 25 + + + + + + ºC + + + + + Add + + + + + Remove + + + + + Insert component's + initial temperature: + + + + + FEM_PostCreateFunctions + + + Create a plane function, defined by its origin and normal + + + + + Create a sphere function, defined by its center and radius + + + + + FemGui::DlgSettingsFemCcxImp + + + CalculiX - CalculiX + - - Use internal editor for .inp files - Use internal editor for .inp files - - - - External editor: - External editor: - - - + Leave blank to use default CalculiX ccx binary file - Leave blank to use default CalculiX ccx binary file + - - ccx binary - ccx binary + + Input file Editor + - - Working directory - Working directory + + Use internal editor for *.inp files + - - Default analysis settings - Default analysis settings + + External editor: + - - Default type on analysis - Default type on analysis + + Search in known binary directories + - - Static - Static + + ccx binary path + - - Frequency - Frequency + + Input file splitting + - - Eigenmode number - Eigenmode number + + Split writing of *.inp + - + + CalculiX binary + + + + + Analysis defaults + + + + Type - Soort + - + + Default type on analysis + + + + + Static + + + + + Frequency + + + + + Thermomech + + + + + Solver defaults + + + + + Time incrementation control parameter + + + + + Use non ccx defaults + + + + + Use non-linear geometry + + + + + Matrix solver + + + + + Number of CPU's to use (Spooles only) + + + + + Non-linear geometry + + + + + Default + + + + + Spooles + + + + + Iterative Scaling + + + + + Iterative Cholesky + + + + + Time Initial Step + + + + + Time End + + + + + 3D Output, unchecked for 2D + + + + + Beam, shell element 3D output format + + + + + Thermo mechanical defaults + + + + + Maximum number of iterations + + + + + Use steady state + + + + + Analysis type (transient or steady state) + + + + + Frequency defaults + + + + + Eigenmode number + + + + High frequency limit - High frequency limit + - + Low frequency limit - Low frequency limit + - - + + Hz - Hz + + + + + FemGui::DlgSettingsFemElmerImp + + + Elmer + - - Materials - Materials + + Elmer binaries + - + + Leave blank to use default ElmerGrid binary file + + + + + ElmerSolver binary path + + + + + ElmerGrid binary path + + + + + ElmerGrid: + + + + + + Search in known binary directories + + + + + ElmerSolver: + + + + + Leave blank to use default Elmer elmer binary file + + + + + FemGui::DlgSettingsFemExportAbaqus + + + INP + + + + + Export + + + + + Mesh groups are exported too. +Every constraint and, if there are different materials, material +consists of two mesh groups, faces and nodes where the +constraint or material is applied. + + + + + Export group data + + + + + All: All elements will be exported. + +Highest: Only the highest elements will be exported. This means +for means volumes for a volume mesh and faces for a shell mesh. + +FEM: Only FEM elements will be exported. This means only edges +not belonging to faces and faces not belonging to volumes. + + + + + element parameter: All: all elements, highest: highest elements only, FEM: FEM elements only (only edges not belonging to faces and faces not belonging to volumes) + + + + + All + + + + + Highest + + + + + FEM + + + + + Which mesh elements to export + + + + + FemGui::DlgSettingsFemGeneralImp + + + General + + + + + Working directory for solving analysis and gmsh meshing + + + + + sdfsdfsdfds + + + + + Temporary directories + + + + + Let the application manage (create, delete) the working directories for all solver. Use temporary directories. + + + + + Beside .FCStd file + + + + + Create a directory in the same folder in which the FCStd file of the document is located. Use Subfolder for each solver (e.g. for a file ./mydoc.FCStd and a solver with the label Elmer002 use ./mydoc/Elmer002). + + + + + Use custom directory + + + + + Use directory set below. Create own subdirectory for every solver. Name directory after the solver label prefixed with the document name. + + + + + Path: + + + + + Overwrite solver working directory with the directory chosen above + + + + + Mesh + + + + + Create mesh groups for analysis reference shapes (highly experimental) + + + + + Results + + + + + Keep results on calculation re-run + + + + + Restore result dialog settings + + + + + Hide constraints when open result dialog + + + + + FemGui::DlgSettingsFemGmshImp + + + Gmsh + + + + + Gmsh binary + + + + + Search in known binary directories + + + + + gmsh + + + + + gmsh binary path + + + + + Leave blank to use default gmsh binary file + + + + + FemGui::DlgSettingsFemInOutVtk + + + VTK + + + + + Import + + + + + Which object to import into + + + + + VTK result object: A FreeCAD FEM VTK result object will be imported +(equals to the object which was exported). + +FEM mesh object: The results in the VTK file will be omitted, only the +mesh data will be imported and a FreeCAD FEM mesh object will be created. + +FreeCAD result object: The imported data will be converted into a +FreeCAD FEM Result object. Note: this setting needs the exact result +component names and thus it only works properly with VTK files +exported from FreeCAD. + + + + + Choose in which object to import into + + + + + VTK result object + + + + + FEM mesh object + + + + + FreeCAD result object + + + + + FemGui::DlgSettingsFemMaterialImp + + + Material + + + + + Card resources + + + + Use built-in materials - Use built-in materials + - - Use materials from .FreeCAD/Materials directory - Use materials from .FreeCAD/Materials directory + + Use materials from Materials directory in users FreeCAD user pref directory. + - + Use materials from user defined directory - Use materials from user defined directory + - + User directory - User directory + + + + + Card sorting and duplicates + + + + + Delete card duplicates + + + + + Sort by resources (opposite would be sort by cards) + + + + + FemGui::DlgSettingsFemMystranImp + + + + Mystran + + + + + Mystran binary + + + + + Search in known binary directories + + + + + Mystran binary path + + + + + Leave blank to use default Mystran binary file location + + + + + Comments + + + + + write comments to input file + + + + + FemGui::DlgSettingsFemZ88Imp + + + Z88 + + + + + Z88 binary + + + + + Search in known binary directories + + + + + z88r + + + + + z88r binary path + + + + + Leave blank to use default Z88 z88r binary file + FemGui::TaskAnalysisInfo - + Nodes set - Nodes set + FemGui::TaskCreateNodeSet - + Nodes set - Nodes set + FemGui::TaskDlgFemConstraint - - + + Input error - Invoerfout + - + You must specify at least one reference - You must specify at least one reference + FemGui::TaskDlgFemConstraintBearing - + Input error - Invoerfout + + + + + FemGui::TaskDlgFemConstraintContact + + + Input error + @@ -1467,691 +1533,2019 @@ Input error - Invoerfout + + + + + FemGui::TaskDlgFemConstraintFluidBoundary + + + Input error + FemGui::TaskDlgFemConstraintForce - - + + Input error - Invoerfout + - + Please specify a force greater than 0 - Please specify a force greater than 0 + FemGui::TaskDlgFemConstraintGear - + Input error - Invoerfout + + + + + FemGui::TaskDlgFemConstraintHeatflux + + + Input error + + + + + FemGui::TaskDlgFemConstraintInitialTemperature + + + + Input error + FemGui::TaskDlgFemConstraintPressure - - + Input error - Invoerfout - - - - Please specify a pressure greater than 0 - Please specify a pressure greater than 0 + FemGui::TaskDlgFemConstraintPulley - + Input error - Invoerfout + + + + + FemGui::TaskDlgFemConstraintSpring + + + Input error + + + + + FemGui::TaskDlgFemConstraintTemperature + + + Input error + + + + + FemGui::TaskDlgFemConstraintTransform + + + Input error + FemGui::TaskDlgMeshShapeNetgen - + Edit FEM mesh - Edit FEM mesh + - + Meshing failure - Meshing failure + + + + + FemGui::TaskDlgPost + + + Input error + FemGui::TaskDriver - + Nodes set - Nodes set + FemGui::TaskFemConstraint - + FEM constraint parameters - FEM constraint parameters + + + + + Delete + FemGui::TaskFemConstraintBearing - - Delete - Vee uit - - - - - - - - + + + + + + Selection error - Selection error + - + Please use only a single reference for bearing constraint - Please use only a single reference for bearing constraint + - + Only faces can be picked - Only faces can be picked + - + Only cylindrical faces can be picked - Only cylindrical faces can be picked + - + Only planar faces can be picked - Only planar faces can be picked + - + Only linear edges can be picked - Only linear edges can be picked + - + Only faces and edges can be picked - Only faces and edges can be picked + + + + + FemGui::TaskFemConstraintContact + + + + Delete + + + + + + + + + + + + + + + + + + + + + Selection error + + + + + Only one face in object! - moved to master face + + + + + + Only one master face and one slave face for a contact constraint! + + + + + + + + Nothing selected! + + + + + + Only one slave face for a contact constraint! + + + + + + + + Selected object is not a part! + + + + + + Only faces can be picked + + + + + Only one master for a contact constraint! + + + + + Only one master face for a contact constraint! + FemGui::TaskFemConstraintDisplacement - - Delete - Vee uit - - - - - - + + + + + Selection error - Selection error + - - + + Nothing selected! - Nothing selected! + - - + + Selected object is not a part! - Selected object is not a part! + + + + + Only one type of selection (vertex,face or edge) per constraint allowed! + FemGui::TaskFemConstraintFixed - - Delete - Vee uit - - - - + + + + + Selection error - Selection error + - - Mixed shape types are not possible. Use a second constraint instead - Mixed shape types are not possible. Use a second constraint instead + + + Nothing selected! + - - Only faces, edges and vertices can be picked - Only faces, edges and vertices can be picked + + + Selected object is not a part! + + + + + Only one type of selection (vertex,face or edge) per constraint allowed! + + + + + FemGui::TaskFemConstraintFluidBoundary + + + Basic + + + + + Turbulence + + + + + Thermal + + + + + select boundary type, faces and set value + + + + + Intensity [0~1] + + + + + Dissipation Rate [m2/s3] + + + + + Length Scale[m] + + + + + Viscosity Ratio [1] + + + + + Hydraulic Diameter [m] + + + + + + Gradient [K/m] + + + + + Flux [W/m2] + + + + + Empty selection + + + + + Select an edge or a face, please. + + + + + + + + + Wrong selection + + + + + Selected object is not a part object! + + + + + Only one planar face or edge can be selected! + + + + + Only planar faces can be picked for 3D + + + + + Only planar edges can be picked for 2D + + + + + Only faces for 3D part or edges for 2D can be picked + + + + + + + + + Selection error + + + + + + Nothing selected! + + + + + + Selected object is not a part! + + + + + Only one type of selection (vertex,face or edge) per constraint allowed! + FemGui::TaskFemConstraintForce - - Delete - Vee uit - - - - Point load - Point load - - - - Line load - Line load - - - - Area load - Area load - - - - - - - + + + + + Selection error - Selection error + - - Mixed shape types are not possible. Use a second constraint instead - Mixed shape types are not possible. Use a second constraint instead + + + Nothing selected! + - - Only faces, edges and vertices can be picked - Only faces, edges and vertices can be picked + + + Selected object is not a part! + - - Only planar faces can be picked - Only planar faces can be picked + + Only one type of selection (vertex,face or edge) per constraint allowed! + - - Only linear edges can be picked - Only linear edges can be picked + + + Wrong selection + - - Only faces and edges can be picked - Only faces and edges can be picked + + Select an edge or a face, please. + FemGui::TaskFemConstraintGear - - - + + + Selection error - Selection error + - + Only planar faces can be picked - Only planar faces can be picked + - + Only linear edges can be picked - Only linear edges can be picked + - + Only faces and edges can be picked - Only faces and edges can be picked + + + + + FemGui::TaskFemConstraintHeatflux + + + + + + + + Selection error + + + + + + Nothing selected! + + + + + + Selected object is not a part! + + + + + + Selection must only consist of faces! + + + + + FemGui::TaskFemConstraintPlaneRotation + + + + + + + + + + Selection error + + + + + + Only one face can be selected for a plane rotation constraint! + + + + + + Nothing selected! + + + + + + Selected object is not a part! + + + + + Only faces can be picked + + + + + Only planar faces can be picked + FemGui::TaskFemConstraintPressure - - Delete - Vee uit - - - + + + + + Selection error - Selection error + - + + + Nothing selected! + + + + + + Selected object is not a part! + + + + Only faces can be picked - Only faces can be picked + FemGui::TaskFemConstraintPulley - + Pulley diameter - Pulley diameter + - + Torque [Nm] - Torque [Nm] + + + + + FemGui::TaskFemConstraintSpring + + + + + + + Selection error + + + + + + Nothing selected! + + + + + + Selected object is not a part! + + + + + Only faces can be picked + + + + + FemGui::TaskFemConstraintTemperature + + + + + + Selection error + + + + + + Nothing selected! + + + + + + Selected object is not a part! + + + + + FemGui::TaskFemConstraintTransform + + + Constraint update error + + + + + The transformable faces have changed. Please add only the transformable faces and remove non-transformable faces! + + + + + + + + + + + + + + Selection error + + + + + + Nothing selected! + + + + + + Only one face for rectangular transform constraint! + + + + + + Selected object is not a part! + + + + + Only one face for transform constraint! + + + + + Only faces can be picked + + + + + Only cylindrical faces can be picked + + + + + Only transformable faces can be selected! Apply displacement constraint to surface first then apply constraint to surface + FemGui::TaskObjectName - + TaskObjectName - TaskObjectName + + + + + FemGui::TaskPostClip + + + Clip region, choose implicit function + + + + + FemGui::TaskPostCut + + + Function cut, choose implicit function + + + + + FemGui::TaskPostDataAlongLine + + + Data along a line options + + + + + FemGui::TaskPostDataAtPoint + + + Data at point options + + + + + FemGui::TaskPostDisplay + + + Result display options + + + + + FemGui::TaskPostFunction + + + Implicit function + + + + + FemGui::TaskPostScalarClip + + + Scalar clip options + + + + + FemGui::TaskPostWarpVector + + + Warp options + FemGui::TaskTetParameter - + Tet Parameter - Tet Parameter + FemGui::ViewProviderFemAnalysis - + Activate analysis - Activate analysis + FemGui::ViewProviderFemMeshShapeNetgen - + Meshing failure - Meshing failure + - + The FEM module is built without NETGEN support. Meshing will not work!!! - The FEM module is built without NETGEN support. Meshing will not work!!! + + + + + FemMaterial + + + + FEM material + + + + + + + Material + + + + + Category + + + + + choose... + + + + + Material card + + + + + Material name + + + + + + + TextLabel + + + + + Material Description + + + + + Editing material + + + + + use FreeCAD material editor + + + + + use this task panel + + + + + Basic Properties + + + + + Density + + + + + 8000 kg/m^3 + + + + + Mechanical Properties + + + + + Young's Modulus: + + + + + 200 GPa + + + + + Poisson Ratio: + + + + + Fluidic Properties + + + + + Kinematic viscosity: + + + + + 0.000001 m^2/s + + + + + Thermal Properties + + + + + Thermal Conductivity: + + + + + 50 W/m/K + + + + + Expansion Coefficient: + + + + + 12 um/m/K + + + + + Specific Heat: + + + + + 500 J/kg/K + + + + + Vol Expansion Coeff + + + + + 0.001 m/m/K + + + + + Matrix Material + + + + + + Choose + + + + + + Name + + + + + + Edit + + + + + + Properties + + + + + + Description + + + + + Reinforcement Material + Form - - + Form - Vorm + - - Cross Section - Cross Section + + Fluid Section Parameter + - - - Use FreeCAD Property Editor - Use FreeCAD Property Editor + + Liquid Section Parameter + - - to edit the cross section values - to edit the cross section values + + Pipe Area + - - - References - References + + + + + + + + + + + + + 0 mm^2 + - - - Leave references blank - Leave references blank + + + Hydraulic Radius + - - - to choose all remaining shapes - to choose all remaining shapes + + + + 0 mm + - - - Add reference - Add reference + + Manning Coefficient + - - Thickness - Dikte + + + Initial Area + - - to edit the thickness value - to edit the thickness value + + Enlarged Area + + + + + Contracted Area + + + + + Inlet Pressure + + + + + + Pressure + + + + + Inlet Mass Flow Rate + + + + + + Mass flow rate + + + + + + 1 kg/s + + + + + Outlet Pressure + + + + + Outlet Mass Flow Rate + + + + + + + + + Pipe Area + + + + + Entrance Area + + + + + Diaphragm Area + + + + + Bend Radius/Pipe Diameter + + + + + Bend Angle + + + + + Head loss coefficient + + + + + Gate valve closing coefficient + + + + + Pump Characteristic + + + + + 1 + + + + + 2 + + + + + 3 + + + + + 4 + + + + + 5 + + + + + Flow rate [mm^3/s] + + + + + Head Loss[mm] + + + + + Grain diameter + + + + + Cross section form factor + + + + + Gas Section Parameter + + + + + Open Channel Section Parameter + + + + + Centrif parameter + + + + + + + + + Parameter + + + + + Rotation frequency f<sub>rot</sub> [rps] + + + + + revolutions per second + + + + + + + + + + + + + + 0.0 + + + + + 1/s + + + + + SectionPrint parameter + + + + + Tie parameter + + + + + Tolerance: + + + + + + + Constraint Properties + + + + + Potential: + + + + + Potential Constant + + + + + Farfield / Electric infinity + + + + + + + + + + + + unspecified + + + + + V + + + + + Capacity Body: + Enabled by 'Calculate Capacity Matrix' in Electrostatic equation + + + + + Calculate Electric Force + + + + + Beam section parameter + + + + + + Cross section parameter + + + + + Width: + + + + + Height: + + + + + + Diameter: + + + + + Thickness: + + + + + Shell thickness parameter + + + + + Thickness: + + + + + Beam section rotation + + + + + Rotation: + + + + + + Velocity x: + + + + + + Velocity y: + + + + + + Velocity z: + + + + + + + + + + m/s + + + + + normal to boundary + + + + + Mesh boundary layer settings + + + + + Max Layers + + + + + 1.0 + + + + + Min/1st thickness + + + + + Growth ratio + + + + + Mesh group + + + + + Identifier used for mesh export + + + + + Name + + + + + Label + + + + + Mesh region + + + + + Max element size: + - MechanicalMaterial + GmshMesh - - Mechanical analysis - Mechanical analysis + + FEM Mesh by Gmsh + - - Working directory - Working directory + + FEM Mesh Parameter + - - ... - ... + + Element dimension: + - - Analysis type - Analysis type + + Max element size (0.0 = Auto): + - - Static - Static + + + 0.0 + - - Frequency - Frequency + + Min element size (0.0 = Auto): + - - Write .inp file - Write .inp file + + Element order: + - - Edit .inp file - Edit .inp file + + Gmsh + - - Run Calculix - Run Calculix - - - + Time: - Time: + - - Mechanical material - Mechanical material + + Gmsh version + + + + + PlaneWidget + + + Form + - - Material - Materiaal + + Origin + - - choose... - choose... - - - - Material Description - Material Description - - - - References - References - - - - Leave references blank - Leave references blank - - - - to choose all remaining shapes - to choose all remaining shapes - - - - Add reference - Add reference - - - - Properties - Properties - - - - Young's Modulus: - Young's Modulus: - - - - Poisson Ratio: - Poisson Ratio: - - - - Density - Density - - - - External material resources - External material resources - - - - MatWeb database... - MatWeb database... + + Normal + QObject - + No active Analysis - No active Analysis + - + You need to create or activate a Analysis - You need to create or activate a Analysis + - - - - - - Wrong selection - Verkeerde keuse - - - - - - Your FreeCAD is build without NETGEN support. Meshing will not work.... - Your FreeCAD is build without NETGEN support. Meshing will not work.... - - - - - Select an edge, face or body. Only one body is allowed. - Kies 'n rand, vlak of liggaam. Slegs een liggaam word toegelaat. - - - - - Wrong object type - Verkeerde voorwerpsoort - - - - - Fillet works only on parts - Ronding werk slegs op onderdele - - - + Ok - Ok + - + Cancel - Kanselleer + - + Edit constraint - Edit constraint + - - - - - + + + + + + + + A dialog is already open in the task panel - 'n Dialoog is reeds oop in die taakpaneel + - - - - - + + + + + + + + Do you want to close this dialog? - Wil jy hierdie dialoog toe maak? + - + Meshing - Meshing + - + Constraint force - Constraint force + - - - Constraint normal stress - Constraint normal stress + + + + + + + + FEM + - - [Nodes: %1, Edges: %2, Faces: %3, Polygons: %4, Volumes: %5, Polyhedrons: %6] - [Nodes: %1, Edges: %2, Faces: %3, Polygons: %4, Volumes: %5, Polyhedrons: %6] + + + Import-Export + + + + + [Nodes: %1, Edges: %2, Faces: %3, Polygons: %4, Volumes: %5, Polyhedrons: %6, Groups: %7] + + + + + Constraint Contact + + + + + Constraint displacement + + + + + Constraint fixed + + + + + Constraint fluid boundary + + + + + Constraint heat flux + + + + + Constraint initial temperature + + + + + Constraint planerotation + + + + + Constraint pressure + + + + + Constraint pulley + + + + + Constraint spring + + + + + Constraint temperature + + + + + Constraint transform + + + + + Edit post processing object + ShowDisplacement - + Show result - Show result + - + Result type - Result type + - - Y displacement - Y displacement + + Displacement Magnitude + - - X displacement - X displacement - - - - Z displacement - Z displacement - - - + None - Geen + - - Von Mises stress - Von Mises stress + + Displacement Y + - - Abs displacement - Abs displacement + + Displacement X + - - Avg: - Avg: + + Peeq + - - Max: - Max: + + Displacement Z + - + + Temperature + + + + + von Mises Stress + + + + + Max Principal Stress + + + + + Min Principal Stress + + + + + Max Shear Stress (Tresca) + + + + + Mass Flow Rate + + + + + Network Pressure + + + + Min: - Min: + - + + Max: + + + + + Histogram + + + + Displacement - Displacement + - + Show - Show + - + Factor: - Factor: + - + Slider max: - Slider max: + + + + + User defined equation + + + + + Calculate and plot + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu';">P1-P3 # Stress intensity stress equation. Available values are numpy array format. Calculation np.function can be used on available values. </span></p></body></html> + + + + + Hints user defined equations + + + + + Available result types: + + + + + displacement: x, y, z + + + + + mass flow rate: MF + + + + + network pressure: NP + + + + + von Mises stress: vM + + + + + temperature: T + + + + + min. principal stress vector: s1x, s1y, s1z + + + + + principal stresses: P1, P2, P3 + + + + + reinforcement ratio: rx, ry, rz + + + + + equivalent plastic strain: Peeq + + + + + med. principal stress vector: s2x, s2y, s2z + + + + + stress: sxx, syy, szz, sxy, sxz, syz + + + + + strain: exx, eyy, ezz, exy, exz, eyz + + + + + Mohr Coulomb: mc + + + + + max. principal stress vector: s3x, s3y, s3z + + + + + SolverCalculix + + + Mechanical analysis + + + + + Working directory + + + + + ... + + + + + Analysis type + + + + + Thermo mechanical + + + + + Check Mesh + + + + + Frequency + + + + + Static + + + + + Buckling + + + + + Write .inp file + + + + + Edit .inp file + + + + + Run CalculiX + + + + + Time: + + + + + SphereWidget + + + Form + + + + + Radius + + + + + Center + @@ -2159,17 +3553,17 @@ Form - Vorm + Meshes: - Meshes: + Constraints - Beperkings + @@ -2177,57 +3571,57 @@ Form - Vorm + Volume - Volume + Surface - Surface + Nodes: 0 - Nodes: 0 + Poly - Poly + Box - Boks + Pick - Pick + Add - Voeg by + Angle-search - Angle-search + - Collect adjancent nodes - Collect adjancent nodes + Collect adjacent nodes + Stop angle: - Stop angle: + @@ -2235,7 +3629,7 @@ Form - Vorm + @@ -2243,52 +3637,52 @@ Form - Vorm + Add reference - Add reference + Load [N] - Load [N] + Diameter - Diameter + Other diameter - Other diameter + Center distance - Center distance + Direction - Rigting + Reverse direction - Omgekeerde rigting + Location - Location + Distance - Afstand + @@ -2296,72 +3690,112 @@ Form - Vorm + Add reference - Add reference + Gear diameter - Gear diameter + - Other pulley dia - Other pulley dia + Other pulley diameter + Center distance - Center distance + Force - Force + Belt tension force - Belt tension force + Driven pulley - Driven pulley + Force location [deg] - Force location [deg] + Force Direction - Force Direction + Reversed direction - Reversed direction + Axial free - Axial free + Location - Location + Distance - Afstand + + + + + TaskFemConstraintContact + + + Form + + + + + Select master face, click Add or Remove + + + + + + Add + + + + + + Remove + + + + + Select slave face, click Add or Remove + + + + + Contact Stiffness + + + + + Friction coefficient + @@ -2369,27 +3803,27 @@ Prescribed Displacement - Prescribed Displacement + Select multiple face(s), click Add or Remove - Select multiple face(s), click Add or Remove + Add - Voeg by + Remove - Verwyder + Displacement x - Displacement x + @@ -2399,7 +3833,7 @@ Free - Free + @@ -2409,37 +3843,37 @@ Fixed - Fixed + Displacement y - Displacement y + Displacement z - Displacement z + Rotations are only valid for Beam and Shell elements. - Rotations are only valid for Beam and Shell elements. + Rotation x - Rotation x + Rotation y - Rotation y + Rotation z - Rotation z + @@ -2447,40 +3881,281 @@ Form - Vorm + - Add reference - Add reference + Select multiple face(s), click Add or Remove + + + + + Add + + + + + Remove + + + + + TaskFemConstraintFluidBoundary + + + Form + + + + + Boundary + + + + + Subtype + + + + + Select multiple face(s), click Add or Remove + + + + + Add + + + + + Remove + + + + + Help text + + + + + Tab 1 + + + + + Value [Unit] + + + + + Select a planar edge or face, then press this button + + + + + Direction + + + + + The direction of the edge or the direction of the +normal vector of the face is used as direction + + + + + Reverse direction + + + + + Page + + + + + Turbulence specification + + + + + Intensity + + + + + Length [m] + + + + + Tab 2 + + + + + Type + + + + + Temperature[K] + + + + + Heat flux [W/m2] + + + + + HT coeff + TaskFemConstraintForce - - - Form - Vorm - - - - Add reference - Add reference - + Prescribed Force + + + + + Select multiple face(s), click Add or Remove + + + + + Add + + + + + Remove + + + + Load [N] - Load [N] + - + + Select a planar edge or face, then press this button + + + + Direction - Rigting + - + + The direction of the edge or the direction of the +normal vector of the face is used as direction + + + + Reverse direction - Omgekeerde rigting + + + + + TaskFemConstraintHeatflux + + + TaskFemConstraintHeatflux + + + + + Select multiple face(s), click Add or Remove: + + + + + Add + + + + + Remove + + + + + Surface Convection + + + + + + Surface heat flux + + + + + Film coefficient + + + + + 1 W/m^2/K + + + + + Ambient Temperature + + + + + + 300 K + + + + + TaskFemConstraintInitialTemperature + + + Dialog + + + + + Insert component's initial temperature: + + + + + 300 K + + + + + TaskFemConstraintPlaneRotation + + + Form + + + + + Select a single face, click Add or Remove + + + + + Add + + + + + Remove + @@ -2488,27 +4163,168 @@ Form - Vorm + - Add reference - Add reference + Select multiple face(s), click Add or Remove + - + + Add + + + + + Remove + + + + Pressure - Pressure + - - 1 MPa - 1 MPa + + 0 MPa + - - Reverse direction - Omgekeerde rigting + + Reverse Direction + + + + + TaskFemConstraintSpring + + + Form + + + + + Select multiple face(s), click Add or Remove + + + + + Add + + + + + Remove + + + + + 0 + + + + + Normal Stiffness + + + + + Tangential Stiffness + + + + + TaskFemConstraintTemperature + + + Form + + + + + Select multiple face(s), click Add or Remove + + + + + Add + + + + + Remove + + + + + + Temperature + + + + + Concentrated heat flux + + + + + 300 K + + + + + TaskFemConstraintTransform + + + Form + + + + + Rectangular transform + + + + + Cylindrical transform + + + + + Select a face, click Add or Remove + + + + + Add + + + + + Remove + + + + + Rotation about X-Axis + + + + + Rotation about Y-Axis + + + + + Rotation about Z-Axis + + + + + + Transformable surfaces + @@ -2516,7 +4332,292 @@ Form - Vorm + + + + + TaskPostClip + + + Form + + + + + Create + + + + + Inside Out + + + + + Cut Cells + + + + + TaskPostCut + + + Form + + + + + Create + + + + + TaskPostDataAlongLine + + + Form + + + + + Point1 + + + + + Point2 + + + + + Select Points + + + + + Resolution + + + + + Mode + + + + + Field + + + + + Vector + + + + + Create Plot + + + + + TaskPostDataAtPoint + + + Form + + + + + Center + + + + + Select Point + + + + + Field + + + + + TaskPostDisplay + + + Form + + + + + Mode + + + + + + Outline + + + + + + Surface + + + + + + Surface with Edges + + + + + + Wireframe + + + + + Coloring + + + + + Field + + + + + Vector + + + + + Magnitute + + + + + X + + + + + Y + + + + + Z + + + + + Styling + + + + + Transparency + + + + + TaskPostScalarClip + + + Form + + + + + Scalar + + + + + Outline + + + + + Surface + + + + + Surface with Edges + + + + + Wireframe + + + + + Min scalar + + + + + Clip scalar + + + + + Max scalar + + + + + -100000 + + + + + 0 + + + + + Clip inside out + + + + + TaskPostWarpVector + + + Form + + + + + Vector + + + + + warp vectors + + + + + Min warp + + + + + Warp factor + + + + + Max warp + @@ -2524,87 +4625,87 @@ Form - Vorm + Max. Size: - Max. Size: + Second order - Second order + Fineness: - Fineness: + VeryCoarse - VeryCoarse + Coarse - Coarse + Moderate - Moderate + Fine - Fine + VeryFine - VeryFine + UserDefined - UserDefined + Growth Rate: - Growth Rate: + Nbr. Segs per Edge: - Nbr. Segs per Edge: + Nbr. Segs per Radius: - Nbr. Segs per Radius: + Optimize - Optimize + Node count: - Node count: + Triangle count: - Triangle count: + - Tetraeder count: - Tetraeder count: + Tetrahedron count: + @@ -2612,12 +4713,170 @@ FEM - FEM + &FEM - &FEM + + + + + Model + + + + + M&odel + + + + + Materials + + + + + &Materials + + + + + Element Geometry + + + + + &Element Geometry + + + + + Electrostatic Constraints + + + + + &Electrostatic Constraints + + + + + Fluid Constraints + + + + + &Fluid Constraints + + + + + Geometrical Constraints + + + + + &Geometrical Constraints + + + + + Mechanical Constraints + + + + + &Mechanical Constraints + + + + + Thermal Constraints + + + + + &Thermal Constraints + + + + + Constraints without solver + + + + + &Constraints without solver + + + + + Overwrite Constants + + + + + &Overwrite Constants + + + + + Mesh + + + + + M&esh + + + + + Solve + + + + + &Solve + + + + + Results + + + + + &Results + + + + + Filter functions + + + + + &Filter functions + + + + + Utilities + + + + + setupFilter + + + Error: Wrong or no or to many vtk post processing objects. + + + + + The filter could not set up. Select one vtk post processing pipeline object, or select nothing and make sure there is exact one vtk post processing pipline object in the document. + From ef7127a4563111021c024aa0ff001bf682330e9f Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Thu, 30 Sep 2021 15:03:26 -0500 Subject: [PATCH 2/2] [Tools] Strip translations from base TS files --- src/Tools/updatets.py | 45 ++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/src/Tools/updatets.py b/src/Tools/updatets.py index 8cd1e14d22..0c344e6f1f 100755 --- a/src/Tools/updatets.py +++ b/src/Tools/updatets.py @@ -146,37 +146,32 @@ def update_translation(entry): print (f"EXTRACTING STRINGS FOR {entry['tsname']}") print ("=============================================") cur = os.getcwd() + log_redirect = f" 2>> {cur}/tsupdate_stderr.log 1>> {cur}/tsupdate_stdout.log" os.chdir(entry["workingdir"]) existingjsons = [f for f in os.listdir(".") if f.endswith(".json")] - filename = entry["tsname"] + ".pro" - print("Running qmake -project") - os.system(f"{QMAKE} -project -o {filename}") - #only update the master ts file + project_filename = entry["tsname"] + ".pro" tsBasename = os.path.join(entry["tsdir"],entry["tsname"]) - mainTranslation = f"{LUPDATE} {filename} -ts {tsBasename}.ts" - print(mainTranslation) - os.system(mainTranslation) - os.remove(filename) + + execline = [] + execline.append (f"{QMAKE} -project -o {project_filename}") + execline.append (f"sed 's/.*<\/translation>/<\/translation>/g' {tsBasename}.ts > {tsBasename}.ts.temp") + execline.append (f"touch {tsBasename}.ts") # In case it didn't get created above + execline.append (f"{LUPDATE} {project_filename} -ts {tsBasename}.ts {log_redirect}") + execline.append (f"mv {tsBasename}.ts.temp {tsBasename}.ts") + execline.append (f"{PYLUPDATE} `find ./ -name \"*.py\"` -ts {tsBasename}py.ts {log_redirect}") + execline.append (f"{LCONVERT} -i {tsBasename}py.ts {tsBasename}.ts -o {tsBasename}.ts {log_redirect}") + execline.append (f"rm {tsBasename}py.ts") + print(f"Executing special commands in {entry['workingdir']}:") + for line in execline: + print (line) + os.system(line) + print() + + os.remove(project_filename) # lupdate creates json files since Qt5.something. Remove them here too for jsonfile in [f for f in os.listdir(".") if f.endswith(".json")]: if not jsonfile in existingjsons: os.remove(jsonfile) - - # Also try to do a python lupdate - execline0 = f"touch {tsBasename}.ts" # In case it didn't get created above - execline1 = f"{PYLUPDATE} `find ./ -name \"*.py\"` -ts {tsBasename}py.ts" - execline2 = f"{LCONVERT} -i {tsBasename}py.ts {tsBasename}.ts -o {tsBasename}.ts" - execline3 = f"rm {tsBasename}py.ts" - print(f"Executing special commands in {entry['workingdir']}:") - print(execline0) - os.system(execline0) - print(execline1) - os.system(execline1) - print(execline2) - os.system(execline2) - print(execline3) - os.system(execline3) - print() os.chdir(cur) @@ -192,6 +187,8 @@ def main(): for i in directories: update_translation(i) print("\nIf updatets.py was run successfully, the next step is to run ./src/Tools/updatecrowdin.py") + print("stderr output from lupdate can be found in tsupdate_stderr.log") + print("stdout output from lupdate can be found in tsupdate_stdout.log") if __name__ == "__main__": main()