Index: util/fp2anim =================================================================== --- util/fp2anim (revision 719) +++ util/fp2anim (revision 720) @@ -69,8 +69,10 @@ enable_annot = 1 if (annotation ~ "pins") enable_pinnum = 1 - if (annotation ~ "dimensions") - enable_dims = 1 + if (annotation ~ "dimname") + enable_dim_name = 1 + if (annotation ~ "dimvalue") + enable_dim_value = 1 if (annotation ~ "background") enable_annotbg = 1 } @@ -296,7 +298,7 @@ function vf_text(x, y, txt, rot, elev ,TXT,v,n,W,maxw,s,sep,bg) { -# gsub("[|]", "", name) + gsub("[|]", "", txt) v = split(txt, TXT, "[|]") sep = " " @@ -430,24 +432,33 @@ print "poly", X2, Y2, X2-vx*alen+nx*awidth, Y2-vy*alen+ny*awidth , X2-vx*alen-nx*awidth, Y2-vy*alen-ny*awidth print "endmacro" - if (value == "") - value = len - else if (value == "!") + if (enable_dim_value) { + if (value == "") + value = len + else if (value == "!") + value = "" + if (value != "") + value /= 3937 + } + else value = "" - if (value != "") - value /= 3937 + if (!enable_dim_name) + name = "" if ((name != "") && (value != "")) name = name "=|" value + else if ((value != "") && (name == "")) + name = value - if (ang < 0) - ang = -ang - if ((ang < 3.1415*3/4) && (ang > 3.1415*1/4)) { - annot((X1+X2)/2, (Y1+Y2)/2, name, 0, awidth*1.5) + if (name != "") { + if (ang < 0) + ang = -ang + if ((ang < 3.1415*3/4) && (ang > 3.1415*1/4)) + annot((X1+X2)/2, (Y1+Y2)/2, name, 0, awidth*1.1) + else + annot((X1+X2)/2, (Y1+Y2)/2, name, 1, awidth*1.1) } - else - annot((X1+X2)/2, (Y1+Y2)/2, name, 1, awidth*1.5) edges(X1+nx*awidth, Y1+ny*awidth) edges(X2+nx*awidth, Y2+ny*awidth) @@ -454,7 +465,7 @@ } /^[ \t]*#dimension/ { - if (enable_dims) + if ((enable_dim_name) || (enable_dim_value)) dimension($2, $3, $4, $5, $6, $7, $8) }