Deselect tiles when classifying by keyboard

Author: David Stirling

cpa/classifier.py

@@ -352,7 +352,6 @@ def __init__(self, properties=None, parent=None, id=ID_CLASSIFIER, **kwargs):
         self.Bind(wx.EVT_BUTTON, self.OnTrainClassifier, self.trainClassifierBtn)
         self.Bind(wx.EVT_BUTTON, self.ScoreAll, self.scoreAllBtn)
         self.Bind(wx.EVT_BUTTON, self.OnScoreImage, self.scoreImageBtn)
-        #self.Bind(wx.EVT_BUTTON, self.OnInspect, self.inspectBtn)
 
         self.nObjectsTxt.Bind(wx.EVT_TEXT, self.ValidateIntegerField)
         self.nRulesTxt.Bind(wx.EVT_TEXT, self.ValidateNumberOfRules)
@@ -520,7 +519,8 @@ def OnKey(self, evt):
         elif 0 <= chIdx <= 9:
             bin = chIdx
             if bin < len(self.classBins):
-                self.classBins[bin].AddObjects(self.unclassifiedBin.SelectedKeys(), srcID=self.unclassifiedBin.GetId())
+                self.classBins[bin].AddObjects(self.unclassifiedBin.SelectedKeys(), srcID=self.unclassifiedBin.GetId(),
+                                               deselect=True)
                 if self.unclassifiedBin.tiles:
                     self.unclassifiedBin.tiles[0].Select()
             return

cpa/sortbin.py

@@ -217,7 +217,8 @@ def OnSelectFromPopupMenu(self, evt):
     def AddObject(self, obKey, chMap=None, priority=1, pos='first'):
         self.AddObjects([obKey], chMap, priority, pos)
 
-    def AddObjects(self, obKeys, chMap=None, priority=1, pos='first', display_whole_image=False, srcID=None):
+    def AddObjects(self, obKeys, chMap=None, priority=1, pos='first', display_whole_image=False, srcID=None,
+                   deselect=False):
         if chMap is None:
             chMap = p.image_channel_colors
         if self.tile_collection == None:
@@ -236,10 +237,13 @@ def AddObjects(self, obKeys, chMap=None, priority=1, pos='first', display_whole_
                     else:
                         self.tiles.append(tile)
                         self.sizer.Add(tile, 0, wx.ALL | wx.EXPAND, 1)
+                    if deselect:
+                        tile.Deselect()
             source.UpdateSizer()
             source.UpdateQuantity()
         else:
-            imgSet = self.tile_collection.GetTiles(obKeys, (self.classifier or self), priority, display_whole_image=display_whole_image) # Gives back the np matrix of an image?
+            imgSet = self.tile_collection.GetTiles(obKeys, (self.classifier or self), priority,
+                                                   display_whole_image=display_whole_image)
             for i, obKey, imgs in zip(list(range(len(obKeys))), obKeys, imgSet):
                 if self.classifier:
                     newTile = ImageTile(self, obKey, imgs, chMap, False,