Merge remote-tracking branch 'upstream/master'

Author: set-soft

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -7,7 +7,9 @@ body:
     options:
     - label: I have read [FAQ](https://yaqwsx.github.io/KiKit/latest/faq/)
       required: true
-    - label: I use KiKit at least version 1.4.0 (older version are not supported)
+    - label: I have searched existing issues (including closed ones)
+      required: true
+    - label: I use KiKit at least version 1.5.0 (older version are not supported)
       required: true
 - type: input
   attributes:
@@ -37,7 +39,8 @@ body:
       If you run into KiKit crashing, please rerun the command with `--debug
       'trace: true'` (when using the panelize command) or with `--debug` (when
       using any other command) and include the output in the error log. Please,
-      enclose the log into a code block.
+      enclose the log into a code block. Not including the log might
+      significantly increase time for handling the issue.
 
       If applicable, add screenshots to explain your problem. Note that if file
       type is not supported by GitHub, you can put them in a ZIP archive.
@@ -48,8 +51,9 @@ body:
     label: Steps to Reproduce
     description: >
       Please specify the steps to reproduce the issue. Do not forget to include
-      the KiKit command and also, please include any input boards you use. If
-      the boards are confidential, please reach out to me via e-mail to discuss
-      details.
+      the KiKit command and also, please include any input boards you use. Not
+      including files for reproduction might significantly increase time for
+      handling the issue. If the boards are confidential, you can send them to
+      e-mail@honzamrazek.cz with subject "KiKit issue files for #123".
   validations:
     required: true

.github/workflows/test-kikit.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        kicad-version: [v7, v7-testing, v8-testing, nightly]
+        kicad-version: [v7, v7-testing, v8, v8-testing]
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-kicad
@@ -64,28 +64,28 @@ jobs:
             suffix: ""
             platform: linux/amd64
             repo: ubuntu
-            kicad_version: "6.0"
+            kicad_version: "7.0"
             additional_packages: ""
             additional_python_packages: ""
           - name: "m1"
             suffix: -m1
             platform: linux/arm64/v8
             repo: arm64v8/ubuntu
-            kicad_version: "6.0"
+            kicad_version: "7.0"
             additional_packages: gcc-aarch64-linux-gnu libgeos-dev
             additional_python_packages: python3-dev
-          - name: "x64 v7"
-            suffix: "-v7"
+          - name: "x64 v8"
+            suffix: "-v8"
             platform: linux/amd64
             repo: ubuntu
-            kicad_version: "7.0"
+            kicad_version: "8.0"
             additional_packages: ""
             additional_python_packages: ""
-          - name: "m1 v7"
-            suffix: -m1-v7
+          - name: "m1 v8"
+            suffix: -m1-v8
             platform: linux/arm64/v8
             repo: arm64v8/ubuntu
-            kicad_version: "7.0"
+            kicad_version: "8.0"
             additional_packages: gcc-aarch64-linux-gnu libgeos-dev
             additional_python_packages: python3-dev
     steps:

Dockerfile

@@ -1,7 +1,7 @@
 ARG REPO=ubuntu
 FROM $REPO:22.04 AS base
 
-ARG KICAD_VERSION="6.0"
+ARG KICAD_VERSION="8.0"
 ARG ADDITIONAL_PACKAGES
 ARG ADDITIONAL_PYTHON_PACKAGES
 
@@ -14,7 +14,7 @@ RUN apt-get update && \
 
 RUN add-apt-repository --yes ppa:kicad/kicad-$KICAD_VERSION-releases
 
-# Setup ENV variables for KiCAD 7
+# Setup ENV variables for KiCAD 7 & 8
 # See https://gitlab.com/kicad/packaging/kicad-ubuntu-builder/kicad-daily-package/-/issues/43
 ENV PYTHONPATH=/usr/lib/kicad/lib/python3/dist-packages:${PYTHONPATH} \
     LD_LIBRARY_PATH=/usr/lib/kicad/lib/x86_64-linux-gnu/:${LD_LIBRARY_PATH}

Makefile

@@ -8,7 +8,7 @@ PCM_LIB_RESOURCES :=  $(shell find pcm/kikit-lib -type f -print) \
 	$(shell find kikit/resources/kikit.kicad_sym -type f -print) \
 	$(shell find kikit/resources/kikit.pretty -type f -print)
 
-.PHONY: doc clean package release test test-system test-unit
+.PHONY: doc clean package release test test-system test-unit docker-release
 
 all:
 # doc package test pcm
@@ -108,5 +108,10 @@ pcm-lib: $(PCM_LIB_RESOURCES)
 		-s versions.-1.download_url=\"TBA\" \
 		build/pcm-kikit-lib-metadata.json build/pcm-kikit-lib-metadata.json
 
+docker-release:
+	docker build -t yaqwsx/kikit:$(shell git describe --tags --always)-KiCAD8 --build-arg="KICAD_VERSION=8.0" .
+	docker build -t yaqwsx/kikit:latest --build-arg="KICAD_VERSION=8.0" .
+	docker build -t yaqwsx/kikit:$(shell git describe --tags --always)-KiCAD7 --build-arg="KICAD_VERSION=7.0" .
+
 clean:
 	rm -rf dist build

README.md

@@ -75,11 +75,14 @@ manufacturing data and board presentation pages.
 
 ## How To Use It?
 
-Read the [CLI documentation](https://yaqwsx.github.io/KiKit/latest/panelization/cli/) and the [panelize
-documentation](doc/panelization.md). Also don't miss the
-[examples](https://yaqwsx.github.io/KiKit/examples/panelization/examples/). There is also a quick not on how to use
-[panelization action plugin](https://yaqwsx.github.io/KiKit/latest/panelization/gui/). If you are interested in
-generating solder paste stencils, see [Stencil documentation](https://yaqwsx.github.io/KiKit/latest/stencil/)
+Start with reading the [panelization
+documentation](https://yaqwsx.github.io/KiKit/latest/panelization/intro/). This
+page will you guide through CLI, GUI and scripting usage. Also don't miss the
+[examples](https://yaqwsx.github.io/KiKit/examples/panelization/examples/).
+There is also a quick not on how to use [panelization action
+plugin](https://yaqwsx.github.io/KiKit/latest/panelization/gui/). If you are
+interested in generating solder paste stencils, see [Stencil
+documentation](https://yaqwsx.github.io/KiKit/latest/stencil/)
 
 ## Acknowledgements
 

docs/installation/docker.md

@@ -51,6 +51,17 @@ down and run that for you instead:
 docker run -v $(pwd):/kikit yaqwsx/kikit:nightly --version
 ```
 
+We provide the following containers:
+
+- **latests**: The latest stable version of KiKit with the newest stable KiCAD.
+- **vX.Y.Z-KiCADvA**: A container with particular version of KiKit backed by
+  given version of KiCAD.
+- **nightly**, **nightly-m1**: Daily build of KiKit from the upstream version
+  with the newest KiCAD. The m1 flavour supports mac M1.
+
+A full list is available on
+[Dockerhub](https://hub.docker.com/r/yaqwsx/kikit/tags).
+
 ## Mac M1 containers
 
 There are also nightly containers of Mac M1 available with tag `nightly-m1`.

docs/panelization/cli.md

@@ -339,6 +339,15 @@ Use mousebites to
 - `offset` - specify the offset, positive offset puts the cuts into the board,
   negative puts the cuts into the tabs
 - `layer` - specify the layer to render V-cuts on.
+- `linewidth` - specify linewidth
+- `endprolongation` - prolongation of the cut line from the board line on the
+  side without text.
+- `textprolongation` - the same as above, just on the text side
+- `textoffset` - offset of the text from the cut line
+- `template` - a string template for text to render. Can contain variables
+  listed below, e.g., `V-CUT {pos_mm}`.
+    - `pos_mm`, `pos_inch` – position of the V-cut from the panel origin
+    - `pos_inv_mm`, `pos_inv_inch` – inverted position of the V-cut from the panel origin
 
 #### Layer
 
@@ -349,6 +358,7 @@ design.
 - `layer` - specify the layer to render the cuts on.
 - `prolong` - distance for tangential prolongation of the cuts. It has the same
   meaning as mousebites.
+- `linewidth` - width of line to render
 
 #### Plugin
 
@@ -591,5 +601,7 @@ Finishing touches to the panel.
   be one of `tl`, `tr`, `bl`, `br` (corners), `mt`, `mb`, `ml`, `mr` (middle of
   sides), `c` (center). Empty string does not changes the origin.
 - `dimensions` - `true` or `false`. Draw dimensions with the panel size.
+- `edgewidth` ­– width of the line for panel edges (that is the lines in the
+  `Edge.Cuts` layer).
 
 

kikit/actionPlugins/panelize.py

@@ -4,7 +4,7 @@
 from pcbnewTransition import pcbnew, isV8
 from kikit.panelize_ui_impl import loadPresetChain, obtainPreset, mergePresets
 from kikit import panelize_ui
-from kikit.panelize import appendItem
+from kikit.panelize import NonFatalErrors, appendItem
 from kikit.common import PKG_BASE
 from .common import initDialog, destroyDialog
 import kikit.panelize_ui_sections
@@ -57,9 +57,8 @@ def transplateBoard(source, target):
     for x in items:
         target.Remove(x)
 
-    targetNetinfo = target.GetNetInfo()
-    if not isV8():
-        targetNetinfo.RemoveUnusedNets()
+    for x in list(target.GetNetInfo().NetsByNetcode().values()):
+        target.Remove(x)
 
     for x in source.GetDrawings():
         appendItem(target, x)
@@ -69,9 +68,9 @@ def transplateBoard(source, target):
         appendItem(target, x)
     for x in source.Zones():
         appendItem(target, x)
-    if not isV8():
-        for n in [n for _, n in source.GetNetInfo().NetsByNetcode().items()]:
-            targetNetinfo.AppendNet(n)
+
+    for n in [n for _, n in source.GetNetInfo().NetsByNetcode().items()]:
+        target.Add(n)
 
     d = target.GetDesignSettings()
     d.CloneFrom(source.GetDesignSettings())
@@ -421,7 +420,7 @@ def OnPanelize(self, event):
                     thread.join(timeout=1)
                     if not thread.is_alive():
                         break
-                if thread.exception:
+                if thread.exception and not isinstance(thread.exception, NonFatalErrors):
                     raise thread.exception
                 # KiCAD 6 does something strange here, so we will load
                 # an empty file if we read it directly, but we can always make
@@ -437,6 +436,8 @@ def OnPanelize(self, event):
                 panel = pcbnew.LoadBoard(copyPanelName)
                 transplateBoard(panel, self.board)
                 self.dirty = True
+                if thread.exception:
+                    raise thread.exception
             except Exception as e:
                 dlg = wx.MessageDialog(
                     None, f"Cannot perform:\n\n{e}", "Error", wx.OK)

kikit/common.py

@@ -260,6 +260,18 @@ def isLinestringCyclic(line):
     c = line.coords
     return c[0] == c[-1] or isinstance(line, LinearRing)
 
+def constructArrow(origin, direction, distance: float, tipSize: float) -> shapely.LineString:
+    origin = np.array(origin)
+    direction = np.array(direction)
+
+    endpoint = origin + direction * distance
+
+    tipEndpoint1 = endpoint + tipSize / 2 * (-direction - np.array([-direction[1], direction[0]]))
+    tipEndpoint2 = endpoint + tipSize / 2 * (-direction + np.array([-direction[1], direction[0]]))
+
+    arrow = shapely.LineString([origin, endpoint, tipEndpoint1, tipEndpoint2, endpoint])
+    return arrow
+
 def fromOpt(object, default):
     """
     Given an object, return it if not None. Otherwise return default

kikit/drc.py

@@ -62,7 +62,8 @@ class DrcExclusion:
 
     def eqRepr(self) -> Tuple[str, Union[Tuple[str, str], str]]:
         if len(self.objects) == 1:
-            return (self.type, self.objects[0])
+            objRepr = str(self.objects[0].m_Uuid.AsString()) if isinstance(self.objects[0], pcbnew.BOARD_ITEM) else self.objects[0]
+            return (self.type, objRepr)
         if len(self.objects) == 2 or self.type in ["starved_thermal"]:
             return (self.type, tuple(str(x.m_Uuid.AsString()) for x in self.objects))
         raise RuntimeError("Unsupported exclusion object count")

kikit/panel_features/copperFill.py

@@ -36,6 +36,9 @@ def apply(self, panel: Any) -> None:
         geoms = [zoneArea] if isinstance(zoneArea, Polygon) else zoneArea.geoms
 
         for g in geoms:
+            if len(g.exterior.coords) == 0:
+                # Skip empty geometries
+                continue
             zoneContainer = pcbnew.ZONE(panel.board)
             self._adjustZoneParameters(zoneContainer)
             zoneContainer.Outline().AddOutline(linestringToKicad(g.exterior))