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

convert floating point values of zoom level to int (#840)

Browse Source 
In some cases, arithmetic results (in particular from division) on zoom
levels return floats; however, the PyQt API requires int values to
function correctly. Therefore, explicit conversion to int or integer
division has been added for these cases.

A behavior bug causing sudden crashes was fixed. When a rectangular box
is dragged with the right mouse button, but the left mouse button is
touched prior to release of the right mouse button, the  program
crashed. The root cause seems to be that this deselects the dragged
object so it is no longer available (i.e. `self.canvas.selected_shape is
None`). The new behavior does nothing / cancels the operation if this
occurs.

Added a shortcut for switching file format (CTRL+Y) since I often use
this functionality.
This commit is contained in:
Paul Anton Letnes 2022-01-26 17:17:27 +01:00 committed by GitHub
parent 98e88371ad
commit c35efbd480
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
labelImg.py
View File

@ -249,7 +249,7 @@ class MainWindow(QMainWindow, WindowMixin):
return '&CreateML', 'format_createml' return '&CreateML', 'format_createml'
save_format = action(get_format_meta(self.label_file_format)[0], save_format = action(get_format_meta(self.label_file_format)[0],
self.change_format, 'Ctrl+', self.change_format, 'Ctrl+Y',
get_format_meta(self.label_file_format)[1], get_format_meta(self.label_file_format)[1],
get_str('changeSaveFormat'), enabled=True) get_str('changeSaveFormat'), enabled=True)
@ -968,7 +968,9 @@ class MainWindow(QMainWindow, WindowMixin):
self.actions.fitWidth.setChecked(False) self.actions.fitWidth.setChecked(False)
self.actions.fitWindow.setChecked(False) self.actions.fitWindow.setChecked(False)
self.zoom_mode = self.MANUAL_ZOOM self.zoom_mode = self.MANUAL_ZOOM
self.zoom_widget.setValue(value) # Arithmetic on scaling factor often results in float
# Convert to int to avoid type errors
self.zoom_widget.setValue(int(value))
def add_zoom(self, increment=10): def add_zoom(self, increment=10):
self.set_zoom(self.zoom_widget.value() + increment) self.set_zoom(self.zoom_widget.value() + increment)
@ -1009,7 +1011,7 @@ class MainWindow(QMainWindow, WindowMixin):
move_y = min(max(move_y, 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.add_zoom(scale * units) self.add_zoom(scale * units)
@ -1019,8 +1021,8 @@ class MainWindow(QMainWindow, WindowMixin):
d_v_bar_max = v_bar.maximum() - v_bar_max d_v_bar_max = v_bar.maximum() - v_bar_max
# get the new scrollbar values # get the new scrollbar values
new_h_bar_value = h_bar.value() + move_x * d_h_bar_max new_h_bar_value = int(h_bar.value() + move_x * d_h_bar_max)
new_v_bar_value = v_bar.value() + move_y * d_v_bar_max new_v_bar_value = int(v_bar.value() + move_y * d_v_bar_max)
h_bar.setValue(new_h_bar_value) h_bar.setValue(new_h_bar_value)
v_bar.setValue(new_v_bar_value) v_bar.setValue(new_v_bar_value)
@ -1519,6 +1521,9 @@ class MainWindow(QMainWindow, WindowMixin):
self.set_dirty() self.set_dirty()
def copy_shape(self): def copy_shape(self):
if self.canvas.selected_shape is None:
# True if one accidentally touches the left mouse button before releasing
return
self.canvas.end_move(copy=True) self.canvas.end_move(copy=True)
self.add_label(self.canvas.selected_shape) self.add_label(self.canvas.selected_shape)
self.set_dirty() self.set_dirty()