diff --git a/Graph/TimeSeries/graphTimeSeriesTimeDepth.m b/Graph/TimeSeries/graphTimeSeriesTimeDepth.m index ce2b20c13..085f02203 100644 --- a/Graph/TimeSeries/graphTimeSeriesTimeDepth.m +++ b/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(); diff --git a/Graph/TimeSeries/graphTimeSeriesTimeFrequency.m b/Graph/TimeSeries/graphTimeSeriesTimeFrequency.m index 5f4cfae0f..b9e61c249 100644 --- a/Graph/TimeSeries/graphTimeSeriesTimeFrequency.m +++ b/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(); diff --git a/Graph/TimeSeries/graphTimeSeriesTimeFrequencyDirection.m b/Graph/TimeSeries/graphTimeSeriesTimeFrequencyDirection.m index 7acdb14cc..7c3144d64 100644 --- a/Graph/TimeSeries/graphTimeSeriesTimeFrequencyDirection.m +++ b/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, ... diff --git a/Graph/pcolorMooring2DVar.m b/Graph/pcolorMooring2DVar.m index b717b2550..35e1fbe04 100644 --- a/Graph/pcolorMooring2DVar.m +++ b/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 diff --git a/Preprocessing/CTDDepthBinPP.m b/Preprocessing/CTDDepthBinPP.m index 03c564a42..aef57e15d 100644 --- a/Preprocessing/CTDDepthBinPP.m +++ b/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.) diff --git a/imosToolbox.m b/imosToolbox.m index e7213702b..fd0ea0ddb 100644 --- a/imosToolbox.m +++ b/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{:}); diff --git a/imosToolbox_Linux64.bin b/imosToolbox_Linux64.bin index d12354f1b..bc072efd5 100755 Binary files a/imosToolbox_Linux64.bin and b/imosToolbox_Linux64.bin differ diff --git a/imosToolbox_Win32.exe b/imosToolbox_Win32.exe index eca2a3ed4..ef3a7e2b4 100644 Binary files a/imosToolbox_Win32.exe and b/imosToolbox_Win32.exe differ diff --git a/imosToolbox_Win64.exe b/imosToolbox_Win64.exe index 6c29c16f7..f10b1f355 100644 Binary files a/imosToolbox_Win64.exe and b/imosToolbox_Win64.exe differ