Go to file

John Pateman 676efe2d5a Separate plotPCB versions for macOS and other *nix. Minor edits and some debugging advice. Typos correction.		2020-03-07 13:26:42 +00:00
Documents	Updated screenshots and README. Reordered SCM priority	2020-03-02 23:14:18 +00:00
.gitignore	Add .pyc to gitignore	2018-10-04 23:32:20 +01:00
README.md	Further minor tweaks/typo corrections to README.md	2020-03-03 17:21:45 +00:00
kidiff_gui.py	Updated screenshots and README. Reordered SCM priority	2020-03-02 23:14:18 +00:00
plotPCB2.py	Incorporated svg-pan-zoom in main window. Needed to add Python webserver to permit svg-pan-zoom to work in subsidiary windows. Still issues about filter coloring entire paired window div	2020-03-01 20:57:06 +00:00
plotPCB_macOS.py	Separate plotPCB versions for macOS and other *nix. Minor edits and some debugging advice. Typos correction.	2020-03-07 13:26:42 +00:00
tkUI.py	Updated screenshots and README. Reordered SCM priority	2020-03-02 23:14:18 +00:00

README.md

KiCad-Diff

This is a python program with a Tk inteface for comparing KiCad PCB revisions.

The diffing strategy has been changed for this version and SVGs are generated directly rather than doing renderings in ImageMagick as in previous versions. This has made the rendering possible for all layers in a few seconds (compared to 20-60s+ depending on resolution and number of layers selected in previous version). The SVG images are layered together with a different feColorMatrix filter applied to each diff. This highlights areas where features have been added or removed.

The output is presented as a gallery of images of each layer. Each layer pair can be compared and the combined view highlights clearly where the layers differ from each other.

The diff output can be scrolled and zoomed in and out for closer inspection. The pair of 'before and after' views will also pan and zoom together. I have looked at linking all thre windows together but this makes for a very confusing and unsatisfactory effect.

There is an additional 'Text Diff' which is helpful for identifying specif areas which have changed.

This was originaly written as a bash script, this newer GUI version has been rewritten in Python3 and supports Git, SVN and Fossil as SCM tools. I have also removed many of the dependencies.

Instructions

Check that the paths to your SCM tools are correct (lines 39-45). You do not need to install all of these but if you do not have one, e.g. SVN, make sure that you set svnProg='' etc.
Install 'plotPCB2.py' in /usr/local/bin (or adjust path in lines 45 to suit) This needs to be executable. This program actually generates the necessary SVG files.
Run the main script and select a pair of versions in a source controlled repository from the GUI. The GUI should show which SCM is in use.
The terminal should give you some useful information on progress. Please include a copy of this if you have any issues.
Hit Ctrl + C to terminate the webserver.

The script should build a series of svg files and display the diff in a webpage. If a web page doesn't open automatically, navigate to "http://127.0.0.1:9090/web/index.html" to view the output. You can adjust the port used (9090 by default) if this conflicts with your existing set-up.

Plans

Improvement in parsing and meaning of text diffs.
Place all template text/css text in external files.
Improve display of artifacts in diff choice window.
Consider changing GUI elements to wxPython.
Adjust for three pane output to have white outer border & pan-zoom control, not filter colour.
Improve three pane output layout, perhaps with diff tree on LHS and not underneath.
Consider adding 'Preferences' for this program.

Screenshots

GUI

Overview

Main view

Diff

Fab Layer

F_Cu Layer

Text Diff