Fix Chart

minjk-bl · minjk-bl · commit 0c26dd990490 · 2021-10-25T17:57:36.000+09:00
diff --git a/css/matplotlib/plot.css b/css/matplotlib/plot.css
@@ -33,7 +33,7 @@
 
 .vp-icon-btn.vp-close-view {
     position: absolute;
-    right: 20px;
+    right: 10px;
     cursor: pointer;
 }
 .vp-option-title {
diff --git a/src/api_block/init.js b/src/api_block/init.js
@@ -378,7 +378,27 @@ define([
                     blockContainer.addNodeBlock(createdBlock);
                     blockContainer.resetBlockList();
                     blockContainer.reRenderAllBlock_asc();
-                } 
+                } else if (title == "Background") {
+                    // 1. add code block
+                    // create block as group block
+                    createdBlock = blockContainer.createBlock(BLOCK_CODELINE_TYPE.CODE, null, null, true);
+                    // set code
+                    createdBlock.setState({
+                        [STATE_codeLine]: code
+                    });
+                    createdBlock.writeCode(code);
+                    createdBlock.apply();
+                    if (isFirstBlock == true) {
+                        // if it is first block, set as ROOT
+                        createdBlock.setDirection(BLOCK_DIRECTION.ROOT);
+                    } else {
+                        var lastBottomBlock = blockContainer.getRootToLastBottomBlock();
+                        lastBottomBlock.appendBlock(createdBlock, BLOCK_DIRECTION.DOWN);
+                    }
+                    blockContainer.addNodeBlock(createdBlock);
+                    blockContainer.resetBlockList();
+                    blockContainer.reRenderAllBlock_asc();
+                }
             }
 
             // 2. add cell and run cell
diff --git a/src/matplotlib/plot.js b/src/matplotlib/plot.js
@@ -130,11 +130,6 @@ define([
         // accBoxImport.setOpenBox(true);
         sbTagString.clear();
         sbTagString.appendFormatLine('<div class="{0}">', 'vp-import-box');
-        // import
-        sbTagString.appendLine('<div>');
-        sbTagString.appendFormatLine('<label for="{0}" class="{1}">{2}</label>', 'vp_plImport', '', 'Matplot.pyplot as');
-        sbTagString.appendFormatLine('<input type="text" id="{0}" placeholder="{1}" value="{2}" disabled>', 'vp_plImport', 'alias', 'plt');
-        sbTagString.appendLine('</div>');
         // figure size
         sbTagString.appendLine('<div>');
         sbTagString.appendFormatLine('<label for="{0}" class="{1}">{2}</label>', 'vp_plFigureWidth', '', 'Figure size');
@@ -160,7 +155,7 @@ define([
         sbTagString.appendLine('</div>');
         // import button
         sbTagString.appendLine('<div>');
-        sbTagString.appendFormatLine('<input type="button" id="{0}" class="{1}" value="{2}">', 'vp_plImportRun', 'vp-button activated vp-pl-import-run', 'Import');
+        sbTagString.appendFormatLine('<input type="button" id="{0}" class="{1}" value="{2}">', 'vp_plImportRun', 'vp-button activated vp-pl-import-run', 'Apply');
         sbTagString.appendLine('</div>');
 
         sbTagString.appendLine('</div>');
@@ -468,7 +463,7 @@ define([
             // run cell
             $(vpCommon.wrapSelector('#vp_appsCode')).trigger({
                 type: 'popup_run',
-                title: 'Snippets',
+                title: 'Background',
                 code: code,
                 addCell: true,
                 runCell: true
@@ -1098,14 +1093,12 @@ define([
         var code = new sb.StringBuilder();
 
         // get parameters
-        var alias = $(this.wrapSelector('#vp_plImport')).val();
         var figWidth = $(this.wrapSelector('#vp_plFigureWidth')).val();
         var figHeight = $(this.wrapSelector('#vp_plFigureHeight')).val();
         var styleName = $(this.wrapSelector('#vp_plStyle')).val();
         var fontName = $(this.wrapSelector('#vp_plFontName')).val();
         var fontSize = $(this.wrapSelector('#vp_plFontSize')).val();
 
-        code.appendLine('import matplotlib.pyplot as plt');
         code.appendFormatLine("plt.rc('figure', figsize=({0}, {1}))", figWidth, figHeight);
         if (styleName && styleName.length > 0) {
             code.appendFormatLine("plt.style.use('{0}')", styleName);

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`
`34`	`34`	`.vp-icon-btn.vp-close-view {`
`35`	`35`	`position: absolute;`
`36`		`- right: 20px;`
	`36`	`+ right: 10px;`
`37`	`37`	`cursor: pointer;`
`38`	`38`	`}`
`39`	`39`	`.vp-option-title {`