Make single-frame tracks for mitoses instead of requiring end-frame hulls.

src/MATLAB/+Editor/CreateMitosisAction.m

@@ -11,9 +11,9 @@ function historyAction = CreateMitosisAction(treeID, time, linePoints)
     end
     
     treeTracks = [CellFamilies(treeID).tracks];
-    bMidTracks = (([CellTracks(treeTracks).startTime] < time) & ([CellTracks(treeTracks).endTime] > time));
     
-	checkTracks = treeTracks(bMidTracks);
+    bInTracks = Helper.CheckInTracks(time, treeTracks);
+	checkTracks = treeTracks(bInTracks);
     if ( isempty(checkTracks) )
         error('No valid tracks to add a mitosis onto');
     end
@@ -40,16 +40,25 @@ function historyAction = CreateMitosisAction(treeID, time, linePoints)
 %     bLeafTrack = arrayfun(@(x)(isempty(x.childrenTracks)), CellTracks(treeTracks));
 %     leafTracks = treeTracks(bLeafTrack);
 
+    Helper.SetTreeLocked(treeID, 0);
+    
     % NOTE: This just makes the tree as balanced as possible, it is probably not correct
     balancedTrack = checkTracks(minIdx);
     parentTrack = Hulls.GetTrackID(parentHull);
+    
+    % TODO: Don't change things up if parentTrack is already complete and on
+    % the correct family
+    if ( CellTracks(parentTrack).familyID == treeID )
+        balancedTrack = parentTrack;
+    end
+    
     if ( balancedTrack ~= parentTrack )
-        Tracks.LockedChangeLabel(parentTrack, balancedTrack, time-1);
+        attemptLockedChangeLabel(parentTrack, balancedTrack, time-1);
     end
     
     childTrack = Hulls.GetTrackID(childHulls(1));
     if ( balancedTrack ~= childTrack )
-        Tracks.LockedChangeLabel(childTrack, balancedTrack, time);
+        attemptLockedChangeLabel(childTrack, balancedTrack, time);
     end
     
     childTrack = Hulls.GetTrackID(childHulls(2));
@@ -61,13 +70,25 @@ function historyAction = CreateMitosisAction(treeID, time, linePoints)
     
     % TODO: Make this respect the endTime from start of state
     if ( time < length(HashedCells) )
-        childTrack = Hulls.GetTrackID(childHulls(2));
-        Helper.PushTrackToFrame(childTrack, length(HashedCells));
+        for i=1:2
+            childTrack = Hulls.GetTrackID(childHulls(i));
+            Helper.DropSubtree(childTrack);
+        end
     end
     
+    Helper.SetTreeLocked(treeID, 1);
+    
     historyAction = 'Push';
 end
 
+function attemptLockedChangeLabel(changeTrack, desiredTrack, time)
+    if ( Helper.CheckTreeLocked(changeTrack) )
+        Tracks.LockedChangeLabel(changeTrack, desiredTrack, time);
+    else
+        Tracks.ChangeLabel(changeTrack, desiredTrack, time);
+    end
+end
+
 function newPoints = clipToImage(linePoints)
     global CONSTANTS
     

src/MATLAB/+Editor/MitosisEditInitializeAction.m

@@ -9,7 +9,7 @@ function historyAction = MitosisEditInitializeAction(treeID, endTime)
     rootTrack = CellFamilies(treeID).rootTrackID;
     
     if ( ~CellFamilies(treeID).bLocked )
-        Helper.PushTrackToFrame(rootTrack, endTime);
+        Helper.DropSubtree(rootTrack);
     end
     
     CellFamilies(treeID).bLocked = 1;

src/MATLAB/+Helper/CheckInTracks.m

+% bInTrack = CheckInTracks(tracks)
+% 
+% Check (for reseg or mitosis editing) if time t is within tracks.
+
+function bInTrack = CheckInTracks(time, tracks)
+    global CellTracks
+    
+    bPastStart = ([CellTracks(tracks).startTime] < time);
+    bLeafTracks = arrayfun(@(x)(isempty(x.childrenTracks)), CellTracks(tracks));
+    bBeforeEnd = ([CellTracks(tracks).endTime] > time);
+
+    bInTrack = (bPastStart & (bBeforeEnd | bLeafTracks));
+end
\ No newline at end of file

src/MATLAB/+Helper/DropSubtree.m

+
+function DropSubtree(trackID)
+    global CellTracks
+    
+    if ( isempty(CellTracks(trackID).startTime) )
+        error('Cannot drop subtree of an empty track!');
+    end
+    
+    % Remove children if this is a length 1 track
+    if ( ~isempty(CellTracks(trackID).childrenTracks) )
+        Families.RemoveFromTreePrune(CellTracks(trackID).childrenTracks(1));
+    end
+    
+    Families.RemoveFromTreePrune(trackID, CellTracks(trackID).startTime+1);
+end
\ No newline at end of file

src/MATLAB/+Helper/MakeInitStruct.m

@@ -4,8 +4,8 @@
 % with the same name copied from inStruct (all others empty)
 
 function newStruct = MakeInitStruct(templateStruct, initStruct)
-    if ( isempty(templateStruct) || isempty(fieldnames(templateStruct)) )
-        error('Non-empty template structure required');
+    if ( isempty(fieldnames(templateStruct)) )
+        error('Template structure must have at least one field');
     end
 
     outFields = fieldnames(templateStruct);

src/MATLAB/+UI/FigureCellUp.m

@@ -78,9 +78,9 @@ function addMitosisEvent(treeID, time, dragCoords)
     end
     
     treeTracks = [CellFamilies(treeID).tracks];
-    bMidTracks = (([CellTracks(treeTracks).startTime] < time) & ([CellTracks(treeTracks).endTime] > time));
     
-	checkTracks = treeTracks(bMidTracks);
+    bInTracks = Helper.CheckInTracks(time, treeTracks);
+	checkTracks = treeTracks(bInTracks);
     if ( isempty(checkTracks) )
         msgbox('No valid tracks to add a mitosis onto','Invalid Mitosis','warn');
         return;