From 07f85b94912dacc154d1ecc938be34cf5444ad8d Mon Sep 17 00:00:00 2001
From: Lewin Probst <info@emirror.de>
Date: Mon, 25 May 2020 13:53:45 +0200
Subject: [PATCH] Added line for loaded float information in main window.
---
VERSION | 2 +-
lib/+artoa/+controller/+file/loadInterim.m | 3 +++
lib/+artoa/+controller/+file/loadRfb.m | 3 +++
lib/+artoa/+controller/+main/windowButtonDownFcn.m | 1 +
lib/+artoa/+gui/main.m | 12 ++++++++++++
5 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/VERSION b/VERSION
index 1e38528..b7c52fb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-211
\ No newline at end of file
+212
\ No newline at end of file
diff --git a/lib/+artoa/+controller/+file/loadInterim.m b/lib/+artoa/+controller/+file/loadInterim.m
index 35b55b5..507c8f9 100644
--- a/lib/+artoa/+controller/+file/loadInterim.m
+++ b/lib/+artoa/+controller/+file/loadInterim.m
@@ -35,6 +35,9 @@ artoa.controller.edit.offsets.updateGui();
%% Update menu buttons
artoa.controller.updateMenuButtons();
+%% Update status text in main window
+artoa.controller.main.updateLoadedFloatInformation();
+
%% Notify user if he loaded an outdated interim version
[upToDate, message] = artoa.versioning.checkInterim(artoaWorkspace);
if ~upToDate
diff --git a/lib/+artoa/+controller/+file/loadRfb.m b/lib/+artoa/+controller/+file/loadRfb.m
index 8d44772..29cf0ef 100644
--- a/lib/+artoa/+controller/+file/loadRfb.m
+++ b/lib/+artoa/+controller/+file/loadRfb.m
@@ -48,5 +48,8 @@ artoa.controller.edit.offsets.updateGui();
%% Update menu buttons
artoa.controller.updateMenuButtons();
+%% Update status text in main window
+artoa.controller.main.updateLoadedFloatInformation();
+
end
diff --git a/lib/+artoa/+controller/+main/windowButtonDownFcn.m b/lib/+artoa/+controller/+main/windowButtonDownFcn.m
index 322c980..dfc0b8b 100644
--- a/lib/+artoa/+controller/+main/windowButtonDownFcn.m
+++ b/lib/+artoa/+controller/+main/windowButtonDownFcn.m
@@ -8,6 +8,7 @@ global artoaGui;
artoaGui.main.textVersionInfo.String = artoa.versioning.getVersionString();
+artoa.controller.main.updateLoadedFloatInformation();
end
diff --git a/lib/+artoa/+gui/main.m b/lib/+artoa/+gui/main.m
index 21f3983..e110f6d 100644
--- a/lib/+artoa/+gui/main.m
+++ b/lib/+artoa/+gui/main.m
@@ -239,6 +239,18 @@ artoaGui.main.textVersionInfo = uicontrol( ...
'Position', [(widthWindow - 20) 1 20 1] ...
);
+%% Float loaded status
+artoaGui.main.textLoadedFloat = uicontrol( ...
+ 'Parent', artoaGui.figures.main, ...
+ 'String', 'No float loaded.', ...
+ 'Style', 'text', ...
+ 'FontSize', 10, ...
+ 'Units', 'characters', ...
+ 'HorizontalAlignment', 'left', ...
+ 'Background', [1 1 1], ...
+ 'Position', [3 1 80 1] ...
+);
+
%% Track parameter
artoaGui.trackParameter.frameTrackingParameter = uipanel( ...
--
GitLab