Skip to content
Snippets Groups Projects
Commit 60205bca authored by Eric Wait's avatar Eric Wait
Browse files

Fixed Opening Dataset Loop

parent bc917d86
No related branches found
No related tags found
No related merge requests found
...@@ -19,14 +19,15 @@ while ( ~bOpened ) ...@@ -19,14 +19,15 @@ while ( ~bOpened )
[sigDigits imageDataset] = Helper.ParseImageName(settings.imageFile); [sigDigits imageDataset] = Helper.ParseImageName(settings.imageFile);
if (~strcmp(imageDataset,CONSTANTS.datasetName)) if (~isfield(CONSTANTS,'datasetName'))
CONSTANTS.datasetName = imageDataset;
elseif (~strcmp(imageDataset,CONSTANTS.datasetName))
answer = questdlg('Image does not match dataset would you like to choose another?','Image Selection','Yes','No','Close LEVer','Yes'); answer = questdlg('Image does not match dataset would you like to choose another?','Image Selection','Yes','No','Close LEVer','Yes');
switch answer switch answer
case 'Yes' case 'Yes'
continue; continue;
case 'No' case 'No'
CONSTANTS.imageNamePattern = ''; CONSTANTS.imageNamePattern = '';
bOpened = 1;
case 'Close LEVer' case 'Close LEVer'
return return
otherwise otherwise
...@@ -37,6 +38,8 @@ while ( ~bOpened ) ...@@ -37,6 +38,8 @@ while ( ~bOpened )
CONSTANTS.rootImageFolder = settings.imagePath; CONSTANTS.rootImageFolder = settings.imagePath;
CONSTANTS.imageSignificantDigits = sigDigits; CONSTANTS.imageSignificantDigits = sigDigits;
CONSTANTS.matFullFile = [settings.matFilePath settings.matFile]; CONSTANTS.matFullFile = [settings.matFilePath settings.matFile];
bOpened = 1;
end end
save('LEVerSettings.mat','settings'); save('LEVerSettings.mat','settings');
......
...@@ -98,8 +98,10 @@ ReplayEditActions = []; ...@@ -98,8 +98,10 @@ ReplayEditActions = [];
answer = questdlg('Run Segmentation and Tracking or Use Existing Data?','Data Source','Segment & Track','Existing','Existing'); answer = questdlg('Run Segmentation and Tracking or Use Existing Data?','Data Source','Segment & Track','Existing','Existing');
switch answer switch answer
case 'Segment & Track' case 'Segment & Track'
Helper.ImageFileDialog(); if (~Helper.ImageFileDialog())
save('LEVerSettings.mat','settings'); return;
end
load('LEVerSettings.mat');
Load.InitializeConstants(); Load.InitializeConstants();
Load.AddConstant('version',softwareVersion,1); Load.AddConstant('version',softwareVersion,1);
......
...@@ -78,10 +78,10 @@ function errStatus = SegAndTrack() ...@@ -78,10 +78,10 @@ function errStatus = SegAndTrack()
return return
end end
UI.SaveData(1);
UI.InitializeFigures(); UI.InitializeFigures();
UI.SaveData(1);
% Adds the special origin action, to indicate that this is initial % Adds the special origin action, to indicate that this is initial
% segmentation data from which edit actions are built. % segmentation data from which edit actions are built.
Editor.ReplayableEditAction(@Editor.OriginAction, 1); Editor.ReplayableEditAction(@Editor.OriginAction, 1);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment