From 71f6e21d25a9dc0124d017f39186719dbe0cc090 Mon Sep 17 00:00:00 2001
From: Yves Gouriou <yves.gouriou@ird.fr>
Date: Mon, 26 Jan 2009 11:40:26 +0000
Subject: [PATCH] =?UTF-8?q?Plot=20de=20la=20trace=20du=20navire=20dans=20u?=
=?UTF-8?q?ne=20figure=20ind=C3=A9pendante=20Trac=C3=A9=20des=20param?=
=?UTF-8?q?=C3=A8tres=20avec=20leur=20code=20qualit=C3=A9=20(couleur)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
TSGQC_amelioration.xls | Bin 21504 -> 21504 bytes
tsg_util/plot_Validation.m | 9 ++++-
tsg_util/quitProgram.m | 3 +-
tsgqc.m | 75 ++++++++++++++++++++++++++++---------
4 files changed, 66 insertions(+), 21 deletions(-)
diff --git a/TSGQC_amelioration.xls b/TSGQC_amelioration.xls
index 3b9811e7c6d2646e27b419db8c2f1e36ace78246..8e374c8e4c63ad05bdff1eeac8cf3a00612d3f2e 100644
GIT binary patch
delta 1708
zcmaKtO>7%Q6vy9=ch~m%+g`_Cb+W1L_#<(%P5}Xxnk`aWwS}mZ5Ve<xq^eM)(4eM9
zK%?RV9Jm34s;V5Q5QiL470IGVRe>COpb|vl0ul#QDK`!XL=hhX!GFe6JK=y=v!gfj
zd;fWF-psnQu65S6jR0fUbKGLX!7$O8m(Hy^M|qPy&#$sKwJq-XivM}9$&qVn+~!~U
zf+Jgoc8D&}5-rd&wJ1+tkVY2WW<<nDs1!!g@1`2$X+&Xq3vbeCtLy5|`T0iB<TpZd
z#d~C9I0~I4(L?CSgT3j9af?44OmRK@c;)LX2Fau&=h{oltvA3w(bzFEB}R_%v*D8c
zedIVM>S%tVLuW58t(;%&&P9I@MJ=Sg&pEo%zOb~?zSDg#d`t6Y7G|84wsZKYle1_3
zp(zT`IxuVy9SjkDfc^&<Gsw@45xuJu%^}QNkp5(ds1W9_=Bs<J=f3ja-9&gkq7W15
z^nMPy>0zRe>wLPo+?_0#hF0c}IPbGxt?svu$8!5A1LiZ4Ix^osc(_}tj0Z6KH@25y
zt}N0~7K3H>Eg!51@01G9iYoMYlPY2-=~K!Qf+7TQe%l+S&PDO|R<}JSNgrmbgiMvC
zQ;BMQ%YbF^`=tZL2ZWCL70`OTP6jL=f3keIPZ*djV$~jDfItNNMtPuNN+PESQxRrm
zK=>t5R)il!kt%#1geZ*2Fd&Ik-x7q)Z&se^6BdX9p=Oe|RHS2L1C5X*P(?|E6mfY6
z5tc+r5n)Lf{F|}qn4`ubGPX1?R|mRLc$LJCOWi1lJSF&Awf?ZIGBXhsqnw<LVgK{;
zxQVP{(sM+4#-yjgzuVy%?|a5~dB&yZsPc>}&qr(Z$HbbKnMDbBW@P2XN{L<G3F*B@
zc_-jKL3w_qR@ahzvzF=aX;N|p#U<4$_iG1Udr+4Yh$60HFZUFPBJ%4+kiwZ2RVPoJ
zN^whY_HimRbnnu(H?`wb+K6tXzbiI09oh?CL~cWK6lb=lX+snHbwr7#|3@^vOEfJ-
zi%K*NQ3omiRUedbND^^H3@Ku^F(5KB*`OjaAhKlej~clXu1w68iD{&v<XLQgOC}&L
zWUHTC78?6#OliQMCeeDyWs%$@kB`4{;zxXwmRT7pi!_UNT0L3S&!C^jvxs&Y#H<`&
zq&P|;ns^SfB;7Ql{HLZJ@?ll+!NK+Czl>MK|H7V$Jo~eO@6;tjBVE_|=gkEx7(o7J
zoYcHF(VcF-&E9cc?GA6brO^&l#HZmZnm7U<qD9a)(8T4u&D(C3zwT!FhT97K_Cn<4
iwY!?H`?DL1@fS~-oOxH+dairTn@?&dyMLVWYySdy4ic>Z
delta 1674
zcmZuyO>7%Q7=1fluYcpU9XqktactLiow!a|N8-{b)IF2~MO6h7ia1nl0fk6bB0+no
zT4)aRfW)C>IFufM6Dkr&Q7oZ?0C7SMLP&6h1EMFmATCvVsNl_bymk;;&5XZq-h1CS
z-~4#zj<s{g+KUSDM@7cPd^ieR*^phaA<qh1-V$$HYqA$A|EIsEJ-3ZNCw~aVDr;fu
zBwoWNE})MtJlunYIKC191e8jt#_=$!jh+Q0ag#l4tPOnod_+c*Ir&cFyqrrOZ@ypP
z3>-ZD%H_>|_XbkPwkJF*%2SkAllA;}Q_pZ>fh_`@eCg8W_SWlP4DJ@bv@CzHpM03;
z{DU^4xEWUwfdh7@nB5C0;O7wVNg8N6z-QCIVodIPEmf3XJkN>D12-1s_ELYaQF6i-
z<W}`V@gO#EYduk1hDz}pWZ7F-9)I%Hdh>dW-p8zi;9P^zN0y+)Jk4B)7Sk}6jV6DO
ztS~L6XXYGQs-#~tp7Juat^2)s>|DCfQd+{HSJ10sh7hWvr58IiZPb~@P%4Blt%O`?
ztd><d6vF0LqJLzCY1wk8aVkKBi72CJ5Mg2qMEpLX;b??s5RO3{Z;qoxG(s&=#f%V9
z#!<OT#FX(xH6j;S3Xzw8HlGg=D%TRYV_G9l4VCGON5>iojhHovghA|2Ad(u<Fo>i^
zI5OTk;ns|AO6N8s*IQ%V6j^mt3?fB@hpgOdEk4O}qc_0i1{8H(F1NtLXjQIeRt?kD
zOh={`#>{lUOdn#VHS>sJrVX<{!OR5A%pqn*Gs}jVA+v*${BeSr4VdacjkC>a=A2<>
zP0Y^X>h;ljrim!SHHc{<%G?FuO%ca5udF&H=&6IMc9J{6gF1`fu8t0Bj*%<6PB})d
z1a-<$x5^q1_clk}8r6onIXGu@@rT0s{}s*$!udnOc`eKvql4xtTxBsj?eXT$Xhg;!
zW(?x33B;^kG@lTyF-t@Nj{LP<Jl)j`>`pAOz&utouE0E2f(7!*;0a#Lp+<okey~8Q
z!I!;bS57}*kiKY8|033PTj#h=dpMrqc+Px7kLoY-QlxZCaePW-@wpR|)#Y5mV^sA*
zdGKVtqaU|tJD&Ky&4=xckZs%YucZs|Sd^E_NrO+Hn*Hh6V0-CZA=7jIuJ2pl%C29p
zU87Ed?L9X2bbQ374#lTz>Jr?Qm;IKbX82$7v40}^!NKa;mk+Ga;BVh`<z6Ye+q)&)
R*5G#UT-K@%9z7Sa{slaX_W%F@
diff --git a/tsg_util/plot_Validation.m b/tsg_util/plot_Validation.m
index 63ce132..20d7f0c 100644
--- a/tsg_util/plot_Validation.m
+++ b/tsg_util/plot_Validation.m
@@ -46,8 +46,13 @@ switch nPlot
erase_Line( hPlotAxes, 2 );
if ~isempty( tsg.(PARA) )
- plot_Tsg( hMainFig, hPlotAxes, 2, tsg.DAYD, tsg.(PARA), [],...
- PARA,'k','none','*',2);
+% if ~isempty( tsg.([PARA '_QC']) )
+ plot_Tsg( hMainFig, hPlotAxes, 2, tsg.DAYD, tsg.(PARA),...
+ tsg.([PARA '_QC']),PARA,'','none','*',2);
+% else
+% plot_Tsg( hMainFig, hPlotAxes, 2, tsg.DAYD, tsg.(PARA),...
+% [],PARA,'k','none','*',2);
+% end
end
% ---------------------------------------------------------------------
diff --git a/tsg_util/quitProgram.m b/tsg_util/quitProgram.m
index 8ac15c1..cc754a8 100644
--- a/tsg_util/quitProgram.m
+++ b/tsg_util/quitProgram.m
@@ -1,4 +1,4 @@
-function quitProgram(hMainFig, DEFAULT_PATH_FILE)
+function quitProgram(hMainFig, hMapPanel, DEFAULT_PATH_FILE)
% QUITPROGRAM Exit tsgqc_GUI application
%
% Input
@@ -14,6 +14,7 @@ function quitProgram(hMainFig, DEFAULT_PATH_FILE)
% close the main windows
% ----------------------
delete(hMainFig);
+delete(hMapPanel);
% reset userdata property of root Matalab object (0) for next use
% ---------------------------------------------------------------
diff --git a/tsgqc.m b/tsgqc.m
index cb11f3e..60122ee 100644
--- a/tsgqc.m
+++ b/tsgqc.m
@@ -616,12 +616,32 @@ hPlotAxes(3) = axes('Parent', hPlotsPanel, 'Visible', 'off',...
'box', 'on', 'Units', 'normalized', 'Tag', 'TAG_AXES_3', ...
'HandleVisibility','on', 'Position',[.05, .02, .93, .27]);
+
% The map will be plot in a uipanel
-hMapPanel = uipanel( ...
- 'Parent', hMainFig, ...
- 'Units', 'normalized', ...
- 'Visible', 'off', ...
- 'Position',[0.15, 0, .85, .58]);
+% ---------------------------------
+% hMapPanel = uipanel( ...
+% 'Parent', hMainFig, ...
+% 'Units', 'normalized', ...
+% 'Visible', 'off', ...
+% 'Position',[0.15, 0, .85, .58]);
+
+% The map will be plot a new figure
+% ---------------------------------
+hMapPanel = figure(...
+ 'BackingStore','off',...
+ 'Name', 'TSG MAP FIGURE', ...
+ 'NumberTitle', 'off', ...
+ 'Resize', 'on', ...
+ 'Menubar','none', ...
+ 'Toolbar', 'none', ...
+ 'Tag', 'MAP_FIGURE', ...
+ 'Visible','off',...
+ 'WindowStyle', 'normal', ...
+ 'CloseRequestFcn', @QuitMapCallback,...
+ 'Units', 'normalized',...
+ 'Position',[0.17, 0.05, .8, .44],...
+ 'Color', get(0, 'DefaultUIControlBackgroundColor'));
+
hPlotAxes(4) = axes(... % the axes for plotting ship track map
'Parent', hMapPanel, ...
'Units', 'normalized', ...
@@ -1157,7 +1177,7 @@ end
set( hpCalCoef, 'Visible', 'off' );
set( hpDateLimit, 'Visible', 'off' );
set( hpInterpPos, 'Visible', 'off' );
- set( hMapPanel, 'Visible', 'off' );
+% set( hMapPanel, 'Visible', 'off' );
% set( hbgParameter, 'Visible', 'off');
% Toggle button
@@ -1168,7 +1188,7 @@ end
set( hInterpToggletool, 'state', 'off' );
set( hPanToggletool, 'state', 'off' );
set( hQCToggletool, 'state', 'off' );
- set( hMapToggletool, 'state', 'off' );
+% set( hMapToggletool, 'state', 'off' );
set( hTimelimitToggletool, 'state', 'off' );
% set( hZoomToggletool, 'state', 'off' );
@@ -1716,7 +1736,7 @@ end
% Hide the map. Otherwise it slows down the zooming
% -------------------------------------------------
- set( hMapToggletool, 'state', 'off' );
+% set( hMapToggletool, 'state', 'off' );
% returns a zoom mode object for the figure hMainFig handle
% ---------------------------------------------------------
@@ -1732,7 +1752,7 @@ end
% Disallows a zoom operation on the MAP axes objects
% --------------------------------------------------
- setAllowAxesZoom(hZoom, hPlotAxes(4), false);
+% setAllowAxesZoom(hZoom, hPlotAxes(4), false);
% turns on interactive zooming (same effect than zoom on) but prevent
% side effect on another figure
@@ -1775,7 +1795,7 @@ end
% Hide the map. Otherwise it slows down the zooming
% -------------------------------------------------
- set( hMapToggletool, 'state', 'off' );
+% set( hMapToggletool, 'state', 'off' );
% returns a zoom mode object for the figure hMainFig handle
% ---------------------------------------------------------
@@ -1787,7 +1807,7 @@ end
% Disallows a zoom operation on the MAP axes objects
% --------------------------------------------------
- setAllowAxesZoom(hZoom, hPlotAxes(4), false);
+% setAllowAxesZoom(hZoom, hPlotAxes(4), false);
% turns on interactive zooming (same effect than zoom on) but prevent
% side effect on another figure
@@ -1832,7 +1852,7 @@ end
% Hide the map. Otherwise it slows down the panning
% -------------------------------------------------
- set( hMapToggletool, 'state', 'off' );
+% set( hMapToggletool, 'state', 'off' );
% Returns a pan mode object for the figure handle
% -----------------------------------------------
@@ -1840,7 +1860,7 @@ end
% Disallows a pan operation on the MAP axes objects
% --------------------------------------------------
- setAllowAxesPan(hPan, hPlotAxes(4), false);
+% setAllowAxesPan(hPan, hPlotAxes(4), false);
% turns on interactive pan (same effect than pan on) but prevent
% side effect on another figure
@@ -1882,6 +1902,12 @@ end
set(hPlotAxes(iaxe), 'XTickMode', 'auto')
datetick(hPlotAxes(iaxe), 'x', 'keeplimits')
end
+
+ % Re-draw the map once the zoom/pan is off
+ % ----------------------------------------
+ erase_Line( hPlotAxes, 4 );
+ plot_map( hMainFig, hPlotAxes);
+
end
%% QC_OnMenuCallback ............................... Quality Control Module
@@ -2388,7 +2414,7 @@ end
set( hZoomInToggletool, 'state', 'off', 'enable', 'on' );
set( hZoomOutToggletool, 'state', 'off', 'enable', 'on' );
set( hPanToggletool, 'state', 'off' );
- set( hMapToggletool, 'state', 'off' );
+% set( hMapToggletool, 'state', 'off' );
set( hClimToggletool, 'state', 'off', 'enable', 'off');
set( hCalToggletool, 'enable', 'off' );
set( hInterpToggletool, 'enable', 'off' );
@@ -2439,7 +2465,7 @@ end
set( hZoomInToggletool, 'state', 'off' );
set( hZoomOutToggletool, 'state', 'off' );
set( hPanToggletool, 'state', 'off' );
- set( hMapToggletool, 'state', 'off' );
+% set( hMapToggletool, 'state', 'off' );
set( hClimToggletool, 'enable', 'on');
set( hCalToggletool, 'enable', 'on' );
set( hInterpToggletool, 'enable', 'on' );
@@ -2900,7 +2926,7 @@ end
plot_Calibration( hMainFig, hPlot, 1, 'SSPS' );
plot_Calibration( hMainFig, hPlot, 2, 'SSJT' );
plot_Calibration( hMainFig, hPlot, 3, 'SSTP' );
- elseif strcmp(get(hMapToggletool,'state'), 'on')
+% elseif strcmp(get(hMapToggletool,'state'), 'on')
% plot_map( hMainFig, hPlot)
elseif strcmp(get(hInterpToggletool,'state'), 'on')
plot_Interpolation( hMainFig, hPlot, 1 );
@@ -3144,6 +3170,19 @@ end
end
+%% QuitMapCallback
+ % -----------------------------------------------------------------
+ % Callback function run when the Quit Map Figure item is selected
+ % -----------------------------------------------------------------
+ function QuitMapCallback(hObject, eventdata)
+
+ % Make the earth map invisible
+ % ----------------------------
+ set(hMapPanel, 'Visible', 'off' );
+ set( hMapToggletool, 'state', 'off' );
+
+ end
+
%% QuitMenuCallback
% -----------------------------------------------------------------
% Callback function run when the Quit menu item is selected
@@ -3181,7 +3220,7 @@ end
% quit program
% ------------
- quitProgram(hMainFig, DEFAULT_PATH_FILE);
+ quitProgram(hMainFig, hMapPanel, DEFAULT_PATH_FILE);
else
selection = ...
@@ -3191,7 +3230,7 @@ end
if strcmp(selection, 'No')
return;
else
- quitProgram(hMainFig, DEFAULT_PATH_FILE);
+ quitProgram(hMainFig, hMapPanel, DEFAULT_PATH_FILE);
end
end
--
GitLab