', 'vp-gb-method-box');
- this.methodList.forEach(method => {
+ this.methodList.forEach((method, idx) => {
+ if (idx == 0) {
+ return ;
+ }
+ var methodStr = "'" + method.value + "'";
var checked = "";
- if (previousList && previousList.includes(method.value)) {
+ if (previousList && previousList.includes(methodStr)) {
checked = "checked"
}
page.appendFormatLine(''
- , method.value, checked, method.label);
+ , methodStr, checked, method.label);
});
page.appendLine('
');
page.appendLine(''); @@ -772,6 +776,12 @@ define([ } var advMethod = $(advItemTags[i]).find('.vp-gb-adv-method').data('list'); var advUserMethod = $(advItemTags[i]).find('.vp-gb-adv-method').data('userList'); + if (!advMethod || advMethod == null) { + advMethod = []; + } + if (!advUserMethod || advUserMethod == null) { + advUserMethod = []; + } advMethod = [ ...advMethod, ...advUserMethod ]; var advNaming = $(advItemTags[i]).find('.vp-gb-adv-naming').data('dict'); if (!advMethod || advMethod.length <= 0) { diff --git a/visualpython/js/m_apps/Instance.js b/visualpython/js/m_apps/Instance.js index 512c6f76..e2253474 100644 --- a/visualpython/js/m_apps/Instance.js +++ b/visualpython/js/m_apps/Instance.js @@ -16,11 +16,12 @@ define([ __VP_TEXT_LOADER__('vp_base/html/m_apps/instance.html'), // INTEGRATION: unified version of text loader __VP_CSS_LOADER__('vp_base/css/m_apps/instance'), // INTEGRATION: unified version of css loader 'vp_base/js/com/com_String', + 'vp_base/js/com/com_util', 'vp_base/js/com/component/PopupComponent', 'vp_base/js/com/component/InstanceEditor', 'vp_base/js/com/component/DataSelector', 'vp_base/js/m_apps/Subset' -], function(insHtml, insCss, com_String, PopupComponent, InstanceEditor, DataSelector, Subset) { +], function(insHtml, insCss, com_String, com_util, PopupComponent, InstanceEditor, DataSelector, Subset) { const MAX_STACK_SIZE = 20; @@ -32,10 +33,11 @@ define([ super._init(); /** Write codes executed before rendering */ this.config.dataview = false; - this.config.sizeLevel = 1; + this.config.size = { width: 1064, height: 550 }; this.config.checkModules = ['pd']; this.state = { + target: '', vp_instanceVariable: '', variable: { stack: [] @@ -54,6 +56,12 @@ define([ _bindEvent() { super._bindEvent(); let that = this; + // target change + $(this.wrapSelector('#vp_instanceTarget')).on('change', function(event) { + let value = $(this).val(); + that.updateValue(value); + that.reloadInsEditor('variable'); + }); // clear $(this.wrapSelector('#vp_instanceClear')).on('click', function(event) { that.addStack(); @@ -177,9 +185,26 @@ define([ } templateForBody() { + let that = this; let page = $(insHtml); $(page).find('#vp_instanceVariable').val(this.state.vp_instanceVariable); + let targetSelector = new DataSelector({ + pageThis: this, id: 'vp_instanceTarget', placeholder: 'Select variable', + allowDataType: [ + 'DataFrame', 'Series', 'dict', 'list', 'int' + ], + finish: function(value, dtype) { + $(that.wrapSelector('#vp_instanceTarget')).trigger({type: 'change', value: value}); + }, + select: function(value, dtype) { + $(that.wrapSelector('#vp_instanceTarget')).trigger({type: 'change', value: value}); + // that.updateValue(value); + // that.reloadInsEditor('variable'); + } + }); + $(page).find('#vp_instanceTarget').replaceWith(targetSelector.toTagString()); + let allocateSelector = new DataSelector({ pageThis: this, id: 'vp_instanceAllocate', placeholder: 'Variable name' }); @@ -195,7 +220,7 @@ define([ let that = this; // vpSubsetEditor - this.subsetEditor = new Subset({ pandasObject: '', config: { name: 'Subset' } }, + this.subsetEditor = new Subset({ pandasObject: '', config: { name: 'Subset', category: this.name } }, { useInputVariable: true, targetSelector: this.wrapSelector('#vp_instanceVariable'), @@ -211,7 +236,7 @@ define([ this.ALLOW_SUBSET_TYPES = this.subsetEditor.getAllowSubsetTypes(); // vpInstanceEditor - this.insEditor = new InstanceEditor(this, "vp_instanceVariable", 'vp_variableInsEditContainer'); + this.insEditor = new InstanceEditor(this, "vp_instanceVariable", 'vp_variableInsEditContainer', { targetType: 'outside' }); this.insEditor.show(); @@ -268,6 +293,56 @@ define([ cm.setCursor({ line: 0, ch: value.length}); } this.state.vp_instanceVariable = value; + + // show preview + this.loadPreview(value); + } + + loadPreview(code) { + let that = this; + if (!code || code === '') { + $(that.wrapSelector('#instancePreview')).html(''); + return; + } + // show variable information on clicking variable + vpKernel.execute(code).then(function(resultObj) { + let { result, type, msg } = resultObj; + if (msg.content.data) { + var textResult = msg.content.data["text/plain"]; + var htmlResult = msg.content.data["text/html"]; + var imgResult = msg.content.data["image/png"]; + + $(that.wrapSelector('#instancePreview')).html(''); + if (htmlResult != undefined) { + // 1. HTML tag + $(that.wrapSelector('#instancePreview')).append(htmlResult); + } else if (imgResult != undefined) { + // 2. Image data (base64) + var imgTag = '
';
+ $(that.wrapSelector('#instancePreview')).append(imgTag);
+ } else if (textResult != undefined) {
+ // 3. Text data
+ var preTag = document.createElement('pre');
+ $(preTag).text(textResult);
+ $(that.wrapSelector('#instancePreview')).html(preTag);
+ }
+ } else {
+ var errorContent = '';
+ if (msg.content.ename) {
+ errorContent = com_util.templateForErrorBox(msg.content.ename, msg.content.evalue, msg.content.detail);
+ }
+ $(that.wrapSelector('#instancePreview')).html(errorContent);
+ vpLog.display(VP_LOG_TYPE.ERROR, msg.content.ename, msg.content.evalue, msg.content);
+ }
+ }).catch(function(resultObj) {
+ let { msg } = resultObj;
+ var errorContent = '';
+ if (msg.content.ename) {
+ errorContent = com_util.templateForErrorBox(msg.content.ename, msg.content.evalue, msg.content.detail);
+ }
+ $(that.wrapSelector('#instancePreview')).html(errorContent);
+ vpLog.display(VP_LOG_TYPE.ERROR, msg.content.ename, msg.content.evalue, msg.content);
+ });
}
addStack() {
diff --git a/visualpython/js/m_apps/PandasOption.js b/visualpython/js/m_apps/PandasOption.js
new file mode 100644
index 00000000..b4eb97b2
--- /dev/null
+++ b/visualpython/js/m_apps/PandasOption.js
@@ -0,0 +1,101 @@
+/*
+ * Project Name : Visual Python
+ * Description : GUI-based Python code generator
+ * File Name : PandasOption.js
+ * Author : Black Logic
+ * Note : Pandas option
+ * License : GNU GPLv3 with Visual Python special exception
+ * Date : 2023. 03. 28
+ * Change Date :
+ */
+
+//============================================================================
+// [CLASS] PandasOption
+//============================================================================
+define([
+ __VP_TEXT_LOADER__('vp_base/html/m_apps/pandasOption.html'),
+ 'vp_base/js/com/com_util',
+ 'vp_base/js/com/com_Const',
+ 'vp_base/js/com/com_String',
+ 'vp_base/js/com/component/PopupComponent',
+ 'vp_base/js/com/component/DataSelector'
+], function(poHTML, com_util, com_Const, com_String, PopupComponent, DataSelector) {
+
+ /**
+ * PandasOption
+ */
+ class PandasOption extends PopupComponent {
+ _init() {
+ super._init();
+ /** Write codes executed before rendering */
+ this.config.sizeLevel = 2;
+ this.config.dataview = false;
+ this.config.checkModules = ['pd'];
+
+ this.state = {
+ min_rows: '',
+ max_rows: '',
+ max_cols: '',
+ max_colwidth: '',
+ float_format: '',
+ precision: '',
+ chop_threshold: '',
+ expand_frame_repr: '',
+ ...this.state
+ }
+ }
+
+ _bindEvent() {
+ super._bindEvent();
+ /** Implement binding events */
+ var that = this;
+
+ // setting popup - set default
+ $(this.wrapSelector('#setDefault')).on('change', function() {
+ let checked = $(this).prop('checked');
+
+ if (checked) {
+ // disable input
+ $(that.wrapSelector('.vp-pandas-option-body input')).prop('disabled', true);
+ } else {
+ // enable input
+ $(that.wrapSelector('.vp-pandas-option-body input')).prop('disabled', false);
+ }
+ });
+ }
+
+ templateForBody() {
+ let page = $(poHTML);
+
+ return page;
+ }
+
+ render() {
+ super.render();
+
+
+ }
+
+ generateCode() {
+ let that = this;
+ let code = [];
+
+ let setDefault = $(this.wrapSelector('#setDefault')).prop('checked');
+ if (setDefault == true) {
+ Object.keys(this.state).forEach((key) => {
+ code.push(com_util.formatString("pd.reset_option('display.{0}')", key));
+ })
+ } else {
+ Object.keys(this.state).forEach((key) => {
+ if (that.state[key] && that.state[key] != '') {
+ code.push(com_util.formatString("pd.set_option('display.{0}', {1})", key, that.state[key]));
+ }
+ })
+ }
+ return code.join('\n');
+ }
+
+ }
+
+ return PandasOption;
+});
\ No newline at end of file
diff --git a/visualpython/js/m_apps/Subset.js b/visualpython/js/m_apps/Subset.js
index c446d458..762d885e 100644
--- a/visualpython/js/m_apps/Subset.js
+++ b/visualpython/js/m_apps/Subset.js
@@ -1145,13 +1145,6 @@ define([
that.focus();
});
$(this.targetSelector).on('apply_option_page', function(evt) {
- let code = that.generateCode();
-
- // if finish callback is available
- if (that.finish && typeof that.finish == 'function') {
- that.finish(code);
- }
-
that.close();
});
}
diff --git a/visualpython/js/m_apps/Sweetviz.js b/visualpython/js/m_apps/Sweetviz.js
index c0284f44..d0071449 100644
--- a/visualpython/js/m_apps/Sweetviz.js
+++ b/visualpython/js/m_apps/Sweetviz.js
@@ -100,7 +100,7 @@ define([
}
var title = $(that.wrapSelector('#vp_pfTitle')).val();
var filePath = $(that.wrapSelector('#vp_pfPath')).val();
- var openBrowser = $(that.wrapSelector('#vp_pfOpenBrowser')).prop('checked');
+ // var openBrowser = $(that.wrapSelector('#vp_pfOpenBrowser')).prop('checked');
var code = new com_String();
switch(parseInt(type)) {
case PROFILE_TYPE.GENERATE:
@@ -110,14 +110,14 @@ define([
} else {
code.appendFormatLine("{0} = sweetviz.analyze({1})", saveas, df);
}
- // show html
- code.appendFormat("{0}.show_html(", saveas);
+ // show notebook
+ code.appendFormat("{0}.show_notebook(", saveas);
if (filePath && filePath != '') {
code.appendFormat("filepath='{0}'", filePath);
}
- if (openBrowser === false) {
- code.append(", open_browser=False");
- }
+ // if (openBrowser === false) {
+ // code.append(", open_browser=False");
+ // }
code.appendLine(')');
code.append(saveas);
break;
diff --git a/visualpython/js/menu/TaskItem.js b/visualpython/js/menu/TaskItem.js
index 540c35c0..dcb63181 100644
--- a/visualpython/js/menu/TaskItem.js
+++ b/visualpython/js/menu/TaskItem.js
@@ -64,8 +64,9 @@ define([
_getOptionInfo() {
let task = this.state.task;
let info = {};
- if (task && task.state && task.state.config) {
- let { id, name, desc, apps }= task.state.config;
+ if (task && task.state && task.config) {
+ let { id, name } = task;
+ let { desc, apps }= task.config;
info = {
id: id,
title: name,