From f9bc74e962988c0f8f8486b05ede9298a718f036 Mon Sep 17 00:00:00 2001 From: James Cherry Date: Fri, 16 Aug 2019 17:34:48 -0700 Subject: [PATCH] format_distance, area --- tcl/StaTcl.i | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/tcl/StaTcl.i b/tcl/StaTcl.i index 0a19c8e6..9cbd4509 100644 --- a/tcl/StaTcl.i +++ b/tcl/StaTcl.i @@ -3808,6 +3808,24 @@ format_power(const char *value, return Sta::sta()->units()->powerUnit()->asString(value1, digits); } +const char * +format_distance(const char *value, + int digits) +{ + float value1 = strtof(value, nullptr); + Unit *dist_unit = Sta::sta()->units()->distanceUnit(); + return dist_unit->asString(value1, digits); +} + +const char * +format_area(const char *value, + int digits) +{ + float value1 = strtof(value, nullptr); + Unit *dist_unit = Sta::sta()->units()->distanceUnit(); + return dist_unit->asString(value1 / dist_unit->scale(), digits); +} + //////////////////////////////////////////////////////////////// // Unit converstion from sta unit to user interface and visa versa. @@ -3895,6 +3913,20 @@ distance_sta_ui(double value) return value / Sta::sta()->units()->distanceUnit()->scale(); } +double +area_ui_sta(double value) +{ + double scale = Sta::sta()->units()->distanceUnit()->scale(); + return value * scale * scale; +} + +double +area_sta_ui(double value) +{ + double scale = Sta::sta()->units()->distanceUnit()->scale(); + return value / (scale * scale); +} + //////////////////////////////////////////////////////////////// void