Some graph-edit related fixes.

src/MATLAB/+Tracker/GraphEditAddMitosis.m

@@ -25,22 +25,12 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 function GraphEditAddMitosis(trackID, siblingTrackID, time)
-    global CellTracks GraphEdits Costs CachedCostMatrix
+    global GraphEdits Costs CachedCostMatrix
     
-    parentHash = time - CellTracks(trackID).startTime;
-    siblingHash = time - CellTracks(siblingTrackID).startTime + 1;
+    parentHull = Helper.GetNearestTrackHull(trackID, time-1, 0);
     
-    if ( parentHash < 1 || parentHash+1 > length(CellTracks(trackID).hulls) )
-        return;
-    end
-    if ( siblingHash < 1 || siblingHash > length(CellTracks(trackID).hulls) )
-        return;
-    end
-    
-    parentHull = CellTracks(trackID).hulls(parentHash);
-    childHull = CellTracks(trackID).hulls(parentHash+1);
-    
-    siblingHull = CellTracks(siblingTrackID).hulls(siblingHash);
+    childHull = Helper.GetNearestTrackHull(trackID, time, 0);
+    siblingHull = Helper.GetNearestTrackHull(siblingTrackID, time, 0);
     
     if ( parentHull == 0 || childHull == 0 || siblingHull == 0 )
         return;

src/MATLAB/+Tracker/GraphEditRemoveEdge.m

@@ -30,6 +30,9 @@ function GraphEditRemoveEdge(trackID, time)
     global CellTracks CellFamilies GraphEdits CachedCostMatrix
     
     nextHull = Helper.GetNearestTrackHull(trackID, time, 1);
+    if ( nextHull == 0 )
+        return;
+    end
     
     possibleFamilyParents = [];
     familyID = CellTracks(trackID).familyID;
@@ -38,10 +41,6 @@ function GraphEditRemoveEdge(trackID, time)
         possibleFamilyParents = [possibleFamilyParents Helper.GetNearestTrackHull(checkTrack, time-1, -1)];
     end
     
-    if ( nextHull == 0 )
-        return;
-    end
-    
     nzParentHulls = possibleFamilyParents(possibleFamilyParents > 0);
     for i=1:length(nzParentHulls)
         GraphEdits(nzParentHulls(i),nextHull) = -1;

src/MATLAB/+Tracker/GraphEditSetEdge.m

 % GraphEditSetEdge(trackID, nextTrackID, time)
+% 
 % Set an edge edit in GraphEdits structure.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -31,22 +32,29 @@ function GraphEditSetEdge(trackID, nextTrackID, time, bLongDistance)
         bLongDistance = 0;
     end
     
-    if(bLongDistance)
-        track = CellTracks(trackID);
-        if(isempty(track.hulls)) %check for valid track
-            trackHull = 0;
-        else
-            for i=length(track.hulls):-1:1  %search backward through hulls for last edit or first hull
-                trackHull = track.hulls(i);
-                if(trackHull)
-                    if(any(GraphEdits(trackHull,:)) || any(GraphEdits(:,trackHull)))
-                        break
-                    end
+    [trackHull hullTime] = Helper.GetNearestTrackHull(trackID, time-1, -1);
+    if ( trackHull == 0 )
+        return;
     end
+    
+    if(bLongDistance)
+        hash = hullTime - CellTracks(trackID).startTime + 1;
+        if ( hash < 1 )
+            return;
         end
+        
+        trackHulls = CellTracks(trackID).hulls(1:hash);
+        nzHulls = trackHulls(trackHulls > 0);
+        if ( isempty(nzHulls) )
+            return;
         end
+        
+        trackHullIdx = find(any(GraphEdits(:,nzHulls),1),1,'last');
+        if ( isempty(trackHullIdx) )
+            trackHull = CellTracks(trackID).hulls(1);
         else
-        trackHull = Helper.GetNearestTrackHull(trackID, time-1, -1);
+            trackHull = nzHulls(trackHullIdx);
+        end
     end
     
     nextHull = Helper.GetNearestTrackHull(nextTrackID, time, 1);

src/MATLAB/+Tracker/GraphEditsResetHulls.m

-% GraphEditsResetHulls(hulls)
-% Resets (zeros) all user edits into (bResetBack) and out of (bResetForward)
+% GraphEditsResetHulls(hulls, bResetForward, bResetBack)
+% 
+% Clears all user edits into (bResetBack) and/or out of (bResetForward)
 % a hull, updates associated cached costs.
 
 function GraphEditsResetHulls(hulls, bResetForward, bResetBack)