1
0
mirror of git://projects.qi-hardware.com/eda-tools.git synced 2024-11-04 23:05:21 +02:00

schhist/schhist2web: correctly align shared columns

When sharing columns, the "unchanged" bar wasn't centered unless the
sheet was the first sheet in that column.
This commit is contained in:
Werner Almesberger 2012-05-11 22:07:10 -03:00
parent cc5732bbf3
commit d8f5c95ecb

View File

@ -385,6 +385,7 @@ EOF
next="$head"
td=false
for n in `cd "$dir" && git rev-list $first..HEAD~1` $first; do
[ -d "$cache/$n/ppm0" ] || continue
empty=true
@ -406,34 +407,37 @@ for n in `cd "$dir" && git rev-list $first..HEAD~1` $first; do
pdf="$out/$next/pdf/$m.pdf"
if [ "${order%%=$m[:=]*}" = "$order" ]; then
$td && s="$s<TD>"
td=true
else
td=false
fi
if [ -f "$a0" -a -f "$b0" ]; then
$td && s="$s<TD align=\"center\" valign=\"middle\">"
if ! pngdiff cat "$diff" "$a1" "$b1" "$a0" "$b0"; then
$td && s="$s<TD align=\"center\" valign=\"middle\">"
td=false
s="$s<IMG src=\"unchanged.png\">"
continue
fi
$td && s="$s<TD>"
td=false
pngdiff shrink "$thumb" -f $THUMB_OPTS "$a2" "$b2" "$a0" "$b0" ||
exit
schps2pdf -T BEFORE -T AFTER -o "$pdf" "$aps" "$bps" || exit
elif [ -f "$a0" ]; then
$td && s="$s<TD>"
td=false
pngdiff cat "$diff" -f -c 1,0,0 "$a1" "$a1" || exit
pngdiff shrink "$thumb" -f $THUMB_OPTS -c 1,0,0 "$a2" "$a2" ||
exit
schps2pdf -T DELETED -o "$pdf" "$aps" || exit
elif [ -f "$b0" ]; then
$td && s="$s<TD>"
td=false
pngdiff cat "$diff" -f -c 0,1,0 "$b1" "$b1" || exit
pngdiff shrink "$thumb" -f $THUMB_OPTS -c 0,1,0 "$b2" "$b2" ||
exit
schps2pdf -T NEW -o "$pdf" "$bps" || exit
else
$td && s="$s<TD>"
continue
fi
echo "$s"
@ -441,6 +445,7 @@ for n in `cd "$dir" && git rev-list $first..HEAD~1` $first; do
wrapped_png "$out" "$next" "$m"
empty=false
done < <(ordered_names)
$td && echo "<TD>"
if ! $empty; then
echo "$s<TD valign=\"middle\">"
commit_entry "$dir" $next