From 318d1e6a3580bcccc96231451487903aa4626014 Mon Sep 17 00:00:00 2001
From: ldam <ldam@passcal.nmt.edu>
Date: Thu, 14 Sep 2023 11:57:51 -0600
Subject: [PATCH] create function
get_colors_sizes_for_abs_y_from_value_colors() to be easier in testing
---
.../view/plotting/plotting_widget/plotting.py | 19 ++++-------
.../plotting_widget/plotting_helper.py | 32 +++++++++++++++++++
2 files changed, 38 insertions(+), 13 deletions(-)
create mode 100644 sohstationviewer/view/plotting/plotting_widget/plotting_helper.py
diff --git a/sohstationviewer/view/plotting/plotting_widget/plotting.py b/sohstationviewer/view/plotting/plotting_widget/plotting.py
index 96578b575..838f49808 100644
--- a/sohstationviewer/view/plotting/plotting_widget/plotting.py
+++ b/sohstationviewer/view/plotting/plotting_widget/plotting.py
@@ -5,6 +5,9 @@ from sohstationviewer.controller.util import get_val
from sohstationviewer.controller.plotting_data import get_masspos_value_colors
from sohstationviewer.view.util.color import clr
+from sohstationviewer.view.plotting.plotting_widget.plotting_helper import (
+ get_colors_for_abs_y_from_value_colors
+)
from sohstationviewer.conf import constants
@@ -377,24 +380,14 @@ class Plotting:
self.plotting_axes.set_axes_info(
ax, [total_x], chan_db_info=chan_db_info, y_list=y_list)
for x, y in zip(x_list, y_list):
+ # plot to have artist pl.Line2D to get pick
ax.myPlot = ax.plot(x, y,
linestyle='-', linewidth=0.7,
color=self.parent.display_color['sub_basic'],
picker=True, pickradius=3,
zorder=constants.Z_ORDER['LINE'])[0]
- colors = [None] * len(y)
- sizes = [1.5] * len(y)
- for i in range(len(y)):
- count = -1
- for v, c in value_colors:
- count += 1
- if count <= len(value_colors) - 2:
- if abs(y[i]) <= v:
- colors[i] = clr[c]
- break
- else:
- # The last value color
- colors[i] = clr[c]
+ colors, sizes = get_colors_for_abs_y_from_value_colors(
+ y, value_colors)
ax.scatter(x, y, marker='s', c=colors, s=sizes,
zorder=constants.Z_ORDER['DOT'])
ax.x_list = x_list
diff --git a/sohstationviewer/view/plotting/plotting_widget/plotting_helper.py b/sohstationviewer/view/plotting/plotting_widget/plotting_helper.py
new file mode 100644
index 000000000..ba30b9ad2
--- /dev/null
+++ b/sohstationviewer/view/plotting/plotting_widget/plotting_helper.py
@@ -0,0 +1,32 @@
+from typing import List, Tuple
+
+from sohstationviewer.view.util.color import clr
+
+
+def get_colors_sizes_for_abs_y_from_value_colors(
+ y: List[float],
+ value_colors: List[Tuple[float, str]]) -> \
+ Tuple[List[str], List[float]]:
+ """
+ Map each abs(value) in y with the value in value_colors to get the colors
+ for the indexes corresponding to the y's items.
+ Sizes is currently similar for all items
+ :param y: list of data values
+ :param value_colors: list of color with indexes corresponding to y's items
+ :return colors: list of colors of markers corresponding to y
+ :return sizes: list of sizes of markers corresponding to y
+ """
+ colors = [None] * len(y)
+ sizes = [1.5] * len(y)
+ for i in range(len(y)):
+ count = -1
+ for v, c in value_colors:
+ count += 1
+ if count <= len(value_colors) - 2:
+ if abs(y[i]) <= v:
+ colors[i] = clr[c]
+ break
+ else:
+ # The last value color
+ colors[i] = clr[c]
+ return colors, sizes
--
GitLab