Edit Seaborn app not to auto-import on loading preview, add inner function _vp_seaborn_show_values() for preview code

minjk-bl · minjk-bl · commit afbbfb898df0 · 2022-06-29T15:25:02.000+09:00
diff --git a/js/com/com_Config.js b/js/com/com_Config.js
@@ -104,7 +104,14 @@ define([
                             '%matplotlib inline'
                         ]
                     },
-                    { library: 'seaborn', alias:'sns' }
+                    { library: 'seaborn', alias:'sns' },
+                    {
+                        library: 'plotly.express', alias: 'px',
+                        include: [
+                            'from plotly.offline import init_notebook_mode',
+                            'init_notebook_mode(connected=True)'
+                        ]
+                    }
                 ]
             }
 
@@ -251,6 +258,7 @@ define([
                 'fileNaviCommand.py',
                 'pandasCommand.py',
                 'variableCommand.py',
+                'visualizationCommand.py',
                 // 'userCommand.py'
             ];
             let promiseList = [];
diff --git a/js/m_visualize/Seaborn.js b/js/m_visualize/Seaborn.js
@@ -280,10 +280,8 @@ define([
             $(this.wrapSelector('#showValues')).on('change', function() {
                 let checked = $(this).prop('checked');
                 if (checked === true) {
-                    that.config.checkModules = ['plt', 'sns', 'np', 'vp_seaborn_show_values'];
                     $(that.wrapSelector('#showValuesPrecision')).attr('disabled', false);
                 } else {
-                    that.config.checkModules = ['plt', 'sns'];
                     $(that.wrapSelector('#showValuesPrecision')).attr('disabled', true);
                 }
             });
@@ -696,6 +694,9 @@ define([
             });
 
             this.closeInnerPopup();
+
+            // load preview
+            this.loadPreview();
         }
 
         loadPreview() {
@@ -802,7 +803,19 @@ define([
             let config = this.chartConfig[chartType];
             let state = JSON.parse(JSON.stringify(this.state));
 
-            if (preview && useSampling) {
+            // set checkmodules
+            if (preview === true) {
+                // no auto-import for preview
+                this.config.checkModules = [];
+            } else {
+                if (showValues && showValues === true) {
+                    this.config.checkModules = ['plt', 'sns', 'np', 'vp_seaborn_show_values'];
+                } else {
+                    this.config.checkModules = ['plt', 'sns'];
+                }
+            }
+
+            if (preview === true && useSampling) {
                 // data sampling code for preview
                 // convertedData = data + '.sample(n=' + sampleCount + ', random_state=0)';
                 // convertedData = com_util.formatString('_vp_sample({0}, {1})', data, sampleCount);
@@ -965,7 +978,7 @@ define([
                 chartCode.appendFormatLine("plt.grid({0})", gridCodeList.join(', '));
             }
 
-            if (preview) {
+            if (preview === true) {
                 // Ignore warning
                 code.appendLine('import warnings');
                 code.appendLine('with warnings.catch_warnings():');
@@ -978,7 +991,7 @@ define([
 
                 if (showValues && showValues === true) {
                     code.appendLine('ax = ' + generatedCode);
-                    code.append("vp_seaborn_show_values(ax");
+                    code.append("_vp_seaborn_show_values(ax");
                     if (showValuesPrecision !== '') {
                         code.appendFormat(", precision={0}", showValuesPrecision);
                     }
diff --git a/python/visualizationCommand.py b/python/visualizationCommand.py
@@ -0,0 +1,40 @@
+import numpy as _vp_np
+def _vp_seaborn_show_values(axs, precision=1, space=0.01):
+    """
+    Show values on Seaborn plots
+    - inner function for showing preview on Seaborn app
+    """
+    pstr = '{:.' + str(precision) + 'f}'
+    
+    def _single(ax):
+        # check orient
+        orient = 'v'
+        if len(ax.patches) == 1:
+            # check if 0
+            if ax.patches[0].get_x() == 0:
+                orient = 'h'
+        else:
+            # compare 0, 1 patches
+            p0 = ax.patches[0]
+            p1 = ax.patches[1]
+            if p0.get_x() == p1.get_x():
+                orient = 'h'
+                
+        if orient == 'v':
+            for p in ax.patches:
+                _x = p.get_x() + p.get_width() / 2
+                _y = p.get_y() + p.get_height() + (p.get_height()*space)
+                value = pstr.format(p.get_height())
+                ax.text(_x, _y, value, ha='center') 
+        elif orient == 'h':
+            for p in ax.patches:
+                _x = p.get_x() + p.get_width() + (space - 0.01)
+                _y = p.get_y() + p.get_height() / 2
+                value = pstr.format(p.get_width())
+                ax.text(_x, _y, value, ha='left')
+
+    if isinstance(axs, _vp_np.ndarray):
+        for idx, ax in _vp_np.ndenumerate(axs):
+            _single(ax)
+    else:
+        _single(axs)
