Add ImperialCivil Units Schema

- units for civil engineering - ft, ft2, ft3, mph, and angles as degrees/minutes/seconds
FreeCAD · Dec 6, 2018 · 00e6e37 · 00e6e37
1 parent eb9aa5c
commit 00e6e37
Show file tree

Hide file tree

Showing 12 changed files with 749 additions and 639 deletions.
diff --git a/src/App/ExpressionParser.y b/src/App/ExpressionParser.y
@@ -69,6 +69,7 @@ input:     exp                			{ ScanResult = $1; valueExpression = true;
 
 exp:      num                			{ $$ = $1;                                                                        }
         | num unit_exp %prec NUM_AND_UNIT       { $$ = new OperatorExpression(DocumentObject, $1, OperatorExpression::UNIT, $2);  }
+        | num unit_exp %prec NUM_AND_UNIT %prec NUM_AND_UNIT       { $$ = new OperatorExpression(DocumentObject, $1, OperatorExpression::UNIT, $2, $3);  }
         | STRING                                { $$ = new StringExpression(DocumentObject, $1);                                  }
         | identifier                            { $$ = new VariableExpression(DocumentObject, $1);                                }
         | MINUSSIGN exp %prec NEG               { $$ = new OperatorExpression(DocumentObject, $2, OperatorExpression::NEG, new NumberExpression(DocumentObject, Quantity(-1))); }

diff --git a/src/Base/Quantity.cpp b/src/Base/Quantity.cpp
@@ -32,6 +32,7 @@
 #include "Quantity.h"
 #include "Exception.h"
 #include "UnitsApi.h"
+#include "Console.h"
 
 // suppress annoying warnings from generated source files
 #ifdef _MSC_VER
@@ -305,6 +306,8 @@ Quantity Quantity::WattSecond       (1e+6          ,Unit(2,1,-2));  // Joule (kg
 Quantity Quantity::KMH              (277.778       ,Unit(1,0,-1));  // km/h
 Quantity Quantity::MPH              (447.04        ,Unit(1,0,-1));  // Mile/h
 
+Quantity Quantity::AngMinute        (1.0/60.0      ,Unit(0,0,0,0,0,0,0,1)); // angular minute
+Quantity Quantity::AngSecond        (1.0/3600.0    ,Unit(0,0,0,0,0,0,0,1)); // angular minute
 Quantity Quantity::Degree           (1.0           ,Unit(0,0,0,0,0,0,0,1)); // degree         (internal standard angle)
 Quantity Quantity::Radian           (180/M_PI      ,Unit(0,0,0,0,0,0,0,1)); // radian
 Quantity Quantity::Gon              (360.0/400.0   ,Unit(0,0,0,0,0,0,0,1)); // gon

diff --git a/src/Base/Quantity.h b/src/Base/Quantity.h
@@ -256,6 +256,8 @@ class BaseExport Quantity
     static Quantity Degree;
     static Quantity Radian;
     static Quantity Gon;
+    static Quantity AngMinute;
+    static Quantity AngSecond;
     //@}