Skip to content

Commit e6742e6

Browse files
committed
Fix import order (broken since d50308c
1 parent bb1ca45 commit e6742e6

116 files changed

Lines changed: 264 additions & 238 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

datalab/adapters_plotpy/base.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636
LabelItem,
3737
PolygonShape,
3838
)
39-
40-
from datalab.config import PLOTPY_CONF, Conf
4139
from sigima.objects.base import (
4240
ROI_KEY,
4341
BaseObj,
@@ -52,6 +50,8 @@
5250
)
5351
from sigima.tools import coordinates
5452

53+
from datalab.config import PLOTPY_CONF, Conf
54+
5555
if TYPE_CHECKING:
5656
from plotpy.items import (
5757
AbstractShape,

datalab/adapters_plotpy/converters.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
AnnotatedRectangle,
1616
XRangeSelection,
1717
)
18-
19-
from datalab.adapters_plotpy.factories import create_adapter_from_object
2018
from sigima.objects import (
2119
CircularROI,
2220
PolygonalROI,
2321
RectangularROI,
2422
SegmentROI,
2523
)
2624

25+
from datalab.adapters_plotpy.factories import create_adapter_from_object
26+
2727

2828
def plotitem_to_singleroi(
2929
plot_item: XRangeSelection

datalab/adapters_plotpy/image.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
AnnotatedRectangle,
1919
MaskedImageItem,
2020
)
21+
from sigima.objects import CircularROI, ImageObj, ImageROI, PolygonalROI, RectangularROI
2122

2223
from datalab.adapters_plotpy.base import (
2324
BaseObjPlotPyAdapter,
2425
BaseROIPlotPyAdapter,
2526
BaseSingleROIPlotPyAdapter,
2627
)
2728
from datalab.config import Conf
28-
from sigima.objects import CircularROI, ImageObj, ImageROI, PolygonalROI, RectangularROI
2929

3030

3131
class PolygonalROIPlotPyAdapter(

datalab/adapters_plotpy/signal.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
from guidata.dataset import restore_dataset, update_dataset
1717
from plotpy.builder import make
1818
from plotpy.items import CurveItem, XRangeSelection
19+
from sigima.objects import SegmentROI, SignalObj, SignalROI
1920

2021
from datalab.adapters_plotpy.base import (
2122
BaseObjPlotPyAdapter,
2223
BaseROIPlotPyAdapter,
2324
BaseSingleROIPlotPyAdapter,
2425
)
2526
from datalab.config import Conf
26-
from sigima.objects import SegmentROI, SignalObj, SignalROI
2727

2828
if TYPE_CHECKING:
2929
from plotpy.styles import CurveParam

datalab/baseproxy.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030

3131
import guidata.dataset as gds
3232
import numpy as np
33-
3433
from sigima import ImageObj, SignalObj
3534

3635
if TYPE_CHECKING:

datalab/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
from plotpy.config import CONF as PLOTPY_CONF
1919
from plotpy.config import MAIN_BG_COLOR, MAIN_FG_COLOR
2020
from plotpy.constants import LUTAlpha
21+
from sigima.config import options as sigima_options
2122

2223
from datalab.utils import conf
23-
from sigima.config import options as sigima_options
2424

2525
CONF_VERSION = "0.3.0"
2626

datalab/gui/actionhandler.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,23 @@
3939
from contextlib import contextmanager
4040
from typing import TYPE_CHECKING
4141

42+
import sigima.objects as sio
4243
from guidata.configtools import get_icon
4344
from guidata.qthelpers import add_actions, create_action
4445
from qtpy import QtCore as QC
4546
from qtpy import QtGui as QG
4647
from qtpy import QtWidgets as QW
4748

48-
import sigima.objects as sio
4949
from datalab.config import Conf, _
5050
from datalab.gui import newobject
5151
from datalab.widgets import fitdialog
5252

5353
if TYPE_CHECKING:
54+
from sigima.objects import ImageObj, SignalObj
55+
5456
from datalab.gui.panel.image import ImagePanel
5557
from datalab.gui.panel.signal import SignalPanel
5658
from datalab.objectmodel import ObjectGroup
57-
from sigima.objects import ImageObj, SignalObj
5859

5960

6061
class SelectCond:

datalab/gui/docks.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@
5959
from qtpy import QtGui as QG
6060
from qtpy import QtWidgets as QW
6161
from qtpy.QtWidgets import QApplication, QMainWindow
62-
63-
from datalab.config import APP_NAME, Conf, _
6462
from sigima.objects import create_signal
6563
from sigima.tools.signal.pulse import fwhm
6664

65+
from datalab.config import APP_NAME, Conf, _
66+
6767
if TYPE_CHECKING:
6868
from plotpy.items.image.base import BaseImageItem
6969
from plotpy.plot import BasePlot

datalab/gui/h5io.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717

1818
from guidata.qthelpers import exec_dialog
1919
from qtpy import QtWidgets as QW
20+
from sigima.objects import SignalObj
2021

2122
from datalab.config import _
2223
from datalab.env import execenv
2324
from datalab.h5 import H5Importer
2425
from datalab.h5.native import NativeH5Reader, NativeH5Writer
2526
from datalab.utils.qthelpers import create_progress_bar, qt_try_loadsave_file
2627
from datalab.widgets.h5browser import H5BrowserDialog
27-
from sigima.objects import SignalObj
2828

2929
if TYPE_CHECKING:
3030
from datalab.gui.main import DLMainWindow

datalab/gui/macroeditor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
from guidata.widgets.console.shell import PythonShellWidget
2424
from qtpy import QtCore as QC
2525
from qtpy import QtWidgets as QW
26+
from sigima.io.common.converters import to_string
2627

2728
import datalab
2829
from datalab.config import _
2930
from datalab.env import execenv
3031
from datalab.gui import ObjItf
31-
from sigima.io.common.converters import to_string
3232

3333
UNTITLED_NB = 0
3434

0 commit comments

Comments
 (0)