Skip to content

Commit cc1866b

Browse files
committed
Move to_string, count_lines, and read_first_n_lines to common modules for better organization
(cherry picked from commit 756ce0d5e80ad9676cf468c54e168dab292689f4) # Conflicts: # sigima_/io/image/formats.py # sigima_/io/signal/formats.py
1 parent cb29d5c commit cc1866b

14 files changed

Lines changed: 18 additions & 13 deletions

File tree

cdl/gui/macroeditor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
from cdl.config import _
2929
from cdl.env import execenv
3030
from cdl.gui import ObjItf
31-
from sigima_.io.converters import to_string
31+
from sigima_.io.common.converters import to_string
3232

3333
UNTITLED_NB = 0
3434

cdl/h5/common.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import numpy as np
1717

1818
from cdl.config import Conf
19-
from sigima_.io.converters import convert_array_to_standard_type, to_string
19+
from sigima_.io.common.converters import convert_array_to_standard_type, to_string
2020

2121

2222
def data_to_xy(data: np.ndarray) -> list[np.ndarray]:

cdl/h5/generic.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import numpy as np
1111

1212
from cdl.h5 import common, utils
13-
from sigima_.io.converters import to_string
13+
from sigima_.io.common.converters import to_string
1414
from sigima_.obj import create_image, create_signal
1515

1616

cdl/h5/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import numpy as np
1010

11-
from sigima_.io.converters import to_string
11+
from sigima_.io.common.converters import to_string
1212

1313

1414
def fix_ldata(fuzzy):

cdl/utils/qthelpers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
from cdl.config import APP_NAME, DATETIME_FORMAT, SHOTPATH, Conf, _, get_old_log_fname
3131
from cdl.env import execenv
32-
from sigima_.io.converters import to_string
32+
from sigima_.io.common.converters import to_string
3333

3434

3535
def close_widgets_and_quit(screenshot=False) -> None:

cdl/widgets/h5browser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
from cdl.h5 import H5Importer
3737
from cdl.utils.qthelpers import qt_handle_error_message
3838
from sigima_ import ImageObj, SignalObj
39-
from sigima_.io.converters import to_string
39+
from sigima_.io.common.converters import to_string
4040

4141
if TYPE_CHECKING:
4242
from plotpy.plot import BasePlot

cdl/widgets/textimport.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
from cdl.utils.qthelpers import CallbackWorker, create_progress_bar, qt_long_callback
3838
from cdl.widgets.wizard import Wizard, WizardPage
3939
from sigima_ import ImageObj, SignalObj, create_image, create_signal
40+
from sigima_.io.common.textreader import count_lines, read_first_n_lines
4041
from sigima_.io.signal.funcs import get_labels_units_from_dataframe, read_csv_by_chunks
41-
from sigima_.io.textreader import count_lines, read_first_n_lines
4242

4343
if TYPE_CHECKING:
4444
from plotpy.items import CurveItem, MaskedImageItem

sigima_/io/common/__init__.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Copyright (c) DataLab Platform Developers, BSD 3-Clause license, see LICENSE file.
2+
3+
"""
4+
Common I/O features
5+
"""

0 commit comments

Comments
 (0)