Add Save/Load app for ml models

minjk-bl · minjk-bl · commit 6e80fa05d794 · 2023-03-15T12:11:38.000+09:00
diff --git a/visualpython/html/m_ml/saveLoad.html b/visualpython/html/m_ml/saveLoad.html
@@ -4,8 +4,10 @@
             <option value="model_save">Save model</option>
             <option value="model_load">Load model</option>
         </select>
-        <div class="vp-modelio-option-box vp-grid-border-box vp-grid-col-110 mt5">
-
+        <div class="vp-grid-border-box mt5">
+            <div class="vp-modelio-option-box vp-grid-col-110">
+    
+            </div>
         </div>
     </div>
 </body>
diff --git a/visualpython/js/com/com_generatorV2.js b/visualpython/js/com/com_generatorV2.js
@@ -459,6 +459,7 @@ define([
                 div.append(input);
                 div.append(fileBrowerButton);
 
+                $(document).off('click', pageThis.wrapSelector(`.vp-file-browser-button[data-parent="${obj.name}"]`));
                 $(document).on('click', pageThis.wrapSelector(`.vp-file-browser-button[data-parent="${obj.name}"]`), function() {
                     let fileNavi = new FileNavigation({
                         type: 'save',
@@ -497,6 +498,7 @@ define([
                 div.append(input);
                 div.append(fileBrowerButton);
 
+                $(document).off('click', pageThis.wrapSelector(`.vp-file-browser-button[data-parent="${obj.name}"]`));
                 $(document).on('click', pageThis.wrapSelector(`.vp-file-browser-button[data-parent="${obj.name}"]`), function() {
                     let fileNavi = new FileNavigation({
                         type: 'open',
diff --git a/visualpython/js/m_ml/SaveLoad.js b/visualpython/js/m_ml/SaveLoad.js
@@ -38,7 +38,9 @@ define([
                 modelio: 'model_save', // model_save / model_load
                 target: '',
                 allocateTo: '',
-                path: '',
+                userOption: '',
+                savePath: '',
+                loadPath: '',
                 ...this.state
             }
             
@@ -54,7 +56,14 @@ define([
                 let modelio = $(this).val();
                 that.state.modelio = modelio;
                 $(that.wrapSelector('.vp-modelio-option-box')).html(that.templateForOption(modelio));
+
+                $(that.wrapSelector('#userOption')).val('');
             });
+
+            // user option
+            $(this.wrapSelector('#userOption')).on('change', function() {
+                that.state.userOption = $(this).val();
+            })
         }
 
         templateForBody() {
@@ -63,6 +72,9 @@ define([
             // render option page
             $(page).find('.vp-modelio-option-box').html(this.templateForOption(this.state.modelio));
 
+            $(page).find('#modelio').val(this.state.modelio);
+            $(page).find('#userOption').val(this.state.userOption);
+
             return page;
         }
 
@@ -95,7 +107,11 @@ define([
         generateCode() {
             let { modelio, userOption } = this.state;
             let code = new com_String();
-            let modelCode = com_generator.vp_codeGenerator(this, this.mlConfig[modelio], this.state);
+            if (userOption && userOption != '') {
+                userOption = ', ' + userOption;
+            }
+
+            let modelCode = com_generator.vp_codeGenerator(this, this.mlConfig[modelio], this.state, userOption);
             code.append(modelCode);
             return code.toString();
         }
