[3D outputs][Fixed] show_components processing

Always a list
INTI-CMNB · Jul 11, 2024 · 7a7ba8f · 7a7ba8f
1 parent db75d2b
commit 7a7ba8f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 15 deletions.
diff --git a/kibot/out_base_3d.py b/kibot/out_base_3d.py
@@ -603,13 +603,11 @@ def config(self, parent):
         # List of components
         self._show_all_components = False
         self._show_components_raw = self.show_components
-        if isinstance(self.show_components, str):
-            if self.show_components == 'all':
+        if len(self.show_components) == 1 and self.show_components[0] in {'all', 'none'}:
+            if self.show_components[0] == 'all':
                 self._show_all_components = True
-            elif self.show_components == 'none':
+            else:  # if self.show_components[0] == 'none':
                 self.show_components = []
-            else:
-                self.show_components = self.solve_kf_filters([self.show_components])
         else:  # a list
             self.show_components = self.solve_kf_filters(self.show_components)
         # Highlight

diff --git a/kibot/out_pcb2blender_tools.py b/kibot/out_pcb2blender_tools.py
@@ -115,13 +115,11 @@ def config(self, parent):
         self._filters_to_expand = False
         # List of components
         self._show_all_components = False
-        if isinstance(self.show_components, str):
-            if self.show_components == 'all':
+        if len(self.show_components) == 1 and self.show_components[0] in {'all', 'none'}:
+            if self.show_components[0] == 'all':
                 self._show_all_components = True
-            elif self.show_components == 'none':
+            else:  # if self.show_components[0] == 'none':
                 self.show_components = []
-            else:
-                self.show_components = self.solve_kf_filters([self.show_components])
         else:  # a list
             self.show_components = self.solve_kf_filters(self.show_components)
 

diff --git a/kibot/out_pcbdraw.py b/kibot/out_pcbdraw.py
@@ -270,14 +270,12 @@ def config(self, parent):
         # Margin
         self._margin, self.margin = PcbMargin.solve(self.margin)
         # Filter
-        if isinstance(self.show_components, str):
-            if self.show_components == 'none':
+        if len(self.show_components) == 1 and self.show_components[0] in {'all', 'none'}:
+            if self.show_components[0] == 'none':
                 self.show_components = None
-            elif self.show_components == 'all':
+            else:  # if self.show_components[0] == 'all':
                 # Empty list: means we don't filter
                 self.show_components = []
-            else:
-                self.show_components = self.solve_kf_filters([self.show_components])
         else:  # A list
             self.show_components = self.solve_kf_filters(self.show_components)
         # Resistors Remap