Skip to content
Snippets Groups Projects
Commit 7d200e89 authored by Lan Dam's avatar Lan Dam
Browse files

Merge branch 'update_color_for_white_background' into 'develop'

Update color for white background

Closes #107

See merge request !304
parents f3ce3d8f 2075f3b1
No related branches found
No related tags found
1 merge request!304Update color for white background
Pipeline #3920 passed with stage
in 4 minutes and 40 seconds
No preview for this file type
No preview for this file type
...@@ -21,7 +21,7 @@ plot_types = { ...@@ -21,7 +21,7 @@ plot_types = {
"plot_function": "plot_lines_dots", "plot_function": "plot_lines_dots",
"value_pattern": re.compile('^(L|D|Z|Line|Dot|Zero)$'), "value_pattern": re.compile('^(L|D|Z|Line|Dot|Zero)$'),
"pattern": re.compile(f'^$|^(?:Line|Dot|Zero):{color_regex}$'), "pattern": re.compile(f'^$|^(?:Line|Dot|Zero):{color_regex}$'),
"default_value_color": "Line:#00FF00" "default_value_color": "Line:#00CC00"
}, },
'linesSRate': { 'linesSRate': {
"description": "Lines, one color dots, bitweight info. ", "description": "Lines, one color dots, bitweight info. ",
...@@ -42,7 +42,7 @@ plot_types = { ...@@ -42,7 +42,7 @@ plot_types = {
"plot_function": "plot_tri_colors", "plot_function": "plot_tri_colors",
"value_pattern": re.compile('^-?[10]?$'), "value_pattern": re.compile('^-?[10]?$'),
"pattern": re.compile(f'^-?[10]:{color_regex}$'), "pattern": re.compile(f'^-?[10]:{color_regex}$'),
"default_value_color": "-1:#FF0000|0:#00FF00|1:#0000FF", "default_value_color": "-1:#FF0000|0:#00CC00|1:#0099DD",
"total_value_color_required": 3 "total_value_color_required": 3
}, },
'dotForTime': { 'dotForTime': {
...@@ -53,7 +53,7 @@ plot_types = { ...@@ -53,7 +53,7 @@ plot_types = {
"plot_function": "plot_dot_for_time", "plot_function": "plot_dot_for_time",
"value_pattern": re.compile('^C|(Color)$'), "value_pattern": re.compile('^C|(Color)$'),
"pattern": re.compile(f'^$|^Color:{color_regex}$'), "pattern": re.compile(f'^$|^Color:{color_regex}$'),
"default_value_color": "Color:#00FF00", "default_value_color": "Color:#00CC00",
"total_value_color_required": 1 "total_value_color_required": 1
}, },
'multiColorDotsEqualOnUpperBound': { 'multiColorDotsEqualOnUpperBound': {
...@@ -86,7 +86,7 @@ plot_types = { ...@@ -86,7 +86,7 @@ plot_types = {
"pattern": re.compile( "pattern": re.compile(
fr'^[=<]?[0-9]\.?[0-9]?:(?:{color_regex}|not plot)' fr'^[=<]?[0-9]\.?[0-9]?:(?:{color_regex}|not plot)'
), ),
"default_value_color": "<0:#FF0000|=0:#00FF00" "default_value_color": "<0:#FF0000|=0:#00CC00"
}, },
'upDownDots': { 'upDownDots': {
"description": ( "description": (
......
...@@ -26,7 +26,7 @@ class TestGetChanPlotInfo(BaseTestCase): ...@@ -26,7 +26,7 @@ class TestGetChanPlotInfo(BaseTestCase):
'dbLabel': None, 'dbLabel': None,
'label': 'SOH/Data Def', 'label': 'SOH/Data Def',
'fixPoint': 0, 'fixPoint': 0,
'valueColors': 'Down:#FFFFFF|Up:#00FFFF'} 'valueColors': 'Up:#00FFFF|Down:#FFFFFF'}
self.assertDictEqual(get_chan_plot_info('SOH/Data Def', 'RT130'), self.assertDictEqual(get_chan_plot_info('SOH/Data Def', 'RT130'),
expected_result) expected_result)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment