Merge pull request #32 from ImperialCollegeLondon/vNext

Update software to v3.4.1

.github/workflows/matlab.yml

@@ -38,7 +38,7 @@ jobs:
     if: github.ref == 'refs/heads/main'
     needs: test
     env:
-      VERSION: "3.4.0"
+      VERSION: "3.4.1"
     steps:
       - name: Check out repository
         uses: actions/checkout@v3

resources/ReleaseNotes.md

@@ -1,16 +1,10 @@
 # App
 
-- Add button to close generated figures
-- Fix issue with assigning value of `DebugStatus` when more than one breakpoint is set
+- Make sure to reset everything when "Reset" button is pressed
 
 # Software
 
-- Add description of both Normal and Burst mode in `mag.event.ModeChange`, regardless of the active mode
-- Add mode events in I-ALiRT timestamp comparison plot in `mag.graphics.view.IALiRT`
-- Allow specifying multiple labels and label alignment in `mag.graphics.chart.Line`
-- Move removal of all-zero vectors in data after removal of missing data
-- Improve algorithm to find closest science and I-ALiRT timestamps
-- Make sure all I-ALiRT right-hand side graphs have `YAxisLocation` set to `right`
-- Fix issue with `UNCHANGED` data frequency appearing as `NaN` in event log
-- Fix issue with filtering I-ALiRT secondary data in `mag.graphics.view.IALiRT`
-- Fix issue with PSDs showing large noise in mode and range cycling
+- Fix issue with exporting empty HK
+- Fix issue with plotting CPT data with no mode cycling information
+- Fix issue with `tiledlayout` spacing when tile indexing is column-major
+- Fix issue with naming HK close up figure

src/analyze/+mag/@IMAPTestingAnalysis/IMAPTestingAnalysis.m

@@ -262,13 +262,18 @@ function load(this)
                 idxFirst = find(modeEvents.Mode == "Normal", 1);
                 idxLast = find(diff(modeEvents.Mode == "Normal") == 0, 1);
 
-                finalTime = events(find([events.Time] == modeEvents.Time(idxLast), 1) + 1, :).Time;
-                modeEvents = modeEvents(idxFirst:idxLast, :);
-
-                if isempty(modeEvents)
+                if isempty(modeEvents) && isempty(idxFirst) && isempty(idxLast)
                     period = timerange(NaT(TimeZone = "UTC"), NaT(TimeZone = "UTC"));
                 else
-                    period = timerange(modeEvents.Time(1), finalTime, "closedleft");
+
+                    finalTime = events(find([events.Time] == modeEvents.Time(idxLast), 1) + 1, :).Time;
+                    modeEvents = modeEvents(idxFirst:idxLast, :);
+
+                    if isempty(modeEvents)
+                        period = timerange(NaT(TimeZone = "UTC"), NaT(TimeZone = "UTC"));
+                    else
+                        period = timerange(modeEvents.Time(1), finalTime, "closedleft");
+                    end
                 end
             end
 

src/io/+mag/+io/+format/HKMAT.m

@@ -25,10 +25,14 @@
 
             arguments
                 exportedData (1, 1) struct
-                data (1, 1) mag.HK
+                data mag.HK {mustBeScalarOrEmpty}
                 matTypeName (1, 1) string
             end
 
+            if isempty(data)
+                return;
+            end
+
             exportedData.HK.(matTypeName).Time = data.Time;
 
             for p = string(data.Data.Properties.VariableNames)

src/visualize/+mag/+graphics/+view/HK.m

@@ -64,7 +64,7 @@ function visualize(this)
                 [mag.graphics.style.LeftRight(Title = "+8 V", LeftLabel = "[V]", RightLabel = "[mA]", Charts = [mag.graphics.chart.Plot(YVariables = "P8V"), mag.graphics.chart.Plot(YVariables = "P8VI")]), ...
                 mag.graphics.style.LeftRight(Title = "-8 V", LeftLabel = "[V]", RightLabel = "[mA]", Charts = [mag.graphics.chart.Plot(YVariables = "N8V"), mag.graphics.chart.Plot(YVariables = "N8VI")]), ...
                 mag.graphics.style.LeftRight(Title = "2.5 V", LeftLabel = "[V]", RightLabel = "[mA]", Charts = [mag.graphics.chart.Plot(YVariables = "P2V5V"), mag.graphics.chart.Plot(YVariables = "P2V5I")])], ...
-                Title = compose("From: (t_{0} + %s) - To: (t_{end} - %s)", string(scienceStartTime - pwr.Time(1)), string(pwr.Time(end) - scienceEndTime)), ...
+                Title = compose("From: (t_{0} + %s) - To: (t_{end} - %s)", string(scienceStartTime - pwr.Time(1)), string(abs(pwr.Time(end) - scienceEndTime))), ...
                 Name = "+-8V Close Up", ...
                 Arrangement = [3, 1], ...
                 LinkXAxes = true, ...

src/visualize/+mag/+graphics/cptPlots.m

@@ -22,16 +22,22 @@
     %% Modes
 
     modeCycling = analysis.getModeCycling();
-    views(end + 1) = mag.graphics.view.Field(modeCycling, Event = "Mode", Name = "Mode Cycling", Title = string.empty());
+
+    if ~isempty(modeCycling)
+
+        views(end + 1) = mag.graphics.view.Field(modeCycling, Event = "Mode", Name = "Mode Cycling", Title = string.empty());
+        views(end + 1) = mag.graphics.view.PSD(modeCycling, Name = "Mode Cycling PSD Analysis", Event = "DataFrequency");
+    end
 
     %% Ranges
 
     rangeCycling = analysis.getRangeCycling();
 
     if ~isempty(rangeCycling) && rangeCycling.HasData
 
-        % Plot all ranges.
+        % Plot all ranges and PSDs.
         views(end + 1) = mag.graphics.view.Field(rangeCycling, Event = "Range", Name = "Range Cycling", Title = string.empty());
+        views(end + 1) = mag.graphics.view.PSD(rangeCycling, Name = "Range Cycling PSD Analysis", Event = "Range");
 
         % Plot ranges without range 0.
         locNoRangeZero = (rangeCycling.Primary.Range ~= 0) & (rangeCycling.Secondary.Range ~= 0);
@@ -49,14 +55,9 @@
     %% Ramp
 
     rampMode = analysis.getRampMode();
-    views(end + 1) = mag.graphics.view.RampMode(rampMode);
 
-    %% PSD
-
-    views(end + 1) = mag.graphics.view.PSD(modeCycling, Name = "Mode Cycling PSD Analysis", Event = "DataFrequency");
-
-    if ~isempty(rangeCycling) && rangeCycling.HasData
-        views(end + 1) = mag.graphics.view.PSD(rangeCycling, Name = "Range Cycling PSD Analysis", Event = "Range");
+    if ~isempty(rampMode)
+        views(end + 1) = mag.graphics.view.RampMode(rampMode);
     end
 
     %% Final Normal Mode

src/visualize/+mag/+graphics/visualize.m

@@ -38,7 +38,13 @@
         arrangement = num2cell(options.Arrangement);
     end
 
-    t = tiledlayout(f, arrangement{:}, TileSpacing = "tight", TileIndexing = options.TileIndexing);
+    if isequal(options.TileIndexing, "columnmajor")
+        spacing = "compact";
+    else
+        spacing = "tight";
+    end
+
+    t = tiledlayout(f, arrangement{:}, TileSpacing = spacing, TileIndexing = options.TileIndexing);
     t.Title.String = options.Title;
 
     axes = matlab.graphics.axis.Axes.empty();