diff --git a/README.md b/README.md index f029a8f2..48c53bdd 100644 --- a/README.md +++ b/README.md @@ -173,7 +173,7 @@ Notes: [**Blender**](https://www.blender.org/) v3.4.0 [![Tool](https://raw.githubusercontent.com/INTI-CMNB/KiBot/master/docs/images/llave-inglesa-22x22.png)](https://www.blender.org/) [![Debian](https://raw.githubusercontent.com/INTI-CMNB/KiBot/master/docs/images/debian-openlogo-22x22.png)](https://packages.debian.org/bullseye/blender) - Mandatory for `blender_export` -[**Interactive HTML BoM**](https://github.com/INTI-CMNB/InteractiveHtmlBom) v2.4.1.4 [![Tool](https://raw.githubusercontent.com/INTI-CMNB/KiBot/master/docs/images/llave-inglesa-22x22.png)](https://github.com/INTI-CMNB/InteractiveHtmlBom) ![Auto-download](https://raw.githubusercontent.com/INTI-CMNB/KiBot/master/docs/images/auto_download-22x22.png) +[**Interactive HTML BoM**](https://github.com/INTI-CMNB/InteractiveHtmlBom) v2.7.0 [![Tool](https://raw.githubusercontent.com/INTI-CMNB/KiBot/master/docs/images/llave-inglesa-22x22.png)](https://github.com/INTI-CMNB/InteractiveHtmlBom) ![Auto-download](https://raw.githubusercontent.com/INTI-CMNB/KiBot/master/docs/images/auto_download-22x22.png) - Mandatory for `ibom` [**KiBoM**](https://github.com/INTI-CMNB/KiBoM) v1.8.0 [![Tool](https://raw.githubusercontent.com/INTI-CMNB/KiBot/master/docs/images/llave-inglesa-22x22.png)](https://github.com/INTI-CMNB/KiBoM) ![Auto-download](https://raw.githubusercontent.com/INTI-CMNB/KiBot/master/docs/images/auto_download-22x22.png) @@ -2822,7 +2822,7 @@ Notes: Affected by global options. - `hide_pads`: [boolean=false] Hide footprint pads by default. - `hide_silkscreen`: [boolean=false] Hide silkscreen by default. - - `highlight_pin1`: [boolean=false] Highlight pin1 by default. + - `highlight_pin1`: [boolean|none,all,selected] Highlight pin1 by default. - `include_nets`: [boolean=false] Include netlist information in output.. - `name_format`: [string='ibom'] Output file name format supports substitutions: %f : original pcb file name without extension. diff --git a/docs/samples/generic_plot.kibot.yaml b/docs/samples/generic_plot.kibot.yaml index cc1417e9..d5a03056 100644 --- a/docs/samples/generic_plot.kibot.yaml +++ b/docs/samples/generic_plot.kibot.yaml @@ -1248,7 +1248,7 @@ outputs: hide_pads: false # [boolean=false] Hide silkscreen by default hide_silkscreen: false - # [boolean=false] Highlight pin1 by default + # [boolean|none,all,selected] Highlight pin1 by default highlight_pin1: false # [boolean=false] Include netlist information in output. include_nets: false diff --git a/kibot/out_ibom.py b/kibot/out_ibom.py index 6f11b568..da4cf6c1 100644 --- a/kibot/out_ibom.py +++ b/kibot/out_ibom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020-2022 Salvador E. Tropea -# Copyright (c) 2020-2022 Instituto Nacional de TecnologĂ­a Industrial +# Copyright (c) 2020-2023 Salvador E. Tropea +# Copyright (c) 2020-2023 Instituto Nacional de TecnologĂ­a Industrial # License: GPL-3.0 # Project: KiBot (formerly KiPlot) """ @@ -15,7 +15,7 @@ Dependencies: - InteractiveHtmlBom/InteractiveHtmlBom - org_openscopeproject_InteractiveHtmlBom - org_openscopeproject_InteractiveHtmlBom/InteractiveHtmlBom - version: 2.4.1.4 + version: 2.7.0 downloader: pytool id: ibom """ @@ -47,7 +47,7 @@ class IBoMOptions(VariantOptions): self.hide_silkscreen = False """ Hide silkscreen by default """ self.highlight_pin1 = False - """ Highlight pin1 by default """ + """ [boolean|none,all,selected] Highlight pin1 by default """ self.no_redraw_on_drag = False """ Do not redraw pcb on drag by default """ self.board_rotation = 0 @@ -145,6 +145,8 @@ class IBoMOptions(VariantOptions): self._extra_data_file_guess = True if self.extra_data_file: self.extra_data_file = self.expand_filename('', self.extra_data_file, 'ibom', 'xml') + if isinstance(self.highlight_pin1, bool): + self.highlight_pin1 = 'all' if self.highlight_pin1 else 'none' def get_targets(self, out_dir): if self.output: diff --git a/src/kibot-check b/src/kibot-check index 4beae1cc..3288e2f8 100755 --- a/src/kibot-check +++ b/src/kibot-check @@ -334,9 +334,8 @@ deps = '{\ "output": "ibom",\ "version": [\ 2,\ - 4,\ - 1,\ - 4\ + 7,\ + 0\ ]\ }\ ],\ diff --git a/tests/test_plot/test_ibom.py b/tests/test_plot/test_ibom.py index 44af3e6c..29c5cc2a 100644 --- a/tests/test_plot/test_ibom.py +++ b/tests/test_plot/test_ibom.py @@ -78,7 +78,7 @@ def test_ibom_all_ops(test_dir): r'"show_pads": false', r'"show_fabrication": true', r'"show_silkscreen": false', - r'"highlight_pin1": true', + r'"highlight_pin1": "all"', r'"redraw_on_drag": false', r'"board_rotation": 18.0', # 90/5 r'"offset_back_rotation": true',