From 3650b3e59dc3a1156aca5754d8a6cf2bd7cfc2d4 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Fri, 26 Apr 2019 15:04:18 +0200 Subject: [PATCH] Units: add AngleOfFriction as another parameter with Angle unit --- src/App/FreeCADInit.py | 6 +++++- src/Base/Unit.cpp | 6 +++++- src/Base/Unit.h | 3 +++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/App/FreeCADInit.py b/src/App/FreeCADInit.py index 900f0a6b5b..0a3e96ee34 100644 --- a/src/App/FreeCADInit.py +++ b/src/App/FreeCADInit.py @@ -338,7 +338,11 @@ App.Units.Length = App.Units.Unit(1) App.Units.Area = App.Units.Unit(2) App.Units.Volume = App.Units.Unit(3) App.Units.Mass = App.Units.Unit(0,1) -App.Units.Angle = App.Units.Unit(0,0,0,0,0,0,0,1) + +# Angle +App.Units.Angle = App.Units.Unit(0,0,0,0,0,0,0,1) +App.Units.AngleOfFriction = App.Units.Unit(0,0,0,0,0,0,0,1) + App.Units.Density = App.Units.Unit(-3,1) App.Units.TimeSpan = App.Units.Unit(0,0,1) diff --git a/src/Base/Unit.cpp b/src/Base/Unit.cpp index 579d1befb9..db06d0acb4 100644 --- a/src/Base/Unit.cpp +++ b/src/Base/Unit.cpp @@ -461,7 +461,11 @@ Unit Unit::Length(1); Unit Unit::Area(2); Unit Unit::Volume(3); Unit Unit::Mass(0,1); -Unit Unit::Angle(0,0,0,0,0,0,0,1); + +// Angle, deg +Unit Unit::Angle (0,0,0,0,0,0,0,1); +Unit Unit::AngleOfFriction (0,0,0,0,0,0,0,1); + Unit Unit::Density(-3,1); Unit Unit::TimeSpan(0,0,1); diff --git a/src/Base/Unit.h b/src/Base/Unit.h index 6f9eb49d07..77aea72201 100644 --- a/src/Base/Unit.h +++ b/src/Base/Unit.h @@ -93,8 +93,11 @@ public: static Unit Length; /// Mass unit static Unit Mass; + /// Angle static Unit Angle; + static Unit AngleOfFriction; + static Unit Density; static Unit Area;