Skip to content

Commit 1689380

Browse files
committed
implement projection and segment shapes
1 parent 21659e5 commit 1689380

1 file changed

Lines changed: 21 additions & 6 deletions

File tree

‎lib/ds9_attr_parser.py‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def get_ds9_attr_parser():
3232
class Ds9AttrParser(object):
3333
def set_continued(self, s, l, tok):
3434
self.continued = True
35-
35+
3636
def __init__(self):
3737
self.continued = False
3838

@@ -42,6 +42,9 @@ def __init__(self):
4242
vector=wcs_shape(CoordOdd, CoordEven,
4343
Distance, Angle),
4444
composite=wcs_shape(CoordOdd, CoordEven, Angle),
45+
projection=wcs_shape(CoordOdd, CoordEven, CoordOdd, CoordEven, Distance),
46+
segment=wcs_shape(CoordOdd, CoordEven,
47+
repeat=(0,2)),
4548
)
4649
regionShape = define_shape_helper(ds9_shape_in_comment_defs)
4750
regionShape = regionShape.setParseAction(lambda s, l, tok: Shape(tok[0], tok[1:]))
@@ -68,7 +71,7 @@ def parse_check_shape(self, s):
6871
return l[0], l[1:]
6972
else:
7073
return None, l
71-
74+
7275
def get_attr(attr_list, global_attrs):
7376
"""
7477
Parameters
@@ -83,12 +86,12 @@ def get_attr(attr_list, global_attrs):
8386
keyword = kv[0]
8487
if len(kv) == 1:
8588
local_attr[0].append(keyword)
86-
continue
89+
continue
8790
elif len(kv) == 2:
8891
value = kv[1]
8992
elif len(kv) > 2:
9093
value = kv[1:]
91-
94+
9295
if keyword == 'tag':
9396
local_attr[1].setdefault(keyword,set()).add(value)
9497
else:
@@ -111,15 +114,27 @@ def test_attr():
111114
assert p.parseString("font=\"123 123\"")[0] == ("font", '"123 123"')
112115
assert p.parseString("color")[0] == ("color",)
113116
assert p.parseString("tag={group 1}")[0] == ("tag","group 1")
114-
117+
115118
def test_get_attr ():
116119
attr_list = [('tag','group1'),('tag','group2'),('tag','group3'),('color','green')]
117120
global_attrs = [],{}
118-
121+
119122
attr = get_attr(attr_list, global_attrs)
120123
assert attr[0] == []
121124
assert attr[1] == {'color': 'green', 'tag': set(['group1', 'group3', 'group2'])}
122125

126+
def test_shape_in_comment():
127+
parser = Ds9AttrParser()
128+
129+
r = parser.parse_check_shape("segment(0, 2)")
130+
assert r[0].name == "segment"
131+
assert r[1] == []
132+
133+
r = parser.parse_check_shape("projection(0, 2, 3, 2, 4)")
134+
assert r[0].name == "projection"
135+
assert r[1] == []
136+
137+
123138
if __name__ == "__main__":
124139
p = get_ds9_attr_parser()
125140
s = 'point=cross 40 color=green dashlist= 8 4 font="helvetica 10 normal" tag={group 1} select=1 source panda=(1 3 2)(2 3 4)'

0 commit comments

Comments
 (0)