Skip to content

Commit c8ff7e6

Browse files
committed
Merge pull request #1179 from chaosphere2112/autot_resize_round_2
Fix ratio resizing issue
2 parents d3e9d56 + 4b8184c commit c8ff7e6

File tree

1 file changed

+11
-47
lines changed

1 file changed

+11
-47
lines changed

Packages/vcs/Lib/configurator.py

Lines changed: 11 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -210,57 +210,21 @@ def update(self):
210210
self.init_toolbar()
211211

212212
self.displays = [vcs.elements["display"][display] for display in self.canvas.display_names]
213-
214213
for display in self.displays:
215214

216215
if display._template_origin in self.templates:
217-
# Adjust data coords if display.ratio is not none
218-
if display.ratio is not None:
219-
t = vcs.gettemplate(display.template)
220-
orig = vcs.gettemplate(self.templates[display._template_origin])
221-
t.data._ratio = -999.
222-
t.data._x1 = orig.data._x1
223-
t.data._x2 = orig.data._x2
224-
t.data._y1 = orig.data._y1
225-
t.data._y2 = orig.data._y2
226-
t.box1._x1 = orig.box1._x1
227-
t.box1._x2 = orig.box1._x2
228-
t.box1._y1 = orig.box1._y1
229-
t.box1._y2 = orig.box1._y2
230-
t.xlabel1._y = orig.xlabel1._y
231-
t.xlabel2._y = orig.xlabel2._y
232-
t.xtic2._y1 = orig.xtic2._y1
233-
t.ylabel1._x = orig.ylabel1._x
234-
t.ytic1._x1 = orig.ytic1._x1
235-
t.ylabel2._x = orig.ylabel2._x
236-
t.ytic2._x1 = orig.ytic2._x1
237-
t.xtic1._y2 = orig.xtic1._y2
238-
t.xtic1._y1 = orig.xtic1._y1
239-
t.data._y1 = orig.data._y1
240-
t.xtic1.y1 = orig.xtic1.y1
241-
t.xtic2._y2 = orig.xtic2._y2
242-
t.data._y2 = orig.data._y2
243-
t.xtic2.y1 = orig.xtic2.y1
244-
t.xmintic1._y2 = orig.xmintic1._y2
245-
t.xmintic1._y1 = orig.xmintic1._y1
246-
t.xmintic2._y2 = orig.xmintic2._y2
247-
t.xmintic2._y1 = orig.xmintic2._y1
248-
t.ytic1._x2 = orig.ytic1._x2
249-
t.data._x1 = orig.data._x1
250-
t.ytic2._x2 = orig.ytic2._x2
251-
t.data._x2 = orig.data._x2
252-
t.ymintic1._x2 = orig.ymintic1._x2
253-
t.ymintic1._x1 = orig.ymintic1._x1
254-
t.ymintic2._x2 = orig.ymintic2._x2
255-
t.ymintic2._x1 = orig.ymintic2._x1
256-
# It already has a template we created
257216
continue
258-
# Manufacture a placeholder template to use for updates
259-
new_template = vcs.createtemplate(source=display.template)
260-
self.templates[new_template.name] = display.template
261-
display.template = new_template.name
262-
# This is an attribute used internally; might break
263-
display._template_origin = new_template.name
217+
218+
if display.ratio is not None:
219+
# Ratio'd displays already have a temporary template
220+
self.templates[display.template] = display._template_origin
221+
else:
222+
# Manufacture a placeholder template to use for updates
223+
new_template = vcs.createtemplate(source=display.template)
224+
self.templates[new_template.name] = display.template
225+
display.template = new_template.name
226+
# This is an attribute used internally; might break
227+
display._template_origin = new_template.name
264228

265229
def detach(self):
266230
if self.toolbar is not None:

0 commit comments

Comments
 (0)