From 9fb26f0e71fe128b01b944245ff7ffea7480fb97 Mon Sep 17 00:00:00 2001
From: Lewin Probst <info@emirror.de>
Date: Fri, 6 Sep 2019 14:44:16 +0200
Subject: [PATCH] The load and save interim functions are now using the values
from the ini file.
---
lib/+artoa/+controller/+file/loadInterim.m | 11 +++++++++--
lib/+artoa/+controller/+file/saveInterim.m | 6 +++++-
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/lib/+artoa/+controller/+file/loadInterim.m b/lib/+artoa/+controller/+file/loadInterim.m
index 4759005..8b7a2a3 100644
--- a/lib/+artoa/+controller/+file/loadInterim.m
+++ b/lib/+artoa/+controller/+file/loadInterim.m
@@ -2,11 +2,18 @@ function [] = loadInterim()
%LOADINTERIM Loads the current state of ARTOA4 from the file specified by dialog.
%
+global artoaDataInput;
+
+%% Get required variables
+folder = artoa.data.getMember(artoaDataInput, {'ini', 'directory', 'interim'}, pwd());
+filter = artoa.data.getMember(artoaDataInput, {'ini', 'filemask', 'interim'}, '*.itm');
+
+
%% Ask for filename
-filename = uigetfile('*.itm');
+filename = uigetfile(fullfile(folder, filter));
if (filename == 0)
- return
+ return;
end
%% Load mat file
diff --git a/lib/+artoa/+controller/+file/saveInterim.m b/lib/+artoa/+controller/+file/saveInterim.m
index 361dcfb..b9dc7d5 100644
--- a/lib/+artoa/+controller/+file/saveInterim.m
+++ b/lib/+artoa/+controller/+file/saveInterim.m
@@ -4,8 +4,12 @@ function [] = saveInterim()
global artoaWorkspace artoaDataInput artoaDataOutput;
+%% Get required variables
+folder = artoa.data.getMember(artoaDataInput, {'ini', 'directory', 'interim'}, pwd());
+filter = artoa.data.getMember(artoaDataInput, {'ini', 'filemask', 'interim'}, '*.itm');
+
%% Ask for filename
-filename = uiputfile('*.itm');
+filename = uiputfile(fullfile(folder, filter));
if (filename ~= 0)
save(filename, 'artoaWorkspace', 'artoaDataInput', 'artoaDataOutput');
--
GitLab