-

Author: yatengLG

ISAT/annotation.py

@@ -9,6 +9,18 @@
 
 
 class Object:
+    """
+    A class to represent an annotation object.
+
+    category: The category of the object.
+    group: The group of the object.
+    segmentation: The vertices of the object.
+    area: The area of the object.
+    layer: The layer of the object.
+    bbox: The bbox of the object.
+    iscrowd: The crowd tag of the object.
+    note: The note of the object.
+    """
     def __init__(self, category:str, group:int, segmentation, area, layer, bbox, iscrowd=0, note=''):
         self.category = category
         self.group = group

ISAT/widgets/annos_dock_widget.py

@@ -154,7 +154,7 @@ def set_polygon_selected(self):
                     polygon.setSelected(False)
 
     def set_polygon_show(self, polygon):
-        for vertex in polygon.vertexs:
+        for vertex in polygon.vertices:
             vertex.setVisible(self.sender().checkState())
         polygon.setVisible(self.sender().checkState())
 
@@ -191,10 +191,10 @@ def zoom_to_group(self):
                                 if polygon.group == int(selected_group)]
         if not polygons_in_group:
             return
-        min_x = min(min(vertex.x() for vertex in polygon.vertexs) for polygon in polygons_in_group)
-        min_y = min(min(vertex.y() for vertex in polygon.vertexs) for polygon in polygons_in_group)
-        max_x = max(max(vertex.x() for vertex in polygon.vertexs) for polygon in polygons_in_group)
-        max_y = max(max(vertex.y() for vertex in polygon.vertexs) for polygon in polygons_in_group)
+        min_x = min(min(vertex.x() for vertex in polygon.vertices) for polygon in polygons_in_group)
+        min_y = min(min(vertex.y() for vertex in polygon.vertices) for polygon in polygons_in_group)
+        max_x = max(max(vertex.x() for vertex in polygon.vertices) for polygon in polygons_in_group)
+        max_y = max(max(vertex.y() for vertex in polygon.vertices) for polygon in polygons_in_group)
         margin = 20
         bounding_rect = QtCore.QRectF(min_x - margin, min_y - margin, max_x - min_x + 2*margin, max_y - min_y + 2*margin)
         self.mainwindow.view.fitInView(bounding_rect, QtCore.Qt.AspectRatioMode.KeepAspectRatio)

ISAT/widgets/canvas.py

@@ -336,7 +336,7 @@ def finish_draw(self):
 
                     # 设置为最高图层
                     self.current_graph.setZValue(len(self.mainwindow.polygons)+1)
-                    for vertex in self.current_graph.vertexs:
+                    for vertex in self.current_graph.vertices:
                         vertex.setZValue(len(self.mainwindow.polygons)+1)
 
                     # 添加新polygon
@@ -388,7 +388,7 @@ def finish_draw(self):
 
             # 设置为最高图层
             self.current_graph.setZValue(len(self.mainwindow.polygons)+1)
-            for vertex in self.current_graph.vertexs:
+            for vertex in self.current_graph.vertices:
                 vertex.setZValue(len(self.mainwindow.polygons)+1)
 
             # 添加新polygon
@@ -472,14 +472,14 @@ def delete_selected_graph(self):
                 del item
             elif isinstance(item, Vertex):
                 polygon = item.polygon
-                if polygon.vertexs:
-                    index = polygon.vertexs.index(item)
+                if polygon.vertices:
+                    index = polygon.vertices.index(item)
                     item.polygon.removePoint(index)
                 else:
                     self.removeItem(item)
                     del item
                 # 如果剩余顶点少于三个，删除多边形
-                if len(polygon.vertexs) < 3:
+                if len(polygon.vertices) < 3:
                     if polygon in self.mainwindow.polygons:
                         self.mainwindow.polygons.remove(polygon)
                         self.mainwindow.annos_dock_widget.listwidget_remove_polygon(polygon)
@@ -520,7 +520,7 @@ def move_polygon_to_top(self):
                 p.setZValue(p.zValue() - 1)
 
         current_polygon.setZValue(max_layer)
-        for vertex in current_polygon.vertexs:
+        for vertex in current_polygon.vertices:
             vertex.setZValue(max_layer)
         self.mainwindow.set_saved_state(False)
 
@@ -540,7 +540,7 @@ def move_polygon_to_bottom(self):
                     p.setZValue(p.zValue() + 1)
 
             current_polygon.setZValue(1)
-            for vertex in current_polygon.vertexs:
+            for vertex in current_polygon.vertices:
                 vertex.setZValue(1)
         self.mainwindow.set_saved_state(False)
 
@@ -552,7 +552,7 @@ def copy_item(self):
                     self.current_graph = Polygon()
                     self.addItem(self.current_graph)
 
-                for point in item.vertexs:
+                for point in item.vertices:
                     x, y = point.x(), point.y()
                     self.current_graph.addPoint(QtCore.QPointF(x, y))
 
@@ -564,13 +564,13 @@ def copy_item(self):
                 self.current_graph = None
             elif isinstance(item, Vertex):
                 polygon = item.polygon
-                index = polygon.vertexs.index(item)
+                index = polygon.vertices.index(item)
                 point = QtCore.QPointF(item.x(), item.y())
 
                 polygon.points.insert(index, point)
                 vertex = Vertex(self, polygon.color, self.mainwindow.cfg['software']['vertex_size'] * 2)
                 self.addItem(vertex)
-                polygon.vertexs.insert(index, vertex)
+                polygon.vertices.insert(index, vertex)
                 vertex.setPos(point)
 
     # 感谢[XieDeWu](https://github.com/XieDeWu)提的有关交、并、差、异或的[建议](https://github.com/yatengLG/ISAT_with_segment_anything/issues/167)。
@@ -586,8 +586,8 @@ def polygons_union(self):
             color = self.selected_polygons_list[0].color
 
             try:
-                polygon1_shapely = shapely.Polygon([(point.x(), point.y()) for point in self.selected_polygons_list[0].vertexs])
-                polygon2_shapely = shapely.Polygon([(point.x(), point.y()) for point in self.selected_polygons_list[1].vertexs])
+                polygon1_shapely = shapely.Polygon([(point.x(), point.y()) for point in self.selected_polygons_list[0].vertices])
+                polygon2_shapely = shapely.Polygon([(point.x(), point.y()) for point in self.selected_polygons_list[1].vertices])
                 return_shapely = polygon1_shapely.union(polygon2_shapely)
             except Exception as e:
                 QtWidgets.QMessageBox.warning(self.mainwindow, 'Warning', 'Polygon warning: {}'.format(e))
@@ -629,8 +629,8 @@ def polygons_difference(self):
             layer = self.selected_polygons_list[0].zValue()
             color = self.selected_polygons_list[0].color
             try:
-                polygon1_shapely = shapely.Polygon([(point.x(), point.y()) for point in self.selected_polygons_list[0].vertexs])
-                polygon2_shapely = shapely.Polygon([(point.x(), point.y()) for point in self.selected_polygons_list[1].vertexs])
+                polygon1_shapely = shapely.Polygon([(point.x(), point.y()) for point in self.selected_polygons_list[0].vertices])
+                polygon2_shapely = shapely.Polygon([(point.x(), point.y()) for point in self.selected_polygons_list[1].vertices])
                 return_shapely = polygon1_shapely.difference(polygon2_shapely)
             except Exception as e:
                 QtWidgets.QMessageBox.warning(self.mainwindow, 'Warning', 'Polygon warning: {}'.format(e))
@@ -684,8 +684,8 @@ def polygons_intersection(self):
             layer = self.selected_polygons_list[0].zValue()
             color = self.selected_polygons_list[0].color
             try:
-                polygon1_shapely = shapely.Polygon([(point.x(), point.y()) for point in self.selected_polygons_list[0].vertexs])
-                polygon2_shapely = shapely.Polygon([(point.x(), point.y()) for point in self.selected_polygons_list[1].vertexs])
+                polygon1_shapely = shapely.Polygon([(point.x(), point.y()) for point in self.selected_polygons_list[0].vertices])
+                polygon2_shapely = shapely.Polygon([(point.x(), point.y()) for point in self.selected_polygons_list[1].vertices])
                 return_shapely = polygon1_shapely.intersection(polygon2_shapely)
             except Exception as e:
                 QtWidgets.QMessageBox.warning(self.mainwindow, 'Warning', 'Polygon warning: {}'.format(e))
@@ -739,8 +739,8 @@ def polygons_symmetric_difference(self):
             layer = self.selected_polygons_list[0].zValue()
             color = self.selected_polygons_list[0].color
             try:
-                polygon1_shapely = shapely.Polygon([(point.x(), point.y()) for point in self.selected_polygons_list[0].vertexs])
-                polygon2_shapely = shapely.Polygon([(point.x(), point.y()) for point in self.selected_polygons_list[1].vertexs])
+                polygon1_shapely = shapely.Polygon([(point.x(), point.y()) for point in self.selected_polygons_list[0].vertices])
+                polygon2_shapely = shapely.Polygon([(point.x(), point.y()) for point in self.selected_polygons_list[1].vertices])
                 return_shapely = polygon1_shapely.symmetric_difference(polygon2_shapely)
             except Exception as e:
                 QtWidgets.QMessageBox.warning(self.mainwindow, 'Warning', 'Polygon warning: {}'.format(e))
@@ -862,9 +862,9 @@ def mousePressEvent(self, event: 'QtWidgets.QGraphicsSceneMouseEvent'):
                     self.current_line.addPoint(self.repaint_end_vertex.pos())
 
                     repaint_polygon = self.repaint_start_vertex.polygon
-                    repaint_start_index = repaint_polygon.vertexs.index(self.repaint_start_vertex)
-                    repaint_end_index = repaint_polygon.vertexs.index(self.repaint_end_vertex)
-                    replace_points = [QtCore.QPointF(vertex.pos()) for vertex in self.current_line.vertexs]
+                    repaint_start_index = repaint_polygon.vertices.index(self.repaint_start_vertex)
+                    repaint_end_index = repaint_polygon.vertices.index(self.repaint_end_vertex)
+                    replace_points = [QtCore.QPointF(vertex.pos()) for vertex in self.current_line.vertices]
 
                     if repaint_start_index > repaint_end_index:
                         record = repaint_start_index
@@ -874,16 +874,16 @@ def mousePressEvent(self, event: 'QtWidgets.QGraphicsSceneMouseEvent'):
 
                     # 这里永远替换数量最少的顶点
                     distance = abs(repaint_end_index - repaint_start_index)
-                    if len(repaint_polygon.vertexs) - distance < distance:
+                    if len(repaint_polygon.vertices) - distance < distance:
                         # 替换两端的点
                         points = ([vertex.pos() for vertex in
-                                  repaint_polygon.vertexs[repaint_start_index + 1: repaint_end_index]]
+                                  repaint_polygon.vertices[repaint_start_index + 1: repaint_end_index]]
                                   + replace_points[::-1])
                     else:
                         # 替换中间的点
-                        points = ([vertex.pos() for vertex in repaint_polygon.vertexs[:repaint_start_index]] +
+                        points = ([vertex.pos() for vertex in repaint_polygon.vertices[:repaint_start_index]] +
                                   replace_points +
-                                  [vertex.pos() for vertex in repaint_polygon.vertexs[repaint_end_index + 1:]])
+                                  [vertex.pos() for vertex in repaint_polygon.vertices[repaint_end_index + 1:]])
                     repaint_polygon.delete()
                     for point in points:
                         repaint_polygon.addPoint(point)

ISAT/widgets/mainwindow.py

@@ -1180,7 +1180,7 @@ def change_bit_map_to_semantic(self):
         # to semantic
         for polygon in self.polygons:
             polygon.setEnabled(False)
-            for vertex in polygon.vertexs:
+            for vertex in polygon.vertices:
                 vertex.setVisible(False)
             polygon.change_color(QtGui.QColor(self.category_color_dict.get(polygon.category, '#6F737A')))
             polygon.color.setAlpha(255)
@@ -1203,7 +1203,7 @@ def change_bit_map_to_instance(self):
         # to instance
         for polygon in self.polygons:
             polygon.setEnabled(False)
-            for vertex in polygon.vertexs:
+            for vertex in polygon.vertices:
                 vertex.setVisible(False)
             if polygon.group != '':
                 index = int(polygon.group)
@@ -1232,7 +1232,7 @@ def change_bit_map_to_label(self):
         # to label
         for polygon in self.polygons:
             polygon.setEnabled(True)
-            for vertex in polygon.vertexs:
+            for vertex in polygon.vertices:
                 # vertex.setEnabled(True)
                 vertex.setVisible(polygon.isVisible())
             polygon.change_color(QtGui.QColor(self.category_color_dict.get(polygon.category, '#6F737A')))

ISAT/widgets/polygon.py

@@ -72,7 +72,7 @@ def itemChange(self, change: 'QtWidgets.QGraphicsItem.GraphicsItemChange', value
                 value.setY(0)
             if value.y() > self.scene().height()-1:
                 value.setY(self.scene().height()-1)
-            index = self.polygon.vertexs.index(self)
+            index = self.polygon.vertices.index(self)
             self.polygon.movePoint(index, value)
 
         return super(Vertex, self).itemChange(change, value)
@@ -103,7 +103,7 @@ def __init__(self):
         self.hover_alpha = 150
         self.nohover_alpha = 80
         self.points = []
-        self.vertexs = []
+        self.vertices = []
         self.category = ''
         self.group = 0
         self.iscrowd = 0
@@ -129,7 +129,7 @@ def addPoint(self, point):
         vertex = Vertex(self, self.color, self.scene().mainwindow.cfg['software']['vertex_size'] * 2)
         # 添加路径点
         self.scene().addItem(vertex)
-        self.vertexs.append(vertex)
+        self.vertices.append(vertex)
         vertex.setPos(point)
 
     def movePoint(self, index, point):
@@ -147,22 +147,22 @@ def removePoint(self, index):
         if not self.points:
             return
         self.points.pop(index)
-        vertex = self.vertexs.pop(index)
+        vertex = self.vertices.pop(index)
         self.scene().removeItem(vertex)
         del vertex
         self.redraw()
 
     def delete(self):
         self.points.clear()
-        while self.vertexs:
-            vertex = self.vertexs.pop()
+        while self.vertices:
+            vertex = self.vertices.pop()
             self.scene().removeItem(vertex)
             del vertex
 
     def moveVertex(self, index, point):
-        if not 0 <= index < len(self.vertexs):
+        if not 0 <= index < len(self.vertices):
             return
-        vertex = self.vertexs[index]
+        vertex = self.vertices[index]
         vertex.setEnabled(False)
         vertex.setPos(point)
         vertex.setEnabled(True)
@@ -236,7 +236,7 @@ def change_color(self, color):
         self.setPen(QtGui.QPen(color, self.line_width))
         self.color.setAlpha(self.nohover_alpha)
         self.setBrush(self.color)
-        for vertex in self.vertexs:
+        for vertex in self.vertices:
             vertex_color = self.color
             vertex_color.setAlpha(255)
             vertex.setPen(QtGui.QPen(vertex_color, self.line_width))
@@ -259,9 +259,9 @@ def set_drawed(self, category, group, iscrowd, note, color:QtGui.QColor, layer=N
         self.setBrush(self.color)
         if layer is not None:
             self.setZValue(layer)
-            for vertex in self.vertexs:
+            for vertex in self.vertices:
                 vertex.setZValue(layer)
-        for vertex in self.vertexs:
+        for vertex in self.vertices:
             vertex.setColor(color)
 
     def calculate_area(self):
@@ -346,7 +346,7 @@ def itemChange(self, change: 'QtWidgets.QGraphicsItem.GraphicsItemChange', value
                 value.setY(0)
             if value.y() > self.scene().height()-1:
                 value.setY(self.scene().height()-1)
-            index = self.polygon.vertexs.index(self)
+            index = self.polygon.vertices.index(self)
             self.polygon.movePoint(index, value)
 
         return super(LineVertex, self).itemChange(change, value)
@@ -358,7 +358,7 @@ def __init__(self):
         # self.hover_alpha = 150
         # self.nohover_alpha = 80
         self.points = []
-        self.vertexs = []
+        self.vertices = []
         self.color = QtGui.QColor('#ff0000')
         pen = QtGui.QPen(self.color, self.line_width)
         pen.setStyle(QtCore.Qt.PenStyle.DotLine)
@@ -370,7 +370,7 @@ def addPoint(self, point):
         vertex = LineVertex(self, self.color, self.scene().mainwindow.cfg['software']['vertex_size'] * 2)
         # 添加路径点
         self.scene().addItem(vertex)
-        self.vertexs.append(vertex)
+        self.vertices.append(vertex)
         vertex.setPos(point)
 
     def movePoint(self, index, point):
@@ -383,15 +383,15 @@ def removePoint(self, index):
         if not self.points:
             return
         self.points.pop(index)
-        vertex = self.vertexs.pop(index)
+        vertex = self.vertices.pop(index)
         self.scene().removeItem(vertex)
         del vertex
         self.redraw()
 
     def delete(self):
         self.points.clear()
-        while self.vertexs:
-            vertex = self.vertexs.pop()
+        while self.vertices:
+            vertex = self.vertices.pop()
             self.scene().removeItem(vertex)
             del vertex
 
@@ -454,7 +454,7 @@ def itemChange(self, change: 'QtWidgets.QGraphicsItem.GraphicsItemChange', value
                 value.setY(0)
             if value.y() > self.scene().height()-1:
                 value.setY(self.scene().height()-1)
-            index = self.rect.vertexs.index(self)
+            index = self.rect.vertices.index(self)
             self.rect.movePoint(index, value)
 
         return super(RectVertex, self).itemChange(change, value)
@@ -465,15 +465,15 @@ def __init__(self):
         super().__init__(parent=None)
         self.line_width = 1
         self.points = []
-        self.vertexs = []
+        self.vertices = []
         self.color = QtGui.QColor('#ff0000')
 
     def addPoint(self, point):
         self.points.append(point)
         vertex = RectVertex(self, self.color, self.scene().mainwindow.cfg['software']['vertex_size'] * 2)
         # 添加路径点
         self.scene().addItem(vertex)
-        self.vertexs.append(vertex)
+        self.vertices.append(vertex)
         vertex.setPos(point)
 
     def movePoint(self, index, point):
@@ -486,15 +486,15 @@ def removePoint(self, index):
         if not self.points:
             return
         self.points.pop(index)
-        vertex = self.vertexs.pop(index)
+        vertex = self.vertices.pop(index)
         self.scene().removeItem(vertex)
         del vertex
         self.redraw()
 
     def delete(self):
         self.points.clear()
-        while self.vertexs:
-            vertex = self.vertexs.pop()
+        while self.vertices:
+            vertex = self.vertices.pop()
             self.scene().removeItem(vertex)
             del vertex