Skip to content

Commit dca7cf3

Browse files
minjk-blminjk-bl
authored
Merge pull request #138 from minjk-bl/devops
Merge for v2.2.5
2 parents ddcd693 + 6a2dbf2 commit dca7cf3

54 files changed

Lines changed: 958 additions & 326 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎data/libraries.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2154,8 +2154,7 @@
21542154
"tag" : "PANDAS PLOT,PANDAS",
21552155
"path" : "visualpython - library - pandas - plot",
21562156
"desc" : "Pandas Plot",
2157-
"file" : "m_library/m_pandas/plot",
2158-
"useAuto" : true
2157+
"file" : "m_library/m_pandas/PandasPlot"
21592158
},
21602159
{
21612160
"id" : "pdPkg_inputOutput",

‎data/m_library/pandasLibrary.js‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ define([
207207
{
208208
name:'i0',
209209
type:'var',
210-
label: 'Target Variable',
210+
label: 'DataFrame',
211211
component: 'var_select',
212212
var_type: ['DataFrame', 'Series']
213213
},
@@ -2936,7 +2936,7 @@ define([
29362936
{
29372937
name: 'i0',
29382938
type:'var',
2939-
label: 'Target Variable',
2939+
label: 'DataFrame',
29402940
component: 'var_select',
29412941
var_type: ['DataFrame', 'Series']
29422942
}
@@ -2974,7 +2974,7 @@ define([
29742974
{
29752975
name: 'i0',
29762976
type:'var',
2977-
label: 'Target Variable',
2977+
label: 'DataFrame',
29782978
component: 'var_select',
29792979
var_type: ['DataFrame', 'Series']
29802980
},
@@ -5017,22 +5017,17 @@ define([
50175017
name: 'Plot',
50185018
library: 'pandas',
50195019
description: 'create chart',
5020-
code: '${o0} = ${i0}.plot(${v}${etc})\nplt.show()',
5020+
code: '${i0}.plot(${v}${etc})\nplt.show()',
50215021
input: [
50225022
{
50235023
name: 'i0',
5024-
type:'var',
5025-
label: 'Pandas Object',
5026-
component: 'var_select',
5027-
var_type: ['DataFrame', 'Series']
5024+
type: 'var',
5025+
label: 'DataFrame',
5026+
var_type: ['DataFrame', 'Series'],
5027+
required: true
50285028
}
50295029
],
50305030
output: [
5031-
{
5032-
name:'o0',
5033-
type:'var',
5034-
label:'Allocate to'
5035-
}
50365031
],
50375032
variable: [
50385033
{
@@ -5046,7 +5041,7 @@ define([
50465041
},
50475042
{
50485043
name: 'title',
5049-
type: ['text', 'list'],
5044+
type: 'text',
50505045
label: 'Chart Title'
50515046
},
50525047
{
@@ -5058,6 +5053,7 @@ define([
50585053
{
50595054
name: 'fontsize',
50605055
type: 'int',
5056+
component: 'input_number',
50615057
label: 'Font Size'
50625058
},
50635059
{
@@ -5089,16 +5085,17 @@ define([
50895085
{
50905086
name: 'rot',
50915087
type: 'int',
5088+
component: 'input_number',
50925089
label: 'X Label Rotation'
50935090
},
50945091
{
50955092
name: 'xlabel',
5096-
type: 'list',
5093+
type: 'text',
50975094
label: 'X Label'
50985095
},
50995096
{
51005097
name: 'ylabel',
5101-
type: 'list',
5098+
type: 'text',
51025099
label: 'Y Label'
51035100
},
51045101
{
@@ -5210,7 +5207,7 @@ define([
52105207
{
52115208
name: 'i0',
52125209
type: 'var',
5213-
label: 'Target Variable',
5210+
label: 'DataFrame',
52145211
component: 'var_select',
52155212
var_type: ['DataFrame', 'Series']
52165213
},

‎data/m_visualize/plotlyLibrary.js‎

Lines changed: 34 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,68 +25,74 @@ define([
2525
//========================================================================
2626
'scatter': {
2727
name: 'Scatter Plot',
28-
code: '${allocateTo} = px.scatter(${data}${x}${y}${etc})',
28+
code: '${allocateTo} = px.scatter(${data}${x}${y}${color}${etc})',
2929
description: 'Draw a scatter plot with possibility of several semantic groupings.',
3030
options: [
3131
{ name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'] },
3232
{ name: 'x', component: ['col_select'], usePair: true },
3333
{ name: 'y', component: ['col_select'], usePair: true },
34+
{ name: 'color', component: ['col_select'], usePair: true },
3435
{ name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true }
3536
]
3637
},
3738
'line': {
3839
name: 'Line Plot',
39-
code: '${allocateTo} = px.line(${data}${x}${y}${etc})',
40+
code: '${allocateTo} = px.line(${data}${x}${y}${color}${etc})',
4041
description: 'Draw a line plot with possibility of several semantic groupings.',
4142
options: [
4243
{ name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'] },
4344
{ name: 'x', component: ['col_select'], usePair: true },
4445
{ name: 'y', component: ['col_select'], usePair: true },
46+
{ name: 'color', component: ['col_select'], usePair: true },
4547
{ name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true }
4648
]
4749
},
4850
'area': {
4951
name: 'Line Plot',
50-
code: '${allocateTo} = px.area(${data}${x}${y}${etc})',
52+
code: '${allocateTo} = px.area(${data}${x}${y}${color}${etc})',
5153
description: 'Draw a area plot.',
5254
options: [
5355
{ name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'] },
5456
{ name: 'x', component: ['col_select'], usePair: true },
5557
{ name: 'y', component: ['col_select'], usePair: true },
58+
{ name: 'color', component: ['col_select'], usePair: true },
5659
{ name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true }
5760
]
5861
},
5962
'bar': {
6063
name: 'Bar Plot',
61-
code: '${allocateTo} = px.bar(${data}${x}${y}${etc})',
64+
code: '${allocateTo} = px.bar(${data}${x}${y}${color}${etc})',
6265
description: 'Draw a bar plot.',
6366
options: [
6467
{ name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'] },
6568
{ name: 'x', component: ['col_select'], usePair: true },
6669
{ name: 'y', component: ['col_select'], usePair: true },
70+
{ name: 'color', component: ['col_select'], usePair: true },
6771
{ name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true }
6872
]
6973
},
7074
'funnel': {
7175
name: 'Funnel Plot',
72-
code: '${allocateTo} = px.funnel(${data}${x}${y}${etc})',
76+
code: '${allocateTo} = px.funnel(${data}${x}${y}${color}${etc})',
7377
description: 'Draw a funnel plot.',
7478
options: [
7579
{ name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'] },
7680
{ name: 'x', component: ['col_select'], usePair: true },
7781
{ name: 'y', component: ['col_select'], usePair: true },
82+
{ name: 'color', component: ['col_select'], usePair: true },
7883
{ name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true }
7984
]
8085
},
8186
'timeline': {
8287
name: 'Timeline Plot',
83-
code: '${allocateTo} = px.timeline(${data}${x_start}${x_end}${y}${etc})',
88+
code: '${allocateTo} = px.timeline(${data}${x_start}${x_end}${y}${color}${etc})',
8489
description: 'Draw a timeline plot.',
8590
options: [
8691
{ name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'] },
8792
{ name: 'x_start', label: 'X start', component: ['col_select'], usePair: true },
8893
{ name: 'x_end', label: 'X end', component: ['col_select'], usePair: true },
8994
{ name: 'y', component: ['col_select'], usePair: true },
95+
{ name: 'color', component: ['col_select'], usePair: true },
9096
{ name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true }
9197
]
9298
},
@@ -95,62 +101,67 @@ define([
95101
//========================================================================
96102
'pie': {
97103
name: 'Pie Plot',
98-
code: '${allocateTo} = px.pie(${data}${values}${names}${etc})',
104+
code: '${allocateTo} = px.pie(${data}${values}${names}${color}${etc})',
99105
description: 'Draw a pie plot.',
100106
options: [
101107
{ name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'] },
102108
{ name: 'values', label: 'Values', component: ['col_select'], usePair: true },
103109
{ name: 'names', label: 'Names', component: ['col_select'], usePair: true },
110+
{ name: 'color', component: ['col_select'], usePair: true },
104111
{ name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true }
105112
]
106113
},
107114
'sunburst': {
108115
name: 'Sunburst',
109-
code: '${allocateTo} = px.sunburst(${data}${values}${names}${parents}${path}${etc})',
116+
code: '${allocateTo} = px.sunburst(${data}${values}${names}${color}${parents}${path}${etc})',
110117
description: 'Draw a sunburst plot.',
111118
options: [
112119
{ name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'] },
113120
{ name: 'values', label: 'Values', component: ['col_select'], usePair: true },
114121
{ name: 'names', label: 'Names', component: ['col_select'], usePair: true },
122+
{ name: 'color', component: ['col_select'], usePair: true },
115123
{ name: 'parents', label: 'Parents', component: ['col_select'], usePair: true },
116124
{ name: 'path', label: 'Path', component: ['data_select'], var_type: ['ndarray', 'list'], usePair: true },
117125
{ name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true }
118126
]
119127
},
120128
'treemap': {
121129
name: 'Treemap',
122-
code: '${allocateTo} = px.treemap(${data}${values}${names}${parents}${path}${etc})',
130+
code: '${allocateTo} = px.treemap(${data}${values}${names}${color}${parents}${path}${etc})',
123131
description: 'Draw a treemap plot.',
124132
options: [
125133
{ name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'] },
126134
{ name: 'values', label: 'Values', component: ['col_select'], usePair: true },
127135
{ name: 'names', label: 'Names', component: ['col_select'], usePair: true },
136+
{ name: 'color', component: ['col_select'], usePair: true },
128137
{ name: 'parents', label: 'Parents', component: ['col_select'], usePair: true },
129138
{ name: 'path', label: 'Path', component: ['data_select'], var_type: ['ndarray', 'list'], usePair: true },
130139
{ name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true }
131140
]
132141
},
133142
'icicle': {
134143
name: 'Icicle',
135-
code: '${allocateTo} = px.icicle(${data}${values}${names}${parents}${path}${etc})',
144+
code: '${allocateTo} = px.icicle(${data}${values}${names}${color}${parents}${path}${etc})',
136145
description: 'Draw a icicle plot.',
137146
options: [
138147
{ name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'] },
139148
{ name: 'values', label: 'Values', component: ['col_select'], usePair: true },
140149
{ name: 'names', label: 'Names', component: ['col_select'], usePair: true },
150+
{ name: 'color', component: ['col_select'], usePair: true },
141151
{ name: 'parents', label: 'Parents', component: ['col_select'], usePair: true },
142152
{ name: 'path', label: 'Path', component: ['data_select'], var_type: ['ndarray', 'list'], usePair: true },
143153
{ name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true }
144154
]
145155
},
146156
'funnel_area': {
147157
name: 'Funnel area',
148-
code: '${allocateTo} = px.funnel_area(${data}${values}${names}${etc})',
158+
code: '${allocateTo} = px.funnel_area(${data}${values}${names}${color}${etc})',
149159
description: 'Draw a funnel area.',
150160
options: [
151161
{ name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'] },
152162
{ name: 'values', label: 'Values', component: ['col_select'], usePair: true },
153163
{ name: 'names', label: 'Names', component: ['col_select'], usePair: true },
164+
{ name: 'color', component: ['col_select'], usePair: true },
154165
{ name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true }
155166
]
156167
},
@@ -159,56 +170,61 @@ define([
159170
//========================================================================
160171
'histogram': {
161172
name: 'Histogram',
162-
code: '${allocateTo} = px.histogram(${data}${x}${y}${etc})',
173+
code: '${allocateTo} = px.histogram(${data}${x}${y}${color}${etc})',
163174
description: 'Draw a histogram plot.',
164175
options: [
165176
{ name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'] },
166177
{ name: 'x', component: ['col_select'], usePair: true },
167178
{ name: 'y', component: ['col_select'], usePair: true },
179+
{ name: 'color', component: ['col_select'], usePair: true },
168180
{ name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true }
169181
]
170182
},
171183
'box': {
172184
name: 'Box plot',
173-
code: '${allocateTo} = px.box(${data}${x}${y}${etc})',
185+
code: '${allocateTo} = px.box(${data}${x}${y}${color}${etc})',
174186
description: 'Draw a box plot.',
175187
options: [
176188
{ name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'] },
177189
{ name: 'x', component: ['col_select'], usePair: true },
178190
{ name: 'y', component: ['col_select'], usePair: true },
191+
{ name: 'color', component: ['col_select'], usePair: true },
179192
{ name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true }
180193
]
181194
},
182195
'violin': {
183196
name: 'Violin plot',
184-
code: '${allocateTo} = px.violin(${data}${x}${y}${etc})',
197+
code: '${allocateTo} = px.violin(${data}${x}${y}${color}${etc})',
185198
description: 'Draw a violin plot.',
186199
options: [
187200
{ name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'] },
188201
{ name: 'x', component: ['col_select'], usePair: true },
189202
{ name: 'y', component: ['col_select'], usePair: true },
203+
{ name: 'color', component: ['col_select'], usePair: true },
190204
{ name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true }
191205
]
192206
},
193207
'strip': {
194208
name: 'Strip plot',
195-
code: '${allocateTo} = px.strip(${data}${x}${y}${etc})',
209+
code: '${allocateTo} = px.strip(${data}${x}${y}${color}${etc})',
196210
description: 'Draw a strip plot.',
197211
options: [
198212
{ name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'] },
199213
{ name: 'x', component: ['col_select'], usePair: true },
200214
{ name: 'y', component: ['col_select'], usePair: true },
215+
{ name: 'color', component: ['col_select'], usePair: true },
201216
{ name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true }
202217
]
203218
},
204219
'ecdf': {
205220
name: 'Ecdf plot',
206-
code: '${allocateTo} = px.ecdf(${data}${x}${y}${etc})',
221+
code: '${allocateTo} = px.ecdf(${data}${x}${y}${color}${etc})',
207222
description: 'Draw a ecdf plot.',
208223
options: [
209224
{ name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'] },
210225
{ name: 'x', component: ['col_select'], usePair: true },
211226
{ name: 'y', component: ['col_select'], usePair: true },
227+
{ name: 'color', component: ['col_select'], usePair: true },
212228
{ name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true }
213229
]
214230
},
@@ -229,13 +245,14 @@ define([
229245
},
230246
'density_contour': {
231247
name: 'Density contour',
232-
code: '${allocateTo} = px.density_contour(${data}${x}${y}${z}${etc})',
248+
code: '${allocateTo} = px.density_contour(${data}${x}${y}${z}${color}${etc})',
233249
description: 'Draw a density contour plot.',
234250
options: [
235251
{ name: 'data', component: ['var_select'], var_type: ['DataFrame', 'Series', 'list'] },
236252
{ name: 'x', component: ['col_select'], usePair: true },
237253
{ name: 'y', component: ['col_select'], usePair: true },
238254
{ name: 'z', component: ['col_select'], usePair: true },
255+
{ name: 'color', component: ['col_select'], usePair: true },
239256
{ name: 'allocateTo', label: 'Allocate To', component: ['input'], usePair: true }
240257
]
241258
},

‎html/m_apps/bind.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<div class="vp-bd-type-box concat">
1212
<div>
1313
<label for="vp_bdVariable" class="vp-orange-text w100">DataFrame</label>
14-
<input type="text" id="vp_bdVariable" placeholder="Select variables" readonly="">
14+
<input type="text" id="vp_bdVariable" placeholder="Select variables" readonly="" required="true"t>
1515
</div>
1616
<div>
1717
<label for="vp_bdJoin" class="w100">Join</label>

‎html/m_apps/groupby.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</div>
1010
<div>
1111
<label for="vp_gbBy" class="vp-orange-text w80">Groupby</label>
12-
<input type="text" id="vp_gbBy" placeholder="Groupby columns" readonly="">
12+
<input type="text" id="vp_gbBy" placeholder="Groupby columns" readonly="" required="true">
1313
<label><input type="checkbox" id="vp_gbByGrouper" disabled=""><span>Grouper</span></label>
1414
<div class="vp-gb-by-grouper-box" style="display:none;">
1515
<input type="number" id="vp_gbByGrouperNumber" class="vp-gb-by-number">

‎html/m_apps/pdf.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<div class="vp-pdf-df-box">
1313
<label for="vp_pdfVariable" class="vp-orange-text">File Path</label>
1414
<div>
15-
<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>
15+
<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>
1616
</div>
1717
<label for="vp_pdfReturn">Allocate to</label>
1818
<div>

0 commit comments

Comments
 (0)