Feature/params fix cadquery contrib (#194)

openvmp · Oct 14, 2024 · acb702b · acb702b
1 parent d10241e
commit acb702b
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 16 deletions.
diff --git a/docs/source/configuration.rst b/docs/source/configuration.rst
@@ -409,6 +409,7 @@ Define parts with CodeCAD scripts using the following syntax:
     <part name>:
       type: <openscad|cadquery|build123d>
       cwd: <alternative current working directory>
+      showObject: <(optional) the name of the object to show using "show_object(...)">
       patch:
         # ...regexp substitutions to apply...
         "patern": "repl"

diff --git a/partcad/src/partcad/part_config.py b/partcad/src/partcad/part_config.py
@@ -28,19 +28,19 @@ def normalize(name, config):
                         "type": "string",
                         "default": param_value,
                     }
-                elif isinstance(param_value, float):
+                elif isinstance(param_value, bool):
                     config["parameters"][param_name] = {
-                        "type": "int",
+                        "type": "bool",
                         "default": param_value,
                     }
-                elif isinstance(param_value, int):
+                elif isinstance(param_value, float):
                     config["parameters"][param_name] = {
                         "type": "float",
                         "default": param_value,
                     }
-                elif isinstance(param_value, bool):
+                elif isinstance(param_value, int):
                     config["parameters"][param_name] = {
-                        "type": "bool",
+                        "type": "int",
                         "default": param_value,
                     }
                 elif isinstance(param_value, list):

diff --git a/partcad/src/partcad/part_factory_build123d.py b/partcad/src/partcad/part_factory_build123d.py
@@ -85,7 +85,7 @@ async def instantiate(self, part):
             if "show" in self.config:
                 patch["\\Z"] = "\nshow(%s)\n" % self.config["show"]
             if "showObject" in self.config:
-                patch["\\Z"] = "\nshow_object(%s)\n" % self.config["show"]
+                patch["\\Z"] = "\nshow_object(%s)\n" % self.config["showObject"]
             if "patch" in self.config:
                 patch.update(self.config["patch"])
             request["patch"] = patch

diff --git a/partcad/src/partcad/part_factory_cadquery.py b/partcad/src/partcad/part_factory_cadquery.py
@@ -76,6 +76,10 @@ async def instantiate(self, part):
                 for param_name, param in self.config["parameters"].items():
                     request["build_parameters"][param_name] = param["default"]
             patch = {}
+            if "show" in self.config:
+                patch["\\Z"] = "\nshow(%s)\n" % self.config["show"]
+            if "showObject" in self.config:
+                patch["\\Z"] = "\nshow_object(%s)\n" % self.config["showObject"]
             if "patch" in self.config:
                 patch.update(self.config["patch"])
             request["patch"] = patch

diff --git a/partcad/src/partcad/provider_config.py b/partcad/src/partcad/provider_config.py
@@ -31,19 +31,19 @@ def normalize(name, config):
                         "type": "string",
                         "default": param_value,
                     }
-                elif isinstance(param_value, float):
+                elif isinstance(param_value, bool):
                     config["parameters"][param_name] = {
-                        "type": "int",
+                        "type": "bool",
                         "default": param_value,
                     }
-                elif isinstance(param_value, int):
+                elif isinstance(param_value, float):
                     config["parameters"][param_name] = {
                         "type": "float",
                         "default": param_value,
                     }
-                elif isinstance(param_value, bool):
+                elif isinstance(param_value, int):
                     config["parameters"][param_name] = {
-                        "type": "bool",
+                        "type": "int",
                         "default": param_value,
                     }
                 elif isinstance(param_value, list):

diff --git a/partcad/src/partcad/sketch_config.py b/partcad/src/partcad/sketch_config.py
@@ -28,19 +28,19 @@ def normalize(name, config):
                         "type": "string",
                         "default": param_value,
                     }
-                elif isinstance(param_value, float):
+                elif isinstance(param_value, bool):
                     config["parameters"][param_name] = {
-                        "type": "int",
+                        "type": "bool",
                         "default": param_value,
                     }
-                elif isinstance(param_value, int):
+                elif isinstance(param_value, float):
                     config["parameters"][param_name] = {
                         "type": "float",
                         "default": param_value,
                     }
-                elif isinstance(param_value, bool):
+                elif isinstance(param_value, int):
                     config["parameters"][param_name] = {
-                        "type": "bool",
+                        "type": "int",
                         "default": param_value,
                     }
                 elif isinstance(param_value, list):