From c7b66da910520525fd6169f07a3f36abae4ba775 Mon Sep 17 00:00:00 2001
From: ldam <ldam@passcal.nmt.edu>
Date: Mon, 22 May 2023 11:41:09 -0600
Subject: [PATCH] combine get_wf_plot_info() into get_chan_plot_info
---
sohstationviewer/database/extract_data.py | 43 +++++++----------------
1 file changed, 12 insertions(+), 31 deletions(-)
diff --git a/sohstationviewer/database/extract_data.py b/sohstationviewer/database/extract_data.py
index c6cf6581b..dcb518d2a 100755
--- a/sohstationviewer/database/extract_data.py
+++ b/sohstationviewer/database/extract_data.py
@@ -5,7 +5,7 @@ from sohstationviewer.database.process_db import execute_db_dict, execute_db
from sohstationviewer.conf.dbSettings import dbConf
-def get_chan_plot_info(org_chan_id: str, chan_info: Dict, data_type: str,
+def get_chan_plot_info(org_chan_id: str, data_type: str,
color_mode: ColorMode = 'B') -> Dict:
"""
Given chanID read from raw data file and detected dataType
@@ -24,10 +24,10 @@ def get_chan_plot_info(org_chan_id: str, chan_info: Dict, data_type: str,
chan = 'VM?'
if org_chan_id.startswith('MassPos'):
chan = 'MassPos?'
+ if org_chan_id.startswith('DS'):
+ chan = 'SEISMIC'
if org_chan_id.startswith('Event DS'):
chan = 'Event DS?'
- if org_chan_id.startswith('DS'):
- chan = 'DS?'
if org_chan_id.startswith('Disk Usage'):
chan = 'Disk Usage?'
if dbConf['seisRE'].match(chan):
@@ -46,17 +46,13 @@ def get_chan_plot_info(org_chan_id: str, chan_info: Dict, data_type: str,
sql = (f"{o_sql} WHERE channel='{chan}' and C.param=P.param"
f" and dataType='{data_type}'")
chan_db_info = execute_db_dict(sql)
-
+ seismic_label = None
if len(chan_db_info) == 0:
chan_db_info = execute_db_dict(
f"{o_sql} WHERE channel='DEFAULT' and C.param=P.param")
else:
if chan_db_info[0]['channel'] == 'SEISMIC':
- try:
- chan_db_info[0]['label'] = dbConf['seisLabel'][org_chan_id[-1]]
- except KeyError:
- chan_db_info[0]['label'] = str(chan_info['samplerate'])
-
+ seismic_label = get_seismic_chan_label(org_chan_id)
chan_db_info[0]['channel'] = org_chan_id
chan_db_info[0]['label'] = (
@@ -68,6 +64,8 @@ def get_chan_plot_info(org_chan_id: str, chan_info: Dict, data_type: str,
else chan_db_info[0]['fixPoint'])
if chan_db_info[0]['label'].strip() == '':
chan_db_info[0]['label'] = chan_db_info[0]['channel']
+ elif seismic_label is not None:
+ chan_db_info[0]['label'] = seismic_label
else:
chan_db_info[0]['label'] = '-'.join([chan_db_info[0]['channel'],
chan_db_info[0]['label']])
@@ -76,30 +74,13 @@ def get_chan_plot_info(org_chan_id: str, chan_info: Dict, data_type: str,
return chan_db_info[0]
-def get_wf_plot_info(org_chan_id: str, *args, **kwargs) -> Dict:
+def get_seismic_chan_label(chan_id):
"""
- :param org_chan_id: channel name read from data source
- :param chan_info: to be compliant with get_chan_plot_info()
- :param data_type: to be compliant with get_chan_plot_info()
- :param color_mode: to be compliant with get_chan_plot_info()
- :return info of channel read from DB which is used for plotting
+ Get label for chan_id in which data stream can use chan_id for label while
+ other seismic need to add coordinate to chan_id for label
+ :param chan_id: name of channel
+ :return label: label to put in front of the plot of the channel
"""
- # Waveform plot's color is fixed to NULL in the database, so we do not need
- # to get the valueColors columns from the database.
- chan_info = execute_db_dict(
- "SELECT param, plotType, height "
- "FROM Parameters WHERE param='Seismic data'")
- # The plotting API still requires that the key 'valueColors' is mapped to
- # something, so we are setting it to None.
- chan_info[0]['valueColors'] = None
- chan_info[0]['label'] = get_chan_label(org_chan_id)
- chan_info[0]['unit'] = ''
- chan_info[0]['channel'] = 'SEISMIC'
- chan_info[0]['convertFactor'] = 1
- return chan_info[0]
-
-
-def get_chan_label(chan_id):
if chan_id.startswith("DS"):
label = chan_id
else:
--
GitLab