diff --git a/sohstationviewer/database/backup.db b/sohstationviewer/database/backup.db index c59be96b62d8a5525a7183d55082b2b00d71697e..d20b9ca92e87f76ba253903d33d18cda5ff04acc 100755 Binary files a/sohstationviewer/database/backup.db and b/sohstationviewer/database/backup.db differ diff --git a/sohstationviewer/database/soh.db b/sohstationviewer/database/soh.db index c59be96b62d8a5525a7183d55082b2b00d71697e..d20b9ca92e87f76ba253903d33d18cda5ff04acc 100755 Binary files a/sohstationviewer/database/soh.db and b/sohstationviewer/database/soh.db differ diff --git a/sohstationviewer/view/util/plot_type_info.py b/sohstationviewer/view/util/plot_type_info.py index ac04f2593b52acf1b43b449a38992d2e29e78528..c90cd9473e76e005267afbafb683bd152f478fef 100644 --- a/sohstationviewer/view/util/plot_type_info.py +++ b/sohstationviewer/view/util/plot_type_info.py @@ -21,7 +21,7 @@ plot_types = { "plot_function": "plot_lines_dots", "value_pattern": re.compile('^(L|D|Z|Line|Dot|Zero)$'), "pattern": re.compile(f'^$|^(?:Line|Dot|Zero):{color_regex}$'), - "default_value_color": "Line:#00FF00" + "default_value_color": "Line:#00CC00" }, 'linesSRate': { "description": "Lines, one color dots, bitweight info. ", @@ -42,7 +42,7 @@ plot_types = { "plot_function": "plot_tri_colors", "value_pattern": re.compile('^-?[10]?$'), "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 }, 'dotForTime': { @@ -53,7 +53,7 @@ plot_types = { "plot_function": "plot_dot_for_time", "value_pattern": re.compile('^C|(Color)$'), "pattern": re.compile(f'^$|^Color:{color_regex}$'), - "default_value_color": "Color:#00FF00", + "default_value_color": "Color:#00CC00", "total_value_color_required": 1 }, 'multiColorDotsEqualOnUpperBound': { @@ -86,7 +86,7 @@ plot_types = { "pattern": re.compile( fr'^[=<]?[0-9]\.?[0-9]?:(?:{color_regex}|not plot)' ), - "default_value_color": "<0:#FF0000|=0:#00FF00" + "default_value_color": "<0:#FF0000|=0:#00CC00" }, 'upDownDots': { "description": ( diff --git a/tests/database/test_extract_data.py b/tests/database/test_extract_data.py index f92f4ca67451f6dddf5ca63a15504b5d499c7cdd..c89b87b103467c1b6862870b2306165f7751d429 100644 --- a/tests/database/test_extract_data.py +++ b/tests/database/test_extract_data.py @@ -26,7 +26,7 @@ class TestGetChanPlotInfo(BaseTestCase): 'dbLabel': None, 'label': 'SOH/Data Def', 'fixPoint': 0, - 'valueColors': 'Down:#FFFFFF|Up:#00FFFF'} + 'valueColors': 'Up:#00FFFF|Down:#FFFFFF'} self.assertDictEqual(get_chan_plot_info('SOH/Data Def', 'RT130'), expected_result)