Skip to content

Merge for v2.2.5 #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 25 commits into from
Jun 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
6640067
Add inline code on Chart Style
Jun 20, 2022
1104e91
Fix bug: generated code bug on Markdown app
Jun 20, 2022
f85d2e0
Add test code for user code on Plotly app
Jun 20, 2022
e4ff2e5
Fix to refresh preview for bluring textarea on Seaborn, Plotly app
Jun 20, 2022
c0e4486
Add x_label, y_label option on Plotly app
Jun 20, 2022
7f771e0
Add color option on Plotly app
Jun 20, 2022
6d4492d
Add top count option for Plot_Feature_importances
Jun 21, 2022
4e5ba71
Edit label, input type on Pandas Plot and Subset app
Jun 21, 2022
06e61d1
Edit label on File app
Jun 21, 2022
3d44c01
Edit additional option page to open by default on Matplotlib app
Jun 21, 2022
08321ae
Fix code bug on Matplotlib app
Jun 21, 2022
8ab4d5e
Add show values precision option on Seaborn app
Jun 21, 2022
1b342f1
Edit placeholder for DataSelector, VarSelector2, SuggestInput components
Jun 21, 2022
7060024
Fix bug on Profiling app
Jun 21, 2022
369ab2b
Fix bug on Frame app
Jun 21, 2022
6dbf090
Fix signature comment
Jun 21, 2022
5be1ef5
Edit popup component to focus on empty required field
Jun 22, 2022
8235e0a
Add Sort values to Seaborn app
Jun 22, 2022
c1147ae
Add Sort option to Plotly app
Jun 22, 2022
dd1c065
Add DataSelector to PandasPlot app
Jun 22, 2022
6251919
Edit figsize option's input on PandasPlot app
Jun 22, 2022
b2e35e0
Add parent folder to FileNavigation component
Jun 22, 2022
4587a36
small changes
Jun 22, 2022
a75ff41
Add checking functions and package whether it is declared or not
Jun 22, 2022
6a2dbf2
Fix checking func/pack module
Jun 22, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions data/libraries.json
Original file line number Diff line number Diff line change
Expand Up @@ -2154,8 +2154,7 @@
"tag" : "PANDAS PLOT,PANDAS",
"path" : "visualpython - library - pandas - plot",
"desc" : "Pandas Plot",
"file" : "m_library/m_pandas/plot",
"useAuto" : true
"file" : "m_library/m_pandas/PandasPlot"
},
{
"id" : "pdPkg_inputOutput",
Expand Down
31 changes: 14 additions & 17 deletions data/m_library/pandasLibrary.js
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ define([
{
name:'i0',
type:'var',
label: 'Target Variable',
label: 'DataFrame',
component: 'var_select',
var_type: ['DataFrame', 'Series']
},
Expand Down Expand Up @@ -2936,7 +2936,7 @@ define([
{
name: 'i0',
type:'var',
label: 'Target Variable',
label: 'DataFrame',
component: 'var_select',
var_type: ['DataFrame', 'Series']
}
Expand Down Expand Up @@ -2974,7 +2974,7 @@ define([
{
name: 'i0',
type:'var',
label: 'Target Variable',
label: 'DataFrame',
component: 'var_select',
var_type: ['DataFrame', 'Series']
},
Expand Down Expand Up @@ -5017,22 +5017,17 @@ define([
name: 'Plot',
library: 'pandas',
description: 'create chart',
code: '${o0} = ${i0}.plot(${v}${etc})\nplt.show()',
code: '${i0}.plot(${v}${etc})\nplt.show()',
input: [
{
name: 'i0',
type:'var',
label: 'Pandas Object',
component: 'var_select',
var_type: ['DataFrame', 'Series']
type: 'var',
label: 'DataFrame',
var_type: ['DataFrame', 'Series'],
required: true
}
],
output: [
{
name:'o0',
type:'var',
label:'Allocate to'
}
],
variable: [
{
Expand All @@ -5046,7 +5041,7 @@ define([
},
{
name: 'title',
type: ['text', 'list'],
type: 'text',
label: 'Chart Title'
},
{
Expand All @@ -5058,6 +5053,7 @@ define([
{
name: 'fontsize',
type: 'int',
component: 'input_number',
label: 'Font Size'
},
{
Expand Down Expand Up @@ -5089,16 +5085,17 @@ define([
{
name: 'rot',
type: 'int',
component: 'input_number',
label: 'X Label Rotation'
},
{
name: 'xlabel',
type: 'list',
type: 'text',
label: 'X Label'
},
{
name: 'ylabel',
type: 'list',
type: 'text',
label: 'Y Label'
},
{
Expand Down Expand Up @@ -5210,7 +5207,7 @@ define([
{
name: 'i0',
type: 'var',
label: 'Target Variable',
label: 'DataFrame',
component: 'var_select',
var_type: ['DataFrame', 'Series']
},
Expand Down
51 changes: 34 additions & 17 deletions data/m_visualize/plotlyLibrary.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,68 +25,74 @@ define([
//========================================================================
'scatter': {
name: 'Scatter Plot',
code: '${allocateTo} = px.scatter(${data}${x}${y}${etc})',
code: '${allocateTo} = px.scatter(${data}${x}${y}${color}${etc})',
description: 'Draw a scatter plot with possibility of several semantic groupings.',
options: [
{ name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'] },
{ name: 'x', component: ['col_select'], usePair: true },
{ name: 'y', component: ['col_select'], usePair: true },
{ name: 'color', component: ['col_select'], usePair: true },
{ name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true }
]
},
'line': {
name: 'Line Plot',
code: '${allocateTo} = px.line(${data}${x}${y}${etc})',
code: '${allocateTo} = px.line(${data}${x}${y}${color}${etc})',
description: 'Draw a line plot with possibility of several semantic groupings.',
options: [
{ name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'] },
{ name: 'x', component: ['col_select'], usePair: true },
{ name: 'y', component: ['col_select'], usePair: true },
{ name: 'color', component: ['col_select'], usePair: true },
{ name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true }
]
},
'area': {
name: 'Line Plot',
code: '${allocateTo} = px.area(${data}${x}${y}${etc})',
code: '${allocateTo} = px.area(${data}${x}${y}${color}${etc})',
description: 'Draw a area plot.',
options: [
{ name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'] },
{ name: 'x', component: ['col_select'], usePair: true },
{ name: 'y', component: ['col_select'], usePair: true },
{ name: 'color', component: ['col_select'], usePair: true },
{ name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true }
]
},
'bar': {
name: 'Bar Plot',
code: '${allocateTo} = px.bar(${data}${x}${y}${etc})',
code: '${allocateTo} = px.bar(${data}${x}${y}${color}${etc})',
description: 'Draw a bar plot.',
options: [
{ name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'] },
{ name: 'x', component: ['col_select'], usePair: true },
{ name: 'y', component: ['col_select'], usePair: true },
{ name: 'color', component: ['col_select'], usePair: true },
{ name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true }
]
},
'funnel': {
name: 'Funnel Plot',
code: '${allocateTo} = px.funnel(${data}${x}${y}${etc})',
code: '${allocateTo} = px.funnel(${data}${x}${y}${color}${etc})',
description: 'Draw a funnel plot.',
options: [
{ name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'] },
{ name: 'x', component: ['col_select'], usePair: true },
{ name: 'y', component: ['col_select'], usePair: true },
{ name: 'color', component: ['col_select'], usePair: true },
{ name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true }
]
},
'timeline': {
name: 'Timeline Plot',
code: '${allocateTo} = px.timeline(${data}${x_start}${x_end}${y}${etc})',
code: '${allocateTo} = px.timeline(${data}${x_start}${x_end}${y}${color}${etc})',
description: 'Draw a timeline plot.',
options: [
{ name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'] },
{ name: 'x_start', label: 'X start', component: ['col_select'], usePair: true },
{ name: 'x_end', label: 'X end', component: ['col_select'], usePair: true },
{ name: 'y', component: ['col_select'], usePair: true },
{ name: 'color', component: ['col_select'], usePair: true },
{ name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true }
]
},
Expand All @@ -95,62 +101,67 @@ define([
//========================================================================
'pie': {
name: 'Pie Plot',
code: '${allocateTo} = px.pie(${data}${values}${names}${etc})',
code: '${allocateTo} = px.pie(${data}${values}${names}${color}${etc})',
description: 'Draw a pie plot.',
options: [
{ name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'] },
{ name: 'values', label: 'Values', component: ['col_select'], usePair: true },
{ name: 'names', label: 'Names', component: ['col_select'], usePair: true },
{ name: 'color', component: ['col_select'], usePair: true },
{ name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true }
]
},
'sunburst': {
name: 'Sunburst',
code: '${allocateTo} = px.sunburst(${data}${values}${names}${parents}${path}${etc})',
code: '${allocateTo} = px.sunburst(${data}${values}${names}${color}${parents}${path}${etc})',
description: 'Draw a sunburst plot.',
options: [
{ name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'] },
{ name: 'values', label: 'Values', component: ['col_select'], usePair: true },
{ name: 'names', label: 'Names', component: ['col_select'], usePair: true },
{ name: 'color', component: ['col_select'], usePair: true },
{ name: 'parents', label: 'Parents', component: ['col_select'], usePair: true },
{ name: 'path', label: 'Path', component: ['data_select'], var_type: ['ndarray', 'list'], usePair: true },
{ name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true }
]
},
'treemap': {
name: 'Treemap',
code: '${allocateTo} = px.treemap(${data}${values}${names}${parents}${path}${etc})',
code: '${allocateTo} = px.treemap(${data}${values}${names}${color}${parents}${path}${etc})',
description: 'Draw a treemap plot.',
options: [
{ name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'] },
{ name: 'values', label: 'Values', component: ['col_select'], usePair: true },
{ name: 'names', label: 'Names', component: ['col_select'], usePair: true },
{ name: 'color', component: ['col_select'], usePair: true },
{ name: 'parents', label: 'Parents', component: ['col_select'], usePair: true },
{ name: 'path', label: 'Path', component: ['data_select'], var_type: ['ndarray', 'list'], usePair: true },
{ name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true }
]
},
'icicle': {
name: 'Icicle',
code: '${allocateTo} = px.icicle(${data}${values}${names}${parents}${path}${etc})',
code: '${allocateTo} = px.icicle(${data}${values}${names}${color}${parents}${path}${etc})',
description: 'Draw a icicle plot.',
options: [
{ name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'] },
{ name: 'values', label: 'Values', component: ['col_select'], usePair: true },
{ name: 'names', label: 'Names', component: ['col_select'], usePair: true },
{ name: 'color', component: ['col_select'], usePair: true },
{ name: 'parents', label: 'Parents', component: ['col_select'], usePair: true },
{ name: 'path', label: 'Path', component: ['data_select'], var_type: ['ndarray', 'list'], usePair: true },
{ name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true }
]
},
'funnel_area': {
name: 'Funnel area',
code: '${allocateTo} = px.funnel_area(${data}${values}${names}${etc})',
code: '${allocateTo} = px.funnel_area(${data}${values}${names}${color}${etc})',
description: 'Draw a funnel area.',
options: [
{ name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'] },
{ name: 'values', label: 'Values', component: ['col_select'], usePair: true },
{ name: 'names', label: 'Names', component: ['col_select'], usePair: true },
{ name: 'color', component: ['col_select'], usePair: true },
{ name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true }
]
},
Expand All @@ -159,56 +170,61 @@ define([
//========================================================================
'histogram': {
name: 'Histogram',
code: '${allocateTo} = px.histogram(${data}${x}${y}${etc})',
code: '${allocateTo} = px.histogram(${data}${x}${y}${color}${etc})',
description: 'Draw a histogram plot.',
options: [
{ name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'] },
{ name: 'x', component: ['col_select'], usePair: true },
{ name: 'y', component: ['col_select'], usePair: true },
{ name: 'color', component: ['col_select'], usePair: true },
{ name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true }
]
},
'box': {
name: 'Box plot',
code: '${allocateTo} = px.box(${data}${x}${y}${etc})',
code: '${allocateTo} = px.box(${data}${x}${y}${color}${etc})',
description: 'Draw a box plot.',
options: [
{ name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'] },
{ name: 'x', component: ['col_select'], usePair: true },
{ name: 'y', component: ['col_select'], usePair: true },
{ name: 'color', component: ['col_select'], usePair: true },
{ name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true }
]
},
'violin': {
name: 'Violin plot',
code: '${allocateTo} = px.violin(${data}${x}${y}${etc})',
code: '${allocateTo} = px.violin(${data}${x}${y}${color}${etc})',
description: 'Draw a violin plot.',
options: [
{ name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'] },
{ name: 'x', component: ['col_select'], usePair: true },
{ name: 'y', component: ['col_select'], usePair: true },
{ name: 'color', component: ['col_select'], usePair: true },
{ name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true }
]
},
'strip': {
name: 'Strip plot',
code: '${allocateTo} = px.strip(${data}${x}${y}${etc})',
code: '${allocateTo} = px.strip(${data}${x}${y}${color}${etc})',
description: 'Draw a strip plot.',
options: [
{ name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'] },
{ name: 'x', component: ['col_select'], usePair: true },
{ name: 'y', component: ['col_select'], usePair: true },
{ name: 'color', component: ['col_select'], usePair: true },
{ name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true }
]
},
'ecdf': {
name: 'Ecdf plot',
code: '${allocateTo} = px.ecdf(${data}${x}${y}${etc})',
code: '${allocateTo} = px.ecdf(${data}${x}${y}${color}${etc})',
description: 'Draw a ecdf plot.',
options: [
{ name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'] },
{ name: 'x', component: ['col_select'], usePair: true },
{ name: 'y', component: ['col_select'], usePair: true },
{ name: 'color', component: ['col_select'], usePair: true },
{ name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true }
]
},
Expand All @@ -229,13 +245,14 @@ define([
},
'density_contour': {
name: 'Density contour',
code: '${allocateTo} = px.density_contour(${data}${x}${y}${z}${etc})',
code: '${allocateTo} = px.density_contour(${data}${x}${y}${z}${color}${etc})',
description: 'Draw a density contour plot.',
options: [
{ name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'] },
{ name: 'x', component: ['col_select'], usePair: true },
{ name: 'y', component: ['col_select'], usePair: true },
{ name: 'z', component: ['col_select'], usePair: true },
{ name: 'color', component: ['col_select'], usePair: true },
{ name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true }
]
},
Expand Down
2 changes: 1 addition & 1 deletion html/m_apps/bind.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<div class="vp-bd-type-box concat">
<div>
<label for="vp_bdVariable" class="vp-orange-text w100">DataFrame</label>
<input type="text" id="vp_bdVariable" placeholder="Select variables" readonly="">
<input type="text" id="vp_bdVariable" placeholder="Select variables" readonly="" required="true"t>
</div>
<div>
<label for="vp_bdJoin" class="w100">Join</label>
Expand Down
2 changes: 1 addition & 1 deletion html/m_apps/groupby.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</div>
<div>
<label for="vp_gbBy" class="vp-orange-text w80">Groupby</label>
<input type="text" id="vp_gbBy" placeholder="Groupby columns" readonly="">
<input type="text" id="vp_gbBy" placeholder="Groupby columns" readonly="" required="true">
<label><input type="checkbox" id="vp_gbByGrouper" disabled=""><span>Grouper</span></label>
<div class="vp-gb-by-grouper-box" style="display:none;">
<input type="number" id="vp_gbByGrouperNumber" class="vp-gb-by-number">
Expand Down
2 changes: 1 addition & 1 deletion html/m_apps/pdf.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<div class="vp-pdf-df-box">
<label for="vp_pdfVariable" class="vp-orange-text">File Path</label>
<div>
<input type="text" id="vp_pdfFile" class="vp-state vp-input input-single vp-pdf-filepath" index="0" placeholder="" value="" title=""><div id="vp_openFileNavigationBtn" class="vp-file-browser-button"></div>
<input type="text" id="vp_pdfFile" class="vp-state vp-input input-single vp-pdf-filepath" index="0" placeholder="" value="" title="" required="true"><div id="vp_openFileNavigationBtn" class="vp-file-browser-button"></div>
</div>
<label for="vp_pdfReturn">Allocate to</label>
<div>
Expand Down
Loading