diff --git a/kidiff.sh b/kidiff.sh index d883221..6f192e7 100755 --- a/kidiff.sh +++ b/kidiff.sh @@ -277,7 +277,7 @@ HEAD for g in $OUTPUT_DIR/diff-$DIFF_1-$DIFF_2/*.png; do #convert $g -fuzz 1% -trim +repage $g #convert -resize x250 $(basename $g) thumbs/th_$(basename $g) - +convert $g cp $g ./plots/thumbs/th_$(basename $g) route=$g file=${route##*/} diff --git a/kidiff_wc.sh b/kidiff_wc.sh new file mode 100755 index 0000000..cdec8a3 --- /dev/null +++ b/kidiff_wc.sh @@ -0,0 +1,545 @@ +#!/usr/bin/env bash + +# Takes one or two Fossil ref's as arguments and generates visual diffs between them +# If only one ref specified, generates a diff from that file +# If no refs specified, assumes CURRENT + +# TODO Consider moving all formatting to a single, external css file and putting all +# created web content into a 'web' directory. + +# TODO Improve 3-pane layout - possible two side by side and comparison image underneath? + +# TODO Remove filename from display format i.e 'filename-F_Cu' becomes 'F_Cu' + +qual="100" +# TODO Add command line quality option - Quality is dpi. 100 is fast but low quality +# 600 is very detailed. 300 is a good compromise. + +# TODO Add recolour option +# 952927 +# convert F_Cu.png -fill "#952927" -fuzz 75% -opaque "#ffffff" test2.png + +OUTPUT_DIR="./plots" +rm -r $OUTPUT_DIR +WEB_DIR=$OUTPUT_DIR"/web" +# TODO Have added this temprarily to simply remove all the plots prior to generating files. +# Theoretically the script could check if the files have already been generated and then only generate the +# missing files. This would permit multiple diff compares and you could also use an external diff tool like p4merge +# but the disadvantage is that the resoultions have to match. It is also more complicated to script +# Ideally one could request random compares within the web interface and there would +# be 'on the fly' svg/png creation and diff showing. +# Try to keep the web components seperate from the images so that the images could be +# looked at using a graphical diff viewer like p4merge. + +# TODO Might need to use a more complex strategy to cope with spaces in filename +# using some varient of 'find . -name "*.pro" -print0 | xargs -0' + +################################# +# Colours to substitute per layer +# +# Additionally need to add vias, and internal layers. +# TODO Parse the pcbnew file to determine which layers are active. + +F_Cu="#952927" +B_Cu="#359632" +B_Paste="#3DC9C9" +F_Paste="#969696" +F_SilkS="#339697" +B_SilkS="#481649" +B_Mask="#943197" +F_Mask="#943197" +Edge_Cuts="#C9C83B" +In_1_Cu="#c2c200)" +In_2_Cu="#c200c2" + + +#ColorPCBLayer_In1.Cu=rgba(#c2c200, 0.8) +#ColorPCBLayer_In2.Cu=rgba(194, 0, 194, 0.800) +#ColorPCBLayer_In3.Cu=rgba(194, 194, 194, 0.800) +#ColorPCBLayer_In4.Cu=rgba(0, 132, 132, 0.800) +#ColorPCBLayer_In5.Cu=rgba(0, 132, 0, 0.800) +#ColorPCBLayer_In6.Cu=rgba(0, 0, 132, 0.800) +#ColorPCBLayer_B.Cu=rgba(0, 132, 0, 0.800) +#ColorPCBLayer_B.Adhes=rgba(0, 0, 132, 0.800) +#ColorPCBLayer_F.Adhes=rgba(132, 0, 132, 0.800) +#ColorPCBLayer_B.Paste=rgba(0, 194, 194, 0.800) +#ColorPCBLayer_F.Paste=rgba(132, 132, 132, 0.800) +#ColorPCBLayer_B.SilkS=rgba(132, 0, 132, 0.800) +#ColorPCBLayer_F.SilkS=rgba(0, 132, 132, 0.800) +#ColorPCBLayer_B.Mask=rgba(132, 132, 0, 0.800) +#ColorPCBLayer_F.Mask=rgba(132, 0, 132, 0.800) +#ColorPCBLayer_Dwgs.User=rgba(194, 194, 194, 0.800) +#ColorPCBLayer_Cmts.User=rgba(0, 0, 132, 0.800) +#ColorPCBLayer_Eco1.User=rgba(0, 132, 0, 0.800) +#ColorPCBLayer_Eco2.User=rgba(194, 194, 0, 0.800) +#ColorPCBLayer_Edge.Cuts=rgba(194, 194, 0, 0.800) +#ColorPCBLayer_Margin=rgba(194, 0, 194, 0.800) +#ColorPCBLayer_B.CrtYd=rgba(194, 194, 0, 0.800) +#ColorPCBLayer_F.CrtYd=rgba(132, 132, 132, 0.800) +#ColorPCBLayer_B.Fab=rgba(132, 132, 132, 0.800) +#ColorPCBLayer_F.Fab=rgba(194, 194, 0, 0.800) +#ColorTxtFrontEx=rgba(194, 194, 194, 0.800) +#ColorTxtBackEx=rgba(0, 0, 132, 0.800) +#ColorTxtInvisEx=rgba(132, 132, 132, 0.800) +#ColorAnchorEx=rgba(0, 0, 132, 0.800) +#ColorPadBackEx=rgba(0, 132, 0, 0.800) +#ColorPadFrontEx=rgba(132, 132, 132, 0.800) +#ColorViaThruEx=rgba(194, 194, 194, 0.800) +#ColorViaBBlindEx=rgba(132, 132, 0, 0.800) +#ColorViaMicroEx=rgba(0, 132, 132, 0.800) +#ColorNonPlatedEx=rgba(194, 194, 0, 0.800) +######################################################### +# Find the .kicad_pcb files that differ between commits # +######################################################### + +# Look at number of arguments provided set different variables based on number of Fossil refs +############################################################################################# + +# 0. User provided no Fossil references, compare against last Fossil commit + +if [ $# -eq 0 ]; then + DIFF_1="current" + DIFF_2=$(fossil info current | grep ^uuid: | tr -d 'uuid:[:space:]' | cut -c 1-6) + echo $DIFF_2 + CHANGED_KICAD_FILES=$(fossil diff --brief -r "$DIFF_2" | grep '.kicad_pcb$' | tr -d 'CHANGED[:space:]||ADDED[:space:]') + if [[ -z "$CHANGED_KICAD_FILES" ]]; then echo "No .kicad_pcb files differ" && exit 0; fi + + # Copy all modified kicad_pcb files to $OUTPUT_DIR/current + + for k in $CHANGED_KICAD_FILES; do + mkdir -p "$OUTPUT_DIR/$DIFF_1" + cp "$k" $OUTPUT_DIR/current + done + + # Copy the Fossil commit kicad_pcb file to $OUTPUT_DIR/commit uuid + + for k in $CHANGED_KICAD_FILES; do + mkdir -p "$OUTPUT_DIR/$DIFF_2" + echo "Copying $DIFF_2:$k to $OUTPUT_DIR/$DIFF_2/" + fossil cat $k -r $DIFF_2 > "$OUTPUT_DIR/$DIFF_2/$(basename $k)" + done + + + # 1. User supplied one Fossil reference to compare against current files + + elif [ $# -eq 1 ]; then + DIFF_1="current" + DIFF_2="$1" + CHANGED_KICAD_FILES=$(fossil diff --brief -r "$DIFF_2" | grep '.kicad_pcb$' | tr -d 'CHANGED[:space:]||ADDED[:space:]') + if [[ -z "$CHANGED_KICAD_FILES" ]]; then echo "No .kicad_pcb files differ" && exit 0; fi + + # Copy all modified kicad_file to $OUTPUT_DIR/current + + for k in $CHANGED_KICAD_FILES; do + mkdir -p "$OUTPUT_DIR/$DIFF_1" + cp "$k" $OUTPUT_DIR/current + done + + # Copy the specified Fossil commit kicad_file to $OUTPUT_DIR/$(Fossil ref) + + for k in $CHANGED_KICAD_FILES; do + mkdir -p "$OUTPUT_DIR/$DIFF_2" + echo "Copying $DIFF_2:$k to $OUTPUT_DIR/$DIFF_2/$k" + fossil cat $k -r $DIFF_2 > "$OUTPUT_DIR/$DIFF_2/$(basename $k)" + done + + # 2. User supplied 2 Fossil references to compare + + elif [ $# -eq 2 ]; then + DIFF_1="$1" + DIFF_2="$2" + CHANGED_KICAD_FILES=$(fossil diff --brief -r "$DIFF_1" --to "$DIFF_2" | grep '.kicad_pcb' | tr -d 'CHANGED[:space:]||ADDED[:space:]') + if [[ -z "$CHANGED_KICAD_FILES" ]]; then echo "No .kicad_pcb files differ" && exit 0; fi + + # Copy all modified kicad_file to $OUTPUT_DIR/current + + for k in $CHANGED_KICAD_FILES; do + mkdir -p "$OUTPUT_DIR/$DIFF_1" + fossil cat $k -r $DIFF_1 > "$OUTPUT_DIR/$DIFF_1/$(basename $k)" + done + + # Copy the specified Fossil commit kicad_file to $OUTPUT_DIR/Fossil uuid + + for k in $CHANGED_KICAD_FILES; do + mkdir -p "$OUTPUT_DIR/$DIFF_2" + echo "Copying $DIFF_2:$k to $OUTPUT_DIR/$DIFF_2/$k" + fossil cat $k -r $DIFF_2 > "$OUTPUT_DIR/$DIFF_2/$(basename $k)" + done + + + # 3. User provided too many references + +else + echo "Please only provide 1 or 2 arguments: not $#" + exit 2 +fi + +echo "Kicad files saved to: '$OUTPUT_DIR/$DIFF_1' and '$OUTPUT_DIR/$DIFF_2'" + +# Generate svg files from kicad output +###################################### +# +# Use the python script 'plot_pcbnew.py' to generate svg files from the two *.kicad_pcb files. +# Files are saved in /tmp/svg/COMMIT_ID +# + +for f in $OUTPUT_DIR/$DIFF_1/*.kicad_pcb; do + mkdir -p /tmp/svg/$DIFF_1 + echo "Converting $f to .svg: Files will be saved to /tmp/svg" + /usr/local/bin/plot_pcbnew.py "$f" "/tmp/svg/$DIFF_1" +done + +for f in $OUTPUT_DIR/$DIFF_2/*.kicad_pcb; do + mkdir -p /tmp/svg/$DIFF_2 + echo "Converting $f to .svg's Files will be saved to /tmp/svg" + /usr/local/bin/plot_pcbnew.py "$f" "/tmp/svg/$DIFF_2" +done + +# Convert svg files into png +###################################### +# +# Parse the svg files in /tmp/svg/COMMIT_ID using Image Magick. +# The conversion trims the image to the active area using the 'trim' function. +# Fuzz is probably not nescessary (trim measures the corner pixel value and trims +# to the first non-corner coloured pixel. Fuzz allows for minor variation but as this is +# a generated svg, pixels should be white.) +# +# The .png files are created in the output directory. + + +for p in /tmp/svg/$DIFF_1/*.svg; do + d=$(basename $p) + echo "Converting $p to .png" + convert -density $qual -fuzz 1% -trim +repage "$p" "$OUTPUT_DIR/$DIFF_1/${d%%.*}.png" + convert "$OUTPUT_DIR/$DIFF_1/${d%%.*}.png" -negate "$OUTPUT_DIR/$DIFF_1/${d%%.*}.png" +done + + + +for p in /tmp/svg/$DIFF_2/*.svg; do + d=$(basename $p) + echo "Converting $p to .png" + convert -density $qual -fuzz 1% -trim +repage "$p" "$OUTPUT_DIR/$DIFF_2/${d%%.*}.png" + convert "$OUTPUT_DIR/$DIFF_2/${d%%.*}.png" -negate "$OUTPUT_DIR/$DIFF_2/${d%%.*}.png" +done + + +# Generate png diffs between DIFF_1 and DIFF_2 +############################################## +# +# Originally the intention was to use the ImageMagic 'composite stereo 0' function to identify +# where items have moved but I could not get this to work. +# -flatten -grayscale Rec709Luminance + +for g in $OUTPUT_DIR/$DIFF_1/*.png; do + d=$(basename $g) + y=${d%.png} + layerName=${y##*-} + mkdir -p "$OUTPUT_DIR/diff-$DIFF_1-$DIFF_2" + echo "Generating composite image $OUTPUT_DIR/diff-$DIFF_1-$DIFF_2/$(basename $g)" + convert '(' $OUTPUT_DIR/$DIFF_1/$(basename $g) -flatten -grayscale Rec709Luminance ')' \ + '(' $OUTPUT_DIR/$DIFF_2/$(basename $g) -flatten -grayscale Rec709Luminance ')' \ + '(' -clone 0-1 -compose darken -composite ')' \ + -channel RGB -combine $OUTPUT_DIR/diff-$DIFF_1-$DIFF_2/$(basename $g) + convert "$OUTPUT_DIR/diff-$DIFF_1-$DIFF_2/$(basename $g)" -fill ${!layerName} -fuzz 75% -opaque "#ffffff" "$OUTPUT_DIR/diff-$DIFF_1-$DIFF_2/$(basename $g)" +done + +for p in $OUTPUT_DIR/$DIFF_1/*.png; do + d=$(basename $p) + y=${d%.png} + layerName=${y##*-} + echo "Converting $layerName to .png with colour "${!layerName} + convert "$OUTPUT_DIR/$DIFF_1/${d%%.*}.png" -define png:color-type=2 "$OUTPUT_DIR/$DIFF_1/${d%%.*}.png" + convert "$OUTPUT_DIR/$DIFF_1/${d%%.*}.png" -fill ${!layerName} -fuzz 75% -opaque "#ffffff" "$OUTPUT_DIR/$DIFF_1/${d%%.*}.png" +done + + + +for p in $OUTPUT_DIR/$DIFF_2/*.png; do + d=$(basename $p) + y=${d%.png} + layerName=${y##*-} + echo "Converting $layerName to .png with colour "${!layerName} + convert "$OUTPUT_DIR/$DIFF_2/${d%%.*}.png" -define png:color-type=2 "$OUTPUT_DIR/$DIFF_2/${d%%.*}.png" + convert "$OUTPUT_DIR/$DIFF_2/${d%%.*}.png" -fill ${!layerName} -fuzz 75% -opaque "#ffffff" "$OUTPUT_DIR/$DIFF_2/${d%%.*}.png" +done + +# Setup web directories for web output +###################################### +# +# Remove index.html prior to streaming new data +# TODO Would be neater to put thumbs, tryptych, index and any .css sheet in a 'web' directory +# + +if [ -e $OUTPUT_DIR/index.html ] + then rm $OUTPUT_DIR/index.html +fi + +if [ -d thumbs ] +then echo "'thumbs' directory found" +else mkdir $OUTPUT_DIR/thumbs && echo "'thumbs' directory created" +fi + +if [ -d tryptych ] +then echo "'tryptych' directory found" +else mkdir $OUTPUT_DIR/tryptych && echo "'tryptych' directory created" +fi + +# Stream HTML and + + + +
+PCBnew Graphical Diff
+ +
in $DIFF_1 and not in $DIFF_2
+
in $DIFF_2 and not in $DIFF_1
+_HEAD_ + +#for g in $OUTPUT_DIR/diff-$DIFF_1-$DIFF_2/$HTTP/*.png; do +for g in $OUTPUT_DIR/diff-$DIFF_1-$DIFF_2/*.png; do + cp $g ./plots/thumbs/th_$(basename $g) + + route=$g + file=${route##*/} + base=${file%.*} + dir=$(dirname $g) + + echo $dir + + +cat >> $OUTPUT_DIR/index.html <<_HTML_ +
+
+ + + +
$base
+
+
+_HTML_ + + +cat >> $OUTPUT_DIR/tryptych/$(basename $g).html < + + + + + +
$base
+ + +
+
+ + + +
$DIFF_1
+
+
+
+
+ + + +
Composite
+
+
+
+
+ + + +
$DIFF_2
+
+
+HTML + +done + +cat >>$OUTPUT_DIR/index.html< +
+
+FOOT +echo "HTML created and written to index.html" +open $OUTPUT_DIR/index.html diff --git a/plot_pcbnew.py b/plot_pcbnew.py old mode 100644 new mode 100755 index e1bc9d1..84a2af4 --- a/plot_pcbnew.py +++ b/plot_pcbnew.py @@ -48,23 +48,20 @@ layers = [ ("B_Mask", pcbnew.B_Mask, "Mask bottom"), ("F_Mask", pcbnew.F_Mask, "Mask top"), ("Edge_Cuts", pcbnew.Edge_Cuts, "Edges"), + ("In_1_Cu", pcbnew.In1_Cu, "Inner1"), + ("In_2_Cu", pcbnew.In2_Cu, "Inner2") ] - +# Parse layers - might need more than these! # popt.SetColor(COLOR4D(0.050, 0.050, 0.050, 0.1)) # Ideally would set colour of layer with the 'SetColor' method which was previosly descibed with colour names # e.g.popt.SetColor(YELLOW) - this does not work and, although the COLOR4D doesn't cause an error it doesn't work. # Nor does setting an integer work. for layer_info in layers: - pctl.SetLayer(layer_info[1]) - pctl.OpenPlotfile(layer_info[0], pcbnew.PLOT_FORMAT_SVG, layer_info[2]) - pctl.PlotLayer() + pctl.SetLayer(layer_info[1]) + pctl.OpenPlotfile(layer_info[0], pcbnew.PLOT_FORMAT_SVG, layer_info[2]) + pctl.PlotLayer() -# One approach is to write to html and use a 'greyed' filter -# github - aktos-io kicad-tols -# -# Alternative approach is produce a pile of svg fileas nad post process them to add colour -# see http://scottbezek.blogspot.co.uk/2016/04/scripting-kicad-pcbnew-exports.html # At the end you have to close the last plot, otherwise you don't know when # the object will be recycled! pctl.ClosePlot() diff --git a/style.css b/style.css new file mode 100644 index 0000000..387b72e --- /dev/null +++ b/style.css @@ -0,0 +1,143 @@ +/* style.css */ + + +TODO Need to differentiate the .responsive tag between the index and tryptych views + + body { + background-color: #a2b1c6; + } + div.gallery { + border: 1px solid #ccc; + } + + div.gallery:hover { + border: 1px solid #777; + } + + div.gallery img { + width: 100%; + height: auto; + } + + div.desc { + padding: 15px; + text-align: center; + font: 20px arial, sans-serif; + background: #ffffff; + } + div.desc1 { + padding: 15px; + text-align: center; + font: 20px arial, sans-serif; + background: #43FF01; + } + div.desc2 { + padding: 15px; + text-align: center; + font: 20px arial, sans-serif; + background: #F40008; + } + div.title { + padding: 15px; + text-align: left; + font: 30px arial, sans-serif; + color: #496075; + } + * { + box-sizing: border-box; + } + + .responsive { + padding: 0 6px; + float: left; + width: 33.332%; + } + + @media only screen and (max-width: 700px){ + .responsive { + width: 49.99999%; + margin: 6px 0; + } + } + + @media only screen and (max-width: 500px){ + .responsive { + width: 100%; + } + } + + .clearfix:after { + content: ""; + display: table; + clear: both; + } + + + * { + box-sizing: border-box; + } + + .responsive { + padding: 0 6px; + float: left; + width: 24.99999%; + } + + @media only screen and (max-width: 700px){ + .responsive { + width: 49.99999%; + margin: 6px 0; + } + } + + @media only screen and (max-width: 500px){ + .responsive { + width: 100%; + } + } + + .clearfix:after { + content: ""; + display: table; + clear: both; + } + + div.desc { + padding: 15px; + text-align: center; + font: 20px arial, sans-serif; + } + div.desc1 { + padding: 15px; + text-align: left; + align: middle; + font: 20px arial, sans-serif; + color: #FFFFFF; + } + div.desc2 { + padding: 15px; + text-align: left; + font: 20px arial, sans-serif; + color: #FFFFFF; + } + div.title { + padding: 15px; + text-align: left; + font: 30px arial, sans-serif; + color: #496075; + } + .box { + float: left; + width: 20px; + height: 20px; + margin: 5px; + border: 1px solid rgba(0, 0, 0, .2); + } + + .red { + background: #F40008; + } + + .green { + background: #43ff01; + }