Skip to content

Commit 3e961c6

Browse files
committed
Option added to preferences dialog to determine whether station names should be sorted: station_sorter.
1 parent 9d6a248 commit 3e961c6

5 files changed

Lines changed: 236 additions & 83 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5177,9 +5177,9 @@
51775177
'showinactiveopt', 'defaultfigurepos','timezonehandling', ...
51785178
'enforcedtimezone', 'netcdf_use_fillvalue','export_max_ntimes', ...
51795179
'update_showversion', 'defaultrenderer','defaultsmoothing', ...
5180-
'ghostscript', 'ghostscript_browse'}
5180+
'ghostscript', 'ghostscript_browse','station_sorting'}
51815181
args = qp_prefs(UD,mfig,cmd,cmdargs);
5182-
if logfile
5182+
if logfile && ~ismember(cmd,{'preferences','prefpane'})
51835183
writelog(logfile,logtype,args{:});
51845184
end
51855185

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1240,7 +1240,9 @@
12401240
end
12411241
end
12421242
if ~isempty(FI)
1243-
FI = qp_option(FI,'sortStations','alphabetically');
1243+
sorter = qp_preferences_interface('default_station_sorter');
1244+
sorter = qp_settings('station_sorter', sorter);
1245+
FI = qp_option(FI,'sortStations',sorter);
12441246
qp_settings('LastFileType',lasttp)
12451247
end
12461248

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

Lines changed: 77 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,49 @@
3737
switch cmd
3838
case 'timezonehandling'
3939
argout = {'Ignored','As in dataset','Enforced'};
40+
4041
case 'enforcedtimezone'
4142
[~,argout] = gettimezone('supported');
43+
44+
case 'figure_positions'
45+
argout = {'Auto','Manual'};
46+
MonPos = get(0,'MonitorPositions');
47+
NumMon = size(MonPos,1);
48+
if NumMon>1
49+
argout{3+NumMon} = '';
50+
argout{3} = 'QP Main';
51+
for nr = NumMon:-1:1
52+
argout{3+nr} = sprintf('Monitor %i',nr);
53+
end
54+
end
55+
56+
case 'renderers'
57+
figures = findall(0,'type','figure');
58+
if isempty(figures)
59+
tempFigure = figure('visible','off');
60+
figures = tempFigure;
61+
else
62+
tempFigure = [];
63+
end
64+
argout = setdiff(set(figures(1),'renderer'),'None');
65+
delete(tempFigure)
66+
67+
case 'default_renderer'
68+
renderers = qp_preferences_interface('renderers');
69+
i = ustrcmpi('zbuffer', renderers);
70+
if i < 0
71+
i = ustrcmpi('OpenGL', renderers);
72+
if i < 0
73+
i = 1;
74+
end
75+
end
76+
argout = renderers{i};
77+
78+
case 'sorters'
79+
argout = sort_stations('methods');
80+
81+
case 'default_station_sorter'
82+
argout = sort_stations('default');
4283
end
4384
end
4485

@@ -201,6 +242,35 @@
201242
%=============
202243
handles=[]; VOffset = dims(2)-Margin-20;
203244
%--------------------------------------------------------------------------
245+
handles(end+1)=uicontrol('style','text', ...
246+
'position',[HOffset VOffset-2 90 18], ...
247+
'string','Station Names', ...
248+
'horizontalalignment','left', ...
249+
'parent',mfig);
250+
sorters = qp_preferences_interface('sorters');
251+
sorter = qp_preferences_interface('default_station_sorter');
252+
sorter = qp_settings('station_sorter', sorter);
253+
j = ustrcmpi(sorter, sorters);
254+
if j>0
255+
i = j;
256+
end
257+
handles(end+1)=uicontrol('style','popupmenu', ...
258+
'position',[HOffset+100 VOffset dims(2)-121 20], ...
259+
'string',sorters, ...
260+
'value',i, ...
261+
'tag','station_sorting', ...
262+
'callback','d3d_qp station_sorting', ...
263+
'backgroundcolor',Active, ...
264+
'horizontalalignment','left', ...
265+
'parent',mfig);
266+
%-------------
267+
%VOffset = VOffset-30;
268+
%--------------------------------------------------------------------------
269+
Panes(end+1,1:2)={'Data Fields' handles};
270+
set(handles,'visible','off')
271+
%=============
272+
handles=[]; VOffset = dims(2)-Margin-20;
273+
%--------------------------------------------------------------------------
204274
handles(end+1)=uicontrol('style','text', ...
205275
'position',[HOffset VOffset-2 150 18], ...
206276
'string','Quick View Figure Layout', ...
@@ -268,16 +338,7 @@
268338
'string','Figure Position', ...
269339
'horizontalalignment','left', ...
270340
'parent',mfig);
271-
FigPos = {'Auto','Manual'};
272-
MonPos = get(0,'MonitorPositions');
273-
NumMon = size(MonPos,1);
274-
if NumMon>1
275-
FigPos{3+NumMon} = '';
276-
FigPos{3} = 'QP Main';
277-
for nr = NumMon:-1:1
278-
FigPos{3+nr} = sprintf('Monitor %i',nr);
279-
end
280-
end
341+
FigPos = qp_preferences_interface('figure_positions');
281342
fp = qp_settings('defaultfigurepos');
282343
fpval = find(strcmpi(fp,FigPos));
283344
if isempty(fpval)
@@ -322,15 +383,9 @@
322383
'string','Renderer', ...
323384
'horizontalalignment','left', ...
324385
'parent',mfig);
325-
renderers = setdiff(set(mfig,'renderer'),'None');
326-
i = ustrcmpi('zbuffer', renderers);
327-
if i < 0
328-
i = ustrcmpi('OpenGL', renderers);
329-
if i < 0
330-
i = 1;
331-
end
332-
end
333-
rndr = qp_settings('defaultrenderer', renderers{i});
386+
renderers = qp_preferences_interface('renderers');
387+
rndr = qp_preferences_interface('default_renderer');
388+
rndr = qp_settings('defaultrenderer', rndr);
334389
j = ustrcmpi(rndr, renderers);
335390
if j>0
336391
i = j;
@@ -381,6 +436,7 @@
381436
'position',[HOffset+170 VOffset 25 20], ...
382437
'callback','d3d_qp defaultaxescolor', ...
383438
'backgroundcolor',qp_settings('defaultaxescolor')/255, ...
439+
'tag','defaultaxescolor', ...
384440
'enable','on', ...
385441
'parent',mfig);
386442
%-------------
@@ -390,6 +446,7 @@
390446
'string','Closed Bounding Box', ...
391447
'value',qp_settings('boundingbox'), ...
392448
'callback','d3d_qp boundingbox', ...
449+
'tag','boundingbox', ...
393450
'parent',mfig);
394451
VOffset = VOffset-25;
395452
handles(end+1)=uicontrol('style','edit', ...
@@ -398,6 +455,7 @@
398455
'backgroundcolor',Active, ...
399456
'horizontalalignment','right', ...
400457
'callback','d3d_qp colorbar_ratio', ...
458+
'tag','colorbar_ratio', ...
401459
'parent',mfig);
402460
handles(end+1)=uicontrol('style','text', ...
403461
'position',[HOffset+37 VOffset-2 200 18], ...

0 commit comments

Comments
 (0)