[PATCH] Use configured vertical speed units in ruler
Anton Lundin
glance at acc.umu.se
Fri Oct 18 10:30:51 UTC 2013
Ruler was hard-coded to use seconds as speed unit. This makes it use
get_vertical_speed_units to switch between seconds and minutes.
Signed-off-by: Anton Lundin <glance at acc.umu.se>
---
profile.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/profile.c b/profile.c
index 1a85e63..2b58e24 100644
--- a/profile.c
+++ b/profile.c
@@ -1307,7 +1307,7 @@ void get_plot_details(struct graphics_context *gc, int time, char *buf, int bufs
void compare_samples(struct plot_data *e1, struct plot_data *e2, char *buf, int bufsize, int sum)
{
struct plot_data *start, *stop, *data;
- const char *depth_unit, *pressure_unit;
+ const char *depth_unit, *pressure_unit, *vertical_speed_unit;
char *buf2 = malloc(bufsize);
int avg_speed, max_speed, min_speed;
int delta_depth, avg_depth, max_depth, min_depth;
@@ -1396,16 +1396,16 @@ void compare_samples(struct plot_data *e1, struct plot_data *e2, char *buf, int
snprintf(buf, bufsize, translate("gettextFromC","%s %sD:%.1f%s\n"), buf2, UTF8_AVERAGE, depthvalue, depth_unit);
memcpy(buf2, buf, bufsize);
- speedvalue = get_depth_units(min_speed, NULL, &depth_unit);
- snprintf(buf, bufsize, translate("gettextFromC","%s%sV:%.2f%s/s"), buf2, UTF8_DOWNWARDS_ARROW, speedvalue, depth_unit);
+ speedvalue = get_vertical_speed_units(abs(min_speed), NULL, &vertical_speed_unit);
+ snprintf(buf, bufsize, translate("gettextFromC","%s%sV:%.2f%s"), buf2, UTF8_DOWNWARDS_ARROW, speedvalue, vertical_speed_unit);
memcpy(buf2, buf, bufsize);
- speedvalue = get_depth_units(max_speed, NULL, &depth_unit);
- snprintf(buf, bufsize, translate("gettextFromC","%s %sV:%.2f%s/s"), buf2, UTF8_UPWARDS_ARROW, speedvalue, depth_unit);
+ speedvalue = get_vertical_speed_units(abs(max_speed), NULL, &vertical_speed_unit);
+ snprintf(buf, bufsize, translate("gettextFromC","%s %sV:%.2f%s"), buf2, UTF8_UPWARDS_ARROW, speedvalue, vertical_speed_unit);
memcpy(buf2, buf, bufsize);
- speedvalue = get_depth_units(avg_speed, NULL, &depth_unit);
- snprintf(buf, bufsize, translate("gettextFromC","%s %sV:%.2f%s/s"), buf2, UTF8_AVERAGE, speedvalue, depth_unit);
+ speedvalue = get_vertical_speed_units(abs(avg_speed), NULL, &vertical_speed_unit);
+ snprintf(buf, bufsize, translate("gettextFromC","%s %sV:%.2f%s"), buf2, UTF8_AVERAGE, speedvalue, vertical_speed_unit);
memcpy(buf2, buf, bufsize);
/* Only print if gas has been used */
--
1.8.3.2
More information about the subsurface
mailing list