Skip to content

Commit 4154479

Browse files
claudeclaude
committed
Flatten plot module: remove plots/ and wrap/ subpackages
Move all files to the top-level autoarray/plot/ package: plots/{array,grid,yx,inversion,utils}.py -> plot/ wrap/base/output.py -> plot/output.py wrap/segmentdata.py -> plot/segmentdata.py Update all internal and external imports accordingly. Delete plots/ and wrap/ subdirectories entirely. https://claude.ai/code/session_01B9sVEV54XWCa2LJw1C8gvv
1 parent 645ff31 commit 4154479

20 files changed

Lines changed: 29 additions & 67 deletions

‎autoarray/dataset/plot/imaging_plots.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import matplotlib.pyplot as plt
44

5-
from autoarray.plot.plots.array import plot_array
6-
from autoarray.plot.plots.utils import subplot_save
5+
from autoarray.plot.array import plot_array
6+
from autoarray.plot.utils import subplot_save
77

88

99
def subplot_imaging_dataset(

‎autoarray/dataset/plot/interferometer_plots.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
import matplotlib.pyplot as plt
55

6-
from autoarray.plot.plots.array import plot_array
7-
from autoarray.plot.plots.grid import plot_grid
8-
from autoarray.plot.plots.yx import plot_yx
9-
from autoarray.plot.plots.utils import subplot_save
6+
from autoarray.plot.array import plot_array
7+
from autoarray.plot.grid import plot_grid
8+
from autoarray.plot.yx import plot_yx
9+
from autoarray.plot.utils import subplot_save
1010
from autoarray.structures.grids.irregular_2d import Grid2DIrregular
1111

1212

‎autoarray/fit/plot/fit_imaging_plots.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import matplotlib.pyplot as plt
44

5-
from autoarray.plot.plots.array import plot_array
6-
from autoarray.plot.plots.utils import subplot_save, symmetric_vmin_vmax
5+
from autoarray.plot.array import plot_array
6+
from autoarray.plot.utils import subplot_save, symmetric_vmin_vmax
77

88

99
def subplot_fit_imaging(

‎autoarray/fit/plot/fit_interferometer_plots.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
import matplotlib.pyplot as plt
55

6-
from autoarray.plot.plots.array import plot_array
7-
from autoarray.plot.plots.yx import plot_yx
8-
from autoarray.plot.plots.utils import subplot_save, symmetric_vmin_vmax
6+
from autoarray.plot.array import plot_array
7+
from autoarray.plot.yx import plot_yx
8+
from autoarray.plot.utils import subplot_save, symmetric_vmin_vmax
99

1010

1111
def subplot_fit_interferometer(

‎autoarray/inversion/plot/inversion_plots.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
from autoconf import conf
77

88
from autoarray.inversion.mappers.abstract import Mapper
9-
from autoarray.plot.plots.array import plot_array
10-
from autoarray.plot.plots.utils import numpy_grid, numpy_lines, numpy_positions, subplot_save
9+
from autoarray.plot.array import plot_array
10+
from autoarray.plot.utils import numpy_grid, numpy_lines, numpy_positions, subplot_save
1111
from autoarray.inversion.plot.mapper_plots import plot_mapper
1212
from autoarray.structures.arrays.uniform_2d import Array2D
1313

‎autoarray/inversion/plot/mapper_plots.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
import matplotlib.pyplot as plt
55

6-
from autoarray.plot.plots.array import plot_array
7-
from autoarray.plot.plots.inversion import plot_inversion_reconstruction
8-
from autoarray.plot.plots.utils import numpy_grid, numpy_lines, subplot_save
6+
from autoarray.plot.array import plot_array
7+
from autoarray.plot.inversion import plot_inversion_reconstruction
8+
from autoarray.plot.utils import numpy_grid, numpy_lines, subplot_save
99

1010
logger = logging.getLogger(__name__)
1111

‎autoarray/plot/__init__.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,13 @@ def _set_backend():
1717

1818
_set_backend()
1919

20-
from autoarray.plot.wrap.base.output import Output
20+
from autoarray.plot.output import Output
2121

22-
23-
from autoarray.plot.plots import (
24-
plot_array,
25-
plot_grid,
26-
plot_yx,
27-
plot_inversion_reconstruction,
22+
from autoarray.plot.array import plot_array
23+
from autoarray.plot.grid import plot_grid
24+
from autoarray.plot.yx import plot_yx
25+
from autoarray.plot.inversion import plot_inversion_reconstruction
26+
from autoarray.plot.utils import (
2827
apply_extent,
2928
conf_figsize,
3029
save_figure,

autoarray/plot/plots/array.py renamed to autoarray/plot/array.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import numpy as np
99
from matplotlib.colors import LogNorm, Normalize
1010

11-
from autoarray.plot.plots.utils import (
11+
from autoarray.plot.utils import (
1212
apply_extent,
1313
conf_figsize,
1414
save_figure,

autoarray/plot/plots/grid.py renamed to autoarray/plot/grid.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import matplotlib.pyplot as plt
99
import numpy as np
1010

11-
from autoarray.plot.plots.utils import apply_extent, conf_figsize, save_figure, numpy_lines
11+
from autoarray.plot.utils import apply_extent, conf_figsize, save_figure, numpy_lines
1212

1313

1414
def plot_grid(

autoarray/plot/plots/inversion.py renamed to autoarray/plot/inversion.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import numpy as np
1010
from matplotlib.colors import LogNorm, Normalize
1111

12-
from autoarray.plot.plots.utils import apply_extent, conf_figsize, save_figure
12+
from autoarray.plot.utils import apply_extent, conf_figsize, save_figure
1313

1414

1515
def plot_inversion_reconstruction(

0 commit comments

Comments
 (0)