Skip to content

Commit cb4e24f

Browse files
committed
Fixes matplotlib#83 and related issues
1 parent 07f24de commit cb4e24f

10 files changed

Lines changed: 42 additions & 39 deletions

File tree

‎hyperspy/axes.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -142,13 +142,6 @@ def index_in_axes_manager(self):
142142
"This DataAxis does not belong to an AxesManager"
143143
" and therefore its index_in_array attribute "
144144
" is not defined")
145-
@property
146-
def _navigation_shape_in_array(self):
147-
return self.navigation_shape[::-1]
148-
149-
@property
150-
def _signal_shape_in_array(self):
151-
return self.signal_shape[::-1]
152145

153146
def _get_positive_index(self, index):
154147
if index < 0:
@@ -448,6 +441,14 @@ def __getslice__(self, i=None, j=None):
448441
def _get_axes_in_natural_order(self):
449442
return self.navigation_axes + self.signal_axes
450443

444+
@property
445+
def _navigation_shape_in_array(self):
446+
return self.navigation_shape[::-1]
447+
448+
@property
449+
def _signal_shape_in_array(self):
450+
return self.signal_shape[::-1]
451+
451452
def remove(self, axis):
452453
"""Remove the given Axis.
453454
@@ -459,7 +460,6 @@ def remove(self, axis):
459460
if axis not in self._axes:
460461
raise ValueError(
461462
"AxesManager.remove(x): x not in AxesManager")
462-
index = self._axes.index(axis)
463463
self._axes.remove(axis)
464464

465465
def __delitem__(self, i):
@@ -535,7 +535,7 @@ def next(self):
535535
else:
536536
self._index += 1
537537
val = np.unravel_index(self._index,
538-
tuple(self.navigation_shape[::-1]))[::-1]
538+
tuple(self._navigation_shape_in_array))[::-1]
539539
self.indices = val
540540
return val
541541

‎hyperspy/component.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ def _create_array(self):
343343
multidimensional datasets.
344344
345345
"""
346-
shape = self._axes_manager.navigation_shape
346+
shape = self._axes_manager._navigation_shape_in_array
347347
if len(shape) == 1 and shape[0] == 0:
348348
shape = [1,]
349349
dtype_ = np.dtype([
@@ -381,9 +381,8 @@ def as_signal(self, field='values'):
381381
if self._axes_manager.navigation_dimension == 0:
382382
raise NavigationDimensionError(0, '>0')
383383

384-
s = Signal(
385-
{'data' : self.map[field],
386-
'axes' : self._axes_manager._get_navigation_axes_dicts()})
384+
s = Signal(data=self.map[field],
385+
axes=self._axes_manager._get_navigation_axes_dicts())
387386
s.mapped_parameters.title = self.name
388387
for axis in s.axes_manager._axes:
389388
axis.navigate = False

‎hyperspy/components/polynomial.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,17 +152,17 @@ def estimate_parameters(self, signal, x1, x2, only_current = False):
152152
else:
153153
if self.coefficients.map is None:
154154
self._create_arrays()
155-
nav_shape = signal.axes_manager.navigation_shape
155+
nav_shape = signal.axes_manager._navigation_shape_in_array
156156
signal.unfold()
157157
dc = signal.data
158158
# For polyfit the spectrum goes in the first axis
159159
if axis.index_in_array > 0:
160-
dc = dc.T
160+
dc = np.rollaxis(dc, axis.index_in_array, 0)
161161
cmaps = np.polyfit(axis.axis[i1:i2],
162162
dc[i1:i2,:], self.get_polynomial_order()).reshape([
163163
self.get_polynomial_order() + 1,] + nav_shape)
164164
self.coefficients.map['values'][:] = np.rollaxis(cmaps, 0,
165-
len(cmaps.shape))
165+
axis.index_in_array)
166166
self.coefficients.map['is_set'][:] = True
167167
signal.fold()
168168
return True

‎hyperspy/drawing/signal.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ def _plot_2D_component(factors, idx, axes_manager,
118118
if ax==None:
119119
ax=plt.gca()
120120
axes=axes_manager.signal_axes[::-1]
121-
shape=axes_manager.signal_shape[::-1]
121+
shape=axes_manager._signal_shape_in_array
122122
extent=None
123123
if calibrate:
124124
extent=(axes[1].low_value,
@@ -171,13 +171,14 @@ def _plot_loading(loadings, idx, axes_manager, ax=None,
171171
if axes_manager.navigation_dimension==2:
172172
extent=None
173173
# get calibration from a passed axes_manager
174-
shape=axes_manager.navigation_shape
174+
shape=axes_manager._navigation_shape_in_array
175175
if calibrate:
176176
extent=(axes[0].low_value,
177177
axes[0].high_value,
178178
axes[1].high_value,
179179
axes[1].low_value)
180-
im=ax.imshow(loadings[idx].reshape(shape),cmap=cmap,extent=extent,
180+
im=ax.imshow(loadings[idx].reshape(shape),
181+
cmap=cmap,extent=extent,
181182
interpolation='nearest')
182183
if calibrate:
183184
plt.xlabel(axes[0].units)

‎hyperspy/drawing/spectrum.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ def _plot_loading(loadings, idx, axes_manager, ax=None,
246246
if axes_manager.navigation_dimension==2:
247247
extent=None
248248
# get calibration from a passed axes_manager
249-
shape=axes_manager.navigation_shape
249+
shape=axes_manager._navigation_shape_in_array
250250
if calibrate:
251251
extent=(axes_manager._axes[0].low_value,
252252
axes_manager._axes[0].high_value,

‎hyperspy/gui/egerton_quantification.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,8 @@ class SpikesRemoval(SpanSelectorInSpectrum):
239239
def __init__(self, signal,navigation_mask=None, signal_mask=None):
240240
super(SpikesRemoval, self).__init__(signal)
241241
self.interpolated_line = None
242-
self.coordinates = [coordinate for coordinate in np.ndindex(
243-
tuple(signal.axes_manager.navigation_shape))
242+
self.coordinates = [coordinate for coordinate in
243+
signal.axes_manager._am_indices_generator()
244244
if (navigation_mask is None or not
245245
navigation_mask[coordinate[::-1]])]
246246
self.signal = signal

‎hyperspy/learn/mva.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ def decomposition(self,
363363
if not isinstance(signal_mask, slice):
364364
# Store the (inverted, as inputed) signal mask
365365
target.signal_mask = ~signal_mask.reshape(
366-
self.axes_manager.signal_shape)
366+
self.axes_manager._signal_shape_in_array)
367367
if reproject not in ('both', 'signal'):
368368
factors = np.zeros((dc.shape[-1], target.factors.shape[1]))
369369
factors[signal_mask == True,:] = target.factors
@@ -372,7 +372,7 @@ def decomposition(self,
372372
if not isinstance(navigation_mask, slice):
373373
# Store the (inverted, as inputed) navigation mask
374374
target.navigation_mask = ~navigation_mask.reshape(
375-
self.axes_manager.navigation_shape)
375+
self.axes_manager._navigation_shape_in_array)
376376
if reproject not in ('both', 'navigation'):
377377
loadings = np.zeros((dc.shape[0], target.loadings.shape[1]))
378378
loadings[navigation_mask == True,:] = target.loadings

‎hyperspy/model.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -922,11 +922,11 @@ def multifit(self, mask=None, fetch_only_fixed=False,
922922
messages.information(
923923
"When multifit finishes its job the file will be deleted")
924924
if mask is not None and \
925-
(mask.shape != tuple(self.axes_manager.navigation_shape)):
925+
(mask.shape != tuple(self.axes_manager._navigation_shape_in_array)):
926926
messages.warning_exit(
927927
"The mask must be a numpy array of boolen type with "
928-
" the same shape as the navigation: %s" %
929-
self.axes_manager.navigation_shape)
928+
" shape: %s" %
929+
self.axes_manager._navigation_shape_in_array)
930930
masked_elements = 0 if mask is None else mask.sum()
931931
maxval=self.axes_manager.navigation_size - masked_elements
932932
if maxval > 0:

‎hyperspy/signal.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ def shift1D(self,
351351
----------
352352
shift_array : numpy array
353353
An array containing the shifting amount. It must have
354-
`axes_manager.navigation_shape` shape.
354+
`axes_manager._navigation_shape_in_array` shape.
355355
interpolation_method : str or int
356356
Specifies the kind of interpolation as a string ('linear',
357357
'nearest', 'zero', 'slinear', 'quadratic, 'cubic') or as an
@@ -488,7 +488,7 @@ def estimate_shift1D(self,
488488
reference_indices = self.axes_manager.indices
489489

490490
i1, i2 = axis._get_index(start), axis._get_index(end)
491-
shift_array = np.zeros(self.axes_manager.navigation_shape)
491+
shift_array = np.zeros(self.axes_manager._navigation_shape_in_array)
492492
ref = self.navigation_indexer[reference_indices].data[i1:i2]
493493
if interpolate is True:
494494
ref = utils.interpolate1D(ip, ref)
@@ -872,10 +872,10 @@ def find_peaks1D_ohaver(self, xdim=None,slope_thresh=0, amp_thresh=None,
872872
873873
Returns
874874
-------
875-
peaks : structured array of shape navigation_shape in which each cells
876-
contains an array that contains as many structured arrays as peaks
877-
where found at that location and which fields: position, width, height
878-
contains position, height, and width of each peak.
875+
peaks : structured array of shape _navigation_shape_in_array in which
876+
each cell contains an array that contains as many structured arrays as
877+
peaks where found at that location and which fields: position, width,
878+
height contains position, height, and width of each peak.
879879
880880
Raises
881881
------
@@ -885,7 +885,7 @@ def find_peaks1D_ohaver(self, xdim=None,slope_thresh=0, amp_thresh=None,
885885
# TODO: add scipy.signal.find_peaks_cwt
886886
self._check_signal_dimension_equals_one()
887887
axis = self.axes_manager.signal_axes[0].axis
888-
arr_shape = (self.axes_manager.navigation_shape
888+
arr_shape = (self.axes_manager._navigation_shape_in_array
889889
if self.axes_manager.navigation_size > 0
890890
else [1,])
891891
peaks = np.zeros(arr_shape, dtype=object)
@@ -1247,7 +1247,7 @@ def _export_factors(self,
12471247
axes_dicts[1]['index_in_array'] = 1
12481248

12491249
factor_data = factors.reshape(
1250-
self.axes_manager.signal_shape + [-1,])
1250+
self.axes_manager._signal_shape_in_array + [-1,])
12511251

12521252
for dim,index in zip(comp_ids,range(len(comp_ids))):
12531253
im = Image(factor_data[...,index],
@@ -3113,14 +3113,14 @@ def _get_navigation_signal(self):
31133113
return None
31143114
elif self.axes_manager.navigation_dimension == 1:
31153115
from hyperspy.signals.spectrum import Spectrum
3116-
s = Spectrum(np.zeros(self.axes_manager.navigation_shape),
3116+
s = Spectrum(np.zeros(self.axes_manager._navigation_shape_in_array),
31173117
axes=self.axes_manager._get_navigation_axes_dicts())
31183118
elif self.axes_manager.navigation_dimension == 2:
31193119
from hyperspy.signals.image import Image
3120-
s = Image(np.zeros(self.axes_manager.navigation_shape),
3120+
s = Image(np.zeros(self.axes_manager._navigation_shape_in_array),
31213121
axes=self.axes_manager._get_navigation_axes_dicts())
31223122
else:
3123-
s = Signal(np.zeros(self.axes_manager.navigation_shape),
3123+
s = Signal(np.zeros(self.axes_manager._navigation_shape_in_array),
31243124
axes=self.axes_manager._get_navigation_axes_dicts())
31253125
return s
31263126

@@ -3133,7 +3133,7 @@ def next(self):
31333133
return self.get_current_signal()
31343134

31353135
def __len__(self):
3136-
return self.axes_manager.signal_shape[0]
3136+
return self.axes_manager.signal_shape[-1]
31373137

31383138
# Implement binary operators
31393139
for name in (

‎hyperspy/tests/model/test_parameter.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ def add_one(self):
3737
class DummyAxesManager:
3838
navigation_shape = [0,]
3939
indices = ()
40+
@property
41+
def _navigation_shape_in_array(self):
42+
return self.navigation_shape[::-1]
4043

4144
class TestParameterLen1:
4245
def setUp(self):

0 commit comments

Comments
 (0)