electron-rare/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Units: add various Material stress properties

Browse Source
This commit is contained in:
Bernd Hahnebach
2019-02-14 21:11:22 +01:00
committed by wmayer
parent 4bfe11ff43
commit 57a0acffc0
3 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/App/FreeCADInit.py
+8 -2
View File
@@ -351,8 +351,14 @@ App.Units.ElectricPotential = App.Units.Unit(2,1,-3,-1)
App.Units.AmountOfSubstance = App.Units.Unit(0,0,0,0,0,1)
App.Units.LuminousIntensity = App.Units.Unit(0,0,0,0,0,0,1)
App.Units.Stress = App.Units.Unit(-1,1,-2)
App.Units.Pressure = App.Units.Unit(-1,1,-2)
# Pressure
App.Units.CompressiveStrength = App.Units.Unit(-1,1,-2)
App.Units.Pressure = App.Units.Unit(-1,1,-2)
App.Units.ShearModulus = App.Units.Unit(-1,1,-2)
App.Units.Stress = App.Units.Unit(-1,1,-2)
App.Units.UltimateTensileStrength = App.Units.Unit(-1,1,-2)
App.Units.YieldStrength = App.Units.Unit(-1,1,-2)
App.Units.YoungsModulus = App.Units.Unit(-1,1,-2)
App.Units.Force = App.Units.Unit(1,1,-2)
App.Units.Work = App.Units.Unit(2,1,-2)
src/Base/Unit.cpp
+8 -2
View File
@@ -474,8 +474,14 @@ Unit Unit::ElectricPotential(2,1,-3,-1);
Unit Unit::AmountOfSubstance(0,0,0,0,0,1);
Unit Unit::LuminousIntensity(0,0,0,0,0,0,1);
Unit Unit::Stress (-1,1,-2); // kg/m*s^2 or N/m^2 or PSI
Unit Unit::Pressure(-1,1,-2); // kg/m*s^2 or N/m^2 or PSI
// Pressure, kg/m*s^2 or N/m^2 or PSI or MPa
Unit Unit::CompressiveStrength (-1,1,-2);
Unit Unit::Pressure (-1,1,-2);
Unit Unit::ShearModulus (-1,1,-2);
Unit Unit::Stress (-1,1,-2);
Unit Unit::UltimateTensileStrength (-1,1,-2);
Unit Unit::YieldStrength (-1,1,-2);
Unit Unit::YoungsModulus (-1,1,-2);
Unit Unit::Force (1,1,-2);
Unit Unit::Work (2,1,-2);
src/Base/Unit.h
+8 -1
View File
@@ -109,8 +109,15 @@ public:
static Unit AmountOfSubstance;
static Unit LuminousIntensity;
static Unit Stress;
// Pressure
static Unit CompressiveStrength;
static Unit Pressure;
static Unit ShearModulus;
static Unit Stress;
static Unit UltimateTensileStrength;
static Unit YieldStrength;
static Unit YoungsModulus;
static Unit Force;
static Unit Work;
static Unit Power;