10000 FLK8 · matplotlib/matplotlib@3d72132 · GitHub
[go: up one dir, main page]
Skip to content

Commit 3d72132

Browse files
jklymakjklymak
committed
FLK8
1 parent ee05697 commit 3d72132

File tree

2 files changed

+38
-42
lines changed

2 files changed

+38
-42
lines changed

‎lib/matplotlib/_constrained_layout.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ def _get_margin_from_padding(object, *, w_pad=0, h_pad=0,
175175
margin = {'leftcb': w_pad, 'rightcb': w_pad,
176176
'bottomcb': h_pad, 'topcb': h_pad,
177177
'left': 0, 'right': 0,
178-
'top': 0, 'bottom':0}
178+
'top': 0, 'bottom': 0}
179179
if _wspace / ncols > w_pad:
180180
if ss.colspan.start > 0:
181181
margin['leftcb'] = _wspace / ncols
@@ -522,7 +522,7 @@ def _reposition_colorbar(cbax, renderer, *, offset=None):
522522
else:
523523
lmargin = cbpos.x0 - cbbbox.x0
524524
dx = bboxparent.x0 - pbcb.x0 # edge of parent
525-
dx += -cbbbox.width - cbpad + lmargin - offset['left']
525+
dx += -cbbbox.width - cbpad + lmargin - offset['left']
526526
offset['left'] += cbbbox.width + cbpad
527527
pbcb = pbcb.translated(dx, 0)
528528
else: # horizontal axes:

‎lib/matplotlib/_layoutgrid.py

Lines changed: 36 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -176,18 +176,20 @@ def hard_constraints(self):
176176
for i in range(self.ncols):
177177
hc = [self.rights[i] >= self.lefts[i],
178178
(self.rights[i] - self.margins['right'][i] -
179-
self.margins['rightcb'][i] >=
180-
self.lefts[i] - self.margins['left'][i] -
181-
self.margins['leftcb'][i])]
179+
self.margins['rightcb'][i] >=
180+
self.lefts[i] - self.margins['left'][i] -
181+
self.margins['leftcb'][i])
182+
]
182183
for c in hc:
183184
self.solver.addConstraint(c | 'required')
184185

185186
for i in range(self.nrows):
186187
hc = [self.tops[i] >= self.bottoms[i],
187188
(self.tops[i] - self.margins['top'][i] -
188-
self.margins['topcb'][i] >=
189+
self.margins['topcb'][i] >=
189190
self.bottoms[i] - self.margins['bottom'][i] -
190-
self.margins['bottomcb'][i])]
191+
self.margins['bottomcb'][i])
192+
]
191193
for c in hc:
192194
self.solver.addConstraint(c | 'required')
193195

@@ -227,10 +229,10 @@ def parent_constrain(self):
227229
bottom += parent.margins['bottom'][rows[-1]]
228230
bottom += parent.margins['bottomcb'][rows[-1]]
229231
hc = [self.lefts[0] == left,
230-
self.rights[-1] == right,
231-
# from top to bottom
232-
self.tops[0] == top,
233-
self.bottoms[-1] == bottom]
232+
self.rights[-1] == right,
233+
# from top to bottom
234+
self.tops[0] == top,
235+
self.bottoms[-1] == bottom]
234236
for c in hc:
235237
self.solver.addConstraint(c | 'required')
236238

@@ -373,7 +375,8 @@ def edit_outer_margin_mins(self, margin, ss):
373375
self.edit_margin_min('top', margin['top'], ss.rowspan.start)
374376
self.edit_margin_min('topcb', margin['topcb'], ss.rowspan.start)
375377
self.edit_margin_min('bottom', margin['bottom'], ss.rowspan.stop - 1)
376-
self.edit_margin_min('bottomcb', margin['bottomcb'], ss.rowspan.stop - 1)
378+
self.edit_margin_min('bottomcb', margin['bottomcb'],
379+
ss.rowspan.stop - 1)
377380

378381
def get_margins(self, todo, col):
379382
"""Return the margin at this position"""
@@ -404,20 +407,17 @@ def get_inner_bbox(self, rows=[0], cols=[0]):
404407

405408
bbox = Bbox.from_extents(
406409
(self.lefts[cols[0]].value() +
407-
self.margins['left'][cols[0]].value() +
408-
self.margins['leftcb'][cols[0]].value()
409-
),
410+
self.margins['left'][cols[0]].value() +
411+
self.margins['leftcb'][cols[0]].value()),
410412
(self.bottoms[rows[-1]].value() +
411-
self.margins['bottom'][rows[-1]].value() +
412-
self.margins['bottomcb'][rows[-1]].value()),
413+
self.margins['bottom'][rows[-1]].value() +
414+
self.margins['bottomcb'][rows[-1]].value()),
413415
(self.rights[cols[-1]].value() -
414-
self.margins['right'][cols[-1]].value() -
415-
self.margins['rightcb'][cols[-1]].value()
416-
),
416+
self.margins['right'][cols[-1]].value() -
417+
self.margins['rightcb'][cols[-1]].value()),
417418
(self.tops[rows[0]].value() -
418-
self.margins['top'][rows[0]].value() -
419-
self.margins['topcb'][rows[0]].value()
420-
)
419+
self.margins['top'][rows[0]].value() -
420+
self.margins['topcb'][rows[0]].value())
421421
)
422422
return bbox
423423

@@ -431,16 +431,13 @@ def get_bbox_for_cb(self, rows=[0], cols=[0]):
431431

432432
bbox = Bbox.from_extents(
433433
(self.lefts[cols[0]].value() +
434-
self.margins['leftcb'][cols[0]].value()
435-
),
434+
self.margins['leftcb'][cols[0]].value()),
436435
(self.bottoms[rows[-1]].value() +
437-
self.margins['bottomcb'][rows[-1]].value()),
436+
self.margins['bottomcb'][rows[-1]].value()),
438437
(self.rights[cols[-1]].value() -
439-
self.margins['rightcb'][cols[-1]].value()
440-
),
438+
self.margins['rightcb'][cols[-1]].value()),
441439
(self.tops[rows[0]].value() -
442-
self.margins['topcb'][rows[0]].value()
443-
)
440+
self.margins['topcb'][rows[0]].value())
444441
)
445442
return bbox
446443

@@ -454,11 +451,11 @@ def get_left_margin_bbox(self, rows=[0], cols=[0]):
454451

455452
bbox = Bbox.from_extents(
456453
(self.lefts[cols[0]].value() +
457-
self.margins['leftcb'][cols[0]].value() ),
454+
self.margins['leftcb'][cols[0]].value()),
458455
(self.bottoms[rows[-1]].value()),
459456
(self.lefts[cols[0]].value() +
460-
self.margins['leftcb'][cols[0]].value() +
461-
self.margins['left'][cols[0]].value()),
457+
self.margins['leftcb'][cols[0]].value() +
458+
self.margins['left'][cols[0]].value()),
462459
(self.tops[rows[0]].value()))
463460
return bbox
464461

@@ -491,11 +488,11 @@ def get_right_margin_bbox(self, rows=[0], cols=[0]):
491488

492489
bbox = Bbox.from_extents(
493490
(self.rights[cols[-1]].value() -
494-
self.margins['right'][cols[-1]].value() -
495-
self.margins['rightcb'][cols[-1]].value()
496-
),
491+
self.margins['right'][cols[-1]].value() -
492+
self.margins['rightcb'][cols[-1]].value()),
497493
(self.bottoms[rows[-1]].value()),
498-
(self.rights[cols[-1]].value() - self.margins['rightcb'][cols[-1]].value()),
494+
(self.rights[cols[-1]].value() -
495+
self.margins['rightcb'][cols[-1]].value()),
499496
(self.tops[rows[0]].value()))
500497
return bbox
501498

@@ -510,12 +507,11 @@ def get_top_margin_bbox(self, rows=[0], cols=[0]):
510507
bbox = Bbox.from_extents(
511508
(self.lefts[cols[0]].value()),
512509
(self.tops[rows[0]].value() -
513-
self.margins['topcb'][rows[0]].value()
514-
),
510+
self.margins['topcb'][rows[0]].value()),
515511
(self.rights[cols[-1]].value()),
516-
(self.tops[rows[0]].value() -
517-
self.margins['topcb'][rows[0]].value() -
518-
self.margins['top'][rows[0]].value()))
512+
(self.tops[rows[0]].value() -
513+
self.margins['topcb'][rows[0]].value() -
514+
self.margins['top'][rows[0]].value()))
519515
return bbox
520516

521517
def update_variables(self):

0 commit comments

Comments
 (0)
0