Index: util/pcblib-map/imgmap_fp.sh =================================================================== --- util/pcblib-map/imgmap_fp.sh (revision 396) +++ util/pcblib-map/imgmap_fp.sh (revision 397) @@ -1,9 +1,14 @@ #!/bin/sh -png=map.png -pcb=map.pcb +pcb=$1.pcb +pcb -x png --dpi 300 --photo-mode $pcb +png=$1.png +html=$1.html + png_dims=`file $png | awk -F "[,]" '{ sub("x", " ", $2); print $2}'` + + awk -v "png_dims=$png_dims" -v "png_url=$png" ' BEGIN { q = "\"" @@ -40,6 +45,7 @@ E[ne, "cmd"] = P[2] E[ne, "cx"] = A[1] E[ne, "cy"] = A[2] + E[ne, "file"] = P[4] ne++ next } @@ -76,7 +82,7 @@ END { scale_x = png_sx/pcb_sx scale_y = png_sy/pcb_sy - + print "" print "

" print "" for(n = 0; n < ne; n++) { @@ -104,13 +110,18 @@ x2 += 5 y2 += 5 # print n, x1, y1, x2, y2, E[n, "cmd"] - url="http://igor2.repo.hu/cgi-bin/pcblib-param.cgi?cmd=" E[n, "cmd"] + cmd = E[n, "cmd"] + if (cmd ~ "[(]") + url="http://igor2.repo.hu/cgi-bin/pcblib-param.cgi?cmd=" cmd + else + url="http://igor2.repo.hu/cgi-bin/pcblib-static.cgi?fp=" E[n, "file"] gsub(" ", "+", url) print "" } print "" + print "" } -' < $pcb > a.html +' < $pcb > $html Index: util/pcblib-map/imgmap_page.sh =================================================================== --- util/pcblib-map/imgmap_page.sh (revision 396) +++ util/pcblib-map/imgmap_page.sh (revision 397) @@ -1,7 +1,9 @@ #!/bin/sh -png=map.png -pcb=map.pcb +pcb=$1.pcb +pcb -x png --dpi 100 --photo-mode $pcb +png=$1.png + png_dims=`file $png | awk -F "[,]" '{ sub("x", " ", $2); print $2}'` awk -v "png_dims=$png_dims" -v "png_url=$png" ' @@ -68,6 +70,7 @@ scale_x = png_sx/pcb_sx scale_y = png_sy/pcb_sy + print "" print "

" print "" for(n = 0; n < ne; n++) { @@ -120,6 +123,7 @@ T[t, "text"] = "-" } print "" + print "" } ' < $pcb > map.html