From 259dad460b8367455eeb2bedf9da00dedb8129e9 Mon Sep 17 00:00:00 2001
From: Yves Gouriou <yves.gouriou@ird.fr>
Date: Tue, 19 May 2009 12:49:20 +0000
Subject: [PATCH] Correction d'un bug dans la fonction d'impression : passage
de PARA : cellule de 2 elements au lieu d'un string.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Mise à jour instantanee des statistiques des codes
de validation
---
TSGQC_amelioration.xls | Bin 26112 -> 34816 bytes
tsg_data/touc0702.nc | Bin 1803596 -> 1803596 bytes
tsg_util/display_QC.m | 37 ++++++++++-----------------------
tsg_util/preferencesForm.m | 7 +++++--
tsgqc.m | 41 +++++++++++++++++++++----------------
5 files changed, 39 insertions(+), 46 deletions(-)
diff --git a/TSGQC_amelioration.xls b/TSGQC_amelioration.xls
index e0a531013f70bd481ae4b82c72cc264ca50b9e59..1715d17e42917d732906c7467157dff607602f40 100644
GIT binary patch
delta 3801
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
delta 1328
zcmZuxdrXs86hGgiPZ*`Oqkw2zV00?f7BB+xC}6Y#f0Us@d;)93fDW)g<^Ts7Erhs7
z>2(ee0}SO4GN-0<)@?c@)s0NHxR{VQ*+9$)i<vUF>4w^!uVsnZc2Dj-_x{ekzw>?P
zoO|1xblWw`siXAW`jxB>0L~VkrihOc(F;l<rdRWX0IydNJzYUeG)sEuE^3+>m{tE8
zTLK6xCm%5)zfDfA1!jmjS%I2{X&#jgHmHO$u!0`ef`I}E1}Bcd!Zh))s*ta6z6=3E
z1~%YGE?x$a1woFH^U~)xd)Nf!f4J`>k@#8eSn=}G&&$aFS#pdfp5F~C7wh438c*UL
z_b9J9C_)AyKtUuxx*x@1Of>^?5Ry!(0<D17i2t$HNEMWj{2*2c0(&CK3F+3j>NOk-
zAGTN;E3JA5a+ha3gCufDWhRlzq6L43ThNl?PLur>p6-J*5P~w4iw(dT)W=bqqyQNh
zyqOgMlMFzT0zf4I7+3}H)^h-AH9&}zys=Ibx1gL9OpKvx+!jQK<KaNlp!!`4a6Jt`
zkU_f3tYl++qVgyUum`0E8lW6gW`TN~?ZMR9pcazJZ2Sv)iVcTb;9;0A+JFX;pU;fZ
zprM4OQI}vGDJa0R4Ja0{k;R03mz^a~j8UyeSS=V$s)Dk5i!IO6pi0r{bgCkYt<qAj
zGUXPiHgG@hZ!9E25!JyQ?6;UM<mG0|FV0WqUrneQ>N0xgFR7xRwmC+O6?1PoLJz*{
z@ixyLrW7}J1zpK8J(j*desf$RUAgI@<tJ(TOu{#*{Sm+PCY}7wcc9gf?`a>RYqr&n
z4+q!UFMm=jOh3Be+x5+}xtE+@3-<M_(=Jg9;f51)QthXGBX2A1-XFb(W~z-6FEwRI
z_Avd8cdqVL+O645YQ<<ee>MMMZii}4cbM;t%T21A_|@u|kKcW^J$B*Hv65TNy_}G-
z&NG^rKg3JgUUB)k+1BUNU87g%iKIo1qt>hR9(O8Suiakn+F2*NyQ!ZZSd&_OH~Z$G
z?EbdMp}y|u%A5;9RpTw9>dw#9#d-U;occbdVC$pJVfWs<oMKGf-aCAKzr}jKYT)s?
zmv=0ETy^Z^=^Hs!vIp<<C60ZWmsmIzFN<xQX{u}QvQ5UkI=$nSBH{EMAE>8Zdf=93
zCDHE5!nJHFMf0&TDcA*1@Z#_>kGo+brXa9lF#A|m5ZJ}yDuDA~pF4TyuwaEb2*655
zLl|gL!eBcTxPRVjqC*(u;wphb;q!^HG?sf=YDy#N$V@D_W*&twpGeEg#3CV9Ha`@W
z?dmLdci92TW!6z+L~o8!w;&O^fg{+ti!g{C>l{ABj&}e&q|vP5a~6EDM$DNaI3IVa
z^Wp@>xEIY52^owRx*B?DiN@X6a9hGY_4$0H%^nq)4BDeUa8TW)n_V4`=(;TOS4R`2
QB8{D`!7m~q;FodjZ|Ea;J^%m!
diff --git a/tsg_data/touc0702.nc b/tsg_data/touc0702.nc
index d15ef6c5a3535e5d91918179875a1a1e05756809..b519783eb51ecebd1377f8bc408ae73731c7ef18 100644
GIT binary patch
delta 223
zcmX@pm3O8qZ^Joe4ns2_v@|wtzQ){sjhPXMnSdC?W&vVWAZ7z%b|B^eV$SW?n7Q~K
zZ(m@>5%YBV18-J|?Gb0V-#%q|bLPx}cF#>bK+L<{a}!@Q3zC|4i8=g0EC9rU+a=}*
ziM?iKU|^X3u}WB-4ak791Nj)(7}yYC`ayAa;q4dNg)`*ZudEjbVu|fn)=S20*nVL;
f?=6w-7sT0{RoXxHivh7X5K92D<o1vKQqf-lt|wJ~
delta 177590
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
CyrE_Q
diff --git a/tsg_util/display_QC.m b/tsg_util/display_QC.m
index 369f29c..ef9fb4d 100644
--- a/tsg_util/display_QC.m
+++ b/tsg_util/display_QC.m
@@ -1,11 +1,10 @@
-function display_QC( hGUI, hAxes )
+function display_QC( hMainFig )
%
-% Function to plot the Water Sample measurements
+% Function to refresh QC statistic panel
%
% Input
% -----
% hGUI ............... Handel to the user interface
-% hAxes .............. Handels to the graphic axes
%
% Output
% ------
@@ -13,26 +12,11 @@ function display_QC( hGUI, hAxes )
% Retrieve named application data
% -------------------------------
-tsg = getappdata( hGUI, 'tsg_data');
+tsg = getappdata( hMainFig, 'tsg_data');
% get panel handle
% ----------------
-hdlPanel = findobj(hGUI, 'tag', 'TAG_QC_DISPLAY_PANEL');
-
-% get color axes and set 'BackgroundColor' properties of panel handle
-% give a transparency effect
-% -------------------------------------------------------------------
-%bgColor = get(hAxes(1), 'Color');
-%set(hdlPanel, 'BackgroundColor', bgColor);
-
-% and to his chlidren uicontrol
-% -----------------------------
-%set(findobj(get(hdlPanel,'children'),'style','text'),...
-% 'BackgroundColor', bgColor)
-
-% set panel visible
-% -----------------
-%set(hdlPanel, 'visible', 'on');
+hdlPanel = findobj(hMainFig, 'tag', 'TAG_QC_DISPLAY_PANEL');
% get list of keys from hashtable tsg.qc.hash, defined inside
% tsg_initialisation.m
@@ -42,19 +26,19 @@ qc_list = keys(tsg.qc.hash);
% iterate (loop) on each key store inside hastable
% ------------------------------------------------
for key = qc_list
-
+
% get some values in hashtable
% ------------------------------------
code = tsg.qc.hash.(key).code;
-
+
% get the uicontrol handle from tag construct with key
% ----------------------------------------------------
- hdlText = findobj(hGUI, 'tag', ['TAG_QC_TEXT_' char(key)]);
-
+ hdlText = findobj(hMainFig, 'tag', ['TAG_QC_TEXT_' char(key)]);
+
% find number of sample flag with this QC code
% --------------------------------------------
ind = find(tsg.SSPS_QC == code);
-
+
% if index empty, no data with this flag, set field to zero (char)
% ----------------------------------------------------------------
if isempty(ind)
@@ -65,4 +49,5 @@ for key = qc_list
end
-
+drawnow
+
diff --git a/tsg_util/preferencesForm.m b/tsg_util/preferencesForm.m
index 0bb270b..c3e04ef 100644
--- a/tsg_util/preferencesForm.m
+++ b/tsg_util/preferencesForm.m
@@ -329,14 +329,17 @@ uiwait(hPreferencesFig);
% -------------------
minSpeedQC(hTsgGUI);
-
% close windows (replace call to uiresume(hHeaderFig))
% ----------------------------------------------------
close(hPreferencesFig);
% flushes the event queue and updates the figure window
% -----------------------------------------------------
- drawnow;
+ drawnow;
+
+ % refresh QC statistic panel
+ % --------------------------
+ display_QC( hTsgGUI );
% return with no error code (true)
% --------------------------------
diff --git a/tsgqc.m b/tsgqc.m
index 2588d3b..5a86889 100644
--- a/tsgqc.m
+++ b/tsgqc.m
@@ -1232,7 +1232,7 @@ hrbInterpCancel = uicontrol( ...
% Update QC statistics
% --------------------
- display_QC( hMainFig, hPlotAxes);
+ display_QC( hMainFig );
% Initialise the popupmenu displaying the parameters that can be
% plot
@@ -1910,8 +1910,12 @@ hrbInterpCancel = uicontrol( ...
% -------------------------------
tsg = getappdata( hMainFig, 'tsg_data');
- PARA = tsg.plot.parameter{1};
+ PARA = getParaCorModule( hMainFig );
SAMPLE = tsg.plot.sample;
+
+ % refresh QC statistic panel
+ % --------------------------
+ display_QC( hMainFig );
% Activate right clic context menu on first axes (salinity)
% ---------------------------------------------------------
@@ -1989,7 +1993,7 @@ hrbInterpCancel = uicontrol( ...
% get index on selected zone
% ---------------------------
ind = find(tsg.DAYD > p1(1,1) & tsg.DAYD < p2(1,1) & ...
- tsg.(PARA) > p1(1,2) & tsg.(PARA) < p2(1,2));
+ tsg.(PARA{1}) > p1(1,2) & tsg.(PARA{1}) < p2(1,2));
% Keep the information on the indices of the selected zone
% --------------------------------------------------------
@@ -1997,7 +2001,7 @@ hrbInterpCancel = uicontrol( ...
% Modifiy the QC
% --------------
- tsg.([PARA '_QC'])(ind) = tsg.qc.active.Code;
+ tsg.([PARA{1} '_QC'])(ind) = tsg.qc.active.Code;
% put last SSPS_QC in queue (Undo/Redo)
% -------------------------------------
@@ -2013,11 +2017,11 @@ hrbInterpCancel = uicontrol( ...
% Draw plot 1 of the validation figure
% ------------------------------------
- plot_Validation( hMainFig, hPlotAxes, 1, PARA );
+ plot_Validation( hMainFig, hPlotAxes, 1, PARA{1} );
% refresh QC statistic panel
% --------------------------
- display_QC( hMainFig, hPlotAxes );
+ display_QC( hMainFig );
% enable undo menu
% ----------------
@@ -2087,7 +2091,7 @@ hrbInterpCancel = uicontrol( ...
% Get the parameter (SSPS, SSJT or SSTP)
% --------------------------------------
- PARA = tsg.plot.parameter{1};
+ PARA = getParaCorModule( hMainFig );
SAMPLE = tsg.plot.sample;
% get key and some values in hashtable
@@ -2118,7 +2122,7 @@ hrbInterpCancel = uicontrol( ...
plot_Correction( hMainFig, hPlotAxes, PARA );
else
- tsg.([PARA '_QC'])(tsg.rbboxind) = tsg.qc.active.Code;
+ tsg.([PARA{1} '_QC'])(tsg.rbboxind) = tsg.qc.active.Code;
% Save tsg.SSPS_QC in the application data
% ----------------------------------------
@@ -2126,7 +2130,7 @@ hrbInterpCancel = uicontrol( ...
% Draw plot 1 of the validation figure
% ------------------------------------
- plot_Validation( hMainFig, hPlotAxes, 1, PARA );
+ plot_Validation( hMainFig, hPlotAxes, 1, PARA{1} );
end
@@ -2135,13 +2139,15 @@ hrbInterpCancel = uicontrol( ...
% Update the radio button corresponding to the selected
% QC context menu (rbg : RadioButtonGroup)
% -----------------------------------------------------
- radioTag = ['TAG_QC_RADIO_' key]; % Build the TAG of the CODE
- hbgChildren = get(hbgQc,'Children'); % Get the handles of the rbg
- hbgTagCell = get(hbgChildren, 'tag'); % get the TAG of the rbg
- ind = strcmp(radioTag, hbgTagCell); % Compare the TAG
- hRadioButton = hbgChildren( ind == 1 ); % Get the handle of the button
- set(hbgQc, 'SelectedObject', hRadioButton); % Make this button active
-
+% radioTag = ['TAG_QC_RADIO_' key]; % Build the TAG of the CODE
+% hbgChildren = get(hbgQc,'Children'); % Get the handles of the rbg
+% hbgTagCell = get(hbgChildren, 'tag'); % get the TAG of the rbg
+% ind = strcmp(radioTag, hbgTagCell); % Compare the TAG
+% hRadioButton = hbgChildren( ind == 1 ); % Get the handle of the button
+% set(hbgQc, 'SelectedObject', hRadioButton); % Make this button active
+
+ display_QC( hMainFig);
+
setappdata( hMainFig, 'tsg_data', tsg );
end
@@ -2910,9 +2916,8 @@ hrbInterpCancel = uicontrol( ...
if strcmp(get(hBottleToggletool,'state'), 'on')
% Default parameter
- % ATTENTION au cas ou (PARA)_CAL existe - A implementer
% -----------------------------------------------------
- PARA = tsg.plot.parameter{1};
+ PARA = getParaCorModule( hMainFig );
plot_Correction( hMainFig, hPlot, PARA );
--
GitLab