Skip to content

Commit 41cb631

Browse files
nachifurnachifur
committed
add func: delete box
1 parent e31136e commit 41cb631

3 files changed

Lines changed: 80 additions & 45 deletions

File tree

‎mulimg_viewer.py‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ def __init__(self, parent, UpdateUI, get_type):
2424
(wx.ACCEL_NORMAL, wx.WXK_RIGHT,
2525
self.menu_right.GetId()),
2626
(wx.ACCEL_NORMAL, wx.WXK_LEFT,
27-
self.menu_left.GetId())
27+
self.menu_left.GetId()),
28+
(wx.ACCEL_NORMAL, wx.WXK_DELETE,
29+
self.menu_delete_box.GetId())
2830
])
2931
self.SetAcceleratorTable(acceltbl)
3032
# self.img_Sizer = self.scrolledWindow_img.GetSizer()
@@ -277,8 +279,20 @@ def background_alpha(self, event):
277279
def foreground_alpha(self, event):
278280
self.ImgManager.img_alpha = self.foreground_slider.GetValue()
279281

282+
def delete_box(self, event):
283+
if self.select_img_box.Value:
284+
if self.box_id != -1:
285+
self.xy_magnifier.pop(self.box_id)
286+
self.refresh(event)
287+
self.SetStatusText_(
288+
["delete "+str(self.box_id)+"-th box", "-1", "-1", "-1"])
289+
else:
290+
self.xy_magnifier = []
291+
self.refresh(event)
292+
self.SetStatusText_(["delete all box", "-1", "-1", "-1"])
293+
280294
def up_img(self, event):
281-
if self.move_img_box.Value:
295+
if self.select_img_box.Value:
282296
if self.box_id != -1:
283297
box_point = self.xy_magnifier[self.box_id][0:4]
284298
show_scale = self.xy_magnifier[self.box_id][4:6]
@@ -301,7 +315,7 @@ def up_img(self, event):
301315
self.SetStatusText_(["up", "-1", "-1", "-1"])
302316

303317
def down_img(self, event):
304-
if self.move_img_box.Value:
318+
if self.select_img_box.Value:
305319
if self.box_id != -1:
306320
box_point = self.xy_magnifier[self.box_id][0:4]
307321
show_scale = self.xy_magnifier[self.box_id][4:6]
@@ -327,7 +341,7 @@ def down_img(self, event):
327341
self.SetStatusText_(["down", "-1", "-1", "-1"])
328342

329343
def right_img(self, event):
330-
if self.move_img_box.Value:
344+
if self.select_img_box.Value:
331345
if self.box_id != -1:
332346
box_point = self.xy_magnifier[self.box_id][0:4]
333347
show_scale = self.xy_magnifier[self.box_id][4:6]
@@ -353,7 +367,7 @@ def right_img(self, event):
353367
self.SetStatusText_(["right", "-1", "-1", "-1"])
354368

355369
def left_img(self, event):
356-
if self.move_img_box.Value:
370+
if self.select_img_box.Value:
357371
if self.box_id != -1:
358372
box_point = self.xy_magnifier[self.box_id][0:4]
359373
show_scale = self.xy_magnifier[self.box_id][4:6]
@@ -389,7 +403,7 @@ def img_left_click(self, event):
389403
self.x = x_0
390404
self.y = y_0
391405

392-
if self.move_img_box.Value:
406+
if self.select_img_box.Value:
393407
# select box
394408
x, y = event.GetPosition()
395409
id = self.get_img_id_from_point([x, y])
@@ -421,7 +435,7 @@ def img_left_click(self, event):
421435
self.refresh(event)
422436

423437
def img_left_dclick(self, event):
424-
if self.move_img_box.Value:
438+
if self.select_img_box.Value:
425439
pass
426440
else:
427441
self.start_flag = 0

‎mulimg_viewer_gui.py‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -359,13 +359,13 @@ def __init__( self, parent ):
359359

360360
bSizer25 = wx.BoxSizer( wx.HORIZONTAL )
361361

362-
self.m_staticText30 = wx.StaticText( self.scrolledWindow_set, wx.ID_ANY, u"Move box", wx.DefaultPosition, wx.DefaultSize, 0 )
362+
self.m_staticText30 = wx.StaticText( self.scrolledWindow_set, wx.ID_ANY, u"Select box", wx.DefaultPosition, wx.DefaultSize, 0 )
363363
self.m_staticText30.Wrap( -1 )
364364

365365
bSizer25.Add( self.m_staticText30, 1, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 )
366366

367-
self.move_img_box = wx.CheckBox( self.scrolledWindow_set, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 )
368-
bSizer25.Add( self.move_img_box, 0, wx.ALL, 5 )
367+
self.select_img_box = wx.CheckBox( self.scrolledWindow_set, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 )
368+
bSizer25.Add( self.select_img_box, 0, wx.ALL, 5 )
369369

370370

371371
fgSizer3.Add( bSizer25, 1, wx.EXPAND, 5 )
@@ -567,6 +567,9 @@ def __init__( self, parent ):
567567
self.menu_left = wx.MenuItem( self.m_menu2, wx.ID_ANY, u"left", wx.EmptyString, wx.ITEM_NORMAL )
568568
self.m_menu2.Append( self.menu_left )
569569

570+
self.menu_delete_box = wx.MenuItem( self.m_menu2, wx.ID_ANY, u"delete_box", wx.EmptyString, wx.ITEM_NORMAL )
571+
self.m_menu2.Append( self.menu_delete_box )
572+
570573
self.m_menubar1.Append( self.m_menu2, u"Edit" )
571574

572575
self.m_menu3 = wx.Menu()
@@ -596,7 +599,7 @@ def __init__( self, parent ):
596599
self.magnifier.Bind( wx.EVT_TOGGLEBUTTON, self.magnifier_fc )
597600
self.rotation.Bind( wx.EVT_TOGGLEBUTTON, self.rotation_fc )
598601
self.choice_normalized_size.Bind( wx.EVT_CHOICE, self.change_img_stitch_mode )
599-
self.move_img_box.Bind( wx.EVT_CHECKBOX, self.move_img_box_func )
602+
self.select_img_box.Bind( wx.EVT_CHECKBOX, self.select_img_box_func )
600603
self.colourPicker_gap.Bind( wx.EVT_COLOURPICKER_CHANGED, self.colour_change )
601604
self.background_slider.Bind( wx.EVT_SCROLL, self.background_alpha )
602605
self.foreground_slider.Bind( wx.EVT_SCROLL, self.foreground_alpha )
@@ -615,6 +618,7 @@ def __init__( self, parent ):
615618
self.Bind( wx.EVT_MENU, self.down_img, id = self.menu_down.GetId() )
616619
self.Bind( wx.EVT_MENU, self.right_img, id = self.menu_right.GetId() )
617620
self.Bind( wx.EVT_MENU, self.left_img, id = self.menu_left.GetId() )
621+
self.Bind( wx.EVT_MENU, self.delete_box, id = self.menu_delete_box.GetId() )
618622
self.Bind( wx.EVT_MENU, self.index_table_gui, id = self.index_table.GetId() )
619623
self.Bind( wx.EVT_MENU, self.about_gui, id = self.menu_about.GetId() )
620624

@@ -659,7 +663,7 @@ def rotation_fc( self, event ):
659663
def change_img_stitch_mode( self, event ):
660664
event.Skip()
661665

662-
def move_img_box_func( self, event ):
666+
def select_img_box_func( self, event ):
663667
event.Skip()
664668

665669
def colour_change( self, event ):
@@ -706,6 +710,9 @@ def right_img( self, event ):
706710
def left_img( self, event ):
707711
event.Skip()
708712

713+
def delete_box( self, event ):
714+
event.Skip()
715+
709716
def index_table_gui( self, event ):
710717
event.Skip()
711718

0 commit comments

Comments
 (0)