Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • software_public/passoft/sohstationviewer
1 result
Show changes
Commits on Source (10)
Pegasus firmware was updated to record VEI in millivolts.
Previous versions of the firmware recorded VEI in microvolts.
We decided to apply VEI's conversion factor in newer version of Pegasus.
If user may see higher than expected values in the older version of Pegasus.
\ No newline at end of file
......@@ -7,7 +7,7 @@ import os
import json
import re
from pathlib import Path
from typing import List, Optional, Dict, Tuple
from typing import List, Optional, Dict, Tuple, Union
from PySide6.QtCore import QEventLoop, Qt
from PySide6.QtGui import QCursor
......@@ -167,7 +167,7 @@ def read_mseed_channels(tracking_box: QTextBrowser, list_of_dir: List[str],
return channel_info
def detect_data_type(list_of_dir: List[str]) -> Optional[str]:
def detect_data_type(list_of_dir: List[Union[str, Path]]) -> Optional[str]:
"""
Detect data type for the given directories using get_data_type_from_file
:param list_of_dir: list of directories selected by users
......@@ -183,6 +183,10 @@ def detect_data_type(list_of_dir: List[str]) -> Optional[str]:
dir_data_type_dict = {}
is_multiplex_dict = {}
for d in list_of_dir:
try:
d = d.as_posix()
except AttributeError:
pass
data_type = "Unknown"
is_multiplex = None
for path, subdirs, files in os.walk(d):
......
No preview for this file type
......@@ -423,31 +423,30 @@ class MainWindow(QtWidgets.QMainWindow, UIMainWindow):
"TPS or RAW checkboxes checked.\nPlease clear the "
"selection of waveform if you don't want to display the data.")
if self.tps_check_box.isChecked() or self.raw_check_box.isChecked():
if self.all_wf_chans_check_box.isChecked():
req_mseed_wildcards = ['*']
req_dss = ['*'] # all data stream
else:
req_dss = []
req_mseed_wildcards = []
for idx, ds_checkbox in enumerate(self.ds_check_boxes):
if ds_checkbox.isChecked():
req_dss.append(idx + 1)
if self.mseed_wildcard_edit.text().strip() != "":
req_mseed_wildcards = self.mseed_wildcard_edit.text(
).split(",")
if self.data_type == 'RT130':
req_wf_chans = req_dss
if req_dss != ['*'] and req_mseed_wildcards != []:
msg = 'MSeed Wildcards will be ignored for RT130.'
self.processing_log.append((msg, LogType.WARNING))
else:
req_wf_chans = req_mseed_wildcards
if req_mseed_wildcards != ['*'] and req_dss != []:
msg = ('Checked data streams will be ignored for '
'none-RT130 data type.')
self.processing_log.append((msg, LogType.WARNING))
if self.all_wf_chans_check_box.isChecked():
req_mseed_wildcards = ['*']
req_dss = ['*'] # all data stream
else:
req_dss = []
req_mseed_wildcards = []
for idx, ds_checkbox in enumerate(self.ds_check_boxes):
if ds_checkbox.isChecked():
req_dss.append(idx + 1)
if self.mseed_wildcard_edit.text().strip() != "":
req_mseed_wildcards = self.mseed_wildcard_edit.text(
).split(",")
if self.data_type == 'RT130':
req_wf_chans = req_dss
if req_dss != ['*'] and req_mseed_wildcards != []:
msg = 'MSeed Wildcards will be ignored for RT130.'
self.processing_log.append((msg, LogType.WARNING))
else:
req_wf_chans = req_mseed_wildcards
if req_mseed_wildcards != ['*'] and req_dss != []:
msg = ('Checked data streams will be ignored for '
'none-RT130 data type.')
self.processing_log.append((msg, LogType.WARNING))
return req_wf_chans
def get_requested_soh_chan(self):
......@@ -894,8 +893,11 @@ class MainWindow(QtWidgets.QMainWindow, UIMainWindow):
self.is_plotting_waveform = False
self.is_plotting_tps = False
self.is_stopping = False
if len(self.data_object.keys) > 1:
self.plot_diff_key_button.setEnabled(True)
try:
if len(self.data_object.keys) > 1:
self.plot_diff_key_button.setEnabled(True)
except AttributeError:
pass
@QtCore.Slot()
def reset_is_plotting_waveform(self):
......