diff --git a/sohstationviewer/model/data_loader.py b/sohstationviewer/model/data_loader.py index d1e08c29536015e98f1ca1c54ae73a10abba32bd..a1bfb1a29f90cea2e3fd64e31d6cd0941a86e6df 100644 --- a/sohstationviewer/model/data_loader.py +++ b/sohstationviewer/model/data_loader.py @@ -59,7 +59,7 @@ class DataLoaderWorker(QtCore.QObject): def run(self): try: if self.data_type == 'RT130': - from sohstationviewer.model.reftek.reftek import RT130 + from sohstationviewer.model.reftek_data.reftek import RT130 object_type = RT130 else: from sohstationviewer.model.mseed_data.mseed import MSeed diff --git a/sohstationviewer/model/reftek/__init__.py b/sohstationviewer/model/reftek_data/__init__.py similarity index 100% rename from sohstationviewer/model/reftek/__init__.py rename to sohstationviewer/model/reftek_data/__init__.py diff --git a/sohstationviewer/model/reftek/log_info.py b/sohstationviewer/model/reftek_data/log_info.py similarity index 99% rename from sohstationviewer/model/reftek/log_info.py rename to sohstationviewer/model/reftek_data/log_info.py index 54756cdfee58af8b33f9529cd854bc7582b55609..70e5a111fd5a5a8d2ec43c25d69c4b56f0a4a0ff 100644 --- a/sohstationviewer/model/reftek/log_info.py +++ b/sohstationviewer/model/reftek_data/log_info.py @@ -7,7 +7,7 @@ from sohstationviewer.controller.util import ( from sohstationviewer.view.util.enums import LogType if TYPE_CHECKING: - from sohstationviewer.model.reftek.reftek import RT130 + from sohstationviewer.model.reftek_data.reftek import RT130 class LogInfo(): diff --git a/sohstationviewer/model/reftek/reftek.py b/sohstationviewer/model/reftek_data/reftek.py similarity index 98% rename from sohstationviewer/model/reftek/reftek.py rename to sohstationviewer/model/reftek_data/reftek.py index 69e549594b431fdb2bdaec3021d0a5979b14ec2c..8bf7eee12796adcd4be6774c0b1823fc30fc27e5 100755 --- a/sohstationviewer/model/reftek/reftek.py +++ b/sohstationviewer/model/reftek_data/reftek.py @@ -7,8 +7,8 @@ from typing import Tuple, List, Union import traceback import numpy as np -from sohstationviewer.model.reftek.reftek_data import core, soh_packet -from sohstationviewer.model.reftek.log_info import LogInfo +from sohstationviewer.model.reftek_data.reftek_data import core, soh_packet +from sohstationviewer.model.reftek_data.log_info import LogInfo from sohstationviewer.model.data_type_model import ( DataTypeModel, ThreadStopped, ProcessingDataError) from sohstationviewer.model.handling_data import read_text diff --git a/sohstationviewer/model/reftek/reftek_reader/__init__.py b/sohstationviewer/model/reftek_data/reftek_reader/__init__.py similarity index 100% rename from sohstationviewer/model/reftek/reftek_reader/__init__.py rename to sohstationviewer/model/reftek_data/reftek_reader/__init__.py diff --git a/sohstationviewer/model/reftek/reftek_reader/core.py b/sohstationviewer/model/reftek_data/reftek_reader/core.py similarity index 98% rename from sohstationviewer/model/reftek/reftek_reader/core.py rename to sohstationviewer/model/reftek_data/reftek_reader/core.py index a0ad2b10e470d2705bb0bd83d6b575b8b6491ae6..ff647893448aeaca6a43c5232dbc40d615f39eb1 100644 --- a/sohstationviewer/model/reftek/reftek_reader/core.py +++ b/sohstationviewer/model/reftek_data/reftek_reader/core.py @@ -23,9 +23,9 @@ from obspy.core.util.obspy_types import ObsPyException from obspy.io.reftek.packet import PACKET_FINAL_DTYPE from sohstationviewer.model.mseed_data.record_reader_helper import Unpacker -from sohstationviewer.model.reftek.reftek_reader.packet import EHPacket +from sohstationviewer.model.reftek_data.reftek_reader.packet import EHPacket -from sohstationviewer.model.reftek.reftek_reader.reftek_helper import ( +from sohstationviewer.model.reftek_data.reftek_reader.reftek_helper import ( read_rt130_file, convert_packet_to_obspy_format, ) diff --git a/sohstationviewer/model/reftek/reftek_reader/header.py b/sohstationviewer/model/reftek_data/reftek_reader/header.py similarity index 100% rename from sohstationviewer/model/reftek/reftek_reader/header.py rename to sohstationviewer/model/reftek_data/reftek_reader/header.py diff --git a/sohstationviewer/model/reftek/reftek_reader/packet.py b/sohstationviewer/model/reftek_data/reftek_reader/packet.py similarity index 98% rename from sohstationviewer/model/reftek/reftek_reader/packet.py rename to sohstationviewer/model/reftek_data/reftek_reader/packet.py index 56a579c360ead8edcfd8cb361fcd8b2b6101330c..d30400cd6629b08d06c8bf9b08d1c4d38f6808dc 100644 --- a/sohstationviewer/model/reftek/reftek_reader/packet.py +++ b/sohstationviewer/model/reftek_data/reftek_reader/packet.py @@ -19,7 +19,7 @@ from obspy.io.reftek.util import ( _decode_ascii, _parse_long_time, _16_tuple_ascii, _16_tuple_float, _16_tuple_int, ) -from sohstationviewer.model.reftek.reftek_reader.soh_packet import SOHPacket +from sohstationviewer.model.reftek_data.reftek_reader.soh_packet import SOHPacket class Reftek130UnpackPacketError(ValueError): diff --git a/sohstationviewer/model/reftek/reftek_reader/packet_readers.py b/sohstationviewer/model/reftek_data/reftek_reader/packet_readers.py similarity index 97% rename from sohstationviewer/model/reftek/reftek_reader/packet_readers.py rename to sohstationviewer/model/reftek_data/reftek_reader/packet_readers.py index ccec5b3cc08b3c8644c54bf8e241dae019bf60b5..ff9cc90a986356f3228117f5ef3861bc56f8cb5e 100644 --- a/sohstationviewer/model/reftek/reftek_reader/packet_readers.py +++ b/sohstationviewer/model/reftek_data/reftek_reader/packet_readers.py @@ -4,9 +4,9 @@ import numpy from obspy.io.reftek.util import bcd from sohstationviewer.model.mseed_data.record_reader_helper import Unpacker -from sohstationviewer.model.reftek.reftek_reader.packet import \ +from sohstationviewer.model.reftek_data.reftek_reader.packet import \ eh_et_payload_end_in_packet -from sohstationviewer.model.reftek.reftek_reader.packets import ( +from sohstationviewer.model.reftek_data.reftek_reader.packets import ( DTExtendedHeader, EHETExtendedHeader, SOHExtendedHeader, ) diff --git a/sohstationviewer/model/reftek/reftek_reader/packets.py b/sohstationviewer/model/reftek_data/reftek_reader/packets.py similarity index 96% rename from sohstationviewer/model/reftek/reftek_reader/packets.py rename to sohstationviewer/model/reftek_data/reftek_reader/packets.py index 8418632cadf6f2e749bd2a6aa4a7ce42d1bf360d..90607bbdb213fb3574b1d8dd0290cfff98df4b39 100644 --- a/sohstationviewer/model/reftek/reftek_reader/packets.py +++ b/sohstationviewer/model/reftek_data/reftek_reader/packets.py @@ -1,6 +1,6 @@ import dataclasses -from sohstationviewer.model.reftek.reftek_reader.header import PacketHeader +from sohstationviewer.model.reftek_data.reftek_reader.header import PacketHeader @dataclasses.dataclass diff --git a/sohstationviewer/model/reftek/reftek_reader/reftek_helper.py b/sohstationviewer/model/reftek_data/reftek_reader/reftek_helper.py similarity index 95% rename from sohstationviewer/model/reftek/reftek_reader/reftek_helper.py rename to sohstationviewer/model/reftek_data/reftek_reader/reftek_helper.py index cb1a894c6cc1a54accc7cc2a72f2b10ae9661867..5f0e6cdc6a6aa15733d62abfe8d2517ed800554d 100644 --- a/sohstationviewer/model/reftek/reftek_reader/reftek_helper.py +++ b/sohstationviewer/model/reftek_data/reftek_reader/reftek_helper.py @@ -5,15 +5,15 @@ import numpy import numpy as np from sohstationviewer.model.mseed_data.record_reader_helper import Unpacker -from sohstationviewer.model.reftek.reftek_reader.packet import \ +from sohstationviewer.model.reftek_data.reftek_reader.packet import \ eh_et_payload_end_in_packet -from sohstationviewer.model.reftek.reftek_reader.packet_readers import ( +from sohstationviewer.model.reftek_data.reftek_reader.packet_readers import ( read_dt_packet, read_eh_et_packet, read_soh_packet, ) -from sohstationviewer.model.reftek.reftek_reader.packets import ( +from sohstationviewer.model.reftek_data.reftek_reader.packets import ( DTPacket, EHETPacket, SOHPacket, ) -from sohstationviewer.model.reftek.reftek_reader.header import \ +from sohstationviewer.model.reftek_data.reftek_reader.header import \ get_rt130_packet_header diff --git a/sohstationviewer/model/reftek/reftek_reader/soh_packet.py b/sohstationviewer/model/reftek_data/reftek_reader/soh_packet.py similarity index 100% rename from sohstationviewer/model/reftek/reftek_reader/soh_packet.py rename to sohstationviewer/model/reftek_data/reftek_reader/soh_packet.py diff --git a/sohstationviewer/view/file_information/get_file_information.py b/sohstationviewer/view/file_information/get_file_information.py index 302d55e47e875529ccf833ede84e7aa95aebf092..aa3b3dd8142ee77dcf7c066a169d80234cbde8e8 100644 --- a/sohstationviewer/view/file_information/get_file_information.py +++ b/sohstationviewer/view/file_information/get_file_information.py @@ -3,7 +3,7 @@ from typing import Union, Dict, List, Set, Tuple from sohstationviewer.controller.plotting_data import format_time from sohstationviewer.model.general_data.general_data import GeneralData from sohstationviewer.model.mseed_data.mseed import MSeed -from sohstationviewer.model.reftek.reftek import RT130 +from sohstationviewer.model.reftek_data.reftek import RT130 from sohstationviewer.view.util.functions import extract_netcodes diff --git a/sohstationviewer/view/plotting/gps_plot/extract_gps_data.py b/sohstationviewer/view/plotting/gps_plot/extract_gps_data.py index 9a876211798221f824298ca880f39f94a1e7f734..0c0a6ecf102b45ef1ca8e0f41857fc853d6ffda9 100644 --- a/sohstationviewer/view/plotting/gps_plot/extract_gps_data.py +++ b/sohstationviewer/view/plotting/gps_plot/extract_gps_data.py @@ -7,7 +7,7 @@ import numpy as np from obspy import UTCDateTime from sohstationviewer.model.mseed_data.mseed import MSeed -from sohstationviewer.model.reftek.reftek import RT130 +from sohstationviewer.model.reftek_data.reftek import RT130 from sohstationviewer.view.plotting.gps_plot.gps_point import GPSPoint from sohstationviewer.view.util.enums import LogType diff --git a/tests/test_model/test_reftek/test_core.py b/tests/test_model/test_reftek/test_core.py index 27bd475b3072787a825f0253cd0421c7a4a1691f..8036702536584dccdc314a6886d00876621f3636 100644 --- a/tests/test_model/test_reftek/test_core.py +++ b/tests/test_model/test_reftek/test_core.py @@ -6,11 +6,11 @@ import numpy import obspy.core from numpy.testing import assert_array_equal -from sohstationviewer.model.reftek.reftek_reader.core import ( +from sohstationviewer.model.reftek_data.reftek_reader.core import ( DiscontinuousTrace, Reftek130, ) -from sohstationviewer.model.reftek.reftek_reader.header import NotRT130FileError +from sohstationviewer.model.reftek_data.reftek_reader.header import NotRT130FileError class TestDiscontinuousTrace(unittest.TestCase): diff --git a/tests/test_model/test_reftek/test_header.py b/tests/test_model/test_reftek/test_header.py index 7af53aa0eb2214d3ac54921ba8c8431de2e1788a..24678a26a87f2ae74a295007fc36620d1b5a670d 100644 --- a/tests/test_model/test_reftek/test_header.py +++ b/tests/test_model/test_reftek/test_header.py @@ -1,6 +1,6 @@ import unittest -from sohstationviewer.model.reftek.reftek_reader.header import ( +from sohstationviewer.model.reftek_data.reftek_reader.header import ( parse_rt130_time, get_rt130_packet_header, NotRT130FileError, ) diff --git a/tests/test_model/test_reftek/test_packet_readers.py b/tests/test_model/test_reftek/test_packet_readers.py index 73253f81b29126d1870f81eb184c5607414aa3b0..2235ea668cc999bb26b16b597b97e4e788dbc11a 100644 --- a/tests/test_model/test_reftek/test_packet_readers.py +++ b/tests/test_model/test_reftek/test_packet_readers.py @@ -2,13 +2,13 @@ import unittest from unittest.mock import patch from sohstationviewer.model.mseed_data.record_reader_helper import Unpacker -from sohstationviewer.model.reftek.reftek_reader.packet import \ +from sohstationviewer.model.reftek_data.reftek_reader.packet import \ eh_et_payload_end_in_packet -from sohstationviewer.model.reftek.reftek_reader.packet_readers import ( +from sohstationviewer.model.reftek_data.reftek_reader.packet_readers import ( decode_uncompressed, decode_compressed, read_dt_packet, read_eh_et_packet, read_soh_packet, ) -from sohstationviewer.model.reftek.reftek_reader.packets import SOHExtendedHeader +from sohstationviewer.model.reftek_data.reftek_reader.packets import SOHExtendedHeader unpacker = Unpacker('>') diff --git a/tests/test_model/test_reftek/test_reftek_helper.py b/tests/test_model/test_reftek/test_reftek_helper.py index 11a2647c387b5e55d111fc1d78e01b8ab5d8a5fd..d5b132e62d8c4c6c876005039ba9ee9ef452f9ac 100644 --- a/tests/test_model/test_reftek/test_reftek_helper.py +++ b/tests/test_model/test_reftek/test_reftek_helper.py @@ -6,15 +6,15 @@ from unittest.mock import patch from obspy.io.reftek.packet import PACKET_FINAL_DTYPE from sohstationviewer.model.mseed_data.record_reader_helper import Unpacker -from sohstationviewer.model.reftek.reftek_reader.header import NotRT130FileError -from sohstationviewer.model.reftek.reftek_reader.packet_readers import ( +from sohstationviewer.model.reftek_data.reftek_reader.header import NotRT130FileError +from sohstationviewer.model.reftek_data.reftek_reader.packet_readers import ( read_eh_et_packet, read_dt_packet, read_soh_packet, ) -from sohstationviewer.model.reftek.reftek_reader.packets import ( +from sohstationviewer.model.reftek_data.reftek_reader.packets import ( SOHPacket, EHETPacket, DTPacket, ) -from sohstationviewer.model.reftek.reftek_reader.reftek_helper import ( +from sohstationviewer.model.reftek_data.reftek_reader.reftek_helper import ( read_rt130_file, convert_packet_to_obspy_format, )