diff --git a/VERSION b/VERSION index 50f0bcd37553d013ca12d64ebde925a26d4256d7..d55f9f7457c480079465ca51b679ee672016af1a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -135 \ No newline at end of file +136 \ No newline at end of file diff --git a/lib/+artoa/+controller/+file/saveInterim.m b/lib/+artoa/+controller/+file/saveInterim.m index f3d1f39db5fbecf1578ac4dce21e0d979c199875..a42875fb39aab675fc3450cd7fa0c17fec1a3841 100644 --- a/lib/+artoa/+controller/+file/saveInterim.m +++ b/lib/+artoa/+controller/+file/saveInterim.m @@ -2,7 +2,7 @@ function [] = saveInterim(~, ~) %SAVEINTERIM Saves the current state of ARTOA4 to the file specified by dialog. % -global artoaWorkspace artoaDataInput artoaDataOutput; +global artoaWorkspace artoaDataInput; %% Get required variables folder = artoa.data.getMember(artoaDataInput, {'ini', 'directory', 'interim'}, pwd()); @@ -13,10 +13,10 @@ filter = artoa.data.getMember(artoaDataInput, {'ini', 'filemask', 'interim'}, '* filepath = fullfile(pathname, filename); -save(filepath, 'artoaWorkspace', 'artoaDataInput', 'artoaDataOutput'); +save(filepath, 'artoaWorkspace', 'artoaDataInput'); return if isfile(filepath) - save(filepath, 'artoaWorkspace', 'artoaDataInput', 'artoaDataOutput'); + save(filepath, 'artoaWorkspace', 'artoaDataInput'); else warning([mfilename ': Save interim file failed because the selected file is not a file!']); end diff --git a/lib/+artoa/+controller/initializeArtoa4.m b/lib/+artoa/+controller/initializeArtoa4.m index 0d39f171e2c2780c43dab3a3ff34c7aa78a98782..277324a54f649e888b1875967a96bc9587395ad9 100644 --- a/lib/+artoa/+controller/initializeArtoa4.m +++ b/lib/+artoa/+controller/initializeArtoa4.m @@ -2,7 +2,7 @@ function [] = initializeArtoa4() %INITIALIZEARTOA4 Initializes variables required for artoa4 and creates the main window if required. % -global artoaDataInput artoaDataOutput artoaWorkspace artoaGui; +global artoaDataInput artoaWorkspace artoaGui; %% When the gui exists, focus it if isfield(artoaGui, 'figures') && isfield(artoaGui.figures, 'main') @@ -12,7 +12,6 @@ end %% Initalize required variables artoaDataInput = struct(); -artoaDataOutput = struct(); artoaWorkspace = struct(); artoaWorkspace.hideDeletedDataPoints = false; artoaWorkspace.defaults = struct(); diff --git a/lib/+artoa/+controller/quit.m b/lib/+artoa/+controller/quit.m index 46b160a18289e868280882092f3f5cff112b0622..bc186a4c1a42b888aa8a474f5429b19cec5c0ebb 100644 --- a/lib/+artoa/+controller/quit.m +++ b/lib/+artoa/+controller/quit.m @@ -5,7 +5,7 @@ global artoaGui; if ~exist('artoaGui', 'var') || isempty(artoaGui) delete(gcf); - clearvars -global artoaGui artoaDataInput artoaDataOutput artoaWorkspace; + clearvars -global artoaGui artoaDataInput artoaWorkspace; return; end @@ -24,7 +24,7 @@ try catch end -clearvars -global artoaGui artoaDataInput artoaDataOutput artoaWorkspace; +clearvars -global artoaGui artoaDataInput artoaWorkspace; end diff --git a/lib/artoa4.m b/lib/artoa4.m index 2e05c774e7c49cf0a7a99c828b6ace348e6005a3..5887d32390e143413d6336ee7ed2320a7240b96c 100644 --- a/lib/artoa4.m +++ b/lib/artoa4.m @@ -1,5 +1,3 @@ %% Start artoa4 -global artoaDataInput artoaDataOutput artoaWorkspace artoaGui; - artoa.controller.initializeArtoa4(); \ No newline at end of file