Merge pull request #395 from aodn/2.5.21

2.5.21

Graph/TimeSeries/graphTimeSeriesTimeDepth.m

@@ -70,7 +70,7 @@
 % xPcolor = [time.data(1:end-1) - diff(time.data)/2; time.data(end) - (time.data(end)-time.data(end-1))/2];
 % yPcolor = [depth.data(1:end-1) - diff(depth.data)/2; depth.data(end) - (depth.data(end)-depth.data(end-1))/2];
 
-h = pcolor(ax, xPcolor, yPcolor, double(var.data'));
+h = pcolor(ax, double(xPcolor), double(yPcolor), double(var.data'));
 set(h, 'FaceColor', 'flat', 'EdgeColor', 'none');
 cb = colorbar();
 

Graph/TimeSeries/graphTimeSeriesTimeFrequency.m

@@ -70,7 +70,7 @@
 % xPcolor = [time.data(1:end-1) - diff(time.data)/2; time.data(end) - (time.data(end)-time.data(end-1))/2];
 % yPcolor = [freq.data(1:end-1) - diff(freq.data)/2; freq.data(end) - (freq.data(end)-freq.data(end-1))/2];
 
-h = pcolor(ax, xPcolor, yPcolor, double(var.data'));
+h = pcolor(ax, double(xPcolor), double(yPcolor), double(var.data'));
 set(h, 'FaceColor', 'flat', 'EdgeColor', 'none');
 cb = colorbar();
 

Graph/TimeSeries/graphTimeSeriesTimeFrequencyDirection.m

@@ -92,7 +92,7 @@
     X(i, :) = r*sin(theta(i));
 end
 
-h = pcolor(ax, X, Y, double([squeeze(sswvData(iTime, :, :)), sswvData(iTime, :, 1)']')); % we need to repeat the first values at the end
+h = pcolor(ax, double(X), double(Y), double([squeeze(sswvData(iTime, :, :)), sswvData(iTime, :, 1)']')); % we need to repeat the first values at the end
 axis equal tight
 shading flat
 set(ax, ...

Graph/pcolorMooring2DVar.m

@@ -199,7 +199,7 @@ function pcolorMooring2DVar(sample_data, varName, isQC, saveToFile, exportDir)
             dataVar(~iGoodHeight) = [];
             dataVar = reshape(dataVar, nGoodTime, nGoodHeight);
 
-            hPcolorVar(i) = pcolor(hAxMooringVar, xPcolor, yPcolor, double(dataVar'));
+            hPcolorVar(i) = pcolor(hAxMooringVar, double(xPcolor), double(yPcolor), double(dataVar'));
             set(hPcolorVar(i), 'FaceColor', 'flat', 'EdgeColor', 'none');
 
             % Let's redefine properties after pcolor to make sure grid lines appear

Preprocessing/CTDDepthBinPP.m

@@ -54,9 +54,8 @@
 % auto logical in input to enable running under batch processing
 if nargin<3, auto=false; end
 
-% no modification of data is performed on the raw FV00 dataset except
-% local time to UTC conversion
-if strcmpi(qcLevel, 'raw'), return; end
+% in order to achieve consistency across facilities (which for the most part except SA already use binned
+% datasets) and with FV01 files, this PP routine is performed on the raw FV00 dataset
 
 % read options from parameter file  Minimum Soak Delay: SoakDelay1 (sec.)
 %                                   Optimal Soak Delay: SoakDelay2 (sec.)

imosToolbox.m

@@ -73,7 +73,7 @@ function imosToolbox(auto, varargin)
 end
 
 % Set current toolbox version
-toolboxVersion = ['2.5.20 - ' computer];
+toolboxVersion = ['2.5.21 - ' computer];
 
 switch auto  
   case 'auto', autoIMOSToolbox(toolboxVersion, varargin{:});