From d419d26345e1a7e6bc1deeb529224de4824c3cb3 Mon Sep 17 00:00:00 2001 From: Yan Wong Date: Mon, 19 Aug 2024 00:14:27 +0200 Subject: [PATCH] Add "ago" Fixes #2977 --- python/tests/data/svg/tree_both_axes.svg | 2 +- python/tests/data/svg/ts_max_trees.svg | 2 +- python/tests/data/svg/ts_max_trees_treewise.svg | 2 +- python/tests/data/svg/ts_multiroot.svg | 2 +- python/tests/data/svg/ts_plain_y.svg | 2 +- python/tests/data/svg/ts_y_axis.svg | 2 +- python/tests/data/svg/ts_y_axis_regular.svg | 2 +- python/tests/test_drawing.py | 6 +++--- python/tskit/drawing.py | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/python/tests/data/svg/tree_both_axes.svg b/python/tests/data/svg/tree_both_axes.svg index a86dd3d379..f90ce1c539 100644 --- a/python/tests/data/svg/tree_both_axes.svg +++ b/python/tests/data/svg/tree_both_axes.svg @@ -27,7 +27,7 @@ - Time + Time ago diff --git a/python/tests/data/svg/ts_max_trees.svg b/python/tests/data/svg/ts_max_trees.svg index 3f3578de88..7720e50ece 100644 --- a/python/tests/data/svg/ts_max_trees.svg +++ b/python/tests/data/svg/ts_max_trees.svg @@ -73,7 +73,7 @@ - Time (generations) + Time ago (generations) diff --git a/python/tests/data/svg/ts_max_trees_treewise.svg b/python/tests/data/svg/ts_max_trees_treewise.svg index 84b1929b02..0d1164dc65 100644 --- a/python/tests/data/svg/ts_max_trees_treewise.svg +++ b/python/tests/data/svg/ts_max_trees_treewise.svg @@ -47,7 +47,7 @@ - Time (generations) + Time ago (generations) diff --git a/python/tests/data/svg/ts_multiroot.svg b/python/tests/data/svg/ts_multiroot.svg index 28dba3aa4e..fea6053303 100644 --- a/python/tests/data/svg/ts_multiroot.svg +++ b/python/tests/data/svg/ts_multiroot.svg @@ -139,7 +139,7 @@ - Time (generations) + Time ago (generations) diff --git a/python/tests/data/svg/ts_plain_y.svg b/python/tests/data/svg/ts_plain_y.svg index 9e4499d3f7..9aa6f26c88 100644 --- a/python/tests/data/svg/ts_plain_y.svg +++ b/python/tests/data/svg/ts_plain_y.svg @@ -51,7 +51,7 @@ - Time + Time ago diff --git a/python/tests/data/svg/ts_y_axis.svg b/python/tests/data/svg/ts_y_axis.svg index dccc399050..b1c5450b45 100644 --- a/python/tests/data/svg/ts_y_axis.svg +++ b/python/tests/data/svg/ts_y_axis.svg @@ -97,7 +97,7 @@ - Time (generations) + Time ago (generations) diff --git a/python/tests/data/svg/ts_y_axis_regular.svg b/python/tests/data/svg/ts_y_axis_regular.svg index f5e4240cde..c73dc6f40c 100644 --- a/python/tests/data/svg/ts_y_axis_regular.svg +++ b/python/tests/data/svg/ts_y_axis_regular.svg @@ -97,7 +97,7 @@ - Time + Time ago diff --git a/python/tests/test_drawing.py b/python/tests/test_drawing.py index d9010b3c0b..95dbc4face 100644 --- a/python/tests/test_drawing.py +++ b/python/tests/test_drawing.py @@ -1,6 +1,6 @@ # MIT License # -# Copyright (c) 2018-2023 Tskit Developers +# Copyright (c) 2018-2024 Tskit Developers # Copyright (C) 2017 University of Oxford # # Permission is hereby granted, free of charge, to any person obtaining a copy @@ -2697,7 +2697,7 @@ def test_known_svg_ts_y_axis(self, overwrite_viz, draw_plotbox): tables.time_units = "generations" ts = tables.tree_sequence() svg = ts.draw_svg(y_axis=True, debug_box=draw_plotbox) - assert "Time (generations)" in svg + assert "Time ago (generations)" in svg self.verify_known_svg( svg, "ts_y_axis.svg", overwrite_viz, width=200 * ts.num_trees ) @@ -2799,7 +2799,7 @@ def test_known_svg_ts_multiroot(self, overwrite_viz, draw_plotbox, caplog): self.verify_known_svg( svg, "ts_multiroot.svg", overwrite_viz, width=200 * ts.num_trees ) - assert "Time (generations)" in svg + assert "Time ago (generations)" in svg def test_known_svg_ts_xlim(self, overwrite_viz, draw_plotbox, caplog): ts = self.get_simple_ts() diff --git a/python/tskit/drawing.py b/python/tskit/drawing.py index e7d412e98c..dcd0e03952 100644 --- a/python/tskit/drawing.py +++ b/python/tskit/drawing.py @@ -730,7 +730,7 @@ def __init__( if time_scale == "rank": y_label = "Node time" else: - y_label = "Time" + y_label = "Time ago" if ts.time_units != tskit.TIME_UNITS_UNKNOWN: y_label += f" ({ts.time_units})" self.x_label = x_label