diff --git a/VERSION b/VERSION index 1e3852840b57172af41e4323ea5262e777f99916..b7c52fb1813fefa7feb43758b4c9d2ca8f65a681 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 35b55b5fbd33ea46d3055cdd59b460ea50897b09..507c8f929f7928c6fd5b3b1bd2f59e76d7ee1d17 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 8d4477271d448c6ed045e6df172c39830cac257f..29cf0ef918d445aa041b2b1ca75762e4164a966f 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 322c980f561f39bb8e67a9fa1963de4ed8f011ff..dfc0b8ba63ad8a4e22b98d5981ecdba076c3e4f6 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 21f3983cf73ff3611c88931192f4d5db066a4e92..e110f6d2d07b6fb09b88dea0b343213e0957dfd8 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( ...