--- ECHO_content/ECHO_helpers.py 2005/06/09 15:08:01 1.52
+++ ECHO_content/ECHO_helpers.py 2005/06/09 16:35:51 1.53
@@ -229,19 +229,22 @@ class ECHO_basis:
coords = string.split(coordstring, ',')
angle = self.REQUEST.get('angle.'+id, '0')
type = self.REQUEST.get('type.'+id, 'area')
+ permanent = self.REQUEST.get('permanent.'+id, '')
if len(coords) == 4:
area.setCoordString(coordstring)
area.setAngle(angle)
area.setType(type)
+ area.setPermanent(permanent)
# add new area
if self.REQUEST.has_key('add'):
coordstring = self.REQUEST.get('coords.new', '')
coords = string.split(coordstring, ',')
angle = self.REQUEST.get('angle.new', '0')
type = self.REQUEST.get('type.new', 'area')
+ permanent = self.REQUEST.get('permanent.'+id, '')
if len(coords) == 4:
coords.append(angle)
- area = MapArea(None, coords, type=type)
+ area = MapArea(None, coords, type=type, permanent=permanent)
self.addMapArea(area)
# return to edit area menu
if RESPONSE is not None:
@@ -249,10 +252,10 @@ class ECHO_basis:
def createJSAreas(self, areas):
"""create area calls for JavaScript"""
- dynamical="\n"
+ js="\n"
for ob in areas:
- dynamical+="""addArea('%s', 'overview', %s, '%s');\n"""%(ob.getFullId(),ob.getCoordString(),ob.getType())
- return dynamical
+ js+="""addArea('%s', 'overview', %s, '%s', '%s');\n"""%(ob.getFullId(),ob.getCoordString(),ob.getType(),ob.isPermanent())
+ return js
def createMapHead(self):
"""create javascript include and script tags for head"""
@@ -316,7 +319,7 @@ class ECHO_basis:
# N4 - Arrow
rot = ob.angle
marksrc = arrowsrc
- if rot < 0:
+ if float(rot) < 0:
marksrc = circlesrc
tag += ''%(link,marksrc,rot)
else:
@@ -337,7 +340,6 @@ class ECHO_basis:
marksrc = arrowsrc
if float(rot) < 0:
marksrc = circlesrc
- print "ROT: ", rot, " mark: ", marksrc
if bt.isIEWin and bt.versIE > 5:
# IE/Win 5.5 has "feature" for PNG transparency
tag += ''%(id,marksrc,rot,marksrc,rot)
@@ -347,9 +349,8 @@ class ECHO_basis:
elif ob.isTypeText():
# DOM - Text
tag += '