InteractiveHtmlBom 2.10.0__tar.gz → 2.11.1__tar.gz

{interactivehtmlbom-2.10.0 → interactivehtmlbom-2.11.1}/DATAFORMAT.md

@@ -96,6 +96,7 @@ pcbdata = {
     "revision": "rev",
     "company": "Horns and Hoofs",
     "date": "2019-04-18",
+    "variant": "var" // optional
   },
   // Contains full bom table as well as filtered by front/back.
   // See bom row description below.
@@ -258,7 +259,10 @@ attribute.
   // 0: justify center
   // 1: justify right/bot
   "justify": [horizontal, vertical],
+  // Either the thickness or the fillrule must be used
   "thickness": thickness,
+  // fillrule is only supported for svgpath
+  "fillrule": "nonzero" | "evenodd",
   "attr": [
     // may include none, one or both
     "italic", "mirrored"

{interactivehtmlbom-2.10.0 → interactivehtmlbom-2.11.1}/InteractiveHtmlBom/__init__.py

@@ -3,11 +3,11 @@ import sys
 import threading
 import time
 
-import wx
-import wx.aui
+from .compat import get_wx
 
 
 def check_for_bom_button():
+    wx = get_wx()
     # From Miles McCoo's blog
     # https://kicad.mmccoo.com/2017/03/05/adding-your-own-command-buttons-to-the-pcbnew-gui/
     def find_pcbnew_window():

interactivehtmlbom-2.11.1/InteractiveHtmlBom/compat.py

@@ -0,0 +1,23 @@
+"""Compatibility utilities for optional wx dependency."""
+
+import os
+
+_wx = None
+
+
+def should_create_wx_app():
+    """Check if we should create a wx app based on environment."""
+    return 'INTERACTIVE_HTML_BOM_NO_DISPLAY' not in os.environ
+
+
+def get_wx():
+    """Get the wx module, or None if not available."""
+    global _wx
+    if _wx is not None:
+        return _wx
+    try:
+        import wx
+        _wx = wx
+        return _wx
+    except ImportError:
+        return None

{interactivehtmlbom-2.10.0 → interactivehtmlbom-2.11.1}/InteractiveHtmlBom/core/config.py

@@ -4,9 +4,7 @@ import argparse
 import os
 import re
 
-from wx import FileConfig
-
-from .. import dialog
+from ..compat import get_wx
 
 
 class Config:
@@ -17,6 +15,8 @@ class Config:
         '    %p : pcb/project title from pcb metadata.\n'
         '    %c : company from pcb metadata.\n'
         '    %r : revision from pcb metadata.\n'
+        '    %v : pcb variant.\n'
+        '    %V : pcb variant or \'default\', if empty.\n'
         '    %d : pcb date from metadata if available, '
         'file modification date otherwise.\n'
         '    %D : bom generation date.\n'
@@ -39,7 +39,7 @@ class Config:
         'dark_mode', 'show_pads', 'show_fabrication', 'show_silkscreen',
         'highlight_pin1', 'redraw_on_drag', 'board_rotation', 'checkboxes',
         'bom_view', 'layer_view', 'offset_back_rotation',
-        'kicad_text_formatting'
+        'kicad_text_formatting', 'mark_when_checked'
     ]
     default_show_group_fields = ["Value", "Footprint"]
 
@@ -55,13 +55,14 @@ class Config:
     board_rotation = 0
     offset_back_rotation = False
     checkboxes = ','.join(default_checkboxes)
+    mark_when_checked = ''
     bom_view = bom_view_choices[1]
     layer_view = layer_view_choices[1]
     compression = True
     open_browser = True
 
     # General section
-    bom_dest_dir = 'bom/'  # This is relative to pcb file directory
+    bom_dest_dir = 'bom'  # This is relative to pcb file directory
     bom_name_format = 'ibom'
     component_sort_order = default_sort_order
     component_blacklist = []
@@ -82,6 +83,9 @@ class Config:
     board_variant_blacklist = []
     dnp_field = ''
 
+    # this is cli only field
+    kicad_variant = ''
+
     @staticmethod
     def _split(s):
         """Splits string by ',' and drops empty strings from resulting array"""
@@ -106,7 +110,7 @@ class Config:
         else:
             return
 
-        f = FileConfig(localFilename=file)
+        f = get_wx().FileConfig(localFilename=file)
 
         f.SetPath('/html_defaults')
         self.dark_mode = f.ReadBool('dark_mode', self.dark_mode)
@@ -121,6 +125,7 @@ class Config:
         self.offset_back_rotation = f.ReadBool(
             'offset_back_rotation', self.offset_back_rotation)
         self.checkboxes = f.Read('checkboxes', self.checkboxes)
+        self.mark_when_checked = f.Read('mark_when_checked', self.mark_when_checked)
         self.bom_view = f.Read('bom_view', self.bom_view)
         self.layer_view = f.Read('layer_view', self.layer_view)
         self.compression = f.ReadBool('compression', self.compression)
@@ -168,7 +173,7 @@ class Config:
     def save(self, locally):
         file = self.local_config_file if locally else self.global_config_file
         print('Saving to', file)
-        f = FileConfig(localFilename=file)
+        f = get_wx().FileConfig(localFilename=file)
 
         f.SetPath('/html_defaults')
         f.WriteBool('dark_mode', self.dark_mode)
@@ -180,6 +185,7 @@ class Config:
         f.WriteInt('board_rotation', self.board_rotation)
         f.WriteBool('offset_back_rotation', self.offset_back_rotation)
         f.Write('checkboxes', self.checkboxes)
+        f.Write('mark_when_checked', self.mark_when_checked)
         f.Write('bom_view', self.bom_view)
         f.Write('layer_view', self.layer_view)
         f.WriteBool('compression', self.compression)
@@ -226,6 +232,7 @@ class Config:
         self.offset_back_rotation = \
             dlg.html.offsetBackRotationCheckbox.IsChecked()
         self.checkboxes = dlg.html.bomCheckboxesCtrl.Value
+        # No dialog for mark_when_checked ...
         self.bom_view = self.bom_view_choices[dlg.html.bomDefaultView.Selection]
         self.layer_view = self.layer_view_choices[
             dlg.html.layerDefaultView.Selection]
@@ -275,6 +282,7 @@ class Config:
         dlg.html.boardRotationSlider.Value = self.board_rotation
         dlg.html.offsetBackRotationCheckbox.Value = self.offset_back_rotation
         dlg.html.bomCheckboxesCtrl.Value = self.checkboxes
+        # No dialog for mark_when_checked ...
         dlg.html.bomDefaultView.Selection = self.bom_view_choices.index(
             self.bom_view)
         dlg.html.layerDefaultView.Selection = self.layer_view_choices.index(
@@ -320,14 +328,21 @@ class Config:
                                  self.board_variant_blacklist)
         dlg.fields.dnpFieldBox.Value = self.dnp_field
 
+        if self.kicad_variant != '':
+            dlg.fields.variantLabel.Show()
+        dlg.fields.variantLabel.SetLabel(f'Current variant: {self.kicad_variant}')
+
         dlg.finish_init()
 
     @classmethod
     def add_options(cls, parser, version):
         # type: (argparse.ArgumentParser, str) -> None
         parser.add_argument('--show-dialog', action='store_true',
-                            help='Shows config dialog. All other flags '
-                                 'will be ignored.')
+                            help='Shows config dialog. All flags except '
+                                 '--kicad-variant will be ignored.')
+        parser.add_argument('--kicad-variant', default='',
+                            help='KiCad board variant, empty is default '
+                                 'variant. (Only for KiCad v10+)')
         parser.add_argument('--version', action='version', version=version)
         # Html
         parser.add_argument('--dark-mode', help='Default to dark mode.',
@@ -360,6 +375,10 @@ class Config:
         parser.add_argument('--checkboxes',
                             default=cls.checkboxes,
                             help='Comma separated list of checkbox columns.')
+        parser.add_argument('--mark-when-checked',
+                            default=cls.mark_when_checked,
+                            help='Name of the checkbox column used to mark '
+                                 'components when checked.')
         parser.add_argument('--bom-view', default=cls.bom_view,
                             choices=cls.bom_view_choices,
                             help='Default BOM view.')
@@ -436,6 +455,8 @@ class Config:
         # type: (argparse.Namespace) -> None
         import math
 
+        self.kicad_variant = args.kicad_variant
+
         # Html
         self.dark_mode = args.dark_mode
         self.show_pads = not args.hide_pads
@@ -446,6 +467,7 @@ class Config:
         self.board_rotation = math.fmod(args.board_rotation // 5, 37)
         self.offset_back_rotation = args.offset_back_rotation
         self.checkboxes = args.checkboxes
+        self.mark_when_checked = args.mark_when_checked
         self.bom_view = args.bom_view
         self.layer_view = args.layer_view
         self.compression = not args.no_compression

{interactivehtmlbom-2.10.0 → interactivehtmlbom-2.11.1}/InteractiveHtmlBom/core/ibom.py

@@ -8,13 +8,11 @@ import re
 import sys
 from datetime import datetime
 
-import wx
-
 from . import units
 from .config import Config
-from ..dialog import SettingsDialog
 from ..ecad.common import EcadParser, Component
 from ..errors import ParsingException
+from ..compat import get_wx
 
 
 class Logger(object):
@@ -38,13 +36,13 @@ class Logger(object):
         if self.cli:
             self.logger.error(msg)
         else:
-            wx.MessageBox(msg)
+            get_wx().MessageBox(msg)
 
     def warn(self, msg):
         if self.cli:
             self.logger.warning(msg)
         else:
-            wx.LogWarning(msg)
+            get_wx().LogWarning(msg)
 
 
 log = None
@@ -234,6 +232,8 @@ def process_substitutions(bom_name_format, pcb_file_name, metadata):
     name = name.replace('%c', metadata['company'])
     name = name.replace('%r', metadata['revision'])
     name = name.replace('%d', metadata['date'].replace(':', '-'))
+    name = name.replace('%v', metadata.get('variant', ''))
+    name = name.replace('%V', metadata.get('variant', '') or 'default')
     now = datetime.now()
     name = name.replace('%D', now.strftime('%Y-%m-%d'))
     name = name.replace('%T', now.strftime('%H-%M-%S'))
@@ -341,6 +341,8 @@ def main(parser, config, logger):
 
 def run_with_dialog(parser, config, logger):
     # type: (EcadParser, Config, Logger) -> None
+    from ..dialog import SettingsDialog
+
     def save_config(dialog_panel, locally=False):
         config.set_from_dialog(dialog_panel)
         config.save(locally)
@@ -358,7 +360,7 @@ def run_with_dialog(parser, config, logger):
         if extra_data_file is not None:
             dlg.set_extra_data_path(extra_data_file)
         config.transfer_to_dialog(dlg.panel)
-        if dlg.ShowModal() == wx.ID_OK:
+        if dlg.ShowModal() == get_wx().ID_OK:
             config.set_from_dialog(dlg.panel)
             main(parser, config, logger)
     finally:

{interactivehtmlbom-2.10.0 → interactivehtmlbom-2.11.1}/InteractiveHtmlBom/dialog/dialog_base.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ###########################################################################
-## Python code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3)
+## Python code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6)
 ## http://www.wxformbuilder.org/
 ##
 ## PLEASE DO *NOT* EDIT THIS FILE!
@@ -413,6 +413,13 @@ class FieldsPanelBase ( wx.Panel ):
         self.extraDataFilePicker = wx.FilePickerCtrl( sbSizer7.GetStaticBox(), wx.ID_ANY, wx.EmptyString, u"Select a file", u"Netlist and xml files (*.net; *.xml)|*.net;*.xml", wx.DefaultPosition, wx.DefaultSize, wx.FLP_DEFAULT_STYLE|wx.FLP_FILE_MUST_EXIST|wx.FLP_OPEN|wx.FLP_SMALL|wx.FLP_USE_TEXTCTRL|wx.BORDER_SIMPLE )
         sbSizer7.Add( self.extraDataFilePicker, 0, wx.EXPAND|wx.BOTTOM|wx.RIGHT|wx.LEFT, 5 )
 
+        self.variantLabel = wx.StaticText( sbSizer7.GetStaticBox(), wx.ID_ANY, u"Current variant:", wx.DefaultPosition, wx.DefaultSize, 0 )
+        self.variantLabel.Wrap( -1 )
+
+        self.variantLabel.Hide()
+
+        sbSizer7.Add( self.variantLabel, 0, wx.ALL, 5 )
+
 
         bSizer42.Add( sbSizer7, 0, wx.ALL|wx.EXPAND, 5 )
 

{interactivehtmlbom-2.10.0 → interactivehtmlbom-2.11.1}/InteractiveHtmlBom/dialog/settings_dialog.py

@@ -334,8 +334,11 @@ class FieldsPanel(dialog_base.FieldsPanelBase):
             self.extra_field_data = self.extra_data_func(
                 extra_data_file, self.normalizeCaseCheckbox.Value)
         except Exception as e:
+            import traceback
             pop_error(
-                "Failed to parse file %s\n\n%s" % (extra_data_file, e))
+                "Failed to parse file %s\n\n%s" % (
+                    extra_data_file,
+                    str(e) + '\n' + traceback.format_exc()))
             self.extraDataFilePicker.Path = ''
 
         if self.extra_field_data is not None:

{interactivehtmlbom-2.10.0 → interactivehtmlbom-2.11.1}/InteractiveHtmlBom/ecad/kicad.py

@@ -30,10 +30,16 @@ class PcbnewParser(EcadParser):
         self.board = board
         if self.board is None:
             self.board = pcbnew.LoadBoard(self.file_name)  # type: pcbnew.BOARD
+            if not self.board:
+                raise Exception('Failed to load board file')
+            if hasattr(self.board, "SetCurrentVariant"):
+                self.board.SetCurrentVariant(config.kicad_variant)
         if hasattr(self.board, 'GetModules'):
-            self.footprints = list(self.board.GetModules())  # type: list[pcbnew.MODULE]
+            # type: list[pcbnew.MODULE]
+            self.footprints = list(self.board.GetModules())
         else:
-            self.footprints = list(self.board.GetFootprints())  # type: list[pcbnew.FOOTPRINT]
+            # type: list[pcbnew.FOOTPRINT]
+            self.footprints = list(self.board.GetFootprints())
         self.font_parser = FontParser()
 
     def get_extra_field_data(self, file_name):
@@ -46,8 +52,7 @@ class PcbnewParser(EcadParser):
 
         return ExtraFieldData(data[0], data[1])
 
-    @staticmethod
-    def get_footprint_fields(f):
+    def get_footprint_fields(self, f):
         # type: (pcbnew.FOOTPRINT) -> dict
         props = {}
         if hasattr(f, "GetProperties"):
@@ -60,6 +65,15 @@ class PcbnewParser(EcadParser):
         if hasattr(f, "IsDNP"):
             if f.IsDNP():
                 props["kicad_dnp"] = "DNP"
+        if hasattr(f, 'GetVariant'):
+            variant = f.GetVariant(self.config.kicad_variant)
+            if variant:
+                var_fields = variant.GetFields()
+                for k in var_fields.keys():
+                    props[str(k)] = str(f.GetFieldShownText(str(k)))
+                if variant.GetDNP():
+                    props["kicad_dnp"] = "DNP"
+
         return props
 
     def parse_extra_data_from_pcb(self):
@@ -209,7 +223,8 @@ class PcbnewParser(EcadParser):
                 "angle": angle,
                 "polygons": polygons
             }
-            if hasattr(d, "IsFilled") and not d.IsFilled():
+            if ((hasattr(d, "IsFilled") and not d.IsFilled()) or
+                    (hasattr(d, "IsSolidFill") and not d.IsSolidFill())):
                 shape_dict["filled"] = 0
                 shape_dict["width"] = d.GetWidth() * 1e-6
             return shape_dict
@@ -273,7 +288,8 @@ class PcbnewParser(EcadParser):
                 "svgpath": create_path(lines)
             }
         elif hasattr(d, 'GetEffectiveTextShape'):
-            shape = d.GetEffectiveTextShape(False)  # type: pcbnew.SHAPE_COMPOUND
+            # type: pcbnew.SHAPE_COMPOUND
+            shape = d.GetEffectiveTextShape(False)
             segments = []
             polygons = []
             for s in shape.GetSubshapes():
@@ -426,7 +442,7 @@ class PcbnewParser(EcadParser):
             for d in f.GraphicalItems():
                 drawings.append((d.GetClass(), d))
             if hasattr(f, "GetFields"):
-                fields = f.GetFields() # type: list[pcbnew.PCB_FIELD]
+                fields = f.GetFields()  # type: list[pcbnew.PCB_FIELD]
                 for field in fields:
                     if field.IsReference() or field.IsValue():
                         continue
@@ -434,16 +450,31 @@ class PcbnewParser(EcadParser):
 
         return drawings
 
+    @staticmethod
+    def _pad_is_through_hole(pad):
+        # type: (pcbnew.PAD) -> bool
+        if hasattr(pcbnew, 'PAD_ATTRIB_PTH'):
+            through_hole_attributes = [pcbnew.PAD_ATTRIB_PTH,
+                                       pcbnew.PAD_ATTRIB_NPTH]
+        else:
+            through_hole_attributes = [pcbnew.PAD_ATTRIB_STANDARD,
+                                       pcbnew.PAD_ATTRIB_HOLE_NOT_PLATED]
+        return pad.GetAttribute() in through_hole_attributes
+
     def parse_pad(self, pad):
         # type: (pcbnew.PAD) -> list[dict]
         custom_padstack = False
         outer_layers = [(pcbnew.F_Cu, "F"), (pcbnew.B_Cu, "B")]
         if hasattr(pad, 'Padstack'):
-            padstack = pad.Padstack() # type: pcbnew.PADSTACK
+            padstack = pad.Padstack()  # type: pcbnew.PADSTACK
             layers_set = list(padstack.LayerSet().Seq())
+            if hasattr(pcbnew, "UNCONNECTED_LAYER_MODE_REMOVE_ALL"):
+                ULMRA = pcbnew.UNCONNECTED_LAYER_MODE_REMOVE_ALL
+            else:
+                ULMRA = padstack.UNCONNECTED_LAYER_MODE_REMOVE_ALL
             custom_padstack = (
-                padstack.Mode() != padstack.MODE_NORMAL or \
-                    padstack.UnconnectedLayerMode() == padstack.UNCONNECTED_LAYER_MODE_REMOVE_ALL
+                padstack.Mode() != padstack.MODE_NORMAL or
+                padstack.UnconnectedLayerMode() == ULMRA
             )
         else:
             layers_set = list(pad.GetLayerSet().Seq())
@@ -451,7 +482,7 @@ class PcbnewParser(EcadParser):
         for layer, letter in outer_layers:
             if layer in layers_set:
                 layers.append(letter)
-        if not layers:
+        if not layers and not self._pad_is_through_hole(pad):
             return []
 
         if custom_padstack:
@@ -537,13 +568,8 @@ class PcbnewParser(EcadParser):
             except TypeError:
                 pad_dict["chamfpos"] = pad.GetChamferPositions()
                 pad_dict["chamfratio"] = pad.GetChamferRectRatio()
-        if hasattr(pcbnew, 'PAD_ATTRIB_PTH'):
-            through_hole_attributes = [pcbnew.PAD_ATTRIB_PTH,
-                                       pcbnew.PAD_ATTRIB_NPTH]
-        else:
-            through_hole_attributes = [pcbnew.PAD_ATTRIB_STANDARD,
-                                       pcbnew.PAD_ATTRIB_HOLE_NOT_PLATED]
-        if pad.GetAttribute() in through_hole_attributes:
+
+        if self._pad_is_through_hole(pad):
             pad_dict["type"] = "th"
             pad_dict["drillshape"] = {
                 pcbnew.PAD_DRILL_SHAPE_CIRCLE: "circle",
@@ -552,6 +578,7 @@ class PcbnewParser(EcadParser):
             pad_dict["drillsize"] = self.normalize(pad.GetDrillSize())
         else:
             pad_dict["type"] = "smd"
+
         if hasattr(pad, "GetOffset"):
             try:
                 pad_dict["offset"] = self.normalize(pad.GetOffset(layer))
@@ -708,6 +735,8 @@ class PcbnewParser(EcadParser):
                 if (hasattr(zone, 'GetFilledPolysUseThickness') and
                         not zone.GetFilledPolysUseThickness()):
                     width = 0
+                if KICAD_VERSION[0] >= 7:
+                    width = 0
                 zone_dict = {
                     "polygons": self.parse_poly_set(poly_set),
                     "width": width,
@@ -728,16 +757,24 @@ class PcbnewParser(EcadParser):
         nets = sorted([str(s) for s in nets])
         return nets
 
-    @staticmethod
-    def footprint_to_component(footprint, extra_fields):
+    def footprint_to_component(self, footprint, extra_fields):
+        # type: (pcbnew.FOOTPRINT, list) -> Component
         try:
             footprint_name = str(footprint.GetFPID().GetFootprintName())
         except AttributeError:
             footprint_name = str(footprint.GetFPID().GetLibItemName())
 
+        value = footprint.GetValue()
+        if hasattr(footprint, 'GetFieldValueForVariant'):
+            value = footprint.GetFieldValueForVariant(
+                self.config.kicad_variant, 'Value')
         attr = 'Normal'
         if hasattr(pcbnew, 'FP_EXCLUDE_FROM_BOM'):
-            if footprint.GetAttributes() & pcbnew.FP_EXCLUDE_FROM_BOM:
+            if hasattr(footprint, 'GetExcludedFromBOMForVariant'):
+                if footprint.GetExcludedFromBOMForVariant(
+                        self.config.kicad_variant):
+                    attr = 'Virtual'
+            elif footprint.GetAttributes() & pcbnew.FP_EXCLUDE_FROM_BOM:
                 attr = 'Virtual'
         elif hasattr(pcbnew, 'MOD_VIRTUAL'):
             if footprint.GetAttributes() == pcbnew.MOD_VIRTUAL:
@@ -748,7 +785,7 @@ class PcbnewParser(EcadParser):
         }.get(footprint.GetLayer())
 
         return Component(footprint.GetReference(),
-                         footprint.GetValue(),
+                         value,
                          footprint_name,
                          layer,
                          attr,
@@ -767,9 +804,9 @@ class PcbnewParser(EcadParser):
                              self.config.dnp_field)
 
         if not self.config.extra_data_file and need_extra_fields:
-            self.logger.warn('Ignoring extra fields related config parameters '
-                             'since no netlist/xml file was specified.')
-            need_extra_fields = False
+            self.config.extra_data_file = self.file_name
+            self.logger.warn('Assuming extra data file to be the pcb file '
+                             'since --extra-data-file was not specified.')
 
         extra_field_data = None
         if (self.config.extra_data_file and
@@ -832,6 +869,7 @@ class PcbnewParser(EcadParser):
                 "revision": revision,
                 "company": company,
                 "date": file_date,
+                "variant": self.config.kicad_variant,
             },
             "bom": {},
             "font_data": self.font_parser.get_parsed_font()
@@ -898,7 +936,7 @@ class InteractiveHtmlBomPlugin(pcbnew.ActionPlugin, object):
         from ..errors import ParsingException
 
         logger = ibom.Logger()
-        board = pcbnew.GetBoard()
+        board = pcbnew.GetBoard()  # type: pcbnew.BOARD
         pcb_file_name = board.GetFileName()
 
         if not pcb_file_name:
@@ -906,6 +944,9 @@ class InteractiveHtmlBomPlugin(pcbnew.ActionPlugin, object):
             return
 
         config = Config(version, os.path.dirname(pcb_file_name))
+        if hasattr(board, 'GetCurrentVariant'):
+            config.kicad_variant = board.GetCurrentVariant()
+
         parser = PcbnewParser(pcb_file_name, config, logger, board)
 
         try:

{interactivehtmlbom-2.10.0 → interactivehtmlbom-2.11.1}/InteractiveHtmlBom/ecad/schema/genericjsonpcbdata_v1.schema

@@ -305,6 +305,9 @@
                 },
                 "date": {
                     "type": "string"
+                },
+                "variant": {
+                    "type": "string"
                 }
             },
             "required": ["title", "revision", "company", "date"],
@@ -443,12 +446,20 @@
             "properties": {
                 "svgpath": { "type": "string" },
                 "thickness": { "type": "number" },
+                "fillrule": {
+                    "type": "string",
+                    "enum": [
+                        "nonzero",
+                        "evenodd"
+                    ]
+                },
                 "ref": { "type": "integer" , "const": 1 },
                 "val": { "type": "integer" , "const": 1 }
             },
-            "required": [
-                "svgpath",
-                "thickness"
+            "required": ["svgpath"],
+            "oneOf": [
+                { "required": ["thickness"] },
+                { "required": ["fillrule"] }
             ],
             "title": "DrawingText"
         },

{interactivehtmlbom-2.10.0 → interactivehtmlbom-2.11.1}/InteractiveHtmlBom/generate_interactive_bom.py

@@ -4,6 +4,7 @@ from __future__ import absolute_import
 import argparse
 import os
 import sys
+
 # Add ../ to the path
 # Works if this script is executed without installing the module
 script_dir = os.path.dirname(os.path.abspath(os.path.realpath(__file__)))
@@ -23,16 +24,22 @@ def to_utf(s):
 
 
 def main():
-    create_wx_app = 'INTERACTIVE_HTML_BOM_NO_DISPLAY' not in os.environ
-
-    import wx
-
-    if create_wx_app:
-        app = wx.App()
-        if hasattr(wx, "APP_ASSERT_SUPPRESS"):
-            app.SetAssertMode(wx.APP_ASSERT_SUPPRESS)
-    elif hasattr(wx, "DisableAsserts"):
-        wx.DisableAsserts()
+    from .compat import get_wx, should_create_wx_app
+    wx = get_wx()
+    create_wx_app = should_create_wx_app()
+
+    if wx is None and create_wx_app:
+        print("wxpython is required unless INTERACTIVE_HTML_BOM_NO_DISPLAY "
+              "environment variable is set")
+        sys.exit(1)
+
+    if wx is not None:
+        if create_wx_app:
+            app = wx.App()
+            if hasattr(wx, "APP_ASSERT_SUPPRESS"):
+                app.SetAssertMode(wx.APP_ASSERT_SUPPRESS)
+        elif hasattr(wx, "DisableAsserts"):
+            wx.DisableAsserts()
 
     from .core import ibom
     from .core.config import Config
@@ -40,6 +47,7 @@ def main():
     from .version import version
     from .errors import (ExitCodes, ParsingException, exit_error)
 
+
     parser = argparse.ArgumentParser(
             description='KiCad InteractiveHtmlBom plugin CLI.',
             formatter_class=argparse.ArgumentDefaultsHelpFormatter)
@@ -58,6 +66,7 @@ def main():
     print("Loading %s" % args.file)
 
     config = Config(version, os.path.dirname(os.path.abspath(args.file)))
+    config.kicad_variant = args.kicad_variant
 
     parser = get_parser_by_extension(
         os.path.abspath(args.file), config, logger)

{interactivehtmlbom-2.10.0 → interactivehtmlbom-2.11.1}/InteractiveHtmlBom/version.py

@@ -3,7 +3,7 @@ import os
 import subprocess
 
 
-LAST_TAG = 'v2.10.0'
+LAST_TAG = 'v2.11.1'
 
 
 def _get_git_version():

{interactivehtmlbom-2.10.0 → interactivehtmlbom-2.11.1}/InteractiveHtmlBom/web/render.js

@@ -24,12 +24,17 @@ function drawText(ctx, text, color) {
   ctx.strokeStyle = color;
   ctx.lineCap = "round";
   ctx.lineJoin = "round";
-  ctx.lineWidth = text.thickness;
   if ("svgpath" in text) {
-    ctx.stroke(new Path2D(text.svgpath));
+    if ("thickness" in text) {
+      ctx.lineWidth = text.thickness;
+      ctx.stroke(new Path2D(text.svgpath));
+    } else if ("fillrule" in text) {
+      ctx.fill(new Path2D(text.svgpath), text.fillrule);
+    }
     ctx.restore();
     return;
   }
+  ctx.lineWidth = text.thickness;
   if ("polygons" in text) {
     ctx.fill(getPolygonsPath(text));
     ctx.restore();

{interactivehtmlbom-2.10.0 → interactivehtmlbom-2.11.1}/InteractiveHtmlBom/web/table-util.js

@@ -20,7 +20,7 @@ function setBomHandlers() {
     draggingElement.remove();
 
     // Make BOM selectable again
-    bom.style.removeProperty("userSelect");
+    bom.style.removeProperty("user-select");
 
     // Remove listeners
     document.removeEventListener('mousemove', mouseMoveHandler);

{interactivehtmlbom-2.10.0 → interactivehtmlbom-2.11.1}/InteractiveHtmlBom/web/util.js

@@ -549,7 +549,10 @@ function initDefaults() {
   setHighlightPin1(highlightpin1);
   document.forms.highlightpin1.highlightpin1.value = highlightpin1;
 
-  settings.markWhenChecked = readStorage("markWhenChecked") || "";
+  settings.markWhenChecked = readStorage("markWhenChecked");
+  if (settings.markWhenChecked == null) {
+    settings.markWhenChecked = config.mark_when_checked;
+  }
   populateMarkWhenCheckedOptions();
 
   function initBooleanSetting(storageString, def, elementId, func) {