Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9b8dc20

Browse files
authored
Merge pull request#124 from visualpython/release
Release v2.1.2
2 parentsb6587b6 +2906922 commit9b8dc20

38 files changed

+686
-314
lines changed

‎css/boardFrame.css‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,10 @@
315315
.vp-block-markdown.vp-focus .vp-block-header {
316316
border:2px solidvar(--highlight-color);
317317
}
318+
.vp-block-markdown .vp-block-header:empty::after {
319+
content:'Double click to edit.';
320+
font-style: italic;
321+
}
318322

319323
/* block sortable style */
320324
.vp-sortable-placeholder .vp-block-header {

‎css/m_apps/pdf.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
width:100%;
44
height:100%;
55
grid-row-gap:5px;
6-
grid-template-rows:60px100px100px;
6+
grid-template-rows:100px100px;
77
}
88
.vp-pdf-prepare-box {
99
display: grid;

‎css/m_apps/profiling.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
width:100%;
44
height:100%;
55
grid-row-gap:5px;
6-
grid-template-rows:60px140px auto;
6+
grid-template-rows:140px auto;
77
}
88
.vp-pf-prepare-box {
99
display: grid;

‎css/m_visualize/seaborn.css‎

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
padding-right:5px;
55
cursor: pointer;
66
}
7+
.vp-create-subplot-btn {
8+
float: right;
9+
}
710
.vp-tab-bar {
811
width:100%;
912
overflow-y: hidden;
@@ -29,15 +32,38 @@
2932
}
3033
.vp-tab-page {
3134
width:100%;
32-
height:180px;
3335
}
34-
36+
.vp-tab-page-box.plot {
37+
height:calc(100%-30px);
38+
align-content: baseline;
39+
}
40+
.vp-chart-plot-box {
41+
display: grid;
42+
grid-template-columns:calc(50%-8px)calc(50%-8px);
43+
grid-row-gap:5px;
44+
grid-column-gap:15px;
45+
align-items: baseline;
46+
align-content: center;
47+
}
48+
.vp-chart-left-box {
49+
display: grid;
50+
grid-row-gap:3px;
51+
}
52+
.vp-chart-left-box>label {
53+
margin-bottom:0px;
54+
}
3555
.vp-chart-left-box,
3656
.vp-chart-right-box {
37-
padding:3px;
38-
height:250px;
57+
height:100%;
58+
}
59+
.vp-chart-preview-title {
60+
line-height:30px;
61+
}
62+
.vp-chart-preview-option {
63+
float: right;
64+
padding-right:5px;
3965
}
40-
4166
.vp-chart-preview-box {
4267
min-height:150px;
68+
width:100%;
4369
}

‎css/popupComponent.css‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,8 @@
217217
position: relative;
218218
padding-left:20px;
219219
cursor: pointer;
220+
height:15px;
221+
vertical-align: middle;
220222
}
221223
.vp-popup-frameinput[type=checkbox]:not(.vp-checkbox):disabled+label,
222224
.vp-popup-framelabelinput[type=checkbox]:not(.vp-checkbox):disabled+span {
@@ -468,6 +470,15 @@
468470
padding-left:22px;/* Equal to width of new image */
469471
margin-bottom:5px;
470472
}
473+
.vp-popup-body-top-bar-item[data-type="install"]img {
474+
background: url(../../visualpython/img/import.svg) no-repeat;
475+
}
476+
.vp-popup-body-top-bar-item[data-type="install"]:hoverimg {
477+
background: url(../../visualpython/img/import_activated.svg) no-repeat;
478+
}
479+
.vp-popup-body-top-bar-item[data-type="import"] {
480+
margin-left:10px;
481+
}
471482
.vp-popup-body-top-bar-item[data-type="import"]img {
472483
background: url(../../visualpython/img/import.svg) no-repeat;
473484
}

‎css/root.css‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,10 @@ body {
137137
.vp-select.m {
138138
width:116px!important;
139139
}
140+
.vp-input.sm,
141+
.vp-select.sm {
142+
width:70px!important;
143+
}
140144
.vp-input.s,
141145
.vp-select.s {
142146
width:55px!important;
@@ -201,6 +205,10 @@ body {
201205
color:#696969;
202206
cursor: not-allowed;
203207
}
208+
.vp-button.activated.disabled {
209+
background:#FFC09A;
210+
color: white;
211+
}
204212
.vp-checkbox {
205213
display: inline-block;
206214
position: relative!important;
@@ -355,7 +363,7 @@ hr.vp-extra-menu-line {
355363
}
356364
.vp-grid-col-p50 {
357365
display: grid;
358-
grid-template-columns:52%48%;
366+
grid-template-columns:50%50%;
359367
grid-row-gap:5px;
360368
align-items: baseline;
361369
align-content: center;

‎data/m_ml/mlLibrary.js‎

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -269,37 +269,40 @@ define([
269269
'ridge':{
270270
name:'Ridge',
271271
import:'from sklearn.linear_model import Ridge',
272-
code:'Ridge(${etc})',
272+
code:'Ridge(${alpha}${etc})',
273273
options:[
274-
//TODO:
274+
{name:'alpha',component:['input_number'],default:1.0,usePair:true}
275275
]
276276
},
277277
'lasso':{
278278
name:'Lasso',
279279
import:'from sklearn.linear_model import Lasso',
280-
code:'Lasso(${etc})',
280+
code:'Lasso(${alpha}${etc})',
281281
options:[
282-
//TODO:
282+
{name:'alpha',component:['input_number'],default:1.0,usePair:true}
283283
]
284284
},
285285
'elasticnet':{
286286
name:'ElasticNet',
287287
import:'from sklearn.linear_model import ElasticNet',
288-
code:'ElasticNet(${etc})',
288+
code:'ElasticNet(${alpha}${l1_ratio}${etc})',
289289
options:[
290-
//TODO:
290+
{name:'alpha',component:['input_number'],default:1.0,usePair:true},
291+
{name:'l1_ratio',component:['input_number'],default:0.5,usePair:true}
291292
]
292293
},
293294
'sv-rgs':{
294295
name:'SVR',
295296
import:'from sklearn.svm import SVR',
296-
code:'SVR(${C}${kernel}${gamma}${random_state}${etc})',
297+
code:'SVR(${C}${kernel}${degree}${gamma}${coef0}${random_state}${etc})',
297298
options:[
298299
{name:'C',component:['input_number'],placeholder:'1.0',usePair:true},
299-
{name:'kernel',component:['option_select'],type:'text',default:'rbf',type:'text',usePair:true,
300-
options:['linear','poly','rbf','sigmoid','precomputed']},
301-
{name:'gamma',component:['option_suggest'],default:'scale',type:'text',usePair:true,
302-
options:['scale','auto']},
300+
{name:'kernel',component:['option_select'],type:'text',usePair:true,
301+
options:['linear','poly','rbf','sigmoid','precomputed'],default:'rbf'},
302+
{name:'degree',component:['input_number'],placeholder:'3',usePair:true},
303+
{name:'gamma',component:['option_suggest'],usePair:true,
304+
options:["'scale'","'auto'"],default:"'scale'"},
305+
{name:'coef0',component:['input_number'],placeholder:'0.0',usePair:true},
303306
{name:'random_state',component:['input_number'],placeholder:'123',usePair:true}
304307
]
305308
},
@@ -422,15 +425,17 @@ define([
422425
]
423426
},
424427
'sv-clf':{
425-
name:'SupportVectorClassifier',
428+
name:'SVC',
426429
import:'from sklearn.svm import SVC',
427-
code:'SVC(${C}${kernel}${gamma}${random_state}${etc})',
430+
code:'SVC(${C}${kernel}${degree}${gamma}${coef0}${random_state}${etc})',
428431
options:[
429432
{name:'C',component:['input_number'],placeholder:'1.0',usePair:true},
430433
{name:'kernel',component:['option_select'],type:'text',usePair:true,
431434
options:['linear','poly','rbf','sigmoid','precomputed'],default:'rbf'},
432-
{name:'gamma',component:['option_suggest'],usePair:true,
433-
options:['scale','auto'],default:'scale'},
435+
{name:'degree',component:['input_number'],placeholder:'3',usePair:true},
436+
{name:'gamma',component:['option_suggest'],usePair:true,
437+
options:["'scale'","'auto'"],default:"'scale'"},
438+
{name:'coef0',component:['input_number'],placeholder:'0.0',usePair:true},
434439
{name:'random_state',component:['input_number'],placeholder:'123',usePair:true}
435440
]
436441
},

‎html/m_apps/bind.html‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
<divclass="vp-bd-type-box concat">
1212
<div>
1313
<labelfor="vp_bdVariable"class="vp-orange-text w100">Variable</label>
14-
<inputtype="text"id="vp_bdVariable"placeholder="Variable"disabled="">
15-
<buttonid="vp_bdVariableSelect"class="vp-button w50">Edit</button>
14+
<inputtype="text"id="vp_bdVariable"placeholder="Variable"readonly="">
1615
</div>
1716
<div>
1817
<labelfor="vp_bdJoin"class="w100">Join</label>
@@ -62,19 +61,16 @@
6261
</div>
6362
<div>
6463
<labelfor="vp_bdOn"class="w100">On</label>
65-
<inputtype="text"id="vp_bdOn"placeholder="Merge key"disabled="">
66-
<buttonid="vp_bdOnSelect"class="vp-button w50">Edit</button>
64+
<inputtype="text"id="vp_bdOn"placeholder="Merge key"readonly="">
6765
</div>
6866
<div>
6967
<labelfor="vp_bdLeftOn"class="w100">Left on</label>
70-
<inputtype="text"id="vp_bdLeftOn"placeholder="Left key"disabled="">
71-
<buttonid="vp_bdLeftOnSelect"class="vp-button w50">Edit</button>
68+
<inputtype="text"id="vp_bdLeftOn"placeholder="Left key"readonly="">
7269
<label><inputtype="checkbox"id="vp_bdLeftIndex"><span>use index</span></label>
7370
</div>
7471
<div>
7572
<labelfor="vp_bdRightOn"class="w100">Right on</label>
76-
<inputtype="text"id="vp_bdRightOn"placeholder="Right key"disabled="">
77-
<buttonid="vp_bdRightOnSelect"class="vp-button w50">Edit</button>
73+
<inputtype="text"id="vp_bdRightOn"placeholder="Right key"readonly="">
7874
<label><inputtype="checkbox"id="vp_bdRightIndex"><span>use index</span></label>
7975
</div>
8076
<div>

‎html/m_apps/frame.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<divclass="vp-fe-menu-item vp-fe-menu-drop"data-type="3">Drop<iclass="fa fa-caret-right"
55
style="padding-left: 5px;"></i>
66
<divclass="vp-fe-menu-sub-box"style="top: 0px;">
7-
<divclass="vp-fe-menu-item vp-fe-menu-drop"data-type="3">Dropcolumns</div>
7+
<divclass="vp-fe-menu-item vp-fe-menu-drop"data-type="3">DropColumns</div>
88
<divclass="vp-fe-menu-item vp-fe-menu-drop-na"data-type="4">Drop NA</div>
9-
<divclass="vp-fe-menu-item vp-fe-menu-drop-duplicate"data-type="5"data-axis="col">Drop
10-
Duplicates</div>
9+
<divclass="vp-fe-menu-item vp-fe-menu-drop-duplicate"data-type="5"data-axis="col">Drop Duplicates</div>
10+
<divclass="vp-fe-menu-item vp-fe-menu-drop-outlier"data-type="11"data-axis="col">Drop Outlier</div>
1111
</div>
1212
</div>
1313
<divclass="vp-fe-menu-item vp-fe-menu-rename"data-type="2">Rename</div>

‎html/m_apps/groupby.html‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
</div>
1010
<div>
1111
<labelfor="vp_gbBy"class="vp-orange-text w80">Groupby</label>
12-
<inputtype="text"id="vp_gbBy"placeholder="Groupby columns"disabled="">
13-
<buttonid="vp_gbBySelect"class="vp-button w50">Edit</button>
12+
<inputtype="text"id="vp_gbBy"placeholder="Groupby columns"readonly="">
1413
<label><inputtype="checkbox"id="vp_gbByGrouper"disabled=""><span>Grouper</span></label>
1514
<divclass="vp-gb-by-grouper-box"style="display:none;">
1615
<inputtype="number"id="vp_gbByGrouperNumber"class="vp-gb-by-number">
@@ -29,8 +28,7 @@
2928
<hrstyle="margin: 5px 0;">
3029
<div>
3130
<labelfor="vp_gbDisplay"class="w80">Columns</label>
32-
<inputtype="text"id="vp_gbDisplay"placeholder="Display columns"disabled="">
33-
<buttonid="vp_gbDisplaySelect"class="vp-button w50">Edit</button>
31+
<inputtype="text"id="vp_gbDisplay"placeholder="Display columns"readonly="">
3432
</div>
3533
<div>
3634
<labelfor="vp_gbMethodSelect"class="w80">Method</label>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp