8000 Merge pull request #23467 from anntzer/fn · matplotlib/matplotlib@1e69493 · GitHub
[go: up one dir, main page]
Skip to content

Commit 1e69493

Browse files
timhoffmtimhoffm
authored
Merge pull request #23467 from anntzer/fn
Remove old handling for factor=None in axisartist.
2 parents 4d85f70 + 405d76e commit 1e69493

File tree

3 files changed

+20
-36
lines changed

3 files changed

+20
-36
lines changed

‎lib/mpl_toolkits/axisartist/floating_axes.py‎

Lines changed: 16 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -54,22 +54,12 @@ def get_tick_iterators(self, axes):
5454
grid_finder = self.grid_helper.grid_finder
5555

5656
lat_levs, lat_n, lat_factor = self._grid_info["lat_info"]
57-
lon_levs, lon_n, lon_factor = self._grid_info["lon_info"]
57+
yy0 = lat_levs / lat_factor
58+
dy = 0.001 / lat_factor
5859

59-
lon_levs, lat_levs = np.asarray(lon_levs), np.asarray(lat_levs)
60-
if lat_factor is not None:
61-
yy0 = lat_levs / lat_factor
62-
dy = 0.001 / lat_factor
63-
else:
64-
yy0 = lat_levs
65-
dy = 0.001
66-
67-
if lon_factor is not None:
68-
xx0 = lon_levs / lon_factor
69-
dx = 0.001 / lon_factor
70-
else:
71-
xx0 = lon_levs
72-
dx = 0.001
60+
lon_levs, lon_n, lon_factor = self._grid_info["lon_info"]
61+
xx0 = lon_levs / lon_factor
62+
dx = 0.001 / lon_factor
7363

7464
extremes = self.grid_helper._extremes
7565
xmin, xmax = sorted(extremes[:2])
@@ -242,31 +232,25 @@ def _update_grid(self, x1, y1, x2, y2):
242232

243233
lon_min, lon_max = sorted(extremes[:2])
244234
lat_min, lat_max = sorted(extremes[2:])
235+
grid_info["extremes"] = lon_min, lon_max, lat_min, lat_max # extremes
236+
245237
lon_levs, lon_n, lon_factor = \
246238
grid_finder.grid_locator1(lon_min, lon_max)
239+
lon_levs = np.asarray(lon_levs)
247240
lat_levs, lat_n, lat_factor = \
248241
grid_finder.grid_locator2(lat_min, lat_max)
249-
grid_info["extremes"] = lon_min, lon_max, lat_min, lat_max # extremes
242+
lat_levs = np.asarray(lat_levs)
250243

251244
grid_info["lon_info"] = lon_levs, lon_n, lon_factor
252245
grid_info["lat_info"] = lat_levs, lat_n, lat_factor
253246

254-
grid_info["lon_labels"] = grid_finder.tick_formatter1("bottom",
255-
lon_factor,
256-
lon_levs)
257-
258-
grid_info["lat_labels"] = grid_finder.tick_formatter2("bottom",
259-
lat_factor,
260-
lat_levs)
261-
262-
if lon_factor is None:
263-
lon_values = np.asarray(lon_levs[:lon_n])
264-
else:
265-
lon_values = np.asarray(lon_levs[:lon_n]/lon_factor)
266-
if lat_factor is None:
267-
lat_values = np.asarray(lat_levs[:lat_n])
268-
else:
269-
lat_values = np.asarray(lat_levs[:lat_n]/lat_factor)
247+
grid_info["lon_labels"] = grid_finder.tick_formatter1(
248+
"bottom", lon_factor, lon_levs)
249+
grid_info["lat_labels"] = grid_finder.tick_formatter2(
250+
"bottom", lat_factor, lat_levs)
251+
252+
lon_values = lon_levs[:lon_n] / lon_factor
253+
lat_values = lat_levs[:lat_n] / lat_factor
270254

271255
lon_lines, lat_lines = grid_finder._get_raw_grid_lines(
272256
lon_values[(lon_min < lon_values) & (lon_values < lon_max)],

‎lib/mpl_toolkits/axisartist/grid_finder.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,9 @@ def get_grid_info(self, x1, y1, x2, y2):
166166

167167
lon_min, lon_max, lat_min, lat_max = extremes
168168
lon_levs, lon_n, lon_factor = self.grid_locator1(lon_min, lon_max)
169+
lon_levs = np.asarray(lon_levs)
169170
lat_levs, lat_n, lat_factor = self.grid_locator2(lat_min, lat_max)
171+
lat_levs = np.asarray(lat_levs)
170172

171173
lon_values = lon_levs[:lon_n] / lon_factor
172174
lat_values = lat_levs[:lat_n] / lat_factor

‎lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ def update_lim(self, axes):
120120

121121
self._grid_info = {
122122
"extremes": (lon_min, lon_max, lat_min, lat_max),
123-
"lon_info": (lon_levs, lon_n, lon_factor),
124-
"lat_info": (lat_levs, lat_n, lat_factor),
123+
"lon_info": (lon_levs, lon_n, np.asarray(lon_factor)),
124+
"lat_info": (lat_levs, lat_n, np.asarray(lat_factor)),
125125
"lon_labels": grid_finder.tick_formatter1(
126126
"bottom", lon_factor, lon_levs),
127127
"lat_labels": grid_finder.tick_formatter2(
@@ -170,12 +170,10 @@ def get_tick_iterators(self, axes):
170170
grid_finder = self.grid_helper.grid_finder
171171

172172
lat_levs, lat_n, lat_factor = self._grid_info["lat_info"]
173-
lat_levs = np.asarray(lat_levs)
174173
yy0 = lat_levs / lat_factor
175174
dy = 0.01 / lat_factor
176175

177176
lon_levs, lon_n, lon_factor = self._grid_info["lon_info"]
178-
lon_levs = np.asarray(lon_levs)
179177
xx0 = lon_levs / lon_factor
180178
dx = 0.01 / lon_factor
181179

0 commit comments

Comments
 (0)
0