wangtong/ISAT_with_sam
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
yatenglg 2023-05-07 03:03:40 +08:00
parent cc77d2b92c
commit c6328fab6c
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
widgets/canvas.py
View File

@ -282,9 +282,9 @@ class AnnotationScene(QtWidgets.QGraphicsScene):
if self.mode == STATUSMode.CREATE: if self.mode == STATUSMode.CREATE:
sceneX, sceneY = event.scenePos().x(), event.scenePos().y() sceneX, sceneY = event.scenePos().x(), event.scenePos().y()
sceneX = 0 if sceneX < 0 else sceneX sceneX = 0 if sceneX < 0 else sceneX
sceneX = self.width() if sceneX > self.width() else sceneX sceneX = self.width()-1 if sceneX > self.width()-1 else sceneX
sceneY = 0 if sceneY < 0 else sceneY sceneY = 0 if sceneY < 0 else sceneY
sceneY = self.height() if sceneY > self.height() else sceneY sceneY = self.height()-1 if sceneY > self.height()-1 else sceneY
if event.button() == QtCore.Qt.MouseButton.LeftButton: if event.button() == QtCore.Qt.MouseButton.LeftButton:
if self.draw_mode == DRAWMode.SEGMENTANYTHING: if self.draw_mode == DRAWMode.SEGMENTANYTHING:
@ -325,9 +325,9 @@ class AnnotationScene(QtWidgets.QGraphicsScene):
pos = event.scenePos() pos = event.scenePos()
if pos.x() < 0: pos.setX(0) if pos.x() < 0: pos.setX(0)
if pos.x() > self.width(): pos.setX(self.width()) if pos.x() > self.width()-1: pos.setX(self.width()-1)
if pos.y() < 0: pos.setY(0) if pos.y() < 0: pos.setY(0)
if pos.y() > self.height(): pos.setY(self.height()) if pos.y() > self.height()-1: pos.setY(self.height()-1)
# 限制在图片范围内 # 限制在图片范围内
if self.mode == STATUSMode.CREATE: if self.mode == STATUSMode.CREATE:
@ -347,10 +347,12 @@ class AnnotationScene(QtWidgets.QGraphicsScene):
# 状态栏,显示当前坐标 # 状态栏,显示当前坐标
if self.image_data is not None: if self.image_data is not None:
print('-- ', pos.x(), pos.y())
x, y = round(pos.x()), round(pos.y()) x, y = round(pos.x()), round(pos.y())
print('---', x, y)
self.mainwindow.labelCoord.setText('xy: ({:>4d},{:>4d})'.format(x, y)) self.mainwindow.labelCoord.setText('xy: ({:>4d},{:>4d})'.format(x, y))
data = self.image_data[y-1][x-1] data = self.image_data[y][x]
if self.image_data.ndim == 2: if self.image_data.ndim == 2:
self.mainwindow.labelData.setText('pix: [{:^3d}]'.format(data)) self.mainwindow.labelData.setText('pix: [{:^3d}]'.format(data))
elif self.image_data.ndim == 3: elif self.image_data.ndim == 3:

8
widgets/polygon.py
View File

@ -37,12 +37,12 @@ class Vertex(QtWidgets.QGraphicsPathItem):
# 限制顶点移动到图外 # 限制顶点移动到图外
if value.x() < 0: if value.x() < 0:
value.setX(0) value.setX(0)
if value.x() > self.scene().width(): if value.x() > self.scene().width()-1:
value.setX(self.scene().width()) value.setX(self.scene().width()-1)
if value.y() < 0: if value.y() < 0:
value.setY(0) value.setY(0)
if value.y() > self.scene().height(): if value.y() > self.scene().height()-1:
value.setY(self.scene().height()) value.setY(self.scene().height()-1)
self.polygon.movePoint(self.index, value) self.polygon.movePoint(self.index, value)