Skip to content

Commit

Permalink
Another source code pass
Browse files Browse the repository at this point in the history
  • Loading branch information
willGraham01 committed Nov 1, 2023
1 parent 370a469 commit 797744c
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 22 deletions.
2 changes: 1 addition & 1 deletion brainglobe_segmentation/regions/analysis.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from napari.qt.threading import thread_worker
from skimage.measure import regionprops_table

from brainreg_segment.atlas.utils import lateralise_atlas_image
from brainglobe_segmentation.atlas.utils import lateralise_atlas_image


@thread_worker
Expand Down
24 changes: 15 additions & 9 deletions brainglobe_segmentation/segment.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
from qtpy import QtCore
from qtpy.QtWidgets import QFileDialog, QGridLayout, QGroupBox, QLabel, QWidget

from brainreg_segment.atlas.utils import (
from brainglobe_segmentation.atlas.utils import (
get_available_atlases,
structure_from_viewer,
)
from brainreg_segment.layout.gui_constants import (
from brainglobe_segmentation.layout.gui_constants import (
BOUNDARIES_STRING,
COLUMN_WIDTH,
DISPLAY_REGION_INFO,
Expand All @@ -23,15 +23,21 @@
WINDOW_HEIGHT,
WINDOW_WIDTH,
)
from brainreg_segment.layout.gui_elements import add_button, add_combobox
from brainreg_segment.layout.utils import display_warning
from brainreg_segment.paths import Paths
from brainreg_segment.regions.IO import export_label_layers, save_label_layers
from brainglobe_segmentation.layout.gui_elements import (
add_button,
add_combobox,
)
from brainglobe_segmentation.layout.utils import display_warning
from brainglobe_segmentation.paths import Paths
from brainglobe_segmentation.regions.IO import (
export_label_layers,
save_label_layers,
)

### SEGMENTATION
from brainreg_segment.segmentation_panels.regions import RegionSeg
from brainreg_segment.segmentation_panels.tracks import TrackSeg
from brainreg_segment.tracks.IO import export_splines, save_track_layers
from brainglobe_segmentation.segmentation_panels.regions import RegionSeg
from brainglobe_segmentation.segmentation_panels.tracks import TrackSeg
from brainglobe_segmentation.tracks.IO import export_splines, save_track_layers

### LAYOUT HELPERS

Expand Down
10 changes: 5 additions & 5 deletions brainglobe_segmentation/segmentation_panels/regions.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# RegionSeg
from qtpy.QtWidgets import QGridLayout, QGroupBox

from brainreg_segment.layout.gui_constants import (
from brainglobe_segmentation.layout.gui_constants import (
BRUSH_SIZE,
CALCULATE_VOLUMES_DEFAULT,
COLUMN_WIDTH,
Expand All @@ -11,13 +11,13 @@
SEGM_METHODS_PANEL_ALIGN,
SUMMARIZE_VOLUMES_DEFAULT,
)
from brainreg_segment.layout.gui_elements import (
from brainglobe_segmentation.layout.gui_elements import (
add_button,
add_checkbox,
)
from brainreg_segment.layout.utils import display_info, display_warning
from brainreg_segment.regions.analysis import region_analysis
from brainreg_segment.regions.layers import (
from brainglobe_segmentation.layout.utils import display_info, display_warning
from brainglobe_segmentation.regions.analysis import region_analysis
from brainglobe_segmentation.regions.layers import (
add_existing_region_segmentation,
add_new_region_layer,
add_region_from_existing_layer,
Expand Down
12 changes: 6 additions & 6 deletions brainglobe_segmentation/segmentation_panels/tracks.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import numpy as np
from qtpy.QtWidgets import QGridLayout, QGroupBox

from brainreg_segment.image.utils import create_KDTree_from_image
from brainreg_segment.layout.gui_constants import (
from brainglobe_segmentation.image.utils import create_KDTree_from_image
from brainglobe_segmentation.layout.gui_constants import (
COLUMN_WIDTH,
FIT_DEGREE_DEFAULT,
POINT_SIZE,
Expand All @@ -17,15 +17,15 @@
SUMMARISE_TRACK_DEFAULT,
TRACK_FILE_EXT,
)
from brainreg_segment.layout.gui_elements import (
from brainglobe_segmentation.layout.gui_elements import (
add_button,
add_checkbox,
add_float_box,
add_int_box,
)
from brainreg_segment.layout.utils import display_info, display_warning
from brainreg_segment.tracks.analysis import track_analysis
from brainreg_segment.tracks.layers import (
from brainglobe_segmentation.layout.utils import display_info, display_warning
from brainglobe_segmentation.tracks.analysis import track_analysis
from brainglobe_segmentation.tracks.layers import (
add_existing_track_layers,
add_new_track_layer,
add_track_from_existing_layer,
Expand Down
2 changes: 1 addition & 1 deletion brainglobe_segmentation/tracks/analysis.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np
import pandas as pd

from brainreg_segment.tracks.fit import spline_fit
from brainglobe_segmentation.tracks.fit import spline_fit


def track_analysis(
Expand Down

0 comments on commit 797744c

Please sign in to comment.