diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2017-03-11 21:17:59 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2017-03-11 21:17:59 (GMT) |
| commit | eef1b4e01cc3c5307188e1497e6b095081eef378 (patch) | |
| tree | b27c812b352c9024fe4a5b9dbab6f6102a581156 /tksao/frame/ciaoparser.Y | |
| parent | f7a9669c931c4da48dbc39d3f90b17ea2314ab9c (diff) | |
| download | blt-eef1b4e01cc3c5307188e1497e6b095081eef378.zip blt-eef1b4e01cc3c5307188e1497e6b095081eef378.tar.gz blt-eef1b4e01cc3c5307188e1497e6b095081eef378.tar.bz2 | |
add region fill
Diffstat (limited to 'tksao/frame/ciaoparser.Y')
| -rw-r--r-- | tksao/frame/ciaoparser.Y | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/tksao/frame/ciaoparser.Y b/tksao/frame/ciaoparser.Y index 7c17fdc..e59fc77 100644 --- a/tksao/frame/ciaoparser.Y +++ b/tksao/frame/ciaoparser.Y @@ -29,6 +29,7 @@ extern void ciaoerror(Base*, ciaoFlexLexer*, const char*); static const char *color = "green"; static int dash[] = {8,3}; +static int fill_ =0; static const char *font = "helvetica 10 normal roman"; static const char *text = ""; static unsigned short props; @@ -228,18 +229,18 @@ shape : ANNULUS_ bp coord sp value sp value } | BOX_ bp coord sp vvalue { - fr->createBoxCmd(Vector($3), $5, 0, + fr->createBoxCmd(Vector($3), $5, 0, fill_, color,dash,1,font,text,props,NULL,taglist,cblist); } | BOX_ rotbox | CIRCLE_ bp coord sp value { - fr->createCircleCmd(Vector($3), $5, + fr->createCircleCmd(Vector($3), $5, fill_, color,dash,1,font,text,props,NULL,taglist,cblist); } - | ELLIPSE_ bp coord sp vvalue sp angle + | ELLIPSE_ bp coord sp vvalue sp angle { - fr->createEllipseCmd(Vector($3), Vector($5), $7, + fr->createEllipseCmd(Vector($3), Vector($5), $7, fill_, color,dash,1,font,text,props,NULL,taglist,cblist); } | FIELD_ bp {/* not supported */} @@ -255,14 +256,14 @@ shape : ANNULUS_ bp coord sp value sp value } | POLYGON_ {polylist.deleteAll();} bp polyNodes { - fr->createPolygonCmd(polylist, + fr->createPolygonCmd(polylist, fill_, color,dash,1,font,text,props,NULL,taglist,cblist); } | RECTANGLE_ bp coord sp coord { Vector cc = (Vector($5)-Vector($3))/2.+Vector($3); Vector wh = Vector($5)-Vector($3); - fr->createBoxCmd(cc, wh, 0, + fr->createBoxCmd(cc, wh, 0, fill_, color,dash,1,font,text,props,NULL,taglist,cblist); } | REGION_ bp {/* not supported */} @@ -272,7 +273,7 @@ shape : ANNULUS_ bp coord sp value sp value rotbox : bp coord sp vvalue sp angle { - fr->createBoxCmd(Vector($2), Vector($4), $6, + fr->createBoxCmd(Vector($2), Vector($4), $6, fill_, color,dash,1,font,text,props,NULL,taglist,cblist); } ; |