Skip to content

Commit 3e168a2

Browse files
Kentaro Wadawkentaro
authored andcommitted
rewrite: app.py Phase 3-C — use keyword args for action definitions
1 parent fb40b64 commit 3e168a2

File tree

1 file changed

+62
-69
lines changed

1 file changed

+62
-69
lines changed

labelme/app.py

Lines changed: 62 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -242,9 +242,9 @@ def __init__(
242242
action = functools.partial(utils.newAction, self)
243243
shortcuts = self._config["shortcuts"]
244244
quit = action(
245-
self.tr("&Quit"),
246-
self.close,
247-
shortcuts["quit"],
245+
text=self.tr("&Quit"),
246+
slot=self.close,
247+
shortcut=shortcuts["quit"],
248248
icon=None,
249249
tip=self.tr("Quit application"),
250250
)
@@ -257,150 +257,143 @@ def __init__(
257257
)
258258
open_config.setMenuRole(QtWidgets.QAction.PreferencesRole)
259259
open_ = action(
260-
self.tr("&Open\n"),
261-
self._open_file_with_dialog,
262-
shortcuts["open"],
260+
text=self.tr("&Open\n"),
261+
slot=self._open_file_with_dialog,
262+
shortcut=shortcuts["open"],
263263
icon="folder-open.svg",
264264
tip=self.tr("Open image or label file"),
265265
)
266266
opendir = action(
267-
self.tr("Open Dir"),
268-
self._open_dir_with_dialog,
269-
shortcuts["open_dir"],
267+
text=self.tr("Open Dir"),
268+
slot=self._open_dir_with_dialog,
269+
shortcut=shortcuts["open_dir"],
270270
icon="folder-open.svg",
271271
tip=self.tr("Open Dir"),
272272
)
273273
openNextImg = action(
274-
self.tr("&Next Image"),
275-
self._open_next_image,
276-
shortcuts["open_next"],
274+
text=self.tr("&Next Image"),
275+
slot=self._open_next_image,
276+
shortcut=shortcuts["open_next"],
277277
icon="arrow-fat-right.svg",
278278
tip=self.tr("Open next (hold Ctl+Shift to copy labels)"),
279279
enabled=False,
280280
)
281281
openPrevImg = action(
282-
self.tr("&Prev Image"),
283-
self._open_prev_image,
284-
shortcuts["open_prev"],
282+
text=self.tr("&Prev Image"),
283+
slot=self._open_prev_image,
284+
shortcut=shortcuts["open_prev"],
285285
icon="arrow-fat-left.svg",
286286
tip=self.tr("Open prev (hold Ctl+Shift to copy labels)"),
287287
enabled=False,
288288
)
289289
save = action(
290-
self.tr("&Save\n"),
291-
self.saveFile,
292-
shortcuts["save"],
290+
text=self.tr("&Save\n"),
291+
slot=self.saveFile,
292+
shortcut=shortcuts["save"],
293293
icon="floppy-disk.svg",
294294
tip=self.tr("Save labels to file"),
295295
enabled=False,
296296
)
297297
saveAs = action(
298-
self.tr("&Save As"),
299-
self.saveFileAs,
300-
shortcuts["save_as"],
298+
text=self.tr("&Save As"),
299+
slot=self.saveFileAs,
300+
shortcut=shortcuts["save_as"],
301301
icon="floppy-disk.svg",
302302
tip=self.tr("Save labels to a different file"),
303303
enabled=False,
304304
)
305-
306305
deleteFile = action(
307-
self.tr("&Delete File"),
308-
self.deleteFile,
309-
shortcuts["delete_file"],
306+
text=self.tr("&Delete File"),
307+
slot=self.deleteFile,
308+
shortcut=shortcuts["delete_file"],
310309
icon="file-x.svg",
311310
tip=self.tr("Delete current label file"),
312311
enabled=False,
313312
)
314-
315313
changeOutputDir = action(
316-
self.tr("&Change Output Dir"),
314+
text=self.tr("&Change Output Dir"),
317315
slot=self.changeOutputDirDialog,
318316
shortcut=shortcuts["save_to"],
319317
icon="folders.svg",
320318
tip=self.tr("Change where annotations are loaded/saved"),
321319
)
322-
323320
saveAuto = action(
324321
text=self.tr("Save &Automatically"),
325-
slot=lambda x: self.actions.saveAuto.setChecked(x),
322+
slot=lambda checked: self.actions.saveAuto.setChecked(checked),
326323
tip=self.tr("Save automatically"),
327324
checkable=True,
328325
enabled=True,
329326
)
330327
saveAuto.setChecked(self._config["auto_save"])
331-
332328
saveWithImageData = action(
333329
text=self.tr("Save With Image Data"),
334330
slot=self.enableSaveImageWithData,
335331
tip=self.tr("Save image data in label file"),
336332
checkable=True,
337333
checked=self._config["with_image_data"],
338334
)
339-
340335
close = action(
341-
self.tr("&Close"),
342-
self.closeFile,
343-
shortcuts["close"],
336+
text=self.tr("&Close"),
337+
slot=self.closeFile,
338+
shortcut=shortcuts["close"],
344339
icon="x-circle.svg",
345340
tip=self.tr("Close current file"),
346341
)
347-
348342
toggle_keep_prev_mode = action(
349-
self.tr("Keep Previous Annotation"),
350-
self.toggleKeepPrevMode,
351-
shortcuts["toggle_keep_prev_mode"],
352-
None,
353-
self.tr('Toggle "keep previous annotation" mode'),
343+
text=self.tr("Keep Previous Annotation"),
344+
slot=self.toggleKeepPrevMode,
345+
shortcut=shortcuts["toggle_keep_prev_mode"],
346+
icon=None,
347+
tip=self.tr('Toggle "keep previous annotation" mode'),
354348
checkable=True,
355349
)
356350
toggle_keep_prev_mode.setChecked(self._config["keep_prev"])
357-
358351
createMode = action(
359-
self.tr("Create Polygons"),
360-
lambda: self._switch_canvas_mode(edit=False, createMode="polygon"),
361-
shortcuts["create_polygon"],
362-
"polygon.svg",
363-
self.tr("Start drawing polygons"),
352+
text=self.tr("Create Polygons"),
353+
slot=lambda: self._switch_canvas_mode(edit=False, createMode="polygon"),
354+
shortcut=shortcuts["create_polygon"],
355+
icon="polygon.svg",
356+
tip=self.tr("Start drawing polygons"),
364357
enabled=False,
365358
)
366359
createRectangleMode = action(
367-
self.tr("Create Rectangle"),
368-
lambda: self._switch_canvas_mode(edit=False, createMode="rectangle"),
369-
shortcuts["create_rectangle"],
370-
"rectangle.svg",
371-
self.tr("Start drawing rectangles"),
360+
text=self.tr("Create Rectangle"),
361+
slot=lambda: self._switch_canvas_mode(edit=False, createMode="rectangle"),
362+
shortcut=shortcuts["create_rectangle"],
363+
icon="rectangle.svg",
364+
tip=self.tr("Start drawing rectangles"),
372365
enabled=False,
373366
)
374367
createCircleMode = action(
375-
self.tr("Create Circle"),
376-
lambda: self._switch_canvas_mode(edit=False, createMode="circle"),
377-
shortcuts["create_circle"],
378-
"circle.svg",
379-
self.tr("Start drawing circles"),
368+
text=self.tr("Create Circle"),
369+
slot=lambda: self._switch_canvas_mode(edit=False, createMode="circle"),
370+
shortcut=shortcuts["create_circle"],
371+
icon="circle.svg",
372+
tip=self.tr("Start drawing circles"),
380373
enabled=False,
381374
)
382375
createLineMode = action(
383-
self.tr("Create Line"),
384-
lambda: self._switch_canvas_mode(edit=False, createMode="line"),
385-
shortcuts["create_line"],
386-
"line-segment.svg",
387-
self.tr("Start drawing lines"),
376+
text=self.tr("Create Line"),
377+
slot=lambda: self._switch_canvas_mode(edit=False, createMode="line"),
378+
shortcut=shortcuts["create_line"],
379+
icon="line-segment.svg",
380+
tip=self.tr("Start drawing lines"),
388381
enabled=False,
389382
)
390383
createPointMode = action(
391-
self.tr("Create Point"),
392-
lambda: self._switch_canvas_mode(edit=False, createMode="point"),
393-
shortcuts["create_point"],
384+
text=self.tr("Create Point"),
385+
slot=lambda: self._switch_canvas_mode(edit=False, createMode="point"),
386+
shortcut=shortcuts["create_point"],
394387
icon="circles-four.svg",
395388
tip=self.tr("Start drawing points"),
396389
enabled=False,
397390
)
398391
createLineStripMode = action(
399-
self.tr("Create LineStrip"),
400-
lambda: self._switch_canvas_mode(edit=False, createMode="linestrip"),
401-
shortcuts["create_linestrip"],
402-
"line-segments.svg",
403-
self.tr("Start drawing linestrip. Ctrl+LeftClick ends creation."),
392+
text=self.tr("Create LineStrip"),
393+
slot=lambda: self._switch_canvas_mode(edit=False, createMode="linestrip"),
394+
shortcut=shortcuts["create_linestrip"],
395+
icon="line-segments.svg",
396+
tip=self.tr("Start drawing linestrip. Ctrl+LeftClick ends creation."),
404397
enabled=False,
405398
)
406399
createAiPolygonMode = action(

0 commit comments

Comments
 (0)