Made softwareVersion a global separate from CONSTANTS. Updated CompileLEVer to...

Made softwareVersion a global separate from CONSTANTS. Updated CompileLEVer to package about dialog logo.

src/MATLAB/CompileLEVer.m

@@ -62,10 +62,13 @@ system(['copy ..\c\mexDijkstra\Release_' buildplatform '\mexDijkstra.dll .\mexDi
 system(['copy ..\c\MTC\Release_' buildplatform '\MTC.exe .\']);
 system(['copy ..\c\MTC\Release_' buildplatform '\MTC.exe ' bindir]);
 
-mcc -m LEVer.m
-mcc -m Segmentor.m
-mcc -m LEVER_SegAndTrackFolders.m
-mcc -m LinkTreeFolders.m
+mcrfile = mcrinstaller();
+system(['copy "' mcrfile '" "' bindir '\"']);
+
+mcc -R -startmsg -m LEVer.m -a LEVER_logo.tif
+mcc -R -startmsg -m Segmentor.m
+mcc -R -startmsg -m LEVER_SegAndTrackFolders.m
+mcc -R -startmsg -m LinkTreeFolders.m
 system(['copy LEVer.exe ' fullfile(bindir,'.')]);
 system(['copy Segmentor.exe ' fullfile(bindir,'.')]);
 system(['copy LEVER_SegAndTrackFolders.exe ' fullfile(bindir,'.')]);

src/MATLAB/DrawTree.m

@@ -57,6 +57,9 @@ set(overAxes,...
     'XTick',    [],...
     'Box',      'off');
 % ylabel('Time (Frames)');
+
+% title(overAxes, CONSTANTS.datasetName, 'Position',[0 0 1], 'HorizontalAlignment','left', 'Interpreter','none');
+
 hold on
 
 [xMin xCenter xMax phenoScratch] = traverseTree(trackID,0,phenoScratch);

src/MATLAB/LEVER_SegAndTrackFolders.m

@@ -7,14 +7,14 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % mcc -m LEVER_SegAndTrackFolders.m
 function LEVER_SegAndTrackFolders(outputDir)
-global CONSTANTS;
+global CONSTANTS softwareVersion;
 
 CONSTANTS=[];
 
-versionString = '6.1 Adult';
+softwareVersion = '6.1 Adult';
 
 InitializeConstants();
-UpdateFileVersionString(versionString);
+UpdateFileVersionString(softwareVersion);
 
 directory_name = uigetdir('','Select Root Folder for Seg and Track');
 if(~directory_name),return,end

src/MATLAB/LEVer.m

@@ -25,7 +25,7 @@
 
 function LEVer()
 
-global Figures
+global Figures softwareVersion
 
 %if LEVer is already opened, save state just in case the User cancels the
 %open
@@ -37,9 +37,9 @@ if(~isempty(Figures))
     end
 end
 
-versionString = '6.2 Adult';
+softwareVersion = '6.2 Adult';
 
-if(OpenData(versionString))
+if(OpenData())
     InitializeFigures();
     History('Init');
 elseif(~isempty(Figures))

src/MATLAB/LinkTreesForward.m

@@ -80,26 +80,8 @@ function [assignedExtensions findTime extTime] = LinkTreesForward(rootTracks)
     leafHulls = leafHulls(srtidx);
     for i=1:length(leafHulls)
         % Only check best-to-end for now
-        [endpaths endcosts] = dijkstraSearch(leafHulls(i), extGraph, @checkFullExt, Inf);
-        [chkendpaths chkendcosts] = mexDijkstra('matlabExtend', leafHulls(i), Inf, @checkFullExt);
-        
-        if ( length(endcosts) ~= length(chkendcosts)  )
-            error('mexDijkstra verification check failed: cost lengths unequal');
-        end
-        
-        [tstcosts tstsrt] = sort(endcosts);
-        tstpaths = endpaths(tstsrt);
-        [chkendcosts tstsrt] = sort(chkendcosts);
-        chkendpaths = chkendpaths(tstsrt);
-        
-        for k=1:length(tstcosts)
-            if ( tstcosts(k) ~= chkendcosts(k) )
-                error('mexDijkstra verification check failed: costs unequal');
-            end
-            if ( any(tstpaths{k} ~= chkendpaths{k}) )
-                error('mexDijkstra verification check failed: extension paths unequal');
-            end
-        end
+%         [endpaths endcosts] = dijkstraSearch(leafHulls(i), extGraph, @checkFullExt, Inf);
+        [endpaths endcosts] = mexDijkstra('matlabExtend', leafHulls(i), Inf, @checkFullExt);
         
         if ( isempty(endcosts) )
             continue;
@@ -112,21 +94,21 @@ function [assignedExtensions findTime extTime] = LinkTreesForward(rootTracks)
             linkupHull = extEnds(startHull,finalHull);
             
             AssignEdge(linkupHull, startHull, 1);
-            extGraph(:,finalHull) = 0;
-            extGraph(startHull,:) = 0;
+%             extGraph(:,finalHull) = 0;
+%             extGraph(startHull,:) = 0;
             
             mexDijkstra('removeEdges', [], finalHull);
             mexDijkstra('removeEdges', startHull, []);
             
             [rmstart,rmend] = find(extEnds == linkupHull);
             mexDijkstra('removeEdges', rmstart, rmend);
-            for k=1:length(rmstart)
-                if ( rmstart(k) == startHull || rmend(k) == finalHull )
-                    continue;
-                end
-                
-                extGraph(rmstart(k),rmend(k)) = 0;
-            end
+%             for k=1:length(rmstart)
+%                 if ( rmstart(k) == startHull || rmend(k) == finalHull )
+%                     continue;
+%                 end
+%                 
+%                 extGraph(rmstart(k),rmend(k)) = 0;
+%             end
         end
         
         assignedExtensions = assignedExtensions + length(endpaths{minidx}) - 1;

src/MATLAB/OpenData.m

@@ -26,12 +26,12 @@
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-function opened = OpenData(versionString)
+function opened = OpenData()
 
-global Figures Colors CONSTANTS CellFamilies CellHulls CellFeatures HashedCells Costs GraphEdits CellTracks ConnectedDist CellPhenotypes SegmentationEdits SegLevels
+global Figures Colors CONSTANTS CellFamilies CellHulls CellFeatures HashedCells Costs GraphEdits CellTracks ConnectedDist CellPhenotypes SegmentationEdits SegLevels softwareVersion
 
 if(isempty(Figures))
-    fprintf('LEVer ver %s\n***DO NOT DISTRIBUTE***\n\n', versionString);
+    fprintf('LEVer ver %s\n***DO NOT DISTRIBUTE***\n\n', softwareVersion);
 end
 
 if(exist('ColorScheme.mat','file'))
@@ -136,7 +136,7 @@ switch answer
     case 'Segment & Track'
         save('LEVerSettings.mat','settings');
         InitializeConstants();
-        UpdateFileVersionString(versionString);
+        UpdateFileVersionString(softwareVersion);
         errOpen = SegAndTrack();
     case 'Existing'
         while(~goodLoad)
@@ -215,9 +215,9 @@ if(errOpen)
     return
 end
 
-bUpdated = FixOldFileVersions(versionString);
+bUpdated = FixOldFileVersions(softwareVersion);
 if ( bUpdated )
-    UpdateFileVersionString(versionString);
+    UpdateFileVersionString(softwareVersion);
     if( exist('objHulls','var') && strcmpi(answer,'Existing') )
         SaveLEVerState([settings.matFilePath CONSTANTS.datasetName '_LEVer']);
     else

src/MATLAB/about.m

@@ -64,9 +64,9 @@ else
     im=255*ones(339,608);
 end
 imagesc(im)    
-global CONSTANTS
-if exist('CONSTANTS')
-    set(handles.text1,'string',{['LEVER : ' CONSTANTS.version] ; [] ; ['(c) 2012']  });
+global softwareVersion
+if ( ~isempty(softwareVersion) )
+    set(handles.text1,'string',{['LEVER : ' softwareVersion] ; [] ; ['(c) 2012']  });
 else
     set(handles.text1,'string',{['LEVER : (version unknown)' ] ; [] ; ['(c) 2012']  });
 end