Merge pull request #673 from aodn/release_2.6.7

Release 2.6.7

AutomaticQC/imosTimeSeriesSpikeQC.m

@@ -146,7 +146,7 @@
 
 arg_string{l + 1} = [user_input.opts{l + 1} '=' string(user_input.args{l + 1}) '.'];
 
-paramLog = strjoin([sprintf('imosTimeSeriesSpikeQC: %d spikes detected on %s with %s with parameters:', nspikes, varname, fun_name) arg_string{:}]);
+paramLog = char(strjoin([sprintf('%s(%s,', fun_name, varname) arg_string{:}]));
 end
 
 function [ts_variables] = load_timeseries_variables(sample_data)

GUI/previewWindow.m

@@ -3,7 +3,7 @@
     properties (Constant)
         limits_opts_func = @imosSpikeClassifiersLimits;
 
-        windowOpts = {'Name', 'imosTimeSeriesSpikeQC::Preview', 'Visible', 'on', 'MenuBar', 'none', 'Resize', 'on', 'NumberTitle', 'off', 'WindowStyle', 'Modal'};
+        windowOpts = {'Name', 'imosTimeSeriesSpikeQC::Preview', 'Visible', 'on', 'MenuBar', 'none', 'Resize', 'on', 'NumberTitle', 'off', 'WindowStyle', 'Modal','Units','normalized','Position',[0.1,0.1,.8,.8]};
 
         panelMargin = 0.025;
         buttonMargin = 0.025;
@@ -84,11 +84,12 @@
         function obj = previewWindow(postqc_data, classifier_name, classifier_struct, varargin)
             %function obj = previewWindow(postqc_data, classifier_name, classifier_struct, varargin)
             %
-            % Creates the spike preview window. When the user finishes (ok button)
+            % Creates the spike preview window.
+            % When the user finishes (ok button), the UserData property is set.
             %
             % Inputs:
             %
-            % postqc_data - the toolbox struct
+            % postqc_data - the toolbox struct with data
             % classifier_name - the SpikeClassifier method name
             % classifier_struct - the SpikeClassifier struct
             %
@@ -111,7 +112,7 @@
             obj.ydata = postqc_data.data;
             obj.xdata = postqc_data.time;
 
-            % cut bursts as well.
+            % set bursts info if avail.
             if isfield(obj.postqc_data, 'valid_burst_range')
                 obj.is_data_burst = true;
                 obj.valid_burst_range = obj.postqc_data.valid_burst_range;
@@ -156,8 +157,6 @@
 
         function init_uiwindow(obj)
             obj.ui_window = figure(obj.windowOpts{:});
-            obj.ui_window.Position(3) = obj.ui_window.Position(3) * 2.5;
-            obj.ui_window.Position(4) = obj.ui_window.Position(4) * 1.5;
         end
 
         function init_botpanel(obj)

GUI/spikeWindow.m

@@ -9,7 +9,7 @@
         bottomStripHeight = 0.1;
         okSize = 0.05;
         cancelSize = 0.05;
-        windowOpts = {'Name', 'imosTimeSeriesSpikeQC', 'Visible', 'on', 'MenuBar', 'none', 'Resize', 'on', 'NumberTitle', 'off', 'WindowStyle', 'Modal'};
+        windowOpts = {'Name', 'imosTimeSeriesSpikeQC', 'Visible', 'on', 'MenuBar', 'none', 'Resize', 'on', 'NumberTitle', 'off', 'WindowStyle', 'Modal','Units','normalized','Position',[0.25,0.1,0.5,0.8]};
     end
 
     properties (Access = private)
@@ -69,8 +69,6 @@
 
         function init_uiwindow(obj)
             obj.ui_window = figure(obj.windowOpts{:});
-            obj.ui_window.Position(3) = obj.ui_window.Position(3) * 1.5;
-            obj.ui_window.Position(4) = obj.ui_window.Position(3) * 1.;
         end
 
         function init_panel(obj, instrument)

Graph/checkMooringPlannedDepths.m

@@ -301,8 +301,9 @@ function checkMooringPlannedDepths(sample_data, isQC, saveToFile, exportDir)
     uiwait(hMsgbox);
 
     %select the area to use for comparison
-    [x, ~] = select_points(hAxPress);
-
+    rec = drawrectangle(hAxPress);
+    x = [rec.Position(1) rec.Position(1)+rec.Position(3)];
+    delete(rec);
     iGood = timeVar >= x(1) & timeVar <= x(2);
 end
 
@@ -336,4 +337,4 @@ function checkMooringPlannedDepths(sample_data, isQC, saveToFile, exportDir)
     end
 end
 
-end
+end

Util/Path/setToolboxPaths.m

@@ -37,6 +37,7 @@ function setToolboxPaths(toolbox_path)
 
 % Toolbox root level folders and subfolders that contains matlab functions
 folders = { ...
+    'AutomaticQC', ...
     frdir(fullfile(toolbox_path, 'AutomaticQC')), ...
     'DDB', ...
     'FlowManager', ...

Util/UI/numericInputButton.m

@@ -43,7 +43,7 @@
             end
 
             if nargin < 4
-                laterCallback = @(x)(x);
+                laterCallback = @(~)(1); %dummy call
             end
 
             obj.panel = panel;

Util/UI/uiNumericalBox.m

@@ -110,8 +110,8 @@
 
     vboxOpts = {'Units', 'normalized', 'Position', boxPosition};
     textboxOpts = {'Style', 'text', 'Value', boxValues{k}, 'String', boxNames{k}, 'FontSize', 10, 'Units', 'normalized', 'Position', textboxPosition};
-
-    vbox{k} = numericInputButton(panel, boxValues{k}, boxFuncs{k}, vboxOpts{:});
+    laterCallback = @(~)(1); % dummy call
+    vbox{k} = numericInputButton(panel, boxValues{k}, boxFuncs{k}, laterCallback, vboxOpts{:});
     textbox{k} = uicontrol(panel, textboxOpts{:});
 
 end

build.py

@@ -36,7 +36,7 @@
 }
 VERSION_FILE = ".standalone_canonical_version"
 MATLAB_VERSION = "R2018b"
-MATLAB_TOOLBOXES_TO_INCLUDE: List[str] = ["signal"]
+MATLAB_TOOLBOXES_TO_INCLUDE: List[str] = ["signal/signal","stats/stats","images/imuitools"]
 
 
 def find_matlab_rootpath(arch_str):
@@ -178,7 +178,7 @@ def create_mcc_call_sig(
     if MATLAB_TOOLBOXES_TO_INCLUDE:
         matlab_root_path = find_matlab_rootpath(arch)
         extra_toolbox_paths = [
-            os.path.join(matlab_root_path, "toolbox", x, x)
+            os.path.join(matlab_root_path, "toolbox", x)
             for x in MATLAB_TOOLBOXES_TO_INCLUDE
         ]
 

imosToolbox.m

@@ -37,7 +37,7 @@ function imosToolbox(auto, varargin)
 %
 
 % Set current toolbox version
-toolboxVersion = ['2.6.6 - ' computer];
+toolboxVersion = ['2.6.7 - ' computer];
 
 if nargin == 0, auto = 'manual'; end