Fix for multi-tree selection problem if a cell had just been selected.

src/MATLAB/+Editor/ContextAddToExtendedFamily.m

@@ -35,7 +35,8 @@ function ContextAddToExtendedFamily(hullIDs)
         if ~isempty(CellFamilies(familyID).extFamily)
             xfam = CellFamilies(familyID).extFamily;
             if length(xfam) > 1
-                warn = sprintf('Track %d is already in an extended family', trackID);
+                rootTrackID = CellFamilies(familyID).rootTrackID;
+                warn = sprintf('Track %d is already in an extended family', rootTrackID);
                 warndlg(warn);
                 return;
             end
@@ -48,6 +49,10 @@ function ContextAddToExtendedFamily(hullIDs)
     
     newTrackIDLocal = answer{1};
     newTrackID = UI.LocalToTrack(revLocalLabels, newTrackIDLocal);
+    
+    newFamilyID = CellTracks(newTrackID).familyID;
+    bInExtFamily = ismember(trackIDs,CellFamilies(newFamilyID).tracks);
+    trackIDs = trackIDs(~bInExtFamily);
 
     if ( isnan(newTrackID) || newTrackID > length(CellTracks) )
         warn = sprintf('Track %s does not exist.',newTrackIDLocal);
@@ -67,7 +72,6 @@ function ContextAddToExtendedFamily(hullIDs)
         return;
     end
 
-    newFamilyID = CellTracks(newTrackID).familyID;
     newExtFamily = union(CellFamilies(newFamilyID).extFamily, [familyIDs newFamilyID]);
     [CellFamilies(newExtFamily).extFamily] = deal(newExtFamily);
     

src/MATLAB/+UI/AddCellSelection.m

+function AddCellSelection(hullID)
+    global Figures
+    
+    bAlreadySelected = (Figures.cells.selectedHulls == hullID);
+    if ( any(bAlreadySelected) )
+        return;
+    end
+    
+    Figures.cells.selectedHulls = [Figures.cells.selectedHulls hullID];
+end

src/MATLAB/+UI/FigureCellDown.m

@@ -54,6 +54,10 @@ function FigureCellDown(src,evnt, labelID)
         else
             Editor.AddHull(2);
         end
+    elseif (strcmp(selectionType,'alt'))
+        if ( Figures.cells.downHullID > 0 )
+            UI.AddCellSelection(Figures.cells.downHullID);
+        end
     end
 end
 

src/MATLAB/+UI/InitializeFigures.m

@@ -50,7 +50,7 @@ Figures.tree.handle = figure();
 Figures.cells.selectedHulls = [];
 Figures.controlDown = false; %control key is currently down? for selecting cells and fine adjustment
 
-Figures.downHullID = -1;
+Figures.cells.downHullID = -1;
 Figures.downClickPoint = [0 0];
 
 whitebg(Figures.cells.handle,'k');