From 8a802d3a28269035f556da9000088a8bd9a7d966 Mon Sep 17 00:00:00 2001
From: Lewin Probst <info@emirror.de>
Date: Thu, 12 Dec 2019 09:33:56 +0100
Subject: [PATCH] Removed artoaDataOutput from global variables because it is
never used.
---
VERSION | 2 +-
lib/+artoa/+controller/+file/saveInterim.m | 6 +++---
lib/+artoa/+controller/initializeArtoa4.m | 3 +--
lib/+artoa/+controller/quit.m | 4 ++--
lib/artoa4.m | 2 --
5 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/VERSION b/VERSION
index 50f0bcd..d55f9f7 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 f3d1f39..a42875f 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 0d39f17..277324a 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 46b160a..bc186a4 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 2e05c77..5887d32 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
--
GitLab