From 351edfab792ae6c5f8cb92f8b00ddb6d738cabf6 Mon Sep 17 00:00:00 2001
From: Jacques Grelet <jacques.grelet@ird.fr>
Date: Thu, 17 Jan 2008 20:01:26 +0000
Subject: [PATCH] move QC display uicontrol on same loop than context menu add
internal counter inside loop to uicontrol positionning change uipanel QC
display position
---
tsgqc_GUI.m | 59 +++++++++++++++++++++++------------------------------
1 file changed, 25 insertions(+), 34 deletions(-)
diff --git a/tsgqc_GUI.m b/tsgqc_GUI.m
index b4b4c3b..ca0b3b5 100644
--- a/tsgqc_GUI.m
+++ b/tsgqc_GUI.m
@@ -419,7 +419,17 @@ hPlotAxes(4) = axes(... % the axes for plotting ship track map
'Position',[.05, .05, .9, .9]);
-%% Construct the context menu for the Quality control codes
+% Construct display Quality codes panel
+% -------------------------------------
+hQcPanel = uipanel(...
+ 'Parent', hMainFig, ...
+ 'tag', 'TAG_QC_DISPLAY_PANEL',...
+ 'HandleVisibility','on',...
+ 'Visible', 'off',...
+ 'BorderType', 'none',...
+ 'Position', [.85, .80, .1, .13]);
+
+% Construct the context menu for the Quality control codes
% -------------------------------------------------------
hQcCmenu = uicontextmenu(...
'Parent', hMainFig, ...
@@ -430,6 +440,10 @@ hQcCmenu = uicontextmenu(...
% -----------------------------------------------------------
qc_list = get(tsg.qc.hash);
+% internal loop count with state to on
+% ------------------------------------
+count = 0;
+
% iterate (loop) on each key store inside hastable
% ------------------------------------------------
for i=1:numel(qc_list)
@@ -453,36 +467,9 @@ for i=1:numel(qc_list)
'Label', label,...
'ForegroundColor', color,...
'Callback', {@Qc, key});
- end
-end
-
-%% Construct display Quality codes
-% --------------------------------
-hQcPanel = uipanel(...
- 'Parent', hMainFig, ...
- 'tag', 'TAG_QC_DISPLAY_PANEL',...
- 'HandleVisibility','on',...
- 'Visible', 'off',...
- 'BorderType', 'none',...
- 'Position', [.85, .75, .1, .15]);
-
-% iterate (loop) on each key store inside hastable
-% ------------------------------------------------
-for i=1:numel(qc_list)
-
- % get key and some values in hashtable
- % ------------------------------------
- key = qc_list{i};
- label = get(tsg.qc.hash, key, 'label');
- color = get(tsg.qc.hash, key, 'color');
- state = get(tsg.qc.hash, key, 'state');
-
- % construct context menu with only code set to 'on' (valid)
- % ---------------------------------------------------------
- if strcmp( state, 'on')
- % add text QC display label
- % -------------------------
+ % add text QC display label on hQcPanel
+ % ------------------------------------
uicontrol(...
'Parent', hQcPanel,...
'Style', 'text',...
@@ -493,10 +480,10 @@ for i=1:numel(qc_list)
'HandleVisibility','on', ...
'String', label,...
'ForegroundColor', color,...
- 'Position', [.1, .9-i*.12, .5, 0.12]);
+ 'Position', [.1, .9-count*.12, .7, 0.12]);
- % add edit QC display
- % -------------------
+ % add text QC display statistic on hQcPanel
+ % -----------------------------------------
uicontrol(...
'Parent', hQcPanel,...
'Style', 'text',...
@@ -508,7 +495,11 @@ for i=1:numel(qc_list)
'String', 'N/A',...
'ForegroundColor', color,...
'Tag', ['TAG_QC_TEXT_' key],...
- 'Position', [.7, .9-i*.12, .3, 0.12]);
+ 'Position', [.7, .9-count*.12, .25, 0.12]);
+
+ % increment count
+ % ---------------
+ count = count + 1;
end
end
--
GitLab