Skip to content

Commit 61612ce

Browse files
giovannivolpegiovannivolpe
authored
Merge pull request #1474 from softmatterlab/ac-PanelPropCell-FDRtable
Update _PanelPropCell.gen.m
2 parents eb1e999 + dbe5c37 commit 61612ce

6 files changed

Lines changed: 36 additions & 35 deletions

File tree

‎braph2genesis/src/atlas/_PFBrainGraph.gen.m‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,22 +107,24 @@
107107
caxis auto
108108
cmap_temp = colormap(jet);
109109
rgb_meas = zeros(size(cmap_temp));
110+
meas_val = val./val;
111+
meas_val(isnan(meas_val)) = 0.1;
110112
else
111113
caxis([lim_min lim_max]);
112114
cmap_temp = colormap(jet);
113115
rgb_meas = interp1(linspace(lim_min, lim_max, size(cmap_temp, 1)), ...
114116
cmap_temp, val); % colorbar from minimum to maximum value of the measure result
117+
meas_val = (val - lim_min)./(lim_max - lim_min) + 1; % size normalized by minimum and maximum value of the measure result
118+
meas_val(isnan(meas_val)) = 0.1;
119+
meas_val(meas_val <= 0) = 0.1;
115120
end
116121

117122
if pf.get('SPHS')
118123
sph_dict = pf.get('SPH_DICT');
119124
for i = 1:sph_dict.length
120125
sph = sph_dict.getItem(i);
121126
default_value = sph.getPropDefault('SPHERESIZE');
122-
meas_val = (val(i) - lim_min)/(lim_max - lim_min); % size normalized by minimum and maximum value of the measure result
123-
meas_val(isnan(meas_val)) = 0.1;
124-
meas_val(meas_val <= 0) = 0.1;
125-
sph.set('SPHERESIZE', default_value * (meas_val + 1));
127+
sph.set('SPHERESIZE', default_value * meas_val(i));
126128
sph.set('FaceColor', rgb_meas(i, :));
127129
end
128130
pf.update_gui_tbl_sph()
@@ -132,10 +134,7 @@
132134
for i = 1:sym_dict.length
133135
sym = sym_dict.getItem(i);
134136
default_value = sym.getPropDefault('SYMBOLSIZE');
135-
meas_val = (val(i) - lim_min) / (lim_max - lim_min); % size normalized by minimum and maximum value of the measure result
136-
meas_val(isnan(meas_val)) = 0.1;
137-
meas_val(meas_val <= 0) = 0.1;
138-
sym.set('SYMBOLSIZE', default_value * (meas_val + 1));
137+
sym.set('SYMBOLSIZE', default_value * meas_val(i));
139138
sym.set('FaceColor', rgb_meas(i, :));
140139
end
141140

‎braph2genesis/src/atlas/_PFBrainMultiGraph.gen.m‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,21 +67,23 @@
6767
caxis auto
6868
cmap_temp = colormap(jet);
6969
rgb_meas = zeros(size(cmap_temp));
70+
meas_val = val./val;
71+
meas_val(isnan(meas_val)) = 0.1;
7072
else
7173
caxis([lim_min lim_max]);
7274
cmap_temp = colormap(jet);
7375
rgb_meas = interp1(linspace(lim_min, lim_max, size(cmap_temp, 1)), ...
7476
cmap_temp, val); % colorbar from minimum to maximum value of the measure result
77+
meas_val = (val - lim_min)./(lim_max - lim_min) + 1; % size normalized by minimum and maximum value of the measure result
78+
meas_val(isnan(meas_val)) = 0.1;
79+
meas_val(meas_val <= 0) = 0.1;
7580
end
7681
if pf.get('SPHS')
7782
sph_dict = pf.get('SPH_DICT');
7883
for i = 1:sph_dict.length
7984
sph = sph_dict.getItem(i);
8085
default_value = sph.getPropDefault('SPHERESIZE');
81-
meas_val = (val(i) - lim_min) / (lim_max - lim_min); % size normalized by minimum and maximum value of the measure result
82-
meas_val(isnan(meas_val)) = 0.1;
83-
meas_val(meas_val <= 0) = 0.1;
84-
sph.set('SPHERESIZE', default_value * (meas_val + 1));
86+
sph.set('SPHERESIZE', default_value * meas_val(i));
8587
sph.set('FaceColor', rgb_meas(i, :));
8688
end
8789
pf.update_gui_tbl_sph()
@@ -91,10 +93,7 @@
9193
for i = 1:sym_dict.length
9294
sym = sym_dict.getItem(i);
9395
default_value = sym.getPropDefault('SYMBOLSIZE');
94-
meas_val = (val(i) - lim_min) / (lim_max - lim_min); % size normalized by minimum and maximum value of the measure result
95-
meas_val(isnan(meas_val)) = 0.1;
96-
meas_val(meas_val <= 0) = 0.1;
97-
sym.set('SYMBOLSIZE', default_value * (meas_val + 1));
96+
sym.set('SYMBOLSIZE', default_value * meas_val(i));
9897
sym.set('FaceColor', rgb_meas(i, :));
9998
end
10099
pf.update_gui_tbl_sym()

‎braph2genesis/src/atlas/_PFBrainMultiplexBinaryGraph.gen.m‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,22 +74,24 @@
7474
caxis auto
7575
cmap_temp = colormap(jet);
7676
rgb_meas = zeros(size(cmap_temp));
77+
meas_val = val./val;
78+
meas_val(isnan(meas_val)) = 0.1;
7779
else
7880
caxis([lim_min lim_max]);
7981
cmap_temp = colormap(jet);
8082
rgb_meas = interp1(linspace(lim_min, lim_max, size(cmap_temp, 1)), ...
8183
cmap_temp, val); % colorbar from minimum to maximum value of the measure result
84+
meas_val = (val - lim_min)./(lim_max - lim_min) + 1; % size normalized by minimum and maximum value of the measure result
85+
meas_val(isnan(meas_val)) = 0.1;
86+
meas_val(meas_val <= 0) = 0.1;
8287
end
8388

8489
if pf.get('SPHS')
8590
sph_dict = pf.get('SPH_DICT');
8691
for i = 1:sph_dict.length
8792
sph = sph_dict.getItem(i);
8893
default_value = sph.getPropDefault('SPHERESIZE');
89-
meas_val = (val(i) - lim_min) / (lim_max - lim_min); % size normalized by minimum and maximum value of the measure result
90-
meas_val(isnan(meas_val)) = 0.1;
91-
meas_val(meas_val <= 0) = 0.1;
92-
sph.set('SPHERESIZE', default_value * (meas_val + 1));
94+
sph.set('SPHERESIZE', default_value * meas_val(i));
9395
sph.set('FaceColor', rgb_meas(i, :));
9496
end
9597
pf.update_gui_tbl_sph()
@@ -99,10 +101,7 @@
99101
for i = 1:sym_dict.length
100102
sym = sym_dict.getItem(i);
101103
default_value = sym.getPropDefault('SYMBOLSIZE');
102-
meas_val = (val(i) - lim_min) / (lim_max - lim_min); % size normalized by minimum and maximum value of the measure result
103-
meas_val(isnan(meas_val)) = 0.1;
104-
meas_val(meas_val <= 0) = 0.1;
105-
sym.set('SYMBOLSIZE', default_value * (meas_val + 1));
104+
sym.set('SYMBOLSIZE', default_value * meas_val(i));
106105
sym.set('FaceColor', rgb_meas(i, :));
107106
end
108107
pf.update_gui_tbl_sym()

‎braph2genesis/src/atlas/_PFBrainMultiplexGraph.gen.m‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,22 +67,24 @@
6767
caxis auto
6868
cmap_temp = colormap(jet);
6969
rgb_meas = zeros(size(cmap_temp));
70+
meas_val = val./val;
71+
meas_val(isnan(meas_val)) = 0.1;
7072
else
7173
caxis([lim_min lim_max]);
7274
cmap_temp = colormap(jet);
7375
rgb_meas = interp1(linspace(lim_min, lim_max, size(cmap_temp, 1)), ...
7476
cmap_temp, val); % colorbar from minimum to maximum value of the measure result
77+
meas_val = (val - lim_min)./(lim_max - lim_min) + 1; % size normalized by minimum and maximum value of the measure result
78+
meas_val(isnan(meas_val)) = 0.1;
79+
meas_val(meas_val <= 0) = 0.1;
7580
end
7681

7782
if pf.get('SPHS')
7883
sph_dict = pf.get('SPH_DICT');
7984
for i = 1:sph_dict.length
8085
sph = sph_dict.getItem(i);
8186
default_value = sph.getPropDefault('SPHERESIZE');
82-
meas_val = (val(i) - lim_min) / (lim_max - lim_min); % size normalized by minimum and maximum value of the measure result
83-
meas_val(isnan(meas_val)) = 0.1;
84-
meas_val(meas_val <= 0) = 0.1;
85-
sph.set('SPHERESIZE', default_value * (meas_val + 1));
87+
sph.set('SPHERESIZE', default_value * meas_val(i));
8688
sph.set('FaceColor', rgb_meas(i, :));
8789
end
8890
pf.update_gui_tbl_sph()
@@ -92,10 +94,7 @@
9294
for i = 1:sym_dict.length
9395
sym = sym_dict.getItem(i);
9496
default_value = sym.getPropDefault('SYMBOLSIZE');
95-
meas_val = (val(i) - lim_min) / (lim_max - lim_min); % size normalized by minimum and maximum value of the measure result
96-
meas_val(isnan(meas_val)) = 0.1;
97-
meas_val(meas_val <= 0) = 0.1;
98-
sym.set('SYMBOLSIZE', default_value * (meas_val + 1));
97+
sym.set('SYMBOLSIZE', default_value * meas_val(i));
9998
sym.set('FaceColor', rgb_meas(i, :));
10099
end
101100
pf.update_gui_tbl_sym()

‎braph2genesis/src/gui/_PanelPropCell.gen.m‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ function update(pr)
224224
end
225225

226226
function pval = get_p_value()
227-
value = el.get('P1');
227+
value = el.get('P2');
228228
[R, ~] = size(value);
229229
pval = value{R + 1 - get(pr.yslider, 'Value'), get(pr.xslider, 'Value')};
230230
end
@@ -284,10 +284,15 @@ function update(pr)
284284
end
285285

286286
[~, mask] = fdr(tmp_data, el.get('QVALUE'));
287-
[cols, rows] = find(mask);
287+
[cols, rows] = find(mask);
288288

289289
if ~isempty(rows) && ~isempty(cols)
290-
s = uistyle('BackgroundColor',[1 0.6 0.6]);
290+
s = uistyle('BackgroundColor',[146/255 179/255 175/255]);
291+
addStyle(pr.table, s, 'cell', [rows', cols']);
292+
else
293+
non_sign = ones(size(mask));
294+
[cols, rows] = find(non_sign - mask);
295+
s = uistyle('BackgroundColor', [1 1 1]); % default color, no significance
291296
addStyle(pr.table, s, 'cell', [rows', cols']);
292297
end
293298
end

‎braph2genesis/src/gui/layouts/ComparisonGroup.layout‎

8 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)