Rename content -> description

labelme/app.py

@@ -1055,11 +1055,11 @@ class MainWindow(QtWidgets.QMainWindow):
         shape = item.shape()
         if shape is None:
             return
-        text, flags, group_id, content = self.labelDialog.popUp(
+        text, flags, group_id, description = self.labelDialog.popUp(
             text=shape.label,
             flags=shape.flags,
             group_id=shape.group_id,
-            content=shape.content,
+            description=shape.description,
         )
         if text is None:
             return
@@ -1074,7 +1074,7 @@ class MainWindow(QtWidgets.QMainWindow):
         shape.label = text
         shape.flags = flags
         shape.group_id = group_id
-        shape.content = content
+        shape.description = description
 
         self._update_shape_color(shape)
         if shape.group_id is None:
@@ -1206,7 +1206,7 @@ class MainWindow(QtWidgets.QMainWindow):
             points = shape["points"]
             shape_type = shape["shape_type"]
             flags = shape["flags"]
-            content = shape["content"]
+            description = shape["description"]
             group_id = shape["group_id"]
             other_data = shape["other_data"]
 
@@ -1218,7 +1218,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 label=label,
                 shape_type=shape_type,
                 group_id=group_id,
-                content=content,
+                description=description,
             )
             for x, y in points:
                 shape.addPoint(QtCore.QPointF(x, y))
@@ -1255,7 +1255,7 @@ class MainWindow(QtWidgets.QMainWindow):
                     label=s.label.encode("utf-8") if PY2 else s.label,
                     points=[(p.x(), p.y()) for p in s.points],
                     group_id=s.group_id,
-                    content=s.content,
+                    description=s.description,
                     shape_type=s.shape_type,
                     flags=s.flags,
                 )
@@ -1351,7 +1351,7 @@ class MainWindow(QtWidgets.QMainWindow):
         group_id = None
         if self._config["display_label_popup"] or not text:
             previous_text = self.labelDialog.edit.text()
-            text, flags, group_id, content = self.labelDialog.popUp(text)
+            text, flags, group_id, description = self.labelDialog.popUp(text)
             if not text:
                 self.labelDialog.edit.setText(previous_text)
 
@@ -1367,7 +1367,7 @@ class MainWindow(QtWidgets.QMainWindow):
             self.labelList.clearSelection()
             shape = self.canvas.setLastLabel(text, flags)
             shape.group_id = group_id
-            shape.content = content
+            shape.description = description
             self.addLabel(shape)
             self.actions.editMode.setEnabled(True)
             self.actions.undoLastPoint.setEnabled(False)

labelme/label_file.py

@@ -83,7 +83,7 @@ class LabelFile(object):
             "group_id",
             "shape_type",
             "flags",
-            "content",
+            "description",
         ]
         try:
             with open(filename, "r") as f:
@@ -125,7 +125,7 @@ class LabelFile(object):
                     points=s["points"],
                     shape_type=s.get("shape_type", "polygon"),
                     flags=s.get("flags", {}),
-                    content=s.get("content"),
+                    description=s.get("description"),
                     group_id=s.get("group_id"),
                     other_data={
                         k: v for k, v in s.items() if k not in shape_keys

labelme/shape.py

@@ -52,7 +52,7 @@ class Shape(object):
         shape_type=None,
         flags=None,
         group_id=None,
-        content=None,
+        description=None,
     ):
         self.label = label
         self.group_id = group_id
@@ -61,7 +61,7 @@ class Shape(object):
         self.selected = False
         self.shape_type = shape_type
         self.flags = flags
-        self.content = content
+        self.description = description
         self.other_data = {}
 
         self._highlightIndex = None

labelme/widgets/label_dialog.py

@@ -105,10 +105,10 @@ class LabelDialog(QtWidgets.QDialog):
         layout.addItem(self.flagsLayout)
         self.edit.textChanged.connect(self.updateFlags)
         # text edit
-        self.textEdit = QtWidgets.QTextEdit()
-        self.textEdit.setPlaceholderText("Label content")
-        self.textEdit.setFixedHeight(50)
-        layout.addWidget(self.textEdit)
+        self.editDescription = QtWidgets.QTextEdit()
+        self.editDescription.setPlaceholderText("Label description")
+        self.editDescription.setFixedHeight(50)
+        layout.addWidget(self.editDescription)
         self.setLayout(layout)
         # completion
         completer = QtWidgets.QCompleter()
@@ -206,17 +206,8 @@ class LabelDialog(QtWidgets.QDialog):
             return int(group_id)
         return None
 
-    def getContent(self):
-        content = self.textEdit.toPlainText()
-        if content:
-            return content
-        return None
-
-    def setContent(self, content):
-        self.textEdit.setPlainText(content)
-
     def popUp(
-        self, text=None, move=True, flags=None, group_id=None, content=None
+        self, text=None, move=True, flags=None, group_id=None, description=None
     ):
         if self._fit_to_content["row"]:
             self.labelList.setMinimumHeight(
@@ -229,9 +220,10 @@ class LabelDialog(QtWidgets.QDialog):
         # if text is None, the previous label in self.edit is kept
         if text is None:
             text = self.edit.text()
-        if content is None:
-            content = ""
-        self.setContent(content)
+        # description is always initialized by empty text c.f., self.edit.text
+        if description is None:
+            description = ""
+        self.editDescription.setPlainText(description)
         if flags:
             self.setFlags(flags)
         else:
@@ -257,7 +249,7 @@ class LabelDialog(QtWidgets.QDialog):
                 self.edit.text(),
                 self.getFlags(),
                 self.getGroupId(),
-                self.getContent(),
+                self.editDescription.toPlainText(),
             )
         else:
             return None, None, None, None