Skip to content

Commit 1d912c0

Browse files
committed
- fix bug
- 修复repaint模式的bug。(bug为 移动多边形后再使用重绘模式,会使多边形重置到移动的位置) - 修复win11下模型管理界面显示问题
1 parent 20b6597 commit 1d912c0

File tree

4 files changed

+33
-15
lines changed

4 files changed

+33
-15
lines changed

ISAT/ui/model_manager_dialog.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ def setupUi(self, Dialog):
5353
self.label_2.setObjectName("label_2")
5454
self.horizontalLayout_3.addWidget(self.label_2)
5555
self.label_3 = QtWidgets.QLabel(self.widget_4)
56-
self.label_3.setMaximumSize(QtCore.QSize(60, 16777215))
56+
self.label_3.setMinimumSize(QtCore.QSize(80, 0))
57+
self.label_3.setMaximumSize(QtCore.QSize(80, 16777215))
5758
font = QtGui.QFont()
5859
font.setFamily("Times New Roman")
5960
font.setPointSize(12)
@@ -64,7 +65,8 @@ def setupUi(self, Dialog):
6465
self.label_3.setObjectName("label_3")
6566
self.horizontalLayout_3.addWidget(self.label_3)
6667
self.label_4 = QtWidgets.QLabel(self.widget_4)
67-
self.label_4.setMaximumSize(QtCore.QSize(60, 16777215))
68+
self.label_4.setMinimumSize(QtCore.QSize(80, 0))
69+
self.label_4.setMaximumSize(QtCore.QSize(80, 16777215))
6870
font = QtGui.QFont()
6971
font.setFamily("Times New Roman")
7072
font.setPointSize(12)
@@ -81,7 +83,7 @@ def setupUi(self, Dialog):
8183
font.setBold(True)
8284
font.setWeight(75)
8385
self.label_5.setFont(font)
84-
self.label_5.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter)
86+
self.label_5.setAlignment(QtCore.Qt.AlignCenter)
8587
self.label_5.setObjectName("label_5")
8688
self.horizontalLayout_3.addWidget(self.label_5)
8789
self.label_6 = QtWidgets.QLabel(self.widget_4)

ISAT/ui/model_manager_dialog.ui

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,15 @@
8686
</item>
8787
<item>
8888
<widget class="QLabel" name="label_3">
89+
<property name="minimumSize">
90+
<size>
91+
<width>80</width>
92+
<height>0</height>
93+
</size>
94+
</property>
8995
<property name="maximumSize">
9096
<size>
91-
<width>60</width>
97+
<width>80</width>
9298
<height>16777215</height>
9399
</size>
94100
</property>
@@ -110,9 +116,15 @@
110116
</item>
111117
<item>
112118
<widget class="QLabel" name="label_4">
119+
<property name="minimumSize">
120+
<size>
121+
<width>80</width>
122+
<height>0</height>
123+
</size>
124+
</property>
113125
<property name="maximumSize">
114126
<size>
115-
<width>60</width>
127+
<width>80</width>
116128
<height>16777215</height>
117129
</size>
118130
</property>
@@ -146,7 +158,7 @@
146158
<string>Model name</string>
147159
</property>
148160
<property name="alignment">
149-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
161+
<set>Qt::AlignCenter</set>
150162
</property>
151163
</widget>
152164
</item>

ISAT/widgets/canvas.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -867,10 +867,14 @@ def mousePressEvent(self, event: 'QtWidgets.QGraphicsSceneMouseEvent'):
867867
distance = abs(repaint_end_index - repaint_start_index)
868868
if len(repaint_polygon.vertexs) - distance < distance:
869869
# 替换两端的点
870-
points = repaint_polygon.points[repaint_start_index+1: repaint_end_index] + replace_points[::-1]
870+
points = ([vertex.pos() for vertex in
871+
repaint_polygon.vertexs[repaint_start_index + 1: repaint_end_index]]
872+
+ replace_points[::-1])
871873
else:
872874
# 替换中间的点
873-
points = repaint_polygon.points[:repaint_start_index] + replace_points + repaint_polygon.points[repaint_end_index+1:]
875+
points = ([vertex.pos() for vertex in repaint_polygon.vertexs[:repaint_start_index]] +
876+
replace_points +
877+
[vertex.pos() for vertex in repaint_polygon.vertexs[repaint_end_index + 1:]])
874878
repaint_polygon.delete()
875879
for point in points:
876880
repaint_polygon.addPoint(point)

ISAT/widgets/model_manager_dialog.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -137,33 +137,33 @@ def init_ui(self):
137137
pixmap = QtGui.QPixmap(":/icon/icons/校验-小_check-small.svg") if image_segment else QtGui.QPixmap(":/icon/icons/关闭-小_close-small.svg")
138138
image_segment_label.setPixmap(pixmap)
139139
image_segment_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
140-
image_segment_label.setFixedWidth(60)
141-
image_segment_label.setStyleSheet('' if index % 2 else 'background-color: rgb(255, 255, 255);')
140+
image_segment_label.setFixedWidth(80)
141+
image_segment_label.setStyleSheet('background-color: rgb(240, 240, 240);' if index % 2 else 'background-color: rgb(255, 255, 255);')
142142
# video seg
143143
video_segment_label = QtWidgets.QLabel()
144144
pixmap = QtGui.QPixmap(":/icon/icons/校验-小_check-small.svg") if video_segment else QtGui.QPixmap(":/icon/icons/关闭-小_close-small.svg")
145145
video_segment_label.setPixmap(pixmap)
146146
video_segment_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
147-
video_segment_label.setFixedWidth(60)
148-
video_segment_label.setStyleSheet('' if index % 2 else 'background-color: rgb(255, 255, 255);')
147+
video_segment_label.setFixedWidth(80)
148+
video_segment_label.setStyleSheet('background-color: rgb(240, 240, 240);' if index % 2 else 'background-color: rgb(255, 255, 255);')
149149
# model name
150150
name_label = QtWidgets.QLabel()
151151
name_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeft)
152152
name_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignVCenter)
153153
name_label.setText(model_name)
154-
name_label.setStyleSheet('' if index % 2 else 'background-color: rgb(255, 255, 255);')
154+
name_label.setStyleSheet('background-color: rgb(240, 240, 240);' if index % 2 else 'background-color: rgb(255, 255, 255);')
155155
# 显存占用
156156
memory_label = QtWidgets.QLabel()
157157
memory_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
158158
memory_label.setText(bf16_memory)
159159
memory_label.setFixedWidth(100)
160-
memory_label.setStyleSheet('' if index % 2 else 'background-color: rgb(255, 255, 255);')
160+
memory_label.setStyleSheet('background-color: rgb(240, 240, 240);' if index % 2 else 'background-color: rgb(255, 255, 255);')
161161
# 权重大小
162162
params_label = QtWidgets.QLabel()
163163
params_label.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
164164
params_label.setText(params)
165165
params_label.setFixedWidth(100)
166-
params_label.setStyleSheet('' if index % 2 else 'background-color: rgb(255, 255, 255);')
166+
params_label.setStyleSheet('background-color: rgb(240, 240, 240);' if index % 2 else 'background-color: rgb(255, 255, 255);')
167167
# 下载/删除按钮
168168
ops_button = QtWidgets.QPushButton()
169169
ops_button.setFixedWidth(300)

0 commit comments

Comments
 (0)