Fix bool bug and save cancellation

NiceneNerd · Apr 10, 2021 · 9cfdfa4 · 9cfdfa4
1 parent 6ad8244
commit 9cfdfa4
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/plasticity_ai/__init__.py b/plasticity_ai/__init__.py
@@ -1,4 +1,4 @@
-VERSION = "0.5.0"
+VERSION = "0.5.1"
 
 from sys import argv
 

diff --git a/plasticity_ai/__main__.py b/plasticity_ai/__main__.py
@@ -58,7 +58,7 @@ def save_file(self, params):
             if result:
                 open_path = Path(result if isinstance(result, str) else result[0])
             else:
-                return {"success": False}
+                return {"success": False, "error": "cancel"}
         try:
             pio = self._decoder.object_hook(params["pio"])
             if open_path.suffix == ".yml":

diff --git a/plasticity_ai/assets/scripts/bundle.js b/plasticity_ai/assets/scripts/bundle.js
diff --git a/plasticity_ai/assets/src/js/App.jsx b/plasticity_ai/assets/src/js/App.jsx
@@ -125,10 +125,13 @@ export default class App extends Component {
             pio: this.state.aiprog.clone_pio(),
             path
         });
-        if (response.error)
-            alert(
-                `The following error occured when saving this file: ${response.error}`
-            );
+        if (response.error) {
+            if (response.error != "cancel")
+                alert(
+                    `The following error occured when saving this file: ${response.error}`
+                );
+            this.setState({ loading: false });
+        }
         else this.setState({ modified: false, path, loading: false });
     }
 

diff --git a/plasticity_ai/assets/src/js/Components.jsx b/plasticity_ai/assets/src/js/Components.jsx
@@ -14,7 +14,7 @@ export class ParamInput extends Component {
         let new_val;
         switch (this.type) {
             case "Bool":
-                new_val = { bool: $(`#${this.props.param}`).prop("checked") };
+                new_val = { Bool: $(`#${this.props.param}`).prop("checked") };
                 break;
             case "Int":
             case "U32":

diff --git a/plasticity_ai/util.py b/plasticity_ai/util.py
@@ -255,6 +255,7 @@ def _to_param(self, obj) -> Parameter:
             "F32": lambda p: float(p["F32"]),
             "String32": lambda p: oead.FixedSafeString32(str(p["String32"])),
             "Bool": lambda p: bool(p["Bool"]),
+            "bool": lambda p: bool(p["Bool"]),
             "Vec3": lambda p: self._construct_vec3(p["Vec3"]),
         }
         return Parameter(enc_map.get(next(iter(obj)), lambda x: x)(obj))