[CALC] Added "Minute of arc" and "Second of arc" to the "Angles" units. CORE-5939

2024-11-25 12:33:34 +08:00 · 2018-11-04 11:08:44 +01:00 · 2018-11-04 11:08:44 +01:00 · e5c8047e3d
commit e5c8047e3d
parent dcea9e73c6
27 changed files with 64 additions and 8 deletions
--- a/base/applications/calc/convert.c
+++ b/base/applications/calc/convert.c
@ -64,13 +64,17 @@ typedef struct {
    { 0, NULL, NULL },

 /*
-    1 gradian = 0.9 deg
-    1 radian = 57.29577951308233 deg
+    1 arcminute ....... = 1/60 deg
+    1 arcsecond ....... = 1/3600 deg
+    1 gradian ......... = 0.9 deg
+    1 radian .......... = 57.29577951308233 deg
 */
 static const conv_t conv_ANGLE[] = {
-    DECLARE_CONV_UNIT(ANGLE, DEGREES,  "$", "$")
-    DECLARE_CONV_UNIT(ANGLE, GRADIANS, "$*0.9", "$/0.9")
-    DECLARE_CONV_UNIT(ANGLE, RADIANS,  "$/P*180", "$*P/180")
+    DECLARE_CONV_UNIT(ANGLE, ARCMINUTES, "$/60",    "$*60")
+    DECLARE_CONV_UNIT(ANGLE, ARCSECONDS, "$/3600",  "$*3600")
+    DECLARE_CONV_UNIT(ANGLE, DEGREES,    "$",       "$")
+    DECLARE_CONV_UNIT(ANGLE, GRADIANS,   "$*0.9",   "$/0.9")
+    DECLARE_CONV_UNIT(ANGLE, RADIANS,    "$/P*180", "$*P/180")
    DECLARE_CONV_END
 };

--- a/base/applications/calc/lang/bg-BG.rc
+++ b/base/applications/calc/lang/bg-BG.rc
@ -435,6 +435,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
    IDS_ANGLE_DEGREES "Градуси"
    IDS_ANGLE_GRADIANS "Гради"
    IDS_ANGLE_RADIANS "Радиани"
--- a/base/applications/calc/lang/cs-CZ.rc
+++ b/base/applications/calc/lang/cs-CZ.rc
@ -434,6 +434,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
    IDS_ANGLE_DEGREES "Stupně"
    IDS_ANGLE_GRADIANS "Grady"
    IDS_ANGLE_RADIANS "Radiány"
--- a/base/applications/calc/lang/de-DE.rc
+++ b/base/applications/calc/lang/de-DE.rc
@ -429,6 +429,8 @@ END
 /* Winkeltypen */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
    IDS_ANGLE_DEGREES "Grad"
    IDS_ANGLE_GRADIANS "Gon"
    IDS_ANGLE_RADIANS "Radiant"
--- a/base/applications/calc/lang/el-GR.rc
+++ b/base/applications/calc/lang/el-GR.rc
@ -429,6 +429,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
    IDS_ANGLE_DEGREES "Βαθμοί"
    IDS_ANGLE_GRADIANS "Ακτίνια"
    IDS_ANGLE_RADIANS "Μοίρες"
--- a/base/applications/calc/lang/en-US.rc
+++ b/base/applications/calc/lang/en-US.rc
@ -429,6 +429,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
    IDS_ANGLE_DEGREES "Degrees"
    IDS_ANGLE_GRADIANS "Gradians"
    IDS_ANGLE_RADIANS "Radians"
--- a/base/applications/calc/lang/es-ES.rc
+++ b/base/applications/calc/lang/es-ES.rc
@ -435,6 +435,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
    IDS_ANGLE_DEGREES  "Grados"
    IDS_ANGLE_GRADIANS "Gradianes"
    IDS_ANGLE_RADIANS  "Radianes"
--- a/base/applications/calc/lang/fr-FR.rc
+++ b/base/applications/calc/lang/fr-FR.rc
@ -429,6 +429,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
    IDS_ANGLE_DEGREES "Degrés"
    IDS_ANGLE_GRADIANS "Grades"
    IDS_ANGLE_RADIANS "Radians"
--- a/base/applications/calc/lang/he-IL.rc
+++ b/base/applications/calc/lang/he-IL.rc
@ -435,6 +435,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
    IDS_ANGLE_DEGREES "מעלות"
    IDS_ANGLE_GRADIANS "גרדיאנים"
    IDS_ANGLE_RADIANS "רדיאנים"
--- a/base/applications/calc/lang/hu-HU.rc
+++ b/base/applications/calc/lang/hu-HU.rc
@ -437,6 +437,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
    IDS_ANGLE_DEGREES "Fok"
    IDS_ANGLE_GRADIANS "Gradián"
    IDS_ANGLE_RADIANS "Radián"
--- a/base/applications/calc/lang/it-IT.rc
+++ b/base/applications/calc/lang/it-IT.rc
@ -429,6 +429,8 @@ END
 /* Tipi di angoli */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minuti d'arco"
+    IDS_ANGLE_ARCSECONDS "Secondi d'arco"
    IDS_ANGLE_DEGREES "Sessagesimali"
    IDS_ANGLE_GRADIANS "Centesimali (Gradienti)"
    IDS_ANGLE_RADIANS "Radianti"
--- a/base/applications/calc/lang/ja-JP.rc
+++ b/base/applications/calc/lang/ja-JP.rc
@ -429,6 +429,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
    IDS_ANGLE_DEGREES "Degrees"
    IDS_ANGLE_GRADIANS "Gradians"
    IDS_ANGLE_RADIANS "Radians"
--- a/base/applications/calc/lang/ko-KR.rc
+++ b/base/applications/calc/lang/ko-KR.rc
@ -431,6 +431,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
    IDS_ANGLE_DEGREES "Degrees"
    IDS_ANGLE_GRADIANS "Gradians"
    IDS_ANGLE_RADIANS "Radians"
--- a/base/applications/calc/lang/nl-NL.rc
+++ b/base/applications/calc/lang/nl-NL.rc
@ -429,6 +429,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
    IDS_ANGLE_DEGREES "Graden"
    IDS_ANGLE_GRADIANS "Gradiënten"
    IDS_ANGLE_RADIANS "Radialen"
--- a/base/applications/calc/lang/no-NO.rc
+++ b/base/applications/calc/lang/no-NO.rc
@ -429,6 +429,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
    IDS_ANGLE_DEGREES "Grader"
    IDS_ANGLE_GRADIANS "Gradianer"
    IDS_ANGLE_RADIANS "Radianer"
--- a/base/applications/calc/lang/pl-PL.rc
+++ b/base/applications/calc/lang/pl-PL.rc
@ -438,6 +438,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
    IDS_ANGLE_DEGREES "Stopnie"
    IDS_ANGLE_GRADIANS "Gradiany"
    IDS_ANGLE_RADIANS "Radiany"
--- a/base/applications/calc/lang/pt-BR.rc
+++ b/base/applications/calc/lang/pt-BR.rc
@ -431,6 +431,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
    IDS_ANGLE_DEGREES "Graus"
    IDS_ANGLE_GRADIANS "Grados"
    IDS_ANGLE_RADIANS "Radianos"
--- a/base/applications/calc/lang/ro-RO.rc
+++ b/base/applications/calc/lang/ro-RO.rc
@ -434,6 +434,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
    IDS_ANGLE_DEGREES "Grade"
    IDS_ANGLE_GRADIANS "Gradiani"
    IDS_ANGLE_RADIANS "Radiani"
--- a/base/applications/calc/lang/ru-RU.rc
+++ b/base/applications/calc/lang/ru-RU.rc
@ -429,6 +429,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
    IDS_ANGLE_DEGREES "градус"
    IDS_ANGLE_GRADIANS "град"
    IDS_ANGLE_RADIANS "радиан"
--- a/base/applications/calc/lang/sk-SK.rc
+++ b/base/applications/calc/lang/sk-SK.rc
@ -436,6 +436,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
    IDS_ANGLE_DEGREES "Stupne"
    IDS_ANGLE_GRADIANS "Grady"
    IDS_ANGLE_RADIANS "Radiány"
--- a/base/applications/calc/lang/sq-AL.rc
+++ b/base/applications/calc/lang/sq-AL.rc
@ -433,6 +433,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
    IDS_ANGLE_DEGREES "Gradë"
    IDS_ANGLE_GRADIANS "Gradian"
    IDS_ANGLE_RADIANS "Radians"
--- a/base/applications/calc/lang/sv-SE.rc
+++ b/base/applications/calc/lang/sv-SE.rc
@ -436,6 +436,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
    IDS_ANGLE_DEGREES "Grader"
    IDS_ANGLE_GRADIANS "Gradianer"
    IDS_ANGLE_RADIANS "Radianer"
--- a/base/applications/calc/lang/th-TH.rc
+++ b/base/applications/calc/lang/th-TH.rc
@ -429,6 +429,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
    IDS_ANGLE_DEGREES "องศา"
    IDS_ANGLE_GRADIANS "เกรเดียน"
    IDS_ANGLE_RADIANS "เรเดียน"
--- a/base/applications/calc/lang/tr-TR.rc
+++ b/base/applications/calc/lang/tr-TR.rc
@ -431,6 +431,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
    IDS_ANGLE_DEGREES "Derece"
    IDS_ANGLE_GRADIANS "Gradyan"
    IDS_ANGLE_RADIANS "Radyan"
--- a/base/applications/calc/lang/uk-UA.rc
+++ b/base/applications/calc/lang/uk-UA.rc
@ -437,6 +437,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
    IDS_ANGLE_DEGREES "Градус"
    IDS_ANGLE_GRADIANS "Град"
    IDS_ANGLE_RADIANS "Радіан"
--- a/base/applications/calc/lang/zh-CN.rc
+++ b/base/applications/calc/lang/zh-CN.rc
@ -431,6 +431,8 @@ END
 /* Angles */
 STRINGTABLE
 BEGIN
+    IDS_ANGLE_ARCMINUTES "Minute of arc"
+    IDS_ANGLE_ARCSECONDS "Second of arc"
    IDS_ANGLE_DEGREES "角度"
    IDS_ANGLE_GRADIANS "梯度"
    IDS_ANGLE_RADIANS "弧度"
--- a/base/applications/calc/resource.h
+++ b/base/applications/calc/resource.h
@ -126,9 +126,11 @@
 #define IDS_CONV_WEIGHT                 2012

 /* TYPES OF ANGLES */
-#define IDS_ANGLE_DEGREES               2100
-#define IDS_ANGLE_GRADIANS              2101
-#define IDS_ANGLE_RADIANS               2102
+#define IDS_ANGLE_ARCMINUTES            2100
+#define IDS_ANGLE_ARCSECONDS            2101
+#define IDS_ANGLE_DEGREES               2102
+#define IDS_ANGLE_GRADIANS              2103
+#define IDS_ANGLE_RADIANS               2104

 /* TYPES OF AREAS */
 #define IDS_AREA_ACRES                  2200