# HG changeset patch
# User sirebral
# Date 1258968170 21600
# Node ID 8e07c1a2c69bfac7597c34399923ed9f430266ee
# Parent 1ed2feab0db9524abecc939c83558cec8aab1290
Traipse Alpha 'OpenRPG' {091123-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, , , , , , , etc... are all tags now. Check
your gametree and look for dead children!!
New Gametree Recursion method, mapping, and context sensitivity. !Infinite Loops return error instead of freezing the
software!
New Syntax added for custom PC sheets
Tip of the Day added, from Core and community
Fixed Whiteboard ID to prevent random line or text deleting. Modified ID's to prevent non updated clients from
ruining the fix.
diff -r 1ed2feab0db9 -r 8e07c1a2c69b orpg/mapper/background.py
--- a/orpg/mapper/background.py Sat Nov 21 03:19:34 2009 -0600
+++ b/orpg/mapper/background.py Mon Nov 23 03:22:50 2009 -0600
@@ -40,8 +40,6 @@
from orpg.tools.decorators import debugging
from orpg.tools.orpg_settings import settings
-from xml.etree.ElementTree import ElementTree, Element, tostring, fromstring, parse
-
##-----------------------------
## background layer
##-----------------------------
@@ -102,7 +100,7 @@
self.type = BG_TEXTURE
if self.img_path != path:
try:
- self.bg_bmp = ImageHandler.load(path, "texture", 0)
+ self.bg_bmp = ImageHandler.load(path, "texture", 0).ConvertToBitmap()
if self.bg_bmp == None:
logger.general("Invalid image type!")
raise Exception, "Invalid image type!"
@@ -114,7 +112,7 @@
self.isUpdated = True
self.type = BG_IMAGE
if self.img_path != path:
- self.bg_bmp = ImageHandler.load(path, "background", 0)
+ self.bg_bmp = ImageHandler.load(path, "background", 0).ConvertToBitmap()
try:
if self.bg_bmp == None:
logger.general("Invalid image type!")
@@ -136,12 +134,6 @@
if self.bg_bmp == None or not self.bg_bmp.Ok() or ((self.type != BG_TEXTURE) and (self.type != BG_IMAGE)):
return False
dc2 = wx.MemoryDC()
-
- ### Temporary ###
- try: self.bg_bmp = self.bg_bmp.ConvertToBitmap()
- except: pass
- #################
-
dc2.SelectObject(self.bg_bmp)
topLeft = [int(topleft[0]/scale), int(topleft[1]/scale)]
topRight = [int((topleft[0]+size[0]+1)/scale)+1, int((topleft[1]+size[1]+1)/scale)+1]
@@ -214,52 +206,55 @@
def layerToXML(self, action="update"):
- xml = Element('bg')
+ xml_str = ""
+ logger.debug(xml_str)
if (action == "update" and self.isUpdated) or action == "new":
self.isUpdated = False
- return tostring(xml)
+ return xml_str
else: return ''
def layerTakeDOM(self, xml_dom):
type = BG_COLOR
- color = xml_dom.get("color")
+ color = xml_dom.getAttribute("color")
+ logger.debug("color=" + color)
+ path = urllib.unquote(xml_dom.getAttribute("path"))
+ logger.debug("path=" + path)
# Begin ted's map changes
- if xml_dom.get("color"):
- r,g,b = self.r_h.rgb_tuple(xml_dom.get("color"))
+ if xml_dom.hasAttribute("color"):
+ r,g,b = self.r_h.rgb_tuple(xml_dom.getAttribute("color"))
self.set_color(cmpColour(r,g,b))
# End ted's map changes
- if xml_dom.get("type"):
- type = int(xml_dom.get("type"))
+ if xml_dom.hasAttribute("type"):
+ type = int(xml_dom.getAttribute("type"))
logger.debug("type=" + str(type))
- if type == BG_TEXTURE:
- if xml_dom.get('path') != "": self.set_texture(xml_dom.get('path'))
- elif type == BG_IMAGE:
- if xml_dom.get('path') != "": self.set_image(xml_dom.get('path'), 1)
+ if type == BG_TEXTURE:
+ if path != "": self.set_texture(path)
+ elif type == BG_IMAGE:
+ if path != "": self.set_image(path, 1)
elif type == BG_NONE: self.clear()
- if xml_dom.get('local') and xml_dom.get('local') == 'True' and os.path.exists(urllib.unquote(xml_dom.get('localPath'))):
- self.localPath = urllib.unquote(xml_dom.get('localPath'))
+ if xml_dom.hasAttribute('local') and xml_dom.getAttribute('local') == 'True' and os.path.exists(urllib.unquote(xml_dom.getAttribute('localPath'))):
+ self.localPath = urllib.unquote(xml_dom.getAttribute('localPath'))
self.local = True
- self.localTime = int(xml_dom.get('localTime'))
+ self.localTime = int(xml_dom.getAttribute('localTime'))
if self.localTime-time.time() <= 144000:
file = open(self.localPath, "rb")
imgdata = file.read()
file.close()
filename = os.path.split(self.localPath)
(imgtype,j) = mimetypes.guess_type(filename[1])
- postdata = urllib.urlencode({'filename':filename[1],
- 'imgdata':imgdata,
- 'imgtype':imgtype})
+ postdata = urllib.urlencode({'filename':filename[1], 'imgdata':imgdata, 'imgtype':imgtype})
thread.start_new_thread(self.upload, (postdata, self.localPath, type))
@@ -267,12 +262,13 @@
self.lock.acquire()
if type == 'Image' or type == 'Texture':
url = component.get('settings').get_setting('ImageServerBaseURL')
- recvdata = parse(urllib.urlopen(url, postdata))
+ file = urllib.urlopen(url, postdata)
+ recvdata = file.read()
+ file.close()
try:
- xml_dom = fromstring(recvdata).getroot()
- xml_dom = fromstring(recvdata)
- if xml_dom.tag == 'path':
- path = xml_dom.get('url')
+ xml_dom = minidom.parseString(recvdata)._get_documentElement()
+ if xml_dom.nodeName == 'path':
+ path = xml_dom.getAttribute('url')
path = urllib.unquote(path)
if type == 'Image': self.set_image(path, 1)
else: self.set_texture(path)
@@ -280,7 +276,7 @@
self.local = True
self.localTime = time.time()
else:
- print xml_dom.get('msg')
+ print xml_dom.getAttribute('msg')
except Exception, e:
print e
print recvdata
diff -r 1ed2feab0db9 -r 8e07c1a2c69b orpg/mapper/background_msg.py
--- a/orpg/mapper/background_msg.py Sat Nov 21 03:19:34 2009 -0600
+++ b/orpg/mapper/background_msg.py Mon Nov 23 03:22:50 2009 -0600
@@ -27,8 +27,7 @@
#
__version__ = "$Id: background_msg.py,v 1.8 2006/11/04 21:24:21 digitalxero Exp $"
-from base_msg import map_element_msg_base
-from xml.etree.ElementTree import ElementTree
+from base_msg import *
class bg_msg(map_element_msg_base):
diff -r 1ed2feab0db9 -r 8e07c1a2c69b orpg/mapper/base_msg.py
--- a/orpg/mapper/base_msg.py Sat Nov 21 03:19:34 2009 -0600
+++ b/orpg/mapper/base_msg.py Mon Nov 23 03:22:50 2009 -0600
@@ -29,16 +29,15 @@
from threading import RLock
from orpg.networking.mplay_client import *
-
-from xml.etree.ElementTree import XML, fromstring, parse
+from xml.etree.ElementTree import ElementTree, Element
class map_element_msg_base:
# This is a base class
def __init__(self,reentrant_lock_object = None):
- if not self.tagname:
- raise Exception, "This is a virtual class that cannot be directly instantiated. Set self.tagname in derived class."; exit()
+ if not hasattr(self,"tagname"):
+ raise Exception, "This is a virtual class that cannot be directly instantiated. Set self.tagname in derived class."
self._props = {}
# This is a dictionary that holds (value,changed) 2-tuples, indexed by attribute
@@ -197,38 +196,46 @@
#########################################
# XML importers begin
- def _from_dom(self,xml,prop_func):
+ def _from_dom(self,xml_dom,prop_func):
self.p_lock.acquire()
- if xml.tag == self.tagname:
- if xml.keys():
- for k in xml.keys():
- prop_func(k, xml.get(k))
+ if iselement(xml_dom): ## Uses new Element Tree style
+ if xml_dom.tag == self.tagname:
+ if xml_dom.attrib:
+ for k in xml_dom.attrib:
+ prop_func(k,xml_dom.get(k))
+ elif not iselement(xml_dom): ## Uses old DOM style (deprecated!!)
+ if xml_dom.tagName == self.tagname:
+ if xml_dom.getAttributeKeys():
+ for k in xml_dom.getAttributeKeys():
+ prop_func(k,xml_dom.getAttribute(k))
else:
self.p_lock.release()
raise Exception, "Error attempting to modify a " + self.tagname + " from a non-<" + self.tagname + "/> element"
self.p_lock.release()
- def init_from_dom(self, xml):
- # xml must be pointing to an empty tag. Override in a derived class for and other similar tags.
- self._from_dom(xml,self.init_prop)
+ def init_from_dom(self,xml_dom):
+ # xml_dom must be pointing to an empty tag. Override in a derived class for and other similar tags.
+ self._from_dom(xml_dom,self.init_prop)
- def set_from_dom(self, xml):
- # xml must be pointing to an empty tag. Override in a derived class for and other similar tags
- self._from_dom(xml, self.set_prop)
+ def set_from_dom(self,xml_dom):
+ # xml_dom must be pointing to an empty tag. Override in a derived class for and other similar tags
+ self._from_dom(xml_dom,self.set_prop)
- def init_from_xml(self, tree):
- #tree = XML(xmlString)
- node_list = tree.findall(self.tagname)
+ def init_from_xml(self,xml):
+ xml_dom = parseXml(xml)
+ node_list = xml_dom.getElementsByTagName(self.tagname)
if len(node_list) < 1: print "Warning: no <" + self.tagname + "/> elements found in DOM."
else:
- while len(node_list):
- self.init_from_dom(node_list.pop())
+ while len(node_list): self.init_from_dom(node_list.pop())
+ if xml_dom: xml_dom.unlink()
- def set_from_xml(self, tree):
- #tree = XML(xmlString)
- node_list = tree.findall(self.tagname)
+ def set_from_xml(self,xml):
+ xml_dom = parseXml(xml)
+ node_list = xml_dom.getElementsByTagName(self.tagname)
if len(node_list) < 1: print "Warning: no <" + self.tagname + "/> elements found in DOM."
else:
while len(node_list): self.set_from_dom(node_list.pop())
+ if xml_dom: xml_dom.unlink()
+
# XML importers end
#########################################
diff -r 1ed2feab0db9 -r 8e07c1a2c69b orpg/mapper/fog.py
--- a/orpg/mapper/fog.py Sat Nov 21 03:19:34 2009 -0600
+++ b/orpg/mapper/fog.py Mon Nov 23 03:22:50 2009 -0600
@@ -83,7 +83,6 @@
self.log = component.get('log')
layer_base.__init__(self)
self.color = wx.Color(128, 128, 128)
- #if "__WXGTK__" not in wx.PlatformInfo: self.color = wx.Color(128,128,128, 128)
self.fogregion = wx.Region()
self.fogregion.Clear()
self.fog_bmp = None
@@ -122,8 +121,7 @@
self.fill_fog()
def fill_fog(self):
- if not self.use_fog:
- return
+ if not self.use_fog: return
mdc = wx.MemoryDC()
mdc.SelectObject(self.fog_bmp)
mdc.SetPen(wx.TRANSPARENT_PEN)
@@ -144,7 +142,6 @@
if self.fog_bmp == None or not self.fog_bmp.Ok() or not self.use_fog:
return
if self.last_role != self.canvas.frame.session.role: self.fill_fog()
-
mdc = wx.MemoryDC()
mdc.SelectObject(self.fog_bmp)
dc.Blit(0, 0, self.canvas.size[0], self.canvas.size[1], mdc, 0, 0, wx.AND)
@@ -184,14 +181,8 @@
regn.Clear()
list = IRegion().scan_Convert(polypt)
for i in list:
- if regn.IsEmpty():
- #if "__WXGTK__" not in wx.PlatformInfo:
- regn = wx.Region(i.left*COURSE, i.y*COURSE, i.right*COURSE+1-i.left*COURSE, 1*COURSE)
- #else: regn = wx.Region(i.left, i.y, i.right+1-i.left, 1)
- else:
- #if "__WXGTK__" not in wx.PlatformInfo:
- regn.Union(i.left*COURSE, i.y*COURSE, i.right*COURSE+1-i.left*COURSE, 1*COURSE)
- #else: regn.Union(i.left, i.y, i.right+1-i.left, 1)
+ if regn.IsEmpty(): regn = wx.Region(i.left*COURSE, i.y*COURSE, i.right*COURSE+1-i.left*COURSE, 1*COURSE)
+ else: regn.Union(i.left*COURSE, i.y*COURSE, i.right*COURSE+1-i.left*COURSE, 1*COURSE)
return regn
def add_area(self, area="", show="Yes"):
@@ -209,21 +200,16 @@
if show == "Yes": self.canvas.frame.session.send(xml_str)
def layerToXML(self, action="update"):
- if not self.use_fog: return ""
+ if not self.use_fog:
+ return ""
fog_string = ""
ri = wx.RegionIterator(self.fogregion)
if not (ri.HaveRects()): fog_string = FogArea("all", self.log).toxml("del")
while ri.HaveRects():
- #if "__WXGTK__" not in wx.PlatformInfo:
x1 = ri.GetX()/COURSE
x2 = x1+(ri.GetW()/COURSE)-1
y1 = ri.GetY()/COURSE
y2 = y1+(ri.GetH()/COURSE)-1
- #else:
- # x1 = ri.GetX()
- # x2 = x1+ri.GetW()-1
- # y1 = ri.GetY()
- # y2 = y1+ri.GetH()-1
poly = FogArea(str(x1) + "," + str(y1) + ";" +
str(x2) + "," + str(y1) + ";" +
str(x2) + "," + str(y2) + ";" +
@@ -244,11 +230,11 @@
if not self.use_fog:
self.use_fog = True
self.recompute_fog()
- if xml_dom.get('serial'): self.serial_number = int(xml_dom.get('serial'))
- children = xml_dom.getchildren()
+ if xml_dom.hasAttribute('serial'): self.serial_number = int(xml_dom.getAttribute('serial'))
+ children = xml_dom._get_childNodes()
for l in children:
- action = l.get("action")
- outline = l.get("outline")
+ action = l.getAttribute("action")
+ outline = l.getAttribute("outline")
if (outline == "all"):
polyline = [IPoint().make(0,0), IPoint().make(self.width-1, 0),
IPoint().make(self.width-1, self.height-1),
@@ -261,10 +247,10 @@
polyline = []
lastx = None
lasty = None
- list = l.getchildren()
+ list = l._get_childNodes()
for point in list:
- x = point.get( "x" )
- y = point.get( "y" )
+ x = point.getAttribute( "x" )
+ y = point.getAttribute( "y" )
if (x != lastx or y != lasty):
polyline.append(IPoint().make(int(x), int(y)))
lastx = x
diff -r 1ed2feab0db9 -r 8e07c1a2c69b orpg/mapper/fog_msg.py
--- a/orpg/mapper/fog_msg.py Sat Nov 21 03:19:34 2009 -0600
+++ b/orpg/mapper/fog_msg.py Mon Nov 23 03:22:50 2009 -0600
@@ -27,14 +27,13 @@
from base_msg import *
from region import *
-#from orpg.minidom import Element
+from orpg.minidom import Element
import string
-from xml.etree.ElementTree import ElementTree
class fog_msg(map_element_msg_base):
def __init__(self,reentrant_lock_object = None):
- self.tag = "fog"
+ self.tagname = "fog"
map_element_msg_base.__init__(self,reentrant_lock_object)
self.use_fog = 0
self.fogregion=IRegion()
@@ -42,16 +41,16 @@
def get_line(self,outline,action,output_act):
elem = Element( "poly" )
- if ( output_act ): elem.set( "action", action )
- if ( outline == 'all' ) or ( outline == 'none' ): elem.set( "outline", outline )
+ if ( output_act ): elem.setAttribute( "action", action )
+ if ( outline == 'all' ) or ( outline == 'none' ): elem.setAttribute( "outline", outline )
else:
- elem.set( "outline", "points" )
+ elem.setAttribute( "outline", "points" )
for pair in string.split( outline, ";" ):
p = string.split( pair, "," )
point = Element( "point" )
- point.set( "x", p[ 0 ] )
- point.set( "y", p[ 1 ] )
- elem.append( point )
+ point.setAttribute( "x", p[ 0 ] )
+ point.setAttribute( "y", p[ 1 ] )
+ elem.appendChild( point )
str = elem.toxml()
elem.unlink()
return str
@@ -94,10 +93,13 @@
def interpret_dom(self,xml_dom):
self.use_fog=1
- children = xml_dom.getchildren()
+ #print 'fog_msg.interpret_dom called'
+ children = xml_dom._get_childNodes()
+ #print "children",children
for l in children:
- action = l.get("action")
- outline = l.get("outline")
+ action = l.getAttribute("action")
+ outline = l.getAttribute("outline")
+ #print "action/outline",action, outline
if (outline=="all"):
polyline=[]
self.fogregion.Clear()
@@ -107,9 +109,14 @@
self.fogregion.Clear()
else:
polyline=[]
- list = l.getchildren()
+ list = l._get_childNodes()
for node in list:
- polyline.append( IPoint().make( int(node.get("x")), int(node.get("y")) ) )
+ polyline.append( IPoint().make( int(node.getAttribute("x")), int(node.getAttribute("y")) ) )
+ # pointarray = outline.split(";")
+ # for m in range(len(pointarray)):
+ # pt=pointarray[m].split(",")
+ # polyline.append(IPoint().make(int(pt[0]),int(pt[1])))
+ #print "length of polyline", len(polyline)
if (len(polyline)>2):
if action=="del": self.fogregion.FromPolygon(polyline,0)
else: self.fogregion.FromPolygon(polyline,1)
diff -r 1ed2feab0db9 -r 8e07c1a2c69b orpg/mapper/grid.py
--- a/orpg/mapper/grid.py Sat Nov 21 03:19:34 2009 -0600
+++ b/orpg/mapper/grid.py Mon Nov 23 03:22:50 2009 -0600
@@ -33,8 +33,6 @@
from miniatures import SNAPTO_ALIGN_TL
from math import floor
-from xml.etree.ElementTree import ElementTree, Element, tostring
-
# Grid mode constants
GRID_RECTANGLE = 0
GRID_HEXAGON = 1
@@ -63,7 +61,7 @@
#size_ratio is the size ajustment for Hex and ISO to make them more accurate
self.size_ratio = 1.5
self.snap = True
- self.color = wx.BLACK # = color.Get()
+ self.color = wx.BLACK# = color.Get()
#self.color = cmpColour(r,g,b)
self.r_h = RGBHex()
self.mode = GRID_RECTANGLE
@@ -389,37 +387,38 @@
# Disable pen/brush optimizations to prevent any odd effects elsewhere
def layerToXML(self,action = "update"):
- xml = Element('grid')
+ xml_str = ""
if (action == "update" and self.isUpdated) or action == "new":
self.isUpdated = False
- return tostring(xml)
+ return xml_str
else: return ''
def layerTakeDOM(self, xml_dom):
- if xml_dom.get("color"):
- r,g,b = self.r_h.rgb_tuple(xml_dom.get("color"))
+ if xml_dom.hasAttribute("color"):
+ r,g,b = self.r_h.rgb_tuple(xml_dom.getAttribute("color"))
self.set_color(cmpColour(r,g,b))
#backwards compatible with non-isometric map formated clients
ratio = RATIO_DEFAULT
- if xml_dom.get("ratio"): ratio = xml_dom.get("ratio")
- if xml_dom.get("mode"):
- self.SetMode(int(xml_dom.get("mode")))
- if xml_dom.get("size"):
- self.unit_size = int(xml_dom.get("size"))
+ if xml_dom.hasAttribute("ratio"): ratio = xml_dom.getAttribute("ratio")
+ if xml_dom.hasAttribute("mode"):
+ self.SetMode(int(xml_dom.getAttribute("mode")))
+ if xml_dom.hasAttribute("size"):
+ self.unit_size = int(xml_dom.getAttribute("size"))
self.unit_size_y = self.unit_size
- if xml_dom.get("snap"):
- if (xml_dom.get("snap") == 'True') or (xml_dom.get("snap") == "1"): self.snap = True
+ if xml_dom.hasAttribute("snap"):
+ if (xml_dom.getAttribute("snap") == 'True') or (xml_dom.getAttribute("snap") == "1"): self.snap = True
else: self.snap = False
- if xml_dom.get("line"):
- self.SetLine(int(xml_dom.get("line")))
+ if xml_dom.hasAttribute("line"):
+ self.SetLine(int(xml_dom.getAttribute("line")))
diff -r 1ed2feab0db9 -r 8e07c1a2c69b orpg/mapper/grid_msg.py
--- a/orpg/mapper/grid_msg.py Sat Nov 21 03:19:34 2009 -0600
+++ b/orpg/mapper/grid_msg.py Mon Nov 23 03:22:50 2009 -0600
@@ -30,10 +30,8 @@
from base_msg import map_element_msg_base
#from base_msg import * ## ?? import all? Deprecated!?
-from xml.etree.ElementTree import ElementTree
-
class grid_msg(map_element_msg_base):
def __init__(self,reentrant_lock_object = None):
self.tagname = "grid"
- map_element_msg_base.__init__(self, reentrant_lock_object)
+ map_element_msg_base.__init__(self,reentrant_lock_object)
diff -r 1ed2feab0db9 -r 8e07c1a2c69b orpg/mapper/images.py
--- a/orpg/mapper/images.py Sat Nov 21 03:19:34 2009 -0600
+++ b/orpg/mapper/images.py Mon Nov 23 03:22:50 2009 -0600
@@ -63,7 +63,7 @@
if self.__fetching[path]:
thread.start_new_thread(self.__loadCacheThread,
(path, image_type, imageId))
- return wx.Bitmap(dir_struct["icon"] + "fetching.png", wx.BITMAP_TYPE_PNG)
+ return wx.Image(dir_struct["icon"] + "fetching.png", wx.BITMAP_TYPE_PNG)
def directLoad(self, path):
# Directly load an image, no threads
diff -r 1ed2feab0db9 -r 8e07c1a2c69b orpg/mapper/map.py
--- a/orpg/mapper/map.py Sat Nov 21 03:19:34 2009 -0600
+++ b/orpg/mapper/map.py Mon Nov 23 03:22:50 2009 -0600
@@ -35,6 +35,7 @@
import random
import os
import thread
+#import gc #Garbage Collecter Needed?
import traceback
from miniatures_handler import *
@@ -48,7 +49,6 @@
from images import ImageHandler
from orpg.orpgCore import component
from orpg.tools.orpg_settings import settings
-from xml.etree.ElementTree import ElementTree, Element, tostring, parse
# Various marker modes for player tools on the map
MARKER_MODE_NONE = 0
@@ -62,7 +62,6 @@
self.session = component.get("session")
wx.ScrolledWindow.__init__(self, parent, ID,
style=wx.HSCROLL | wx.VSCROLL | wx.FULL_REPAINT_ON_RESIZE | wx.SUNKEN_BORDER )
- self.SetBackgroundStyle(wx.BG_STYLE_CUSTOM)
self.frame = parent
self.MAP_MODE = 1 #Mode 1 = MINI, 2 = DRAW, 3 = TAPE MEASURE
self.layers = {}
@@ -109,14 +108,6 @@
# miniatures drag
self.drag = None
- #self.Bind(wx.EVT_MOUSEWHEEL, self.MouseWheel)
-
- def MouseWheel(self, evt):
- if evt.CmdDown():
- if evt.GetWheelRotation() > 0: self.on_zoom_in(None)
- elif evt.GetWheelRotation() < 0: self.on_zoom_out(None)
- else: pass
-
def better_refresh(self, event=None):
self.Refresh(True)
@@ -125,21 +116,43 @@
def processImages(self, evt=None):
self.session = component.get("session")
- tabs = ['Background', 'Grid', 'Miniatures', 'Whiteboard', 'Fog', 'General']
if self.session.my_role() == self.session.ROLE_LURKER or (str(self.session.group_id) == '0' and str(self.session.status) == '1'):
- for tab in tabs:
- cidx = self.parent.get_tab_index(tab)
- self.parent.tabs.EnableTab(cidx, False)
- elif self.session.my_role() == self.session.ROLE_PLAYER:
- for tab in tabs:
- cidx = self.parent.get_tab_index(tab)
- if tab == "Miniatures" or tab == "Whiteboard":
- self.parent.tabs.EnableTab(cidx, True)
- else: self.parent.tabs.EnableTab(cidx, False)
- elif self.session.my_role() == self.session.ROLE_GM and str(self.session.group_id) != '0':
- for tab in tabs:
- cidx = self.parent.get_tab_index(tab)
- self.parent.tabs.EnableTab(cidx, True)
+ cidx = self.parent.get_tab_index("Background")
+ self.parent.layer_tabs.EnableTab(cidx, False)
+ cidx = self.parent.get_tab_index("Grid")
+ self.parent.layer_tabs.EnableTab(cidx, False)
+ cidx = self.parent.get_tab_index("Miniatures")
+ self.parent.layer_tabs.EnableTab(cidx, False)
+ cidx = self.parent.get_tab_index("Whiteboard")
+ self.parent.layer_tabs.EnableTab(cidx, False)
+ cidx = self.parent.get_tab_index("Fog")
+ self.parent.layer_tabs.EnableTab(cidx, False)
+ cidx = self.parent.get_tab_index("General")
+ self.parent.layer_tabs.EnableTab(cidx, False)
+ else:
+ cidx = self.parent.get_tab_index("Background")
+ if not self.parent.layer_tabs.GetEnabled(cidx):
+ cidx = self.parent.get_tab_index("Miniatures")
+ self.parent.layer_tabs.EnableTab(cidx, True)
+ cidx = self.parent.get_tab_index("Whiteboard")
+ self.parent.layer_tabs.EnableTab(cidx, True)
+ cidx = self.parent.get_tab_index("Background")
+ self.parent.layer_tabs.EnableTab(cidx, False)
+ cidx = self.parent.get_tab_index("Grid")
+ self.parent.layer_tabs.EnableTab(cidx, False)
+ cidx = self.parent.get_tab_index("Fog")
+ self.parent.layer_tabs.EnableTab(cidx, False)
+ cidx = self.parent.get_tab_index("General")
+ self.parent.layer_tabs.EnableTab(cidx, False)
+ if self.session.my_role() == self.session.ROLE_GM:
+ cidx = self.parent.get_tab_index("Background")
+ self.parent.layer_tabs.EnableTab(cidx, True)
+ cidx = self.parent.get_tab_index("Grid")
+ self.parent.layer_tabs.EnableTab(cidx, True)
+ cidx = self.parent.get_tab_index("Fog")
+ self.parent.layer_tabs.EnableTab(cidx, True)
+ cidx = self.parent.get_tab_index("General")
+ self.parent.layer_tabs.EnableTab(cidx, True)
if not self.cacheSizeSet:
self.cacheSizeSet = True
cacheSize = component.get('settings').get_setting("ImageCacheSize")
@@ -148,15 +161,18 @@
if not ImageHandler.Queue.empty():
(path, image_type, imageId) = ImageHandler.Queue.get()
img = wx.ImageFromMime(path[1], path[2])
- # Now, apply the image to the proper object
- if image_type == "miniature":
- min = self.layers['miniatures'].get_miniature_by_id(imageId)
- if min: min.set_bmp(img)
- elif image_type == "background" or image_type == "texture":
- self.layers['bg'].bg_bmp = img.ConvertToBitmap()
- if image_type == "background": self.set_size([img.GetWidth(), img.GetHeight()])
+ try:
+ # Now, apply the image to the proper object
+ if image_type == "miniature":
+ min = self.layers['miniatures'].get_miniature_by_id(imageId)
+ if min: min.set_bmp(img)
+ elif image_type == "background" or image_type == "texture":
+ self.layers['bg'].bg_bmp = img.ConvertToBitmap()
+ if image_type == "background": self.set_size([img.GetWidth(), img.GetHeight()])
+ except: pass
# Flag that we now need to refresh!
self.requireRefresh += 1
+
""" Randomly purge an item from the cache, while this is lamo, it does
keep the cache from growing without bounds, which is pretty important!"""
if len(ImageHandler.Cache) >= self.cacheSize:
@@ -237,9 +253,6 @@
topleft1 = self.GetViewStart()
topleft = [topleft1[0]*scrollsize[0], topleft1[1]*scrollsize[1]]
if (clientsize[0] > 1) and (clientsize[1] > 1):
- #dc = wx.MemoryDC()
- #bmp = wx.EmptyBitmap(clientsize[0]+1, clientsize[1]+1)
- #dc.SelectObject(bmp)
dc = wx.AutoBufferedPaintDC(self)
dc.SetPen(wx.TRANSPARENT_PEN)
dc.SetBrush(wx.Brush(self.GetBackgroundColour(), wx.SOLID))
@@ -255,20 +268,11 @@
self.layers['fog'].layerDraw(dc, topleft, clientsize)
dc.SetPen(wx.NullPen)
dc.SetBrush(wx.NullBrush)
- #dc.SelectObject(wx.NullBitmap)
- #del dc
- #wdc = self.preppaint()
- #wdc.DrawBitmap(bmp, topleft[0], topleft[1])
if settings.get_setting("AlwaysShowMapScale") == "1":
self.showmapscale(dc)
try: evt.Skip()
except: pass
- def preppaint(self):
- dc = wx.PaintDC(self)
- self.PrepareDC(dc)
- return (dc)
-
def showmapscale(self, dc):
scalestring = "Scale x" + `self.layers['grid'].mapscale`[:3]
(textWidth, textHeight) = dc.GetTextExtent(scalestring)
@@ -605,53 +609,68 @@
else: return ""
def takexml(self, xml):
+ """
+ Added Process Dialog to display during long map parsings
+ as well as a try block with an exception traceback to try
+ and isolate some of the map related problems users have been
+ experiencing --Snowdog 5/15/03
+
+ Apparently Process Dialog causes problems with linux.. commenting it out. sheez.
+ --Snowdog 5/27/03
+ """
try:
- xml_dom = fromstring(xml)
+ #parse the map DOM
+ xml_dom = parseXml(xml)
if xml_dom == None: return
- node_list = xml_dom.find("map") if xml_dom.tag != 'map' else xml_dom
- # set map version to incoming data so layers can convert
- self.map_version = node_list.get("version")
- action = node_list.get("action")
- if action == "new":
- self.layers = {}
- try: self.layers['bg'] = layer_back_ground(self)
- except: pass
- try: self.layers['grid'] = grid_layer(self)
- except: pass
- try: self.layers['miniatures'] = miniature_layer(self)
- except: pass
- try: self.layers['whiteboard'] = whiteboard_layer(self)
- except: pass
- try: self.layers['fog'] = fog_layer(self)
- except: pass
- sizex = node_list.get("sizex") if node_list.get("sizex") != None else ''
- if sizex != "":
- sizex = int(float(sizex))
- sizey = self.size[1]
- self.set_size((sizex,sizey))
- self.size_changed = 0
- sizey = node_list.get("sizey") if node_list.get('sizey') != None else ''
- if sizey != "":
- sizey = int(float(sizey))
- sizex = self.size[0]
- self.set_size((sizex,sizey))
- self.size_changed = 0
- children = node_list.getchildren()
- #fog layer must be computed first, so that no data is inadvertently revealed
- for c in children:
- if c.tag == "fog": self.layers[c.tag].layerTakeDOM(c)
- for c in children:
- if c.tag != "fog": self.layers[c.tag].layerTakeDOM(c)
- # all map data should be converted, set map version to current version
- self.map_version = MAP_VERSION
- self.Refresh(False)
- except Exception, e: print 'failed', e; pass
+ node_list = xml_dom.getElementsByTagName("map")
+ if len(node_list) < 1: pass
+ else:
+ # set map version to incoming data so layers can convert
+ self.map_version = node_list[0].getAttribute("version")
+ action = node_list[0].getAttribute("action")
+ if action == "new":
+ self.layers = {}
+ try: self.layers['bg'] = layer_back_ground(self)
+ except: pass
+ try: self.layers['grid'] = grid_layer(self)
+ except: pass
+ try: self.layers['miniatures'] = miniature_layer(self)
+ except: pass
+ try: self.layers['whiteboard'] = whiteboard_layer(self)
+ except: pass
+ try: self.layers['fog'] = fog_layer(self)
+ except: pass
+ sizex = node_list[0].getAttribute("sizex")
+ if sizex != "":
+ sizex = int(float(sizex))
+ sizey = self.size[1]
+ self.set_size((sizex,sizey))
+ self.size_changed = 0
+ sizey = node_list[0].getAttribute("sizey")
+ if sizey != "":
+ sizey = int(float(sizey))
+ sizex = self.size[0]
+ self.set_size((sizex,sizey))
+ self.size_changed = 0
+ children = node_list[0]._get_childNodes()
+ #fog layer must be computed first, so that no data is inadvertently revealed
+ for c in children:
+ name = c._get_nodeName()
+ if name == "fog": self.layers[name].layerTakeDOM(c)
+ for c in children:
+ name = c._get_nodeName()
+ if name != "fog": self.layers[name].layerTakeDOM(c)
+ # all map data should be converted, set map version to current version
+ self.map_version = MAP_VERSION
+ self.Refresh(False)
+ xml_dom.unlink() # eliminate circular refs
+ except: pass
def re_ids_in_xml(self, xml):
new_xml = ""
tmp_map = map_msg()
- xml_dom = fromstring(str(xml))
- node_list = xml_dom.findall("map")
+ xml_dom = parseXml(str(xml))
+ node_list = xml_dom.getElementsByTagName("map")
if len(node_list) < 1: pass
else:
tmp_map.init_from_dom(node_list[0])
@@ -674,9 +693,9 @@
if lines:
for line in lines:
l = whiteboard_layer.children[line]
- if l.tag == 'line': id = 'line-' + self.frame.session.get_next_id()
- elif l.tag == 'text': id = 'text-' + self.frame.session.get_next_id()
- elif l.tag == 'circle': id = 'circle-' + self.frame.session.get_next_id()
+ if l.tagname == 'line': id = 'line-' + self.frame.session.get_next_id()
+ elif l.tagname == 'text': id = 'text-' + self.frame.session.get_next_id()
+ elif l.tagname == 'circle': id = 'circle-' + self.frame.session.get_next_id()
l.init_prop("id", id)
new_xml = tmp_map.get_all_xml()
if xml_dom: xml_dom.unlink()
@@ -691,35 +710,30 @@
self.top_frame = component.get('frame')
self.root_dir = os.getcwd()
self.current_layer = 2
- self.tabs = orpgTabberWnd(self, style=FNB.FNB_NO_X_BUTTON|FNB.FNB_BOTTOM|FNB.FNB_NO_NAV_BUTTONS)
- self.handlers = {}
- self.handlers[0]=(background_handler(self.tabs,-1,self.canvas))
- self.tabs.AddPage(self.handlers[0],"Background")
- self.handlers[1]=(grid_handler(self.tabs,-1,self.canvas))
- self.tabs.AddPage(self.handlers[1],"Grid")
- self.handlers[2]=(miniatures_handler(self.tabs,-1,self.canvas))
- self.tabs.AddPage(self.handlers[2],"Miniatures", True)
- self.handlers[3]=(whiteboard_handler(self.tabs,-1,self.canvas))
- self.tabs.AddPage(self.handlers[3],"Whiteboard")
- self.handlers[4]=(fog_handler(self.tabs,-1,self.canvas))
- self.tabs.AddPage(self.handlers[4],"Fog")
- self.handlers[5]=(map_handler(self.tabs,-1,self.canvas))
- self.tabs.AddPage(self.handlers[5],"General")
- self.tabs.SetSelection(2)
+ self.layer_tabs = orpgTabberWnd(self, style=FNB.FNB_NO_X_BUTTON|FNB.FNB_BOTTOM|FNB.FNB_NO_NAV_BUTTONS)
+ self.layer_handlers = []
+ self.layer_handlers.append(background_handler(self.layer_tabs,-1,self.canvas))
+ self.layer_tabs.AddPage(self.layer_handlers[0],"Background")
+ self.layer_handlers.append(grid_handler(self.layer_tabs,-1,self.canvas))
+ self.layer_tabs.AddPage(self.layer_handlers[1],"Grid")
+ self.layer_handlers.append(miniatures_handler(self.layer_tabs,-1,self.canvas))
+ self.layer_tabs.AddPage(self.layer_handlers[2],"Miniatures", True)
+ self.layer_handlers.append(whiteboard_handler(self.layer_tabs,-1,self.canvas))
+ self.layer_tabs.AddPage(self.layer_handlers[3],"Whiteboard")
+ self.layer_handlers.append(fog_handler(self.layer_tabs,-1,self.canvas))
+ self.layer_tabs.AddPage(self.layer_handlers[4],"Fog")
+ self.layer_handlers.append(map_handler(self.layer_tabs,-1,self.canvas))
+ self.layer_tabs.AddPage(self.layer_handlers[5],"General")
+ self.layer_tabs.SetSelection(2)
self.sizer = wx.BoxSizer(wx.VERTICAL)
self.sizer.Add(self.canvas, 1, wx.EXPAND)
- self.sizer.Add(self.tabs, 0, wx.EXPAND)
+ self.sizer.Add(self.layer_tabs, 0, wx.EXPAND)
self.SetSizer(self.sizer)
self.Bind(FNB.EVT_FLATNOTEBOOK_PAGE_CHANGED, self.on_layer_change)
#self.Bind(wx.EVT_SIZE, self.on_size)
self.Bind(wx.EVT_LEAVE_WINDOW, self.OnLeave)
self.load_default()
- ## Components for making Map Based plugins that create new tabs.
- component.add('map_tabs', self.tabs)
- component.add('map_layers', self.handlers)
- component.add('map_wnd', self)
-
def OnLeave(self, evt):
if "__WXGTK__" in wx.PlatformInfo: wx.SetCursor(wx.StockCursor(wx.CURSOR_ARROW))
@@ -773,41 +787,41 @@
os.chdir(self.root_dir)
def get_current_layer_handler(self):
- return self.handlers[self.current_layer]
+ return self.layer_handlers[self.current_layer]
def get_tab_index(self, layer):
"""Return the index of a chatpanel in the wxNotebook."""
- for i in xrange(self.tabs.GetPageCount()):
- if (self.tabs.GetPageText(i) == layer):
+ for i in xrange(self.layer_tabs.GetPageCount()):
+ if (self.layer_tabs.GetPageText(i) == layer):
return i
return 0
def on_layer_change(self, evt):
- layer = self.tabs.GetPage(evt.GetSelection())
- for i in xrange(0, len(self.handlers)):
- if layer == self.handlers[i]: self.current_layer = i
+ layer = self.layer_tabs.GetPage(evt.GetSelection())
+ for i in xrange(0, len(self.layer_handlers)):
+ if layer == self.layer_handlers[i]: self.current_layer = i
if self.current_layer == 0:
- bg = self.handlers[0]
+ bg = self.layer_handlers[0]
if (self.session.my_role() != self.session.ROLE_GM): bg.url_path.Show(False)
else: bg.url_path.Show(True)
self.canvas.Refresh(False)
evt.Skip()
def on_left_down(self, evt):
- self.handlers[self.current_layer].on_left_down(evt)
+ self.layer_handlers[self.current_layer].on_left_down(evt)
#double click handler added by Snowdog 5/03
def on_left_dclick(self, evt):
- self.handlers[self.current_layer].on_left_dclick(evt)
+ self.layer_handlers[self.current_layer].on_left_dclick(evt)
def on_right_down(self, evt):
- self.handlers[self.current_layer].on_right_down(evt)
+ self.layer_handlers[self.current_layer].on_right_down(evt)
def on_left_up(self, evt):
- self.handlers[self.current_layer].on_left_up(evt)
+ self.layer_handlers[self.current_layer].on_left_up(evt)
def on_motion(self, evt):
- self.handlers[self.current_layer].on_motion(evt)
+ self.layer_handlers[self.current_layer].on_motion(evt)
def MapBar(self, id, data):
self.canvas.MAP_MODE = data
@@ -824,8 +838,8 @@
except: pass
def update_tools(self):
- for h in self.handlers:
- self.handlers[h].update_info()
+ for h in self.layer_handlers:
+ h.update_info()
def on_hk_map_layer(self, evt):
id = self.top_frame.mainmenu.GetHelpString(evt.GetId())
@@ -835,7 +849,7 @@
elif id == "Whiteboard Layer": self.current_layer = self.get_tab_index("Whiteboard")
elif id == "Fog Layer": self.current_layer = self.get_tab_index("Fog")
elif id == "General Properties": self.current_layer = self.get_tab_index("General")
- self.tabs.SetSelection(self.current_layer)
+ self.layer_tabs.SetSelection(self.current_layer)
def on_flush_cache(self, evt):
ImageHandler.flushCache()
diff -r 1ed2feab0db9 -r 8e07c1a2c69b orpg/mapper/map_msg.py
--- a/orpg/mapper/map_msg.py Sat Nov 21 03:19:34 2009 -0600
+++ b/orpg/mapper/map_msg.py Mon Nov 23 03:22:50 2009 -0600
@@ -34,11 +34,6 @@
from miniatures_msg import *
from whiteboard_msg import *
from fog_msg import *
-import traceback
-from orpg.dirpath import dir_struct
-
-from xml.etree.ElementTree import ElementTree, Element, iselement
-from xml.etree.ElementTree import fromstring, tostring, parse
"""