traipse_dev: orpg/mapper/whiteboard.py comparison

comparison orpg/mapper/whiteboard.py @ 137:54446a995007 alpha

Traipse Alpha 'OpenRPG' {091018-00} Traipse is a distribution of OpenRPG that is designed to be easy to setup and go. Traipse also makes it easy for developers to work on code without fear of sacrifice. 'Ornery-Orc' continues the trend of 'Grumpy' and adds fixes to the code. 'Ornery-Orc's main goal is to offer more advanced features and enhance the productivity of the user. Update Summary (Cleaning up for Beta) Added Bookmarks Fix to Remote Admin Commands Minor fix to text based Server Fix to Pretty Print, from Core Fix to Splitter Nodes not being created Fix to massive amounts of images loading, from Core Added 'boot' command to remote admin Added confirmation window for sent nodes Minor changes to allow for portability to an OpenSUSE linux OS Miniatures Layer pop up box allows users to turn off Mini labels, from FlexiRPG Zoom Mouse plugin added Images added to Plugin UI Switching to Element Tree Map efficiency, from FlexiRPG Added Status Bar to Update Manager default_manifest.xml renamed to default_upmana.xml Cleaner clode for saved repositories New TrueDebug Class in orpg_log (See documentation for usage) Mercurial's hgweb folder is ported to upmana **Pretty important update that can help remove thousands of dead children from your gametree. **Children, <forms />, <group_atts />, <horizontal />, <cols />, <rows />, <height />, etc... are all tags now. Check your gametree and look for dead children!! **New Gametree Recusion method, mapping, and context sensitivity. !!Alpha - Watch out for infinite loops!!

author	sirebral
date	Wed, 18 Nov 2009 19:57:52 -0600
parents	449a8900f9ac
children	1ed2feab0db9

comparison

equal deleted inserted replaced

-:b4e02e8cd314
+:54446a995007
 #
 __version__ = "$Id: whiteboard.py,v 1.47 2007/03/09 14:11:55 digitalxero Exp $"
 from base import *
 from orpg.mapper.map_utils import *
+from orpg.tools.orpg_log import debug
+from xml.etree.ElementTree import ElementTree, Element, tostring
 def cmp_zorder(first,second):
 f = first.zorder
 s = second.zorder
 if f == None: f = 0
 dc.SetFont(self.font)
 dc.DrawText(self.text_string, self.posx, self.posy)
 dc.SetTextForeground(wx.Colour(0,0,0))
 def toxml(self, action="update"):
-if action == "del":
+xml = Element('text')
-xml_str = "<text action='del' id='" + str(self.id) + "'/>"
+xml.set('action', action)
-return xml_str
+xml.set('id', str(self.id))
-xml_str = "<text"
+if action == 'del': return tostring(xml)
-xml_str += " action='" + action + "'"
+if self.pointsize != None: xml.set('pointsize', str(self.pointsize))
-xml_str += " id='" + str(self.id) + "'"
+if self.style != None: xml.set('style', str(self.style))
-if self.pointsize != None: xml_str += " pointsize='" + str(self.pointsize) + "'"
+if self.weight != None: xml.set('weight', str(self.weight))
-if self.style != None: xml_str += " style='" + str(self.style) + "'"
+if self.posx != None: xml.set('posx', str(self.posx))
-if self.weight != None: xml_str += " weight='" + str(self.weight) + "'"
+if not (self.posy is None): xml.set('posy', str(self.posy))
-if self.posx != None: xml_str+= " posx='" + str(self.posx) + "'"
+if self.text_string != None: xml.set('text_string', self.text_string)
-if not (self.posy is None): xml_str += " posy='" + str(self.posy) + "'"
+if self.textcolor != None: xml.set('color', self.textcolor)
-if self.text_string != None: xml_str+= " text_string='" + self.text_string + "'"
-if self.textcolor != None: xml_str += " color='" + self.textcolor + "'"
-xml_str += "/>"
 if (action == "update" and self.isUpdated) or action == "new":
 self.isUpdated = False
-return xml_str
+return tostring(xml)
 else: return ''
 def takedom(self, xml_dom):
-self.text_string = xml_dom.getAttribute("text_string")
+self.text_string = xml_dom.get("text_string")
-self.id = xml_dom.getAttribute("id")
+self.id = xml_dom.get("id")
-if xml_dom.hasAttribute("posy"):
+if xml_dom.get("posy"): self.posy = int(xml_dom.get("posy"))
-self.posy = int(xml_dom.getAttribute("posy"))
+if xml_dom.get("posx"): self.posx = int(xml_dom.get("posx"))
-if xml_dom.hasAttribute("posx"):
+if xml_dom.get("weight"):
-self.posx = int(xml_dom.getAttribute("posx"))
+self.weight = int(xml_dom.get("weight"))
-if xml_dom.hasAttribute("weight"):
-self.weight = int(xml_dom.getAttribute("weight"))
 self.font.SetWeight(self.weight)
-if xml_dom.hasAttribute("style"):
+if xml_dom.get("style"):
-self.style = int(xml_dom.getAttribute("style"))
+self.style = int(xml_dom.get("style"))
 self.font.SetStyle(self.style)
-if xml_dom.hasAttribute("pointsize"):
+if xml_dom.get("pointsize"):
-self.pointsize = int(xml_dom.getAttribute("pointsize"))
+self.pointsize = int(xml_dom.get("pointsize"))
 self.font.SetPointSize(self.pointsize)
-if xml_dom.hasAttribute("color") and xml_dom.getAttribute("color") != '':
+if xml_dom.get("color") and xml_dom.get("color") != '':
-self.textcolor = xml_dom.getAttribute("color")
+self.textcolor = xml_dom.get("color")
 if self.textcolor == '#0000000': self.textcolor = '#000000'
 class WhiteboardLine:
 def __init__(self, id, line_string, upperleft, lowerright, color="#000000", width=1, log=None):
 self.scale = 1
 dc.SetPen(wx.NullPen)
 dc.SetBrush(wx.NullBrush)
 #selected outline
 def toxml(self, action="update"):
-if action == "del":
+xml = Element('line')
-xml_str = "<line action='del' id='" + str(self.id) + "'/>"
+xml.set('action', action)
-return xml_str
+xml.set('id', str(self.id))
+if action == "del": return tostring(xml)
 #  if there are any changes, make sure id is one of them
-xml_str = "<line"
+xml.set('line_string', self.line_string)
-xml_str += " action='" + action + "'"
-xml_str += " id='" + str(self.id) + "'"
-xml_str+= " line_string='" + self.line_string + "'"
 if self.upperleft != None:
-xml_str += " upperleftx='" + str(self.upperleft.x) + "'"
+xml.set('upperleftx', str(self.upperleft.x))
-xml_str += " upperlefty='" + str(self.upperleft.y) + "'"
+xml.set('upperlefty', str(self.upperleft.y))
 if self.lowerright != None:
-xml_str+= " lowerrightx='" + str(self.lowerright.x) + "'"
+xml.set('lowerrightx', str(self.lowerright.x))
-xml_str+= " lowerrighty='" + str(self.lowerright.y) + "'"
+xml.set('lowerrighty', str(self.lowerright.y))
 if self.linecolor != None:
-xml_str += " color='" + str(self.linecolor) + "'"
+xml.set('color', str(self.linecolor))
 if self.linewidth != None:
-xml_str += " width='" + str(self.linewidth) + "'"
+xml.set('width', str(self.linewidth))
-xml_str += "/>"
+if action == "new": return tostring(xml)
-if action == "new": return xml_str
 return ''
 def takedom(self, xml_dom):
-self.line_string = xml_dom.getAttribute("line_string")
+self.line_string = xml_dom.get("line_string")
-self.id = xml_dom.getAttribute("id")
+self.id = xml_dom.get("id")
-if xml_dom.hasAttribute("upperleftx"):
+if xml_dom.get("upperleftx"):
-self.upperleft.x = int(xml_dom.getAttribute("upperleftx"))
+self.upperleft.x = int(xml_dom.get("upperleftx"))
-if xml_dom.hasAttribute("upperlefty"):
+if xml_dom.get("upperlefty"):
-self.upperleft.y = int(xml_dom.getAttribute("upperlefty"))
+self.upperleft.y = int(xml_dom.get("upperlefty"))
-if xml_dom.hasAttribute("lowerrightx"):
+if xml_dom.get("lowerrightx"):
-self.lowerright.x = int(xml_dom.getAttribute("lowerrightx"))
+self.lowerright.x = int(xml_dom.get("lowerrightx"))
-if xml_dom.hasAttribute("lowerrighty"):
+if xml_dom.get("lowerrighty"):
-self.lowerright.y = int(xml_dom.getAttribute("lowerrighty"))
+self.lowerright.y = int(xml_dom.get("lowerrighty"))
-if xml_dom.hasAttribute("color") and xml_dom.getAttribute("color") != '':
+if xml_dom.get("color") and xml_dom.get("color") != '':
-self.linecolor = xml_dom.getAttribute("color")
+self.linecolor = xml_dom.get("color")
 if self.linecolor == '#0000000':
 self.linecolor = '#000000'
-if xml_dom.hasAttribute("width"):
+if xml_dom.get("width"):
-self.linewidth = int(xml_dom.getAttribute("width"))
+self.linewidth = int(xml_dom.get("width"))
 ##-----------------------------
 ## whiteboard layer
 ##-----------------------------
 class whiteboard_layer(layer_base):
 self.canvas.Refresh(True)
 def del_all_lines(self):
 for i in xrange(len(self.lines)):
 self.del_line(self.lines[0])
-print self.lines
 def del_text(self, text):
 xml_str = "<map><whiteboard>"
 xml_str += text.toxml("del")
 xml_str += "</whiteboard></map>"
 return s
 else:
 return ""
 def layerTakeDOM(self, xml_dom):
-serial_number = xml_dom.getAttribute('serial')
+serial_number = xml_dom.get('serial')
 if serial_number != "": self.serial_number = int(serial_number)
-children = xml_dom._get_childNodes()
+children = xml_dom.getchildren()
 for l in children:
-nodename = l._get_nodeName()
+nodename = l.tag
-action = l.getAttribute("action")
+action = l.get("action")
-id = l.getAttribute('id')
+id = l.get('id')
+if self.serial_number < int(id[5:]): self.serial_number = int(id[5:])
 if action == "del":
 if nodename == 'line':
 line = self.get_line_by_id(id)
 if line != None: self.lines.remove(line)
 elif nodename == 'text':
 text = self.get_text_by_id(id)
 if text != None: self.texts.remove(text)
 elif action == "new":
 if nodename == "line":
 try:
-line_string = l.getAttribute('line_string')
+line_string = l.get('line_string')
-upperleftx = l.getAttribute('upperleftx')
+upperleftx = l.get('upperleftx')
-upperlefty = l.getAttribute('upperlefty')
+upperlefty = l.get('upperlefty')
-lowerrightx = l.getAttribute('lowerrightx')
+lowerrightx = l.get('lowerrightx')
-lowerrighty = l.getAttribute('lowerrighty')
+lowerrighty = l.get('lowerrighty')
 upperleft = wx.Point(int(upperleftx),int(upperlefty))
 lowerright = wx.Point(int(lowerrightx),int(lowerrighty))
-color = l.getAttribute('color')
+color = l.get('color')
 if color == '#0000000': color = '#000000'
-id = l.getAttribute('id')
+id = l.get('id')
-width = int(l.getAttribute('width'))
+width = int(l.get('width'))
 except:
 line_string = upperleftx = upperlefty = lowerrightx = lowerrighty = color = 0
 continue
 line = WhiteboardLine(id, line_string, upperleft, lowerright, color, width)
 self.lines.append(line)
 elif nodename == "text":
 try:
-text_string = l.getAttribute('text_string')
+text_string = l.get('text_string')
-style = l.getAttribute('style')
+style = l.get('style')
-pointsize = l.getAttribute('pointsize')
+pointsize = l.get('pointsize')
-weight = l.getAttribute('weight')
+weight = l.get('weight')
-color = l.getAttribute('color')
+color = l.get('color')
 if color == '#0000000': color = '#000000'
-id = l.getAttribute('id')
+id = l.get('id')
-posx = l.getAttribute('posx')
+posx = l.get('posx')
-posy = l.getAttribute('posy')
+posy = l.get('posy')
 pos = wx.Point(0,0)
 pos.x = int(posx)
 pos.y = int(posy)
 except:
 continue

Mercurial > traipse_dev

comparison orpg/mapper/whiteboard.py @ 137:54446a995007 alpha