-
Notifications
You must be signed in to change notification settings - Fork 4
/
kicad-diff.py
executable file
·947 lines (854 loc) · 37.3 KB
/
kicad-diff.py
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
#!/usr/bin/python3
# Copyright (c) 2020-2024 Salvador E. Tropea
# Copyright (c) 2020-2024 Instituto Nacional de Tecnología Industrial
# License: GPL-2.0
# Project: KiCad Diff
# Adapted from: https://github.com/obra/kicad-tools
"""
KiCad PCB/SCH diff tool
This program generates a PDF file showing the changes between two KiCad PCB
files.
PCBs are plotted into PDF files, one for each layer. Then ImageMagick is used
to compare the layers and JPG files are generated. The JPGs are finally
assembled into one PDF file and the default PDF reader is invoked.
All the intermediate files are generated in the system temporal directory and
removed as soon as the job is finished. You can cache the layers PDFs
specifying a cache directory and keep the resulting diff images specifying an
output directory.
The default resolution for the images is 150 DPI. It can be increased for
better images, at the cost of (exponentially) longer execution times. You can
provide a smaller resolution for faster processing. For high resolution you
could need to configure the ImageMagick limits. Consult the 'identify -list
resource' command.
For the SCHs we use KiAuto.
"""
__author__ = 'Salvador E. Tropea'
__copyright__ = 'Copyright 2020-2024, INTI/'+__author__
__credits__ = ['Salvador E. Tropea', 'Jesse Vincent']
__license__ = 'GPL 2.0'
__version__ = '2.5.5'
__email__ = '[email protected]'
__status__ = 'beta'
__url__ = 'https://github.com/INTI-CMNB/KiDiff/'
import argparse
import atexit
import csv
from glob import glob
from hashlib import sha1
import json
import logging
from os.path import isfile, isdir, basename, sep, splitext, abspath, dirname, getmtime
from os import makedirs, rename, remove
from pcbnew import (LoadBoard, PLOT_CONTROLLER, FromMM, PLOT_FORMAT_PDF, PLOT_FORMAT_SVG, Edge_Cuts, GetBuildVersion, ToMM,
ZONE_FILLER)
import pcbnew
import re
import shlex
from shutil import rmtree, which, copy2
from struct import unpack
from subprocess import call, PIPE, run, STDOUT, CalledProcessError
from sys import exit
from tempfile import mkdtemp, NamedTemporaryFile
import time
# Exit error codes
# Fixed values
INTERNAL_ERROR = 1
ARGS_ERROR = 2
# Our values
FAILED_TO_PLOT = 3
MISSING_TOOLS = 4
FAILED_TO_CONVERT = 5
FAILED_TO_DIFF = 6
FAILED_TO_JOIN = 7
WRONG_EXCLUDE = 8
WRONG_ARGUMENT = 9
DIFF_TOO_BIG = 10
OLD_INVALID = 11
NEW_INVALID = 12
NOTHING_TO_COMPARE = 13
kicad_version_major = kicad_version_minor = kicad_version_patch = 0
cur_pcb_ops = cur_sch_ops = None
is_pcb = True
use_poppler = True
# Compress SVG files using scour (KiRi mode)
use_scour = False
DEFAULT_LAYER_NAMES = {
pcbnew.F_Cu: 'F.Cu',
pcbnew.B_Cu: 'B.Cu',
pcbnew.F_Adhes: 'F.Adhes',
pcbnew.B_Adhes: 'B.Adhes',
pcbnew.F_Paste: 'F.Paste',
pcbnew.B_Paste: 'B.Paste',
pcbnew.F_SilkS: 'F.SilkS',
pcbnew.B_SilkS: 'B.SilkS',
pcbnew.F_Mask: 'F.Mask',
pcbnew.B_Mask: 'B.Mask',
pcbnew.Dwgs_User: 'Dwgs.User',
pcbnew.Cmts_User: 'Cmts.User',
pcbnew.Eco1_User: 'Eco1.User',
pcbnew.Eco2_User: 'Eco2.User',
pcbnew.Edge_Cuts: 'Edge.Cuts',
pcbnew.Margin: 'Margin',
pcbnew.F_CrtYd: 'F.CrtYd',
pcbnew.B_CrtYd: 'B.CrtYd',
pcbnew.F_Fab: 'F.Fab',
pcbnew.B_Fab: 'B.Fab',
}
SCHEMATIC_SVG_BASE_NAME = 'Schematic_root'
if hasattr(pcbnew, 'DRILL_MARKS_NO_DRILL_SHAPE'):
NO_DRILL_SHAPE = pcbnew.DRILL_MARKS_NO_DRILL_SHAPE
SMALL_DRILL_SHAPE = pcbnew.DRILL_MARKS_SMALL_DRILL_SHAPE
FULL_DRILL_SHAPE = pcbnew.DRILL_MARKS_FULL_DRILL_SHAPE
elif hasattr(pcbnew, 'PCB_PLOT_PARAMS'):
NO_DRILL_SHAPE = pcbnew.PCB_PLOT_PARAMS.NO_DRILL_SHAPE
SMALL_DRILL_SHAPE = pcbnew.PCB_PLOT_PARAMS.SMALL_DRILL_SHAPE
FULL_DRILL_SHAPE = pcbnew.PCB_PLOT_PARAMS.FULL_DRILL_SHAPE
def SetExcludeEdgeLayer(po, exclude_edge_layer, layer):
if hasattr(po, 'SetExcludeEdgeLayer'):
po.SetExcludeEdgeLayer(exclude_edge_layer)
elif not exclude_edge_layer:
# Include the edge on all layers
# Doesn't work in 7.0.0. Bug: https://gitlab.com/kicad/code/kicad/-/issues/13841
include = pcbnew.LSET()
include.addLayer(layer)
po.SetPlotOnAllLayersSelection(include)
def WriteBBox(board, hash_dir):
fname = '{}{}bbox.csv'.format(hash_dir, sep)
if isfile(fname):
# Use the cached value if available, in cache mode the file can be bogus
with open(fname, 'rt') as f:
vals = tuple(map(float, f.read().split(',')))
else:
bbox = board.GetBoundingBox()
vals = tuple(map(ToMM, (bbox.GetX(), bbox.GetY(), bbox.GetWidth(), bbox.GetHeight())))
with open(fname, 'wt') as f:
f.write(','.join(tuple(map(str, vals))))
return vals
def compress_svg(name):
if not use_scour:
return
tmp = name+'.compressed'
run_command(['scour', '-i', name, '-o', tmp, '--enable-viewboxing', '--enable-id-stripping', '--enable-comment-stripping',
'--shorten-ids', '--indent=none'])
rename(tmp, name)
def GetOpsName(name):
return dirname(name)+sep+'.'+basename(name)+'.json'
def WriteOptions(name, ops):
name_ops = GetOpsName(name)
logger.debug('Writing options used for `{}` as `{}` ({})'.format(name, name_ops, ops))
with open(name_ops, 'wt') as f:
f.write(json.dumps(ops))
def CheckOptions(name, cur_ops):
name_ops = GetOpsName(name)
if not isfile(name_ops):
logger.debug('No options for cache entry: '+name)
return False
res = json.load(open(name_ops, 'rt')) == cur_ops
logger.debug('Options for cache entry `{}` are the same as current: {}'.format(name, res))
return res
def GenPCBImages(file, file_hash, hash_dir, file_no_ext, layer_names, wanted_layers, kiri_mode, zones_ops):
# Setup the KiCad plotter
board = LoadBoard(file)
if hasattr(pcbnew, 'LAYER_HIDDEN_TEXT'):
# KiCad 8.0.2 crazyness: hidden text affects scaling, even when not plotted
# So a PRL can affect the plot mechanism
board.SetElementVisibility(pcbnew.LAYER_HIDDEN_TEXT, False)
pctl = PLOT_CONTROLLER(board)
popt = pctl.GetPlotOptions()
popt.SetOutputDirectory(abspath(hash_dir)) # abspath: Otherwise it will be relative to the file
# Options
# KiCad 5 only
if kicad_version_major == 5:
popt.SetLineWidth(FromMM(0.35))
popt.SetPlotFrameRef(False)
else:
popt.SetPlotFrameRef(kiri_mode)
popt.SetMirror(False)
popt.SetUseGerberAttributes(True)
SetExcludeEdgeLayer(popt, False, board.GetLayerID('Edge.Cuts'))
popt.SetUseAuxOrigin(False)
popt.SetSkipPlotNPTH_Pads(False)
popt.SetPlotViaOnMaskLayer(True)
popt.SetSubtractMaskFromSilk(False)
if zones_ops != 'none':
zones = board.Zones()
if zones_ops == 'fill':
ZONE_FILLER(board).Fill(zones)
elif zones_ops == 'unfill':
for z in zones:
z.UnFill()
if kiri_mode:
flavors = 1
extension = 'svg'
plot_format = PLOT_FORMAT_SVG
dir_name = hash_dir+sep+'_KIRI_'+sep+'pcb'
makedirs(dir_name, exist_ok=True)
file_pattern = dir_name+sep+'layer-%02d%s.'+extension
else:
flavors = 2
extension = 'pdf'
plot_format = PLOT_FORMAT_PDF
file_pattern = hash_dir+sep+'%d%s.'+extension
# Plot all used layers to PDF files
for scaled in range(flavors):
# We create 2 versions: one with autoscale and the other without it
# If the BBox is the same we use the scaled one, otherwise we use the non-scaled
sc_id = ''
if scaled:
popt.SetAutoScale(True)
popt.SetScale(0)
else:
popt.SetAutoScale(False)
popt.SetScale(1)
if not kiri_mode:
sc_id = '_1'
for i, layer in wanted_layers.items():
if i not in layer_names:
# This layer was removed, don't plot it
continue
layer_rep = layer.replace('.', '_')
name_pdf_kicad = '{}{}{}-{}.{}'.format(hash_dir, sep, file_no_ext, layer_rep, extension)
name_pdf = file_pattern % (i, sc_id)
# Create the PDF, or use a cached version
if not CheckOptions(name_pdf, cur_pcb_ops) or not isfile(name_pdf):
logger.info('Plotting %s layer' % layer)
# Plot the edge before, no drill marks (8.0.4 added them)
pctl.SetLayer(Edge_Cuts)
popt.SetDrillMarksType(NO_DRILL_SHAPE)
pctl.OpenPlotfile(layer, plot_format, layer)
pctl.PlotLayer()
# Plot the real layer, disable drill marks in silk screen (8.0.4 added them)
pctl.SetLayer(i)
logging.error(i)
logging.error(i > pcbnew.B_Cu)
popt.SetDrillMarksType(NO_DRILL_SHAPE if i > pcbnew.B_Cu else SMALL_DRILL_SHAPE)
pctl.PlotLayer()
pctl.ClosePlot()
if not isfile(name_pdf_kicad):
logger.error('Failed to plot '+name_pdf_kicad)
exit(FAILED_TO_PLOT)
rename(name_pdf_kicad, name_pdf)
if kiri_mode:
compress_svg(name_pdf)
WriteOptions(name_pdf, cur_pcb_ops)
else:
logger.debug('Using cached {} layer'.format(layer))
if scaled:
layer_name = layer_names[i]
if layer_name != layer:
layer_names[i] = '{} ({})'.format(layer_name, layer)
return kiri_mode or WriteBBox(board, hash_dir)
def GenSCHImageDirect(file, file_hash, hash_dir, file_no_ext, layer_names, all):
""" Plot the schematic in one PDF file """
name_pdf = hash_dir+sep+layer_names[0]+'.pdf'
name_ops = hash_dir+sep+'options'
# Create the PDF, or use a cached version
if not CheckOptions(name_ops, cur_sch_ops) or not isfile(name_pdf):
logger.info('Plotting the schematic')
cmd = ['eeschema_do', 'export', '--file_format', 'pdf', '--monochrome', '--no_frame', '--output_name', name_pdf]
if all:
cmd.append('--all_pages')
cmd.extend([file, '.'])
logger.debug('Executing: '+str(cmd))
call(cmd)
if not isfile(name_pdf):
logger.error('Failed to plot %s' % name_pdf)
exit(FAILED_TO_PLOT)
WriteOptions(name_ops, cur_sch_ops)
else:
logger.debug('Using cached schematic')
def svg2png(svg_file, png_file):
cmd = ['rsvg-convert', '-d', str(resolution), '-p', str(resolution), '-f', 'png', '-b', 'white', '-o', png_file, svg_file]
run_command(cmd)
def GenSCHImageSVG(file, file_hash, hash_dir, file_no_ext, layer_names, kiri_mode):
""" Plot the schematic using SVG files so we get separated files with correct names.
Then convert all the pages to PNGs.
This function is used only when all pages are requested """
if kiri_mode:
hash_dir += sep+'_KIRI_'+sep+'sch'
pattern_svgs = hash_dir+sep+file_no_ext+'*.svg'
pattern_pngs = hash_dir+sep+SCHEMATIC_SVG_BASE_NAME+'*.png'
name_ops = hash_dir+sep+'options'
files = glob(pattern_pngs)
# Create the PNG, or use a cached version
ops_changed = not CheckOptions(name_ops, cur_sch_ops)
logger.error(f"ops_changed {ops_changed}")
if ops_changed or not files:
svgs = glob(pattern_svgs)
if ops_changed or not svgs:
logger.info('Plotting the schematic')
cmd = ['eeschema_do', 'export', '--file_format', 'svg', '--monochrome', '--all_pages']
if not kiri_mode:
cmd.append('--no_frame')
cmd.extend([file, hash_dir])
run_command(cmd)
files = glob(pattern_svgs)
if not files:
logger.error('Failed to plot %s' % file)
exit(FAILED_TO_PLOT)
if kiri_mode:
for f in files:
compress_svg(f)
else:
# Convert the files to PNG
# Also rename the files to make independent of the project name
len_file_no_ext = len(file_no_ext)
for f in files:
dname = dirname(f)
name = splitext(basename(f))
if name[0].startswith(file_no_ext):
svg2png(f, dname+sep+SCHEMATIC_SVG_BASE_NAME+name[0][len_file_no_ext:]+'.png')
else:
logger.warning('Unexpected file `{}`'.format(f))
files = glob(pattern_pngs)
WriteOptions(name_ops, cur_sch_ops)
else:
logger.debug('Using cached schematic')
# Remove the "Schematic_all" entry
del layer_names[0]
# We don't have unique ID layers, so we use a different mechanism
# This is just a list of sheet names, inside a hash
for c, f in enumerate(sorted(files)):
name = splitext(basename(f))[0]
if not name.endswith('_blanked'):
layer_names[name] = c
def GenSCHImage(file, file_hash, hash_dir, file_no_ext, layer_names, all, kiri_mode):
if svg_mode:
GenSCHImageSVG(file, file_hash, hash_dir, file_no_ext, layer_names, kiri_mode)
else:
GenSCHImageDirect(file, file_hash, hash_dir, file_no_ext, layer_names, all)
def GenImages(file, file_hash, all, zones, kiri_mode=False):
# Check if we have a valid cache
hash_dir = cache_dir+sep+file_hash
logger.debug('Cache for {} will be {}'.format(file, hash_dir))
if isdir(hash_dir):
logger.info('cache dir for `%s` already exists' % file)
file_no_ext = splitext(basename(file))[0]
# Read the layer names from the file
if is_pcb:
layer_names, wanted_layers = load_layer_names(file, hash_dir, kiri_mode)
logger.debug('Layers list: '+str(layer_names))
logger.debug('Wanted layers: '+str(wanted_layers))
res = GenPCBImages(file, file_hash, hash_dir, file_no_ext, layer_names, wanted_layers, kiri_mode, zones)
else:
layer_names = {0: 'Schematic_all' if args.all_pages else 'Schematic'}
GenSCHImage(file, file_hash, hash_dir, file_no_ext, layer_names, all, kiri_mode)
# No BBox needed
res = True
return layer_names, res
def run_command(command):
logger.debug('Executing: '+shlex.join(command))
try:
res = run(command, check=True, stdout=PIPE, stderr=STDOUT).stdout.decode()
except CalledProcessError as e:
res = ''
logger.debug('Running {} returned {}'.format(e.cmd, e.returncode))
if e.output:
logger.debug('- StdOut from command: '+e.output.decode())
if e.stderr:
logger.debug('- StdErr from command: '+e.stderr.decode())
return res
def pdf2png(base_name, blank=False, ref=None):
source = base_name+'.pdf' if not blank else ref+'.pdf'
source_mtime = getmtime(source) if isfile(source) else 0
dest1 = base_name+'.png'
destm = base_name+'-0.png'
if isfile(dest1) and getmtime(dest1) > source_mtime:
logger.debug(source+" already converted to PNG")
return [dest1]
if isfile(destm) and getmtime(dest1) > source_mtime:
logger.debug(source+" already converted to PNG")
return sorted(glob(base_name+'-*.png'))
if isfile(source):
if use_poppler:
cmd = 'cat "{}" | pdftoppm -r {} -gray - | convert - "{}"'.format(source, resolution, dest1)
else:
cmd = ('convert -density {} "{}" -background white -alpha remove -alpha off -threshold 50% '
'-colorspace Gray -resample {} -depth 8 "{}"'.format(resolution*2, source, resolution, dest1))
run_command(['bash', '-c', cmd])
else:
png = ref+'.png'
assert isfile(png), png
copy2(png, dest1)
if blank:
# Create a blank file
logger.debug('Blanking '+dest1)
blanked = base_name+'_blanked.png'
cmd = ('convert "{}" -background white -threshold 100% -negate -colorspace Gray "{}"'.format(dest1, blanked))
run_command(['bash', '-c', cmd])
remove(dest1)
dest1 = blanked
if isfile(dest1):
return [dest1]
if isfile(destm):
return sorted(glob(base_name+'-*.png'))
assert False
def create_no_diff(output_dir):
diff_name = output_dir+sep+'no-diff.png'
cmd = ['convert', '-size', '640x480', '-background', 'white', '-fill', 'black', '-pointsize', '72', '-gravity', 'center',
'label:No diff', diff_name]
run_command(cmd)
return diff_name
def adapt_name(name_layer):
if name_layer.startswith(SCHEMATIC_SVG_BASE_NAME):
rest = name_layer[len(SCHEMATIC_SVG_BASE_NAME):]
return '/'+rest if not rest else rest
return name_layer
def png_size(file):
with open(file, 'rb') as f:
s = f.read(32)
assert s[:8] == b'\x89PNG\r\n\x1a\n' and (s[12:16] == b'IHDR')
w, h = unpack('>LL', s[16:24])
return int(w), int(h)
def create_diff_stereo(old_name, new_name, diff_name, font_size, layer, resolution, name_layer, only_different):
wn, hn = png_size(new_name)
wo, ho = png_size(old_name)
if wn != wo or hn != ho:
extent = ' -extent {}x{}'.format(max(wn, wo), max(hn, ho))
extra_name = ' [diff page size]'
else:
extra_name = extent = ''
text = ' -font helvetica -pointsize '+font_size+' -draw "text 10,'+font_size+' \''+adapt_name(name_layer)+extra_name+'\'" '
command = ['bash', '-c',
'( convert "'+new_name+'"'+extent+' miff:- ;' +
' convert "'+old_name+'"'+extent+' miff:- ) | ' +
r'convert - \( -clone 0-1 -compose darken -composite \) ' +
text+' -channel RGB -combine "'+diff_name+'"']
run_command(command)
include = True
if only_different:
res = run_command(['identify', '-format', '%[colorspace]', diff_name])
include = res != 'Gray'
if res not in ['Gray', 'sRGB']:
logger.warning('Unknown color space `{}`'.format(res))
return include
def create_diff_stereo_colored(old_name, new_name, diff_name, font_size, layer, resolution, name_layer, only_different):
""" A more complex version of create_diff_stereo where we can control the colors """
wn, hn = png_size(new_name)
wo, ho = png_size(old_name)
if wn != wo or hn != ho:
extent = ' -extent {}x{}'.format(max(wn, wo), max(hn, ho))
extra_name = ' [diff page size]'
else:
extra_name = extent = ''
with NamedTemporaryFile(mode='w', prefix='removed', suffix='.png', delete=False) as f:
removed = f.name
with NamedTemporaryFile(mode='w', prefix='added', suffix='.png', delete=False) as f:
added = f.name
command = ['bash', '-c',
'( convert -threshold 50% "'+new_name+'"'+extent+' miff:- ;' +
' convert -threshold 50% -negate "'+old_name+'"'+extent+' miff:- ) | ' +
r'convert - -compose darken -composite -negate -fill "'+args.removed_2color+'" ' +
' -opaque black -transparent white "'+removed+'"']
run_command(command)
command = ['bash', '-c',
'( convert -threshold 50% -negate "'+new_name+'"'+extent+' miff:- ;' +
' convert -threshold 50% "'+old_name+'"'+extent+' miff:- ) | ' +
r'convert - -compose darken -composite -negate -fill "'+args.added_2color+'" ' +
' -opaque black -transparent white "'+added+'"']
run_command(command)
run_command(['convert', old_name, added, '-composite', removed, '-composite',
'-font', 'helvetica', '-pointsize', font_size, '-draw',
"text 10,"+font_size+" '"+adapt_name(name_layer)+extra_name+"'",
diff_name])
include = True
if only_different:
res1 = run_command(['identify', '-format', '%k', added])
res2 = run_command(['identify', '-format', '%k', removed])
include = res1 == '2' and res2 == '2'
remove(added)
remove(removed)
return include
def create_diff_stat(old_name, new_name, diff_name, font_size, layer, resolution, name_layer, only_different):
wn, hn = png_size(new_name)
wo, ho = png_size(old_name)
if wn != wo or hn != ho:
# extent = ' -extent {}x{}'.format(max(wn, wo), max(hn, ho))
extra_name = ' [diff page size]'
else:
extra_name = ''
# Compare both
cmd = ['compare',
# Tolerate 5 % error in color (configurable)
'-fuzz', str(args.fuzz)+'%',
# Count how many pixels differ
'-metric', 'AE',
new_name,
old_name,
'-colorspace', 'RGB',
diff_name]
logger.debug('Executing: '+shlex.join(cmd))
res = run(cmd, stdout=PIPE, stderr=STDOUT)
errors = int(res.stdout.decode())
logger.debug('AE for {}: {}'.format(layer, errors))
if args.threshold and errors > args.threshold:
logger.error('Difference for `{}` is not acceptable ({} > {})'.format(name_layer, errors, args.threshold))
exit(DIFF_TOO_BIG)
cmd = ['convert', diff_name, '-font', 'helvetica', '-pointsize', font_size, '-draw',
'text 10,'+font_size+" '"+adapt_name(name_layer)+extra_name+"'", diff_name]
logger.debug('Executing: '+str(cmd))
call(cmd)
return not only_different or (only_different and errors != 0)
def DiffImages(old_file_hash, new_file_hash, layers_old, layers_new, only_different, changed):
old_hash_dir = cache_dir+sep+old_file_hash
new_hash_dir = cache_dir+sep+new_file_hash
files = ['convert']
# Compute the difference between images for each layer, store JPGs
font_size = str(int(resolution/5))
all_layers = {}
all_layers.update(layers_old)
all_layers.update(layers_new)
skipped = []
for i in sorted(all_layers.keys()):
if svg_mode:
# Multisheet schematic
layer_rep = layer = i
# Try to reconstruct the sheet path (fails if the names contains -)
name_layer = i.replace('-', '/')
elif is_pcb:
layer = all_layers[i]
name_layer = 'Layer: '+layer
layer_rep = str(i)
if changed:
layer_rep += '_1'
else: # Normal schematic (single or no rsvg-convert)
layer_rep = layer = all_layers[i]
name_layer = layer
# Convert the PDFs to PNGs
old_file = old_hash_dir+sep+layer_rep
new_file = new_hash_dir+sep+layer_rep
old = pdf2png(old_file, i not in layers_old, new_file)
new = pdf2png(new_file, i not in layers_new, old_file)
if i not in layers_old:
name_layer += ' only in new file'
if i not in layers_new:
name_layer += ' only in old file'
if len(old) != len(new):
logger.error("Adding/removing sheets isn't supported without `rsvg-convert`")
exit(FAILED_TO_DIFF)
for i, old_name in enumerate(old):
new_name = new[i]
diff_name = output_dir+sep+'diff-'+layer_rep+str(i)+'.png'
logger.info('Creating diff for '+(layer+'_'+str(i) if len(old) > 1 else layer))
if args.diff_mode == 'red_green':
inc = create_diff_stereo(old_name, new_name, diff_name, font_size, layer, resolution, name_layer,
only_different)
elif args.diff_mode == '2color':
inc = create_diff_stereo_colored(old_name, new_name, diff_name, font_size, layer, resolution,
name_layer, only_different)
else:
inc = create_diff_stat(old_name, new_name, diff_name, font_size, layer, resolution, name_layer,
only_different)
if not isfile(diff_name):
logger.error('Failed to create diff %s' % diff_name)
exit(FAILED_TO_DIFF)
if inc:
files.append(diff_name)
else:
skipped.append(diff_name)
# Check if we skipped all
if len(files) == 1 and skipped:
files.append(create_no_diff(output_dir))
# Join all the JPGs into one PDF
out_name = output_dir+sep+args.output_name
output_pdf = out_name
# The name must end with .pdf
if not output_pdf.endswith('.pdf'):
output_pdf += '.pdf'
files.append(output_pdf)
if len(files) > 2:
logger.info('Joining all diffs into one PDF')
logger.debug(files)
call(files)
else:
logger.error('Nothing to compare!')
exit(NOTHING_TO_COMPARE)
if not isfile(output_pdf):
logger.error('Failed to join diffs into %s' % output_pdf)
exit(FAILED_TO_JOIN)
# Fix the name
if not args.output_name.endswith('.pdf'):
logger.debug('{} -> {}'.format(output_pdf, out_name))
rename(output_pdf, out_name)
# Remove the individual PNGs
if not args.keep_pngs:
for f in files[1:-1]+skipped:
remove(f)
return out_name
def GetDigest(file_path):
h = sha1()
with open(file_path, 'rb') as file:
while True:
chunk = file.read(h.block_size)
if not chunk:
break
h.update(chunk)
return h.hexdigest()
def CleanOutputDir():
rmtree(output_dir)
def CleanCacheDir():
rmtree(cache_dir)
def id2def_name(id):
id = int(id)
if hasattr(pcbnew, 'LayerName'):
return pcbnew.LayerName(id)
return DEFAULT_LAYER_NAMES[id]
def load_cached_layers(layers_file):
layer_names = {}
name_to_id = {}
logger.debug('Loading layers from cache '+layers_file)
with open(layers_file) as csvfile:
reader = csv.reader(csvfile)
header = next(reader)
logger.debug(header)
for r in reader:
ilnum = int(r[0])
lname = r[1]
lname_user = r[2]
name_to_id[lname] = ilnum
logger.debug(lname+'->'+str(ilnum))
if lname_user:
name_to_id[lname_user] = ilnum
# Is in the in/exclude list?
if (lname in layer_list or lname_user in layer_list or ilnum in layer_list) ^ is_exclude:
layer_names[ilnum] = lname
else:
logger.debug('Excluding layer '+lname)
return layer_names, name_to_id
def save_layers_to_cache(layers_file, all_layers, kiri_mode):
dname = dirname(layers_file)
makedirs(dname, exist_ok=True)
if kiri_mode:
return
with open(layers_file, 'wt') as csvfile:
writer = csv.writer(csvfile)
writer.writerow(('Layer ID', 'Layer name', 'User name'))
writer.writerows(all_layers)
def load_layers_from_pcb(pcb_file, layers_file, kiri_mode):
layer_names = {}
name_to_id = {}
all_layers = []
logger.debug('Loading layers from PCB '+pcb_file)
with open(pcb_file) as file_file:
collect_layers = False
re_layer = re.compile(r'\s+\((\d+)\s+(\S+)')
re_layer_user = re.compile(r'\s+\((\d+)\s+(\S+)\s+user\s+"([^"]+)"')
for line in file_file:
if collect_layers:
z = re_layer.match(line)
if z:
res = z.groups()
lname = res[1]
if lname[0] == '"':
lname = lname[1:-1]
lnum = res[0]
logger.debug(lname+'->'+lnum)
ilnum = int(lnum)
name_to_id[lname] = ilnum
# Check if the user renamed this layer
z = re_layer_user.match(line)
if z:
lname_user = z.group(3)
name_to_id[lname_user] = ilnum
all_layers.append((ilnum, lname, lname_user))
else:
lname_user = lname
all_layers.append((ilnum, lname, ''))
# Is in the in/exclude list?
if (lname in layer_list or lname_user in layer_list or ilnum in layer_list) ^ is_exclude:
layer_names[ilnum] = lname
else:
logger.debug('Excluding layer '+res[1])
else:
if re.search(r'^\s+\)$', line):
break
else:
if re.search(r'\s+\(layers', line):
collect_layers = True
save_layers_to_cache(layers_file, all_layers, kiri_mode)
return layer_names, name_to_id
def load_layer_names(pcb_file, hash_dir, kiri_mode):
# Check if this is cached
layers_file = hash_dir+sep+'layers.csv'
if isfile(layers_file):
layer_names, name_to_id = load_cached_layers(layers_file)
else:
layer_names, name_to_id = load_layers_from_pcb(pcb_file, layers_file, kiri_mode)
if layer_list and not is_exclude:
wanted_layers = {}
for la in layer_list:
if isinstance(la, int):
wanted_layers[la] = id2def_name(la)
elif la in name_to_id:
num = name_to_id[la]
wanted_layers[num] = id2def_name(num)
else:
logger.warning('Requested layer `{}` not in `{}`'.format(la, pcb_file))
return layer_names, wanted_layers
return layer_names, layer_names
def thre_type(astr, min=0, max=1e6):
value = int(astr)
if min <= value <= max:
return value
else:
raise argparse.ArgumentTypeError('value not in range {}-{}'.format(min, max))
def get_layer(line):
line = line.rstrip()
try:
line = int(line)
except ValueError:
pass
return line
if __name__ == '__main__':
parser = argparse.ArgumentParser(description='KiCad diff')
parser.add_argument('old_file', help='Original file (PCB/SCH)')
parser.add_argument('new_file', help='New file (PCB/SCH)')
parser.add_argument('--added_2color', help='Color used for added stuff in 2color mode', type=str, default='green')
parser.add_argument('--all_pages', help='Compare all the schematic pages', action='store_true')
parser.add_argument('--cache_dir', help='Directory to cache images', type=str)
parser.add_argument('--diff_mode', help='How to compute the image difference [red_green]',
choices=['red_green', 'stats', '2color'], default='red_green')
group = parser.add_mutually_exclusive_group()
group.add_argument('--exclude', help='Exclude layers in file (one layer per line)', type=str)
parser.add_argument('--force_gs', help='Use Ghostscript even when Poppler is available', action='store_true')
parser.add_argument('--fuzz', help='Color tolerance for diff stats mode [%(default)s]', type=int, choices=range(0, 101),
default=5, metavar='[0-100]')
parser.add_argument('--keep_pngs', help="Don't remove the individual pages", action='store_true')
parser.add_argument('--kiri_mode', help="Generate files compatible with KiRi", action='store_true')
group.add_argument('--layers', help='Process layers in file (one layer per line)', type=str)
parser.add_argument('--new_file_hash', help='Use this hash for NEW_FILE', type=str)
parser.add_argument('--no_reader', help="Don't open the PDF reader", action='store_false')
parser.add_argument('--no_scour', help="Don't use scour even when available", action='store_true')
parser.add_argument('--no_exist_check', help="Don't check if files exists, must specify the cache hash",
action='store_true')
parser.add_argument('--old_file_hash', help='Use this hash for OLD_FILE', type=str)
parser.add_argument('--only_cache', help='Just populate the cache using OLD_FILE, no diff', action='store_true')
parser.add_argument('--only_different', help='Only include the pages with differences', action='store_true')
parser.add_argument('--output_dir', help='Directory for the output file', type=str)
parser.add_argument('--output_name', help='Name of the output diff', type=str, default='diff.pdf')
parser.add_argument('--removed_2color', help='Color used for removed stuff in 2color mode', type=str, default='red')
parser.add_argument('--resolution', help='Image resolution in DPIs [%(default)s]', type=int, default=150)
parser.add_argument('--threshold', help='Error threshold for diff stats mode, 0 is no error [%(default)s]',
type=thre_type, default=0, metavar='[0-1000000]')
parser.add_argument('--verbose', '-v', action='count', default=0)
parser.add_argument('--version', action='version', version='%(prog)s '+__version__+' - ' +
__copyright__+' - License: '+__license__)
parser.add_argument('--zones', help='Un/Fill zones before creating the images', type=str,
choices=('fill', 'unfill', 'none'), default='none')
args = parser.parse_args()
# Fill the names for the inner layers
for i in range(1, 30):
name = 'In'+str(i)+'.Cu'
DEFAULT_LAYER_NAMES[pcbnew.In1_Cu+i-1] = name
# Create a logger with the specified verbosity
if args.verbose >= 2:
log_level = logging.DEBUG
elif args.verbose == 1:
log_level = logging.INFO
else:
log_level = logging.WARNING
logging.basicConfig(level=log_level)
logger = logging.getLogger(basename(__file__))
# Check the environment
if which('convert') is None:
logger.error('No convert command, install ImageMagick')
exit(MISSING_TOOLS)
use_poppler = not args.force_gs
if which('pdftoppm') is None:
if which('gs') is None:
logger.error('No pdftoppm or ghostscript command, install poppler-utils or ghostscript')
exit(MISSING_TOOLS)
use_poppler = False
use_scour = not args.no_scour and which('scour') is not None
if args.no_reader and which('xdg-open') is None:
logger.warning('No xdg-open command, install xdg-utils. Disabling the PDF viewer.')
args.no_reader = False
# KiCad version
kicad_version = GetBuildVersion()
m = re.search(r'(\d+)\.(\d+)\.(\d+)', kicad_version)
if m is None:
logger.error("Unable to detect KiCad version, got: `{}`".format(kicad_version))
exit(MISSING_TOOLS)
kicad_version_major = int(m.group(1))
kicad_version_minor = int(m.group(2))
kicad_version_patch = int(m.group(3))
# Check the arguments
old_file = args.old_file
if not (args.no_exist_check and args.old_file_hash) and not isfile(old_file):
logger.error('%s isn\'t a valid file name' % old_file)
exit(OLD_INVALID)
if args.old_file_hash:
old_file_hash = args.old_file_hash
else:
old_file_hash = GetDigest(old_file)
logger.debug('{} SHA1 is {}'.format(old_file, old_file_hash))
new_file = args.new_file
if not (args.no_exist_check and args.new_file_hash) and not isfile(new_file) and not args.only_cache:
logger.error('%s isn\'t a valid file name' % new_file)
exit(NEW_INVALID)
new_file_hash = None
if args.new_file_hash:
new_file_hash = args.new_file_hash
elif not args.only_cache:
new_file_hash = GetDigest(new_file)
logger.debug('{} SHA1 is {}'.format(new_file, new_file_hash))
if args.cache_dir:
cache_dir = args.cache_dir
if not isdir(cache_dir):
makedirs(cache_dir, exist_ok=True)
logger.debug('Cache dir: %s' % cache_dir)
else:
if args.only_cache:
logger.error('Asking to populate the cache, but no cache dir specified')
exit(ARGS_ERROR)
cache_dir = mkdtemp()
logger.debug('Temporal cache dir %s' % cache_dir)
atexit.register(CleanCacheDir)
if args.output_dir:
output_dir = args.output_dir
if not isdir(output_dir):
makedirs(output_dir, exist_ok=True)
logger.debug('Output dir: %s' % output_dir)
else:
output_dir = mkdtemp()
logger.debug('Temporal output dir %s' % output_dir)
atexit.register(CleanOutputDir)
resolution = args.resolution
if resolution < 30 or resolution > 400:
logger.warning('Resolution outside the recommended range [30,400]')
layer_list = []
is_exclude = True
layer_file = args.exclude or args.layers
if layer_file:
is_exclude = args.exclude is not None
if not isfile(layer_file):
logger.error('Invalid file name ('+layer_file+')')
exit(WRONG_EXCLUDE)
with open(layer_file) as f:
layer_list = [get_layer(line) for line in f if line[0] != '#']
logger.debug('layers to be {}: {}'.format('excluded' if is_exclude else 'included', layer_list))
# Are we using PCBs or SCHs?
is_pcb = old_file.endswith('.kicad_pcb')
if not is_pcb and which('eeschema_do') is None:
logger.error('No eeschema_do command, install KiAuto')
exit(MISSING_TOOLS)
# The SVG mode allows comparing individual pages in a way that we can detect added/removed pages
svg_mode = False
if not is_pcb and args.all_pages:
svg_mode = which('rsvg-convert') is not None
if not svg_mode:
logger.warning("The `rsvg-convert` tool isn't installed:")
logger.warning("- If the number of pages changed the process will be aborted.")
cur_sch_ops = {'KiCad': kicad_version}
cur_pcb_ops = {'KiCad': kicad_version, 'zones': args.zones}
layers_old, bbox_old = GenImages(old_file, old_file_hash, args.all_pages, args.zones, args.kiri_mode)
if args.only_cache:
logger.info('{} SHA1 is {}'.format(old_file, old_file_hash))
exit(0)
layers_new, bbox_new = GenImages(new_file, new_file_hash, args.all_pages, args.zones)
zero_size = (0, 0, 0, 0)
changed = bbox_old != bbox_new and bbox_old != zero_size and bbox_new != zero_size
output_pdf = DiffImages(old_file_hash, new_file_hash, layers_old, layers_new, args.only_different, changed)
if args.no_reader:
call(['xdg-open', output_pdf])
time.sleep(5)