Edit SaveLoad to show model types for target and Fixed labels

minjk-bl · minjk-bl · commit d3434e9b0b2a · 2023-08-30T13:03:28.000+09:00
diff --git a/visualpython/data/m_ml/mlLibrary.js b/visualpython/data/m_ml/mlLibrary.js
@@ -732,19 +732,19 @@ define([
         'model_save': {
             name: 'Save model',
             import: 'import joblib',
-            code: "joblib.dump(${target}, ${savePath}${etc})",
+            code: "joblib.dump(${target}, ${save_path}${etc})",
             options: [
-                { name: 'target', component: ['data_select'], placeholder: 'Select model'},
-                { name: 'savePath', component: ['file-save'], placeholder: 'Select path'}
+                { name: 'target', component: ['data_select'], comp_type: 'ml', placeholder: 'Select model'},
+                { name: 'save_path', component: ['file-save'], placeholder: 'Select path'}
             ]
         },
         'model_load': {
             name: 'Load model',
             import: 'import joblib',
-            code: "${allocateTo} = joblib.load(${loadPath}${etc})",
+            code: "${allocate_to} = joblib.load(${load_path}${etc})",
             options: [
-                { name: 'loadPath', component: ['file-open'], placeholder: 'Select path'},
-                { name: 'allocateTo', component: ['data_select'], placeholder: 'New variable to load'}
+                { name: 'load_path', component: ['file-open'], placeholder: 'Select path'},
+                { name: 'allocate_to', component: ['input'], placeholder: 'New variable to load'}
             ]
         }
     }
diff --git a/visualpython/js/m_ml/SaveLoad.js b/visualpython/js/m_ml/SaveLoad.js
@@ -86,7 +86,7 @@ define([
             // render tag
             config.options.forEach(opt => {
                 optBox.appendFormatLine('<label for="{0}" title="{1}">{2}</label>'
-                    , opt.name, opt.name, opt.name);
+                    , opt.name, opt.name, com_util.optionToLabel(opt.name));
                 let content = com_generator.renderContent(this, opt.component[0], opt, state);
                 optBox.appendLine(content[0].outerHTML);
             });
