Support column labels for sample files in comment block based on the same algorithm in Tekal files.

Author: hrajagers

src/tools_lgpl/matlab/quickplot/progsrc/private/getcollabels.m

@@ -0,0 +1,67 @@
+function ColLabels = getcollabels(ncol,Cmnt)
+%getcollabels Extracts column labels from a cell string variable.
+%   This function searches a cell string argument for lines matching
+%   [.] column <number> [: or =] string
+%   where [.] matches any first character (typically a comment line marker
+%   such as # or %), <number> an integer representing the column number,
+%   and [: or =] either a colon or equal-sign. Lines for which the number
+%   exceeds the number of columns are ignored.
+%
+%   Syntax
+%     columns = getcollabels(nColumns,text)
+%
+%   Input Arguments
+%     nColumns - Number of columns to return
+%     text - Cell string containing a header/comment block possibly
+%       containing lines matching the format described above
+%
+%   Output Argument
+%     columns - Cell array of length nColumns
+
+%----- LGPL --------------------------------------------------------------------
+%
+%   Copyright (C) 2011-2025 Stichting Deltares.
+%
+%   This library is free software; you can redistribute it and/or
+%   modify it under the terms of the GNU Lesser General Public
+%   License as published by the Free Software Foundation version 2.1.
+%
+%   This library is distributed in the hope that it will be useful,
+%   but WITHOUT ANY WARRANTY; without even the implied warranty of
+%   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%   Lesser General Public License for more details.
+%
+%   You should have received a copy of the GNU Lesser General Public
+%   License along with this library; if not, see <http://www.gnu.org/licenses/>.
+%
+%   contact: delft3d.support@deltares.nl
+%   Stichting Deltares
+%   P.O. Box 177
+%   2600 MH Delft, The Netherlands
+%
+%   All indications and logos of, and references to, "Delft3D" and "Deltares"
+%   are registered trademarks of Stichting Deltares, and remain the property of
+%   Stichting Deltares. All rights reserved.
+%
+%-------------------------------------------------------------------------------
+%   http://www.deltaressystems.com
+%   $HeadURL$
+%   $Id$
+
+ColLabels = repmat({''},1,ncol);
+if ~isempty(Cmnt)
+    for i = 1:length(Cmnt)
+        [Tk,Rm] = strtok(Cmnt{i});
+        if ~strcmpi(Tk,'column')
+            % if the first token isn't "column" try ignoring the first
+            % character; it might be a comment character.
+            [Tk,Rm] = strtok(Cmnt{i}(2:end));
+        end
+        if (length(Cmnt{i})>10) && strcmpi(Tk,'column')
+            [a,c,~,idx] = sscanf(Rm,'%i%*[ :=]%c',2);
+            if (c==2) && a(1)<=ncol && a(1)>0
+                ColLabels{a(1)} = deblank(Rm(idx-1:end));
+            end
+        end
+    end
+end

src/tools_lgpl/matlab/quickplot/progsrc/private/samplesfil.m

@@ -417,7 +417,7 @@
 end
 
 if isempty(FI.X) || isempty(FI.Y)
-    if (isempty(FI.X) && isempty(FI.Y) && FI.nLoc>1) || ...
+    if (isempty(FI.X) && isempty(FI.Y) && isscalar(FI.nLoc) && FI.nLoc>1) || ...
             (isfield(FI,'Table') && strcmp(FI.Table,'points'))
         for i=1:NPar
             Out(i+2).DimFlag(2) = 5;

src/tools_lgpl/matlab/quickplot/progsrc/samples.m

@@ -380,12 +380,19 @@
         % Correct any mismatch between the number of data columns and the
         % number of column labels on the label side ...
         %
-        if length(Params)<n
-            for i=n:-1:(length(Params)+1)
+        if isempty(Params)
+            Params = getcollabels(n,xyz.Header);
+            for i = 1:n
+                if isempty(Params{i})
+                    Params{i} = sprintf('Parameter %i',i);
+                end
+            end
+        elseif length(Params) < n
+            for i = n:-1:(length(Params)+1)
                 Params{i}=sprintf('Parameter %i',i);
             end
-        elseif length(Params)>n
-            Params=Params(1:n);
+        elseif length(Params) > n
+            Params = Params(1:n);
         end
         fclose(fid);
     catch err
@@ -421,18 +428,18 @@
     xyz.Y = [];
     xyz.Time = [];
     for i = 1:length(xyz.Params)
-        switch lower(xyz.Params{i})
-            case {'longitude','lon','x','xp','x-coordinate','x coordinate','x_coordinate','x_gpp','distance','chainage'}
+        switch lower(strtok(xyz.Params{i}))
+            case {'longitude','lon','x','xp','x-coordinate','x_coordinate','x_gpp','distance','chainage'}
                 xyz.X = i;
-            case {'latitude' ,'lat','y','yp','y-coordinate','y coordinate','y_coordinate','y_gpp'}
+            case {'latitude' ,'lat','y','yp','y-coordinate','y_coordinate','y_gpp'}
                 xyz.Y = i;
             case 'time'
                 if i>1 && strcmpi(xyz.Params{i-1},'date')
                     xyz.Time = [i-1 i];
                 else
                     xyz.Time = i;
                 end
-            case {'datetime','date and time'}
+            case {'datetime','date'}
                 xyz.Time = i;
         end
     end
@@ -469,7 +476,7 @@
             end
         end
         if isempty(iTime)
-            [Times,idum,iTime] = unique(gettimes(xyz.XYZ(:,xyz.Time)),'stable');
+            [Times,idum,iTime] = unique(gettimes(xyz.XYZ(:,xyz.Time),xyz.Params(xyz.Time)),'stable');
             nLoc = hist(iTime,max(iTime));
         end
         %
@@ -517,13 +524,19 @@ function Local_write_samples(filename,header,format,xyz)
 fclose(fid);
 
 
-function Times = gettimes(Times)
+function Times = gettimes(Times,ColLabels)
 if size(Times,2)==2 % gpp => 20140118 105120
     d = Times(:,1);
     s = Times(:,2);
-else % swan => 20140118.105120
-    d = floor(Times);
-    s = round((Times - d)*1000000);
+else
+    switch ColLabels{1}
+        case 'time (min)'
+            Times = Times/1440;
+            return
+        otherwise % swan => 20140118.105120
+            d = floor(Times);
+            s = round((Times - d)*1000000);
+    end
 end
 m = floor(d/100);
 d = d - 100*m;

src/tools_lgpl/matlab/quickplot/progsrc/tekal.m

@@ -712,22 +712,6 @@
 fclose(fid);
 
 
-function ColLabels=getcollabels(ncol,Cmnt)
-ColLabels={}; % necessary for standalone version
-ColLabels(1:ncol,1)={''};
-if ~isempty(Cmnt)
-    for i=1:length(Cmnt)
-        [Tk,Rm]=strtok(Cmnt{i}(2:end));
-        if (length(Cmnt{i})>10) && strcmpi(Tk,'column')
-            [a,c,err,idx]=sscanf(Rm,'%i%*[ :=]%c',2);
-            if (c==2) && a(1)<=ncol && a(1)>0
-                ColLabels{a(1)}=deblank(Rm(idx-1:end));
-            end
-        end
-    end
-end
-
-
 function Time=gettimestamp(Cmnt)
 Time=[];
 if ~isempty(Cmnt)