apoorva/greenhouse
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleaning up the code

Browse Source
This commit is contained in:
Lars Klein 2017-06-23 19:33:00 +02:00
parent 708e1a21e6
commit 9f6fdbd06b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
labelImg.py
View File

@ -826,26 +826,26 @@ class MainWindow(QMainWindow, WindowMixin):
cursor_x = pos.x() cursor_x = pos.x()
cursor_y = pos.y() cursor_y = pos.y()
w = self.canvas.width()
h = self.canvas.height()
w = self.scrollArea.width() w = self.scrollArea.width()
h = self.scrollArea.height() h = self.scrollArea.height()
print("current: ") # the scaling from 0 to 1 has some padding
print(cursor_x, cursor_y) # you don't have to hit the very leftmost pixel for a maximum-left movement
print(w, h)
print()
margin = 0.1 margin = 0.1
move_x = (cursor_x - margin * w) / (w - 2 * margin * w) move_x = (cursor_x - margin * w) / (w - 2 * margin * w)
move_y = (cursor_y - margin * h) / (h - 2 * margin * h) move_y = (cursor_y - margin * h) / (h - 2 * margin * h)
# clamp the values form 0 to 1
move_x = min(max(move_x, 0), 1)
move_y = min(max(move_y, 0), 1)
# zoom in # zoom in
units = delta / (8 * 15) units = delta / (8 * 15)
scale = 10 scale = 10
self.addZoom(scale * units) self.addZoom(scale * units)
# get the difference in scrollbar values
# this is how far we can move
d_h_bar_max = h_bar.maximum() - h_bar_max d_h_bar_max = h_bar.maximum() - h_bar_max
d_v_bar_max = v_bar.maximum() - v_bar_max d_v_bar_max = v_bar.maximum() - v_bar_max