Skip to content

Commit bffedc0

Browse files
committed
make readsts calls consistent and more robust ... handling index argument in consistent manner
1 parent 97ba050 commit bffedc0

28 files changed

Lines changed: 59 additions & 65 deletions

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
[varargout{1:2}]=gettimezone(FI,idom,Props);
9595
return
9696
case 'stations'
97-
varargout={readsts(FI,Props,0)};
97+
varargout={readsts(FI,Props,varargin{:})};
9898
return
9999
case 'subfields'
100100
varargout={getsubfields(FI,Props,varargin{:})};

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
[varargout{1:2}]=gettimezone(FI,domain,Props);
9090
return
9191
case 'stations'
92-
varargout={readsts(FI,Props,0)};
92+
varargout={readsts(FI,Props,varargin{:})};
9393
return
9494
case 'subfields'
9595
varargout={getsubfields(FI,Props,varargin{:})};
@@ -503,14 +503,6 @@
503503
end
504504
% -----------------------------------------------------------------------------
505505

506-
507-
% -----------------------------------------------------------------------------
508-
function S=readsts(FI,Props,t)
509-
510-
%======================== SPECIFIC CODE =======================================
511-
S={};
512-
% -----------------------------------------------------------------------------
513-
514506
% -----------------------------------------------------------------------------
515507
function [NewFI,cmdargs]=options(FI,mfig,cmd,varargin)
516508
Inactive=get(0,'defaultuicontrolbackground');

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
[varargout{1:2}]=gettimezone(FI,domain,Props);
9090
return
9191
case 'stations'
92-
varargout={readsts(FI,Props,0)};
92+
varargout={readsts(FI,Props,varargin{:})};
9393
return
9494
case 'subfields'
9595
varargout={getsubfields(FI,Props,varargin{:})};

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
[varargout{1:2}]=gettimezone(FI,domain,Props);
7979
return
8080
case 'stations'
81-
varargout={{}};
81+
varargout={readsts(FI,Props,varargin{:})};
8282
return
8383
case 'subfields'
8484
varargout={{}};
@@ -323,11 +323,3 @@
323323
T=T(t);
324324
end
325325
% -----------------------------------------------------------------------------
326-
327-
328-
% -----------------------------------------------------------------------------
329-
function S=readsts(FI,Props,t)
330-
331-
%======================== SPECIFIC CODE =======================================
332-
S={};
333-
% -----------------------------------------------------------------------------

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
[varargout{1:2}]=gettimezone(FI,domain,Props);
8989
return
9090
case 'stations'
91-
varargout={readsts(FI,Props,0)};
91+
varargout={readsts(FI,Props,varargin{:})};
9292
return
9393
case 'subfields'
9494
varargout={{}};
@@ -356,4 +356,7 @@
356356
%======================== SPECIFIC CODE =======================================
357357
[S,Chk]=vs_get(FI,'HISBOT','NAMSTD','quiet');
358358
S=cellstr(S);
359+
if nargin>2 && ~isequal(t,0)
360+
S=S(t);
361+
end
359362
% -----------------------------------------------------------------------------

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
[varargout{1:2}]=gettimezone(FI,idom,Props);
102102
return
103103
case 'stations'
104-
varargout={readsts(FI,Props,0)};
104+
varargout={readsts(FI,Props,varargin{:})};
105105
return
106106
case 'subfields'
107107
varargout={getsubfields(FI,Props,varargin{:})};

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
[varargout{1:2}]=gettimezone(FI,domain,Props);
8989
return
9090
case 'stations'
91-
varargout={readsts(FI,Props,0)};
91+
varargout={readsts(FI,Props,varargin{:})};
9292
return
9393
case 'subfields'
9494
varargout={getsubfields(FI,Props,varargin{:})};
@@ -518,4 +518,7 @@
518518
S=multiline(S(1:end-1));
519519
S=cellstr(S);
520520
end
521+
if nargin>2 && ~isequal(t,0)
522+
S=S(t);
523+
end
521524
% -----------------------------------------------------------------------------

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
[varargout{1:2}]=gettimezone(FI,domain,Props);
8989
return
9090
case 'stations'
91-
varargout={readsts(FI,Props,0)};
91+
varargout={readsts(FI,Props,varargin{:})};
9292
return
9393
case 'subfields'
9494
varargout={getsubfields(FI,Props,varargin{:})};
@@ -343,11 +343,10 @@
343343
otherwise
344344
[S,Chk]=vs_get(FI,'dro-const','NAMDRO','quiet');
345345
end
346-
if t~=0
347-
S=S(t,:);
348-
end
349346
S=cellstr(S);
350-
% -----------------------------------------------------------------------------
347+
if nargin>2 && ~isequal(t,0)
348+
S=S(t);
349+
end% -----------------------------------------------------------------------------
351350

352351
function Subf = getsubfields(FI,Props,f)
353352
if isempty(Props.SubFld)

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1300,6 +1300,9 @@
13001300
if ~iscell(S)
13011301
S=cellstr(S);
13021302
end
1303+
if nargin>2 && ~isequal(t,0)
1304+
S=S(t);
1305+
end
13031306
% -----------------------------------------------------------------------------
13041307

13051308
% -----------------------------------------------------------------------------

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
[varargout{1:2}]=gettimezone(FI,domain,Props);
8989
return
9090
case 'stations'
91-
varargout={readsts(FI,Props,0)};
91+
varargout={readsts(FI,Props,varargin{:})};
9292
return
9393
case 'subfields'
9494
varargout={getsubfields(FI,Props,varargin{:})};
@@ -2154,7 +2154,7 @@
21542154
S=cellstr(S);
21552155
end
21562156
end
2157-
if ~isequal(t,0)
2157+
if nargin>2 && ~isequal(t,0)
21582158
S=S(t);
21592159
end
21602160
% -----------------------------------------------------------------------------

0 commit comments

Comments
 (0)