From fd30f3eec8f9436f42d5f703f407724ea0bd49ad Mon Sep 17 00:00:00 2001
From: ldam <ldam@passcal.nmt.edu>
Date: Mon, 28 Aug 2023 11:47:19 -0600
Subject: [PATCH] change name from model/reftek/ to model/reftek_data/
---
sohstationviewer/model/data_loader.py | 2 +-
.../model/{reftek => reftek_data}/__init__.py | 0
.../model/{reftek => reftek_data}/log_info.py | 2 +-
sohstationviewer/model/{reftek => reftek_data}/reftek.py | 4 ++--
.../{reftek => reftek_data}/reftek_reader/__init__.py | 0
.../model/{reftek => reftek_data}/reftek_reader/core.py | 4 ++--
.../model/{reftek => reftek_data}/reftek_reader/header.py | 0
.../model/{reftek => reftek_data}/reftek_reader/packet.py | 2 +-
.../reftek_reader/packet_readers.py | 4 ++--
.../{reftek => reftek_data}/reftek_reader/packets.py | 2 +-
.../reftek_reader/reftek_helper.py | 8 ++++----
.../{reftek => reftek_data}/reftek_reader/soh_packet.py | 0
.../view/file_information/get_file_information.py | 2 +-
.../view/plotting/gps_plot/extract_gps_data.py | 2 +-
tests/test_model/test_reftek/test_core.py | 4 ++--
tests/test_model/test_reftek/test_header.py | 2 +-
tests/test_model/test_reftek/test_packet_readers.py | 6 +++---
tests/test_model/test_reftek/test_reftek_helper.py | 8 ++++----
18 files changed, 26 insertions(+), 26 deletions(-)
rename sohstationviewer/model/{reftek => reftek_data}/__init__.py (100%)
rename sohstationviewer/model/{reftek => reftek_data}/log_info.py (99%)
rename sohstationviewer/model/{reftek => reftek_data}/reftek.py (98%)
rename sohstationviewer/model/{reftek => reftek_data}/reftek_reader/__init__.py (100%)
rename sohstationviewer/model/{reftek => reftek_data}/reftek_reader/core.py (98%)
rename sohstationviewer/model/{reftek => reftek_data}/reftek_reader/header.py (100%)
rename sohstationviewer/model/{reftek => reftek_data}/reftek_reader/packet.py (98%)
rename sohstationviewer/model/{reftek => reftek_data}/reftek_reader/packet_readers.py (97%)
rename sohstationviewer/model/{reftek => reftek_data}/reftek_reader/packets.py (96%)
rename sohstationviewer/model/{reftek => reftek_data}/reftek_reader/reftek_helper.py (95%)
rename sohstationviewer/model/{reftek => reftek_data}/reftek_reader/soh_packet.py (100%)
diff --git a/sohstationviewer/model/data_loader.py b/sohstationviewer/model/data_loader.py
index d1e08c295..a1bfb1a29 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 54756cdfe..70e5a111f 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 69e549594..8bf7eee12 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 a0ad2b10e..ff6478934 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 56a579c36..d30400cd6 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 ccec5b3cc..ff9cc90a9 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 8418632ca..90607bbdb 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 cb1a894c6..5f0e6cdc6 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 302d55e47..aa3b3dd81 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 9a8762117..0c0a6ecf1 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 27bd475b3..803670253 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 7af53aa0e..24678a26a 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 73253f81b..2235ea668 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 11a2647c3..d5b132e62 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,
)
--
GitLab