revise ASSIGN tool

Author: maxcorsini

source/QtImageViewerPlus.py

@@ -811,7 +811,7 @@ def setTool(self, tool):
         #calls the toolMessage method to show the tool message window        
         self.tools.toolMessage()
 
-        if tool in ["FREEHAND", "RULER", "FOURCLICKS", "PLACEANNPOINT"] or (tool in ["CUT", "EDITBORDER", "RITM"] and len(self.selected_blobs) > 1):
+        if tool in ["FREEHAND", "RULER", "FOURCLICKS", "PLACEANNPOINT", "ASSIGN"] or (tool in ["CUT", "EDITBORDER", "RITM"] and len(self.selected_blobs) > 1):
             self.resetSelection()
 
         if tool == "RITM" or tool == "SAMINTERACTIVE" or tool == "WATERSHED":
@@ -978,7 +978,7 @@ def mousePressEvent(self, event):
             self.leftMouseButtonPressed.emit(x, y)
 
             if mods & Qt.ShiftModifier and (self.tools.tool == "WATERSHED" or self.tools.tool == "FREEHAND" or self.tools.tool == "EDITBORDER"\
-                 or self.tools.tool == "CUT" or self.tools.tool == "RULER" or self.tools.tool == "SAM" or self.tools.tool == "SAMINTERACTIVE"):
+                 or self.tools.tool == "CUT" or self.tools.tool == "ASSIGN" or  self.tools.tool == "RULER" or self.tools.tool == "SAM" or self.tools.tool == "SAMINTERACTIVE"):
                 self.tools.leftPressed(x, y, mods)
 
             elif self.tools.tool == "SELECTAREA":

source/tools/Assign.py

@@ -6,8 +6,10 @@ def __init__(self, viewerplus):
         self.active_label = None
 
         message = "<p><i>Assign a class to a region</i></p>"
-        message += "<p>Choose the class from the Labels panel</p>"
-        message += "<p>- LMB on a region to assign the class</p>"
+        message += "<p>Make sure to have chosen a class from the Labels panel</p>"
+        message += "<p>- SHIFT + LMB on a region to assign the class</p>"
+        message += ("<p>To assign a class to multiple regions, active the PAN/ZOOM tool, make a<br>"
+                    "selection, and then double-click on a class in the Labels panel.</p>")
         self.tool_message = f'<div style="text-align: left;">{message}</div>'
 
 
@@ -22,39 +24,29 @@ def leftPressed(self, x, y, mods):
             return #do nothing, no label is set
 
         # handle points
-
-        select_point = self.viewerplus.annotations.clickedPoint(x, y)
-        if select_point is not None:
-            self.viewerplus.addToSelectedPointList(select_point)
-            for point in self.viewerplus.selected_annpoints:
-                self.viewerplus.setAnnPointClass(point, self.active_label)
-
+        selected_point = self.viewerplus.annotations.clickedPoint(x, y)
+        if selected_point is not None:
+            self.viewerplus.setAnnPointClass(selected_point, self.active_label)
             return
 
         # handle areas
-
         selected_blob = self.viewerplus.annotations.clickedBlob(x, y)
-        if selected_blob is None:
-            return
-
-        self.viewerplus.addToSelectedList(selected_blob)
-
-        genets = set()
-        for blob in self.viewerplus.selected_blobs:
-            if blob.genet is not None \
-                    and blob.genet >= 0:
-                genets.add(blob.genet)
-            else:
-                self.viewerplus.setBlobClass(blob, self.active_label)
-
-        project = self.viewerplus.project
-        for image in project.images:
-            blobs = [blob for blob in image.annotations.seg_blobs if blob.genet in genets]
-            for blob in blobs:
-                self.viewerplus.setBlobClass(blob, self.active_label)
-
-#            if image == self.viewerplus2.image //we need to update also the other viewer!!!!
-#            2) l'undo ha lo stesso problema, posso aggiungere i blob ma devono essere fatti per ogni immagine.
+        if selected_blob is not None:
+            self.viewerplus.setBlobClass(selected_blob, self.active_label)
+
+        # genets = set()
+        # for blob in self.viewerplus.selected_blobs:
+        #     if blob.genet is not None \
+        #             and blob.genet >= 0:
+        #         genets.add(blob.genet)
+        #     else:
+        #         self.viewerplus.setBlobClass(blob, self.active_label)
+        #
+        # project = self.viewerplus.project
+        # for image in project.images:
+        #     blobs = [blob for blob in image.annotations.seg_blobs if blob.genet in genets]
+        #     for blob in blobs:
+        #         self.viewerplus.setBlobClass(blob, self.active_label)
 
         message ="[TOOL][ASSIGN] Blob(s) assigned ({:d}) (CLASS={:s}).".format(len(self.viewerplus.selected_blobs), self.active_label)
         self.viewerplus.logfile.info(message)