Skip to content

Commit

Permalink
Revert "使放大框的缩放比例超出图像大小不会挤在一起 "
Browse files Browse the repository at this point in the history
  • Loading branch information
@nachifur
nachifur authored Aug 21, 2024
1 parent 13d048b commit 7e47748
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 76 deletions.
4 changes: 0 additions & 4 deletions src/mulimgviewer/config.txt
View file

This file was deleted.

4 changes: 0 additions & 4 deletions src/mulimgviewer/gui/config.txt
View file

This file was deleted.

54 changes: 5 additions & 49 deletions src/mulimgviewer/gui/main_gui.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import wx
import wx.xrc
import re

###########################################################################
## Class MulimgViewerGui
###########################################################################
Expand All @@ -29,14 +29,12 @@ def __init__( self, parent ):
wSizer1 = wx.WrapSizer( wx.HORIZONTAL, wx.WRAPSIZER_DEFAULT_FLAGS )

self.button_open_all = wx.Button( self.m_panel1, wx.ID_ANY, u"📂️", wx.DefaultPosition, wx.Size( 50,30 ), wx.BORDER_NONE )

self.button_open_all.SetFont( wx.Font( 20, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, False, wx.EmptyString ) )

wSizer1.Add( self.button_open_all, 0, wx.ALL|wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL, 5 )

choice_input_modeChoices = [ u"Sequential", u"Parallel auto", u"Parallel manual", u"Image File List" ]
self.choice_input_mode = wx.Choice( self.m_panel1, wx.ID_ANY, wx.DefaultPosition, wx.Size( -1,-1 ), choice_input_modeChoices, 0 )

self.choice_input_mode.SetSelection( 0 )
wSizer1.Add( self.choice_input_mode, 0, wx.ALL|wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL, 5 )

Expand Down Expand Up @@ -267,39 +265,8 @@ def __init__( self, parent ):
self.m_staticText2.Wrap( -1 )

bSizer18.Add( self.m_staticText2, 1, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 )
row_col_num = u"1,1"
row_col_one_img_num = u"1,1"
row_col_img_unit_num = u"3,1"
magnifer_row_col_num = u"1,1"
with open('config.txt', 'r') as file:
lines = file.readlines()
for i in range(len(lines)):
s = lines[i].split(':')
if "row_col" == s[0]:
row_col = lines[i].split(':')
row_col_num = row_col[1]

for i in range(len(lines)):
s = lines[i].split(':')
if "row_col_one_img" == s[0]:
row_col_one_img = lines[i].split(':')
row_col_one_img_num = row_col_one_img[1]

for i in range(len(lines)):
s = lines[i].split(':')
if "row_col_img_unit" == s[0]:
row_col_img_unit = lines[i].split(':')
row_col_img_unit_num = row_col_img_unit[1]

for i in range(len(lines)):
s = lines[i].split(':')
if "magnifer_row_col" == s[0]:
magnifer_row_col = lines[i].split(':')
magnifer_row_col_num = magnifer_row_col[1]


self.row_col = wx.TextCtrl( self.m_panel4, wx.ID_ANY, row_col_num, wx.DefaultPosition, wx.Size( -1,-1 ), 0 )

self.row_col = wx.TextCtrl( self.m_panel4, wx.ID_ANY, u"1,1", wx.DefaultPosition, wx.Size( -1,-1 ), 0 )
bSizer18.Add( self.row_col, 0, wx.ALL, 5 )

self.img_vertical = wx.CheckBox( self.m_panel4, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 )
Expand All @@ -315,7 +282,7 @@ def __init__( self, parent ):

bSizer10.Add( self.m_staticText4, 1, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 )

self.row_col_one_img = wx.TextCtrl( self.m_panel4, wx.ID_ANY, row_col_one_img_num, wx.DefaultPosition, wx.Size( -1,-1 ), 0 )
self.row_col_one_img = wx.TextCtrl( self.m_panel4, wx.ID_ANY, u"1,1", wx.DefaultPosition, wx.Size( -1,-1 ), 0 )
bSizer10.Add( self.row_col_one_img, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 )

self.one_img_vertical = wx.CheckBox( self.m_panel4, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 )
Expand All @@ -331,7 +298,7 @@ def __init__( self, parent ):

bSizer14.Add( self.m_staticText331, 1, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 )

self.row_col_img_unit = wx.TextCtrl( self.m_panel4, wx.ID_ANY, row_col_img_unit_num, wx.DefaultPosition, wx.DefaultSize, 0 )
self.row_col_img_unit = wx.TextCtrl( self.m_panel4, wx.ID_ANY, u"3,1", wx.DefaultPosition, wx.DefaultSize, 0 )
bSizer14.Add( self.row_col_img_unit, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 )

self.img_unit_vertical = wx.CheckBox( self.m_panel4, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 )
Expand All @@ -347,7 +314,7 @@ def __init__( self, parent ):

bSizer101.Add( self.m_staticText41, 1, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 )

self.magnifer_row_col = wx.TextCtrl( self.m_panel4, wx.ID_ANY, magnifer_row_col_num, wx.DefaultPosition, wx.Size( -1,-1 ), 0 )
self.magnifer_row_col = wx.TextCtrl( self.m_panel4, wx.ID_ANY, u"1,1", wx.DefaultPosition, wx.Size( -1,-1 ), 0 )
bSizer101.Add( self.magnifer_row_col, 0, wx.ALL, 5 )

self.magnifer_vertical = wx.CheckBox( self.m_panel4, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 )
Expand Down Expand Up @@ -834,17 +801,6 @@ def __init__( self, parent ):
self.Bind( wx.EVT_MENU, self.index_table_gui, id = self.index_table.GetId() )
self.Bind( wx.EVT_MENU, self.about_gui, id = self.menu_about.GetId() )

self.button_open_all.SetToolTip("open all picture")
self.m_button6.SetToolTip("out path")
self.save_butoon.SetToolTip("save")
self.m_button3.SetToolTip("left arrow")
self.m_button4.SetToolTip("right arrow")
self.m_button5.SetToolTip("refresh")
self.magnifier.SetToolTip("magnifier")
self.rotation.SetToolTip("rotation")
self.flip.SetToolTip("flip")


def __del__( self ):
pass

Expand Down
22 changes: 3 additions & 19 deletions src/mulimgviewer/src/utils_img.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ def cal_magnifier_size(self, magnifier_scale, crop_size, img_mode, gap, img_size
# custom magnifier scale
to_height = int(height*magnifier_scale[1])
to_width = int(width*magnifier_scale[0])

width_all = to_width * \
magnifer_row_col[1] + (magnifer_row_col[1]-1)*gap[0]
height_all = to_height * \
Expand All @@ -155,45 +154,30 @@ def cal_magnifier_size(self, magnifier_scale, crop_size, img_mode, gap, img_size
if img_width/width_all > img_height/height_all:
if to_height > img_height:
to_width = int(
img_height/height_all*to_width)
img_height/to_height*to_width)
to_height = int(
(img_height-gap[1]*(magnifer_row_col[0]-1))/magnifer_row_col[0])

else:
if width_all >= img_width:
to_height = int(
img_width/width_all*to_height)
to_width = int(
(img_width-gap[0]*(magnifer_row_col[1]-1))/magnifer_row_col[1])

if (to_height > img_height):
to_width = int(int(img_width) / int(to_height) * int(img_height))
to_height = img_height
if (to_width > img_width):
to_height = int(int(img_height) / int(to_width) * int(img_width))
to_width = img_width
else:
# auto magnifier scale
width_all = width * \
magnifer_row_col[1]+gap[0]*(magnifer_row_col[1]-1)
height_all = height * \
magnifer_row_col[0]+gap[1]*(magnifer_row_col[0]-1)
if img_width/width_all > img_height/height_all:
to_height = int(#img_height)
to_height = int(
(img_height-gap[1]*(magnifer_row_col[0]-1))/magnifer_row_col[0])
to_width = int(to_height/height*width)
else:
to_width = int(#img_width)
to_width = int(
(img_width-gap[0]*(magnifer_row_col[1]-1))/magnifer_row_col[1])
to_height = int(to_width/width*height)

if (int(to_height) > int(img_height)):
to_width = int(int(img_width) / int(to_height) * int(img_height))
to_height = img_height
if (int(to_width) > int(img_width)):
to_height = int(int(img_height) / int(to_width) * int(img_width))
to_width = img_width

width_all = to_width*magnifer_row_col[1]+gap[0]*(magnifer_row_col[1]-1)
height_all = to_height * \
magnifer_row_col[0]+gap[1]*(magnifer_row_col[0]-1)
Expand Down

0 comments on commit 7e47748

Please sign in to comment.