From 4138895f51d2850d60261c49e72646b47309bed6 Mon Sep 17 00:00:00 2001 From: Kentaro Wada Date: Sun, 12 Jan 2020 19:32:20 +0000 Subject: [PATCH] Save self.zoomMode as well --- labelme/app.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/labelme/app.py b/labelme/app.py index 775c360..26c0382 100644 --- a/labelme/app.py +++ b/labelme/app.py @@ -634,7 +634,7 @@ class MainWindow(QtWidgets.QMainWindow): self.otherData = None self.zoom_level = 100 self.fit_window = False - self.zoom_values = {} # key=filename, value=zoom_value + self.zoom_values = {} # key=filename, value=(zoom_mode, zoom_value) self.scroll_values = { Qt.Horizontal: {}, Qt.Vertical: {}, @@ -1203,7 +1203,7 @@ class MainWindow(QtWidgets.QMainWindow): self.actions.fitWindow.setChecked(False) self.zoomMode = self.MANUAL_ZOOM self.zoomWidget.setValue(value) - self.zoom_values[self.filename] = value + self.zoom_values[self.filename] = (self.zoomMode, value) def addZoom(self, increment=1.1): self.setZoom(self.zoomWidget.value() * increment) @@ -1334,7 +1334,8 @@ class MainWindow(QtWidgets.QMainWindow): self.canvas.setEnabled(True) # set zoom values if self.filename in self.zoom_values: - self.setZoom(self.zoom_values[self.filename]) + self.zoomMode = self.zoom_values[self.filename][0] + self.setZoom(self.zoom_values[self.filename][1]) else: self.adjustScale(initial=True) # set scroll values @@ -1363,7 +1364,9 @@ class MainWindow(QtWidgets.QMainWindow): def adjustScale(self, initial=False): value = self.scalers[self.FIT_WINDOW if initial else self.zoomMode]() - self.zoomWidget.setValue(int(100 * value)) + value = int(100 * value) + self.zoomWidget.setValue(value) + self.zoom_values[self.filename] = (self.zoomMode, value) def scaleFitWindow(self): """Figure out the size of the pixmap to fit the main widget.""" -- GitLab