Skip to content

Commit ae9cd9d

Browse files
author
minjk-bl
committed
Add numeric/nonnumeric icon to multiselector
1 parent bfb5657 commit ae9cd9d

6 files changed

Lines changed: 56 additions & 9 deletions

File tree

‎visualpython/css/root.css‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,18 @@ select.vp-select:disabled {
191191
width: 15px;
192192
height: 15px;
193193
}
194+
.vp-icon-numeric {
195+
background: center / contain no-repeat url(../img/numeric.svg);
196+
display: inline-block;
197+
width: 16px;
198+
height: 16px;
199+
}
200+
.vp-icon-non-numeric {
201+
background: center / contain no-repeat url(../img/non_numeric.svg);
202+
display: inline-block;
203+
width: 16px;
204+
height: 16px;
205+
}
194206

195207
.vp-file-browser-button {
196208
width: 22px;

‎visualpython/img/non_numeric.svg‎

Lines changed: 5 additions & 0 deletions
Loading

‎visualpython/img/numeric.svg‎

Lines changed: 4 additions & 0 deletions
Loading

‎visualpython/js/com/component/MultiSelector.js‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,8 @@ define([
175175
...x,
176176
value: x.label,
177177
code: x.value,
178-
type: x.dtype
178+
type: x.dtype,
179+
isNumeric: x.is_numeric
179180
};
180181
});
181182
callback(colList);
@@ -193,7 +194,8 @@ define([
193194
...x,
194195
value: x.label,
195196
code: x.value,
196-
type: x.dtype
197+
type: x.dtype,
198+
isNumeric: x.is_numeric
197199
};
198200
});
199201
callback(list);
@@ -340,6 +342,7 @@ define([
340342
}
341343

342344
renderSelectionBox(dataList) {
345+
let mode = this.mode;
343346
var tag = new com_String();
344347
tag.appendFormatLine('<div class="{0} {1} {2} {3}">', APP_SELECT_BOX, 'left', APP_DROPPABLE, 'no-selection vp-scrollbar');
345348
// get data and make draggable items
@@ -351,9 +354,17 @@ define([
351354
} else {
352355
info = '';
353356
}
357+
let iconStr = '';
358+
if (mode === 'columns') {
359+
if (data.isNumeric === true) {
360+
iconStr = '<span class="vp-icon-numeric mr5 vp-vertical-text"></span>';
361+
} else {
362+
iconStr = '<span class="vp-icon-non-numeric mr5 vp-vertical-text"></span>';
363+
}
364+
}
354365
// render item box
355-
tag.appendFormatLine('<div class="{0} {1}" data-idx="{2}" data-name="{3}" data-type="{4}" data-code="{5}" title="{6}"><span>{7}</span></div>'
356-
, APP_SELECT_ITEM, APP_DRAGGABLE, data.location, data.value, data.type, data.code, info, data.value);
366+
tag.appendFormatLine('<div class="{0} {1}" data-idx="{2}" data-name="{3}" data-type="{4}" data-code="{5}" title="{6}">{7}<span>{8}</span></div>'
367+
, APP_SELECT_ITEM, APP_DRAGGABLE, data.location, data.value, data.type, data.code, info, iconStr, data.value);
357368
});
358369
tag.appendLine('</div>'); // APP_SELECT_BOX
359370
return tag.toString();
@@ -371,9 +382,17 @@ define([
371382
} else {
372383
info = '';
373384
}
385+
let iconStr = '';
386+
if (mode === 'columns') {
387+
if (data.isNumeric === true) {
388+
iconStr = '<span class="vp-icon-numeric mr5 vp-vertical-text"></span>';
389+
} else {
390+
iconStr = '<span class="vp-icon-non-numeric mr5 vp-vertical-text"></span>';
391+
}
392+
}
374393
// render item box
375-
tag.appendFormatLine('<div class="{0} {1} {2}" data-idx="{3}" data-name="{4}" data-type="{5}" data-code="{6}" title="{7}"><span>{8}</span></div>'
376-
, APP_SELECT_ITEM, APP_DRAGGABLE, 'added', data.location, data.value, data.type, data.code, info, data.value);
394+
tag.appendFormatLine('<div class="{0} {1} {2}" data-idx="{3}" data-name="{4}" data-type="{5}" data-code="{6}" title="{7}">{8}<span>{9}</span></div>'
395+
, APP_SELECT_ITEM, APP_DRAGGABLE, 'added', data.location, data.value, data.type, data.code, info, iconStr, data.value);
377396
});
378397
tag.appendLine('</div>'); // APP_SELECT_BOX
379398
return tag.toString();

‎visualpython/js/m_apps/Subset.js‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -523,8 +523,14 @@ define([
523523
// col.array parsing
524524
var colInfo = com_util.safeString(col.array);
525525
// render column box
526-
tag.appendFormatLine('<div class="{0} {1} {2}" data-idx="{3}" data-colname="{4}" data-dtype="{5}" data-code="{6}" title="{7}"><span>{8}</span></div>',
527-
VP_DS_SELECT_ITEM, 'select-col', VP_DS_DRAGGABLE, col.location, col.value, col.dtype, col.code, col.label + ': \n' + colInfo, col.label);
526+
let numIconStr = '';
527+
if (col.isNumeric === true) {
528+
numIconStr = '<span class="vp-icon-numeric mr5 vp-vertical-text"></span>';
529+
} else {
530+
numIconStr = '<span class="vp-icon-non-numeric mr5 vp-vertical-text"></span>';
531+
}
532+
tag.appendFormatLine('<div class="{0} {1} {2}" data-idx="{3}" data-colname="{4}" data-dtype="{5}" data-code="{6}" title="{7}">{8}<span>{9}</span></div>',
533+
VP_DS_SELECT_ITEM, 'select-col', VP_DS_DRAGGABLE, col.location, col.value, col.dtype, col.code, col.label + ': \n' + colInfo, numIconStr, col.label);
528534
});
529535
tag.appendLine('</div>'); // VP_DS_SELECT_BOX
530536
$(this.wrapSelector('.select-col .' + VP_DS_SELECT_BOX + '.left')).replaceWith(function () {
@@ -1212,6 +1218,7 @@ define([
12121218
...x,
12131219
value: x.label,
12141220
code: x.value,
1221+
isNumeric: x.is_numeric
12151222
};
12161223
});
12171224
that.loadColumnList(list);

‎visualpython/python/pandasCommand.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def _vp_get_columns_list(df):
3737
"""
3838
colInfo = { 'name': list(df.columns.names), 'level': df.columns.nlevels, 'list': [] }
3939
for i, c in enumerate(df.columns):
40-
cInfo = { 'label': c, 'value': c, 'dtype': str(df[c].dtype), 'array': str(df[c].array), 'location': i }
40+
cInfo = { 'label': c, 'value': c, 'dtype': str(df[c].dtype), 'is_numeric': _vp_pd.api.types.is_numeric_dtype(df[c]), 'array': str(df[c].array), 'location': i }
4141
# value
4242
if type(c).__name__ == 'list' or type(c).__name__ == 'tuple':
4343
cInfo['label'] = list(c)

0 commit comments

Comments
 (0)