traipse_dev: orpg/mapper/whiteboard.py annotate

annotate orpg/mapper/whiteboard.py @ 220:9611ba80cf99 alpha

Traipse Alpha 'OpenRPG' {100501-01} 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 (Patch-2) Moving to Beta!! New Features: New Namespace method with two new syntaxes New Namespace Internal is context sensitive, always! New Namespace External is 'as narrow as you make it' New Namespace FutureCheck helps ensure you don't receive an incorrect node New PluginDB access for URL2Link plugin New to Forms, they now show their content in Design Mode New to Update Manager, checks Repo for updates on software start New to Mini Lin node, change title in design mode New to Game Tree, never lose a node, appends a number to the end of corrupted trees New to Server GUI, Traipse Suite's Debug Console Updates: Update to White Board layer, uses a pencil image for color button Update to Grid Layer, uses a grid image for color button Update to Chat Window, size of drop down menus Update to default lobby message Update to template Text node Update to 4e PC Sheet node Fixes: Fix to Server GUI startup errors Fix to Server GUI Rooms tab updating Fix to Chat and Settings if non existant die roller is picked Fix to Dieroller and .open() used with .vs(). Successes are correctly calculated Fix to Alias Lib's Export to Tree, Open, Save features Fix to alias node, now works properly Fix to Splitter node, minor GUI cleanup Fix to Backgrounds not loading through remote loader Fix to Node name errors Fix to rolling dice in chat Whispers Fix to Splitters Sizing issues Fix to URL2Link plugin, modified regex compilation should remove memory leak Fix to mapy.py, a roll back due to zoomed grid issues Fix to whiteboard_handler, Circles work by you clicking the center of the circle Fix to Servers parse_incoming_dom which was outdated and did not respect XML Fix to a broken link in the server welcome message Fix to InterParse and logger requiring traceback Fix to Update Manager Status Bar Fix to failed image and erroneous pop up Fix to Mini Lib node that was preventing use Fix to plugins that parce dice but did not call InterParse Fix to nodes for name changing by double click Fix to Game Tree, node ordering on drag and drop corrected Fix to Game Tree, corrupted error message was not showing Fix to Update Manager, checks for internet connection Fix to Update Manager, Auto Update corrections

author	sirebral
date	Sat, 01 May 2010 03:21:26 -0500
parents	b633f4c64aae
children	24769389a7ba

rev	line source
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1 # Copyright (C) 2000-2001 The OpenRPG Project
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	2 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	3 # openrpg-dev@lists.sourceforge.net
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	4 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	5 # This program is free software; you can redistribute it and/or modify
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	6 # it under the terms of the GNU General Public License as published by
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	7 # the Free Software Foundation; either version 2 of the License, or
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	8 # (at your option) any later version.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	9 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	10 # This program is distributed in the hope that it will be useful,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	11 # but WITHOUT ANY WARRANTY; without even the implied warranty of
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	12 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	13 # GNU General Public License for more details.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	14 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	15 # You should have received a copy of the GNU General Public License
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	16 # along with this program; if not, write to the Free Software
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	17 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	18 # --
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	19 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	20 # File: mapper/whiteboard.py
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	21 # Author: Chris Davis
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	22 # Maintainer:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	23 # Version:
195 b633f4c64aae Traipse Alpha 'OpenRPG' {100219-00} sirebral parents: 163 diff changeset	24 # $Id: whiteboard.py,v Traipse 'Ornery-Orc' prof.ebral Exp $
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	25 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	26 # Description: This file contains some of the basic definitions for the chat
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	27 # utilities in the orpg project.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	28 #
195 b633f4c64aae Traipse Alpha 'OpenRPG' {100219-00} sirebral parents: 163 diff changeset	29 __version__ = "$Id: whiteboard.py,v Traipse 'Ornery-Orc' prof.ebral Exp $"
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	30
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	31 from base import *
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	32 from orpg.mapper.map_utils import *
138 1ed2feab0db9 Traipse Alpha 'OpenRPG' {091021-00} sirebral parents: 137 diff changeset	33
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	34 def cmp_zorder(first,second):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	35 f = first.zorder
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	36 s = second.zorder
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	37 if f == None: f = 0
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	38 if s == None: s = 0
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	39 if f == s: value = 0
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	40 elif f < s: value = -1
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	41 else: value = 1
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	42 return value
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	43
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	44 class WhiteboardText:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	45 def __init__(self, id, text_string, pos, style, pointsize, weight, color="#000000", log=None):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	46 self.scale = 1
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	47 self.r_h = RGBHex()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	48 self.selected = False
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	49 self.text_string = text_string
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	50 self.id = id
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	51 self.weight = int(weight)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	52 self.pointsize = int(pointsize)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	53 self.style = int(style)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	54 self.textcolor = color
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	55 self.posx = pos.x
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	56 self.posy = pos.y
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	57 self.font = wx.Font(self.pointsize, wx.DEFAULT, self.style, self.weight)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	58 self.highlighted = False
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	59 r,g,b = self.r_h.rgb_tuple(self.textcolor)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	60 self.highlight_color = self.r_h.hexstring(r^255, g^255, b^255)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	61 self.isUpdated = False
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	62
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	63 def highlight(self, highlight=True):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	64 self.highlighted = highlight
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	65
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	66 def set_text_props(self, text_string, style, point, weight, color="#000000"):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	67 self.text_string = text_string
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	68 self.textcolor = color
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	69 self.style = int(style)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	70 self.font.SetStyle(self.style)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	71 self.pointsize = int(point)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	72 self.font.SetPointSize(self.pointsize)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	73 self.weight = int(weight)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	74 self.font.SetWeight(self.weight)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	75 self.isUpdated = True
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	76
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	77 def hit_test(self, pt, dc):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	78 rect = self.get_rect(dc)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	79 result = rect.InsideXY(pt.x, pt.y)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	80 return result
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	81
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	82 def get_rect(self, dc):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	83 dc.SetFont(self.font)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	84 (w,x,y,z) = dc.GetFullTextExtent(self.text_string)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	85 return wx.Rect(self.posx,self.posy,w,(x+y+z))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	86
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	87 def draw(self, parent, dc, op=wx.COPY):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	88 self.scale = parent.canvas.layers['grid'].mapscale
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	89 if self.highlighted: textcolor = self.highlight_color
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	90 else: textcolor = self.textcolor
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	91 try: dc.SetTextForeground(textcolor)
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	92 except Exception,e: dc.SetTextForeground('#000000')
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	93 dc.SetUserScale(self.scale, self.scale)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	94
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	95 # Draw text
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	96 (w,x,y,z) = self.get_rect(dc)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	97 dc.SetFont(self.font)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	98 dc.DrawText(self.text_string, self.posx, self.posy)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	99 dc.SetTextForeground(wx.Colour(0,0,0))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	100
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	101 def toxml(self, action="update"):
139 8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	102 if action == "del":
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	103 xml_str = "<text action='del' id='" + str(self.id) + "'/>"
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	104 return xml_str
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	105 xml_str = "<text"
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	106 xml_str += " action='" + action + "'"
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	107 xml_str += " id='" + str(self.id) + "'"
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	108 if self.pointsize != None: xml_str += " pointsize='" + str(self.pointsize) + "'"
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	109 if self.style != None: xml_str += " style='" + str(self.style) + "'"
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	110 if self.weight != None: xml_str += " weight='" + str(self.weight) + "'"
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	111 if self.posx != None: xml_str+= " posx='" + str(self.posx) + "'"
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	112 if not (self.posy is None): xml_str += " posy='" + str(self.posy) + "'"
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	113 if self.text_string != None: xml_str+= " text_string='" + self.text_string + "'"
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	114 if self.textcolor != None: xml_str += " color='" + self.textcolor + "'"
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	115 xml_str += "/>"
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	116 if (action == "update" and self.isUpdated) or action == "new":
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	117 self.isUpdated = False
139 8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	118 return xml_str
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	119 else: return ''
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	120
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	121 def takedom(self, xml_dom):
139 8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	122 self.text_string = xml_dom.getAttribute("text_string")
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	123 self.id = xml_dom.getAttribute("id")
151 06f10429eedc Traipse Alpha 'OpenRPG' {091125-00} sirebral parents: 139 diff changeset	124 if xml_dom.hasAttribute("posy"): self.posy = int(xml_dom.getAttribute("posy"))
06f10429eedc Traipse Alpha 'OpenRPG' {091125-00} sirebral parents: 139 diff changeset	125 if xml_dom.hasAttribute("posx"): self.posx = int(xml_dom.getAttribute("posx"))
139 8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	126 if xml_dom.hasAttribute("weight"):
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	127 self.weight = int(xml_dom.getAttribute("weight"))
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	128 self.font.SetWeight(self.weight)
139 8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	129 if xml_dom.hasAttribute("style"):
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	130 self.style = int(xml_dom.getAttribute("style"))
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	131 self.font.SetStyle(self.style)
139 8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	132 if xml_dom.hasAttribute("pointsize"):
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	133 self.pointsize = int(xml_dom.getAttribute("pointsize"))
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	134 self.font.SetPointSize(self.pointsize)
139 8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	135 if xml_dom.hasAttribute("color") and xml_dom.getAttribute("color") != '':
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	136 self.textcolor = xml_dom.getAttribute("color")
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	137 if self.textcolor == '#0000000': self.textcolor = '#000000'
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	138
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	139 class WhiteboardLine:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	140 def __init__(self, id, line_string, upperleft, lowerright, color="#000000", width=1, log=None):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	141 self.scale = 1
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	142 self.r_h = RGBHex()
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	143 if color == '': color = "#000000"
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	144 self.linecolor = color
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	145 self.linewidth = width
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	146 self.lowerright = lowerright
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	147 self.upperleft = upperleft
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	148 self.selected = False
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	149 self.line_string = line_string
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	150 self.id = id
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	151 self.highlighted = False
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	152 r,g,b = self.r_h.rgb_tuple(self.linecolor)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	153 self.highlight_color = self.r_h.hexstring(r^255, g^255, b^255)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	154
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	155 def highlight(self, highlight=True):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	156 self.highlighted = highlight
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	157
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 20 diff changeset	158 def set_line_props(self, line_string="",
449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 20 diff changeset	159 upperleftx=0, upperlefty=0,
449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 20 diff changeset	160 lowerrightx=0, lowerrighty=0,
449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 20 diff changeset	161 color="#000000", width=1):
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	162 self.line_string = line_string
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	163 self.upperleft.x = upperleftx
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	164 self.upperleft.y = upperlefty
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	165 self.lowerright.x = lowerrightx
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	166 self.lowerright.y = lowerrighty
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	167 self.linecolor = color
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	168 self.linewidth = width
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	169
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	170 def hit_test(self, pt):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	171 coords = self.line_string.split(";")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	172 stcords = coords[0].split(",")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	173 oldicords = (int(stcords[0]),int(stcords[1]))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	174 for coordinate_string_counter in range(1, len(coords)):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	175 stcords = coords[coordinate_string_counter].split(",")
151 06f10429eedc Traipse Alpha 'OpenRPG' {091125-00} sirebral parents: 139 diff changeset	176 if stcords[0] == "": return False
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	177 icords = (int(stcords[0]),int(stcords[1]))
151 06f10429eedc Traipse Alpha 'OpenRPG' {091125-00} sirebral parents: 139 diff changeset	178 if orpg.mapper.map_utils.proximity_test(oldicords,icords,pt,12): return True
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	179 oldicords = icords
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	180 return False
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	181
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	182 def draw(self, parent, dc, op=wx.COPY):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	183 self.scale = parent.canvas.layers['grid'].mapscale
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	184 if self.highlighted: linecolor = self.highlight_color
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	185 else: linecolor = self.linecolor
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	186 pen = wx.BLACK_PEN
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	187 try: pen.SetColour(linecolor)
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	188 except Exception,e: pen.SetColour('#000000')
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	189 pen.SetWidth( self.linewidth )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	190 dc.SetPen( pen )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	191 dc.SetBrush(wx.BLACK_BRUSH)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	192 # draw lines
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	193 dc.SetUserScale(self.scale,self.scale)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	194 pointArray = self.line_string.split(";")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	195 x2 = y2 = -999
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	196 for m in range(len(pointArray)-1):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	197 x = pointArray[m]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	198 points = x.split(",")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	199 x1 = int(points[0])
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	200 y1 = int(points[1])
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	201 if x2 != -999: dc.DrawLine(x2,y2,x1,y1)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	202 x2 = x1
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	203 y2 = y1
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	204 pen.SetColour(wx.Colour(0,0,0))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	205 dc.SetPen(pen)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	206 dc.SetPen(wx.NullPen)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	207 dc.SetBrush(wx.NullBrush)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	208 #selected outline
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	209
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	210 def toxml(self, action="update"):
139 8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	211 if action == "del":
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	212 xml_str = "<line action='del' id='" + str(self.id) + "'/>"
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	213 return xml_str
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	214 # if there are any changes, make sure id is one of them
139 8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	215 xml_str = "<line"
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	216 xml_str += " action='" + action + "'"
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	217 xml_str += " id='" + str(self.id) + "'"
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	218 xml_str+= " line_string='" + self.line_string + "'"
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	219 if self.upperleft != None:
139 8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	220 xml_str += " upperleftx='" + str(self.upperleft.x) + "'"
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	221 xml_str += " upperlefty='" + str(self.upperleft.y) + "'"
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	222 if self.lowerright != None:
139 8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	223 xml_str+= " lowerrightx='" + str(self.lowerright.x) + "'"
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	224 xml_str+= " lowerrighty='" + str(self.lowerright.y) + "'"
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	225 if self.linecolor != None:
139 8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	226 xml_str += " color='" + str(self.linecolor) + "'"
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	227 if self.linewidth != None:
139 8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	228 xml_str += " width='" + str(self.linewidth) + "'"
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	229 xml_str += "/>"
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	230 if action == "new": return xml_str
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	231 return ''
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	232
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	233 def takedom(self, xml_dom):
139 8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	234 self.line_string = xml_dom.getAttribute("line_string")
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	235 self.id = xml_dom.getAttribute("id")
151 06f10429eedc Traipse Alpha 'OpenRPG' {091125-00} sirebral parents: 139 diff changeset	236 if xml_dom.hasAttribute("upperleftx"): self.upperleft.x = int(xml_dom.getAttribute("upperleftx"))
06f10429eedc Traipse Alpha 'OpenRPG' {091125-00} sirebral parents: 139 diff changeset	237 if xml_dom.hasAttribute("upperlefty"): self.upperleft.y = int(xml_dom.getAttribute("upperlefty"))
06f10429eedc Traipse Alpha 'OpenRPG' {091125-00} sirebral parents: 139 diff changeset	238 if xml_dom.hasAttribute("lowerrightx"): self.lowerright.x = int(xml_dom.getAttribute("lowerrightx"))
06f10429eedc Traipse Alpha 'OpenRPG' {091125-00} sirebral parents: 139 diff changeset	239 if xml_dom.hasAttribute("lowerrighty"): self.lowerright.y = int(xml_dom.getAttribute("lowerrighty"))
139 8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	240 if xml_dom.hasAttribute("color") and xml_dom.getAttribute("color") != '':
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	241 self.linecolor = xml_dom.getAttribute("color")
151 06f10429eedc Traipse Alpha 'OpenRPG' {091125-00} sirebral parents: 139 diff changeset	242 if self.linecolor == '#0000000': self.linecolor = '#000000'
06f10429eedc Traipse Alpha 'OpenRPG' {091125-00} sirebral parents: 139 diff changeset	243 if xml_dom.hasAttribute("width"): self.linewidth = int(xml_dom.getAttribute("width"))
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	244
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	245 ##-----------------------------
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	246 ## whiteboard layer
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	247 ##-----------------------------
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	248 class whiteboard_layer(layer_base):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	249
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	250 def __init__(self, canvas):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	251 self.canvas = canvas
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	252 layer_base.__init__(self)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	253 self.r_h = RGBHex()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	254 self.id = -1
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	255 self.lines = []
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	256 self.texts = []
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	257 self.serial_number = 0
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	258 self.color = "#000000"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	259 self.width = 1
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	260 self.removedLines = []
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	261
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	262 def next_serial(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	263 self.serial_number += 1
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	264 return self.serial_number
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	265
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	266 def get_next_highest_z(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	267 z = len(self.lines)+1
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	268 return z
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	269
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	270 def cleanly_collapse_zorder(self):
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 20 diff changeset	271 pass
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	272
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	273 def collapse_zorder(self):
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 20 diff changeset	274 pass
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	275
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	276 def rollback_serial(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	277 self.serial_number -= 1
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	278
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	279 def add_line(self, line_string="", upperleft=cmpPoint(0,0), lowerright=cmpPoint(0,0), color="#000000", width=1):
163 565ab3d84430 Traipse Alpha 'OpenRPG' {091202-00} sirebral parents: 151 diff changeset	280 id = 'line-' + self.canvas.session.get_next_id()
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 20 diff changeset	281 line = WhiteboardLine(id, line_string, upperleft, lowerright, color=self.color, width=self.width)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	282 self.lines.append(line)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	283 xml_str = "<map><whiteboard>"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	284 xml_str += line.toxml("new")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	285 xml_str += "</whiteboard></map>"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	286 self.canvas.frame.session.send(xml_str)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	287 self.canvas.Refresh(True)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	288 return line
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	289
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	290 def get_line_by_id(self, id):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	291 for line in self.lines:
151 06f10429eedc Traipse Alpha 'OpenRPG' {091125-00} sirebral parents: 139 diff changeset	292 if str(line.id) == str(id): return line
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	293 return None
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	294
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	295 def get_text_by_id(self, id):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	296 for text in self.texts:
151 06f10429eedc Traipse Alpha 'OpenRPG' {091125-00} sirebral parents: 139 diff changeset	297 if str(text.id) == str(id): return text
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	298 return None
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	299
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	300 def del_line(self, line):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	301 xml_str = "<map><whiteboard>"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	302 xml_str += line.toxml("del")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	303 xml_str += "</whiteboard></map>"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	304 self.canvas.frame.session.send(xml_str)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	305 if line:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	306 self.lines.remove(line)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	307 self.removedLines.append(line)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	308 self.canvas.Refresh(True)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	309
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	310 def undo_line(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	311 if len(self.removedLines)>0:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	312 line = self.removedLines[len(self.removedLines)-1]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	313 self.removedLines.remove(line)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	314 self.add_line(line.line_string, line.upperleft, line.lowerright, line.linecolor, line.linewidth)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	315 self.canvas.Refresh(True)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	316
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	317 def del_all_lines(self):
151 06f10429eedc Traipse Alpha 'OpenRPG' {091125-00} sirebral parents: 139 diff changeset	318 for i in xrange(len(self.lines)): self.del_line(self.lines[0])
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	319
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	320 def del_text(self, text):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	321 xml_str = "<map><whiteboard>"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	322 xml_str += text.toxml("del")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	323 xml_str += "</whiteboard></map>"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	324 self.canvas.frame.session.send(xml_str)
151 06f10429eedc Traipse Alpha 'OpenRPG' {091125-00} sirebral parents: 139 diff changeset	325 if text: self.texts.remove(text)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	326 self.canvas.Refresh(True)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	327
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	328 def layerDraw(self, dc):
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	329 for m in self.lines: m.draw(self, dc)
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	330 for m in self.texts: m.draw(self,dc)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	331
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	332 def hit_test_text(self, pos, dc):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	333 list_of_texts_matching = []
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	334 if self.canvas.layers['fog'].use_fog == 1:
151 06f10429eedc Traipse Alpha 'OpenRPG' {091125-00} sirebral parents: 139 diff changeset	335 if self.canvas.frame.session.role != "GM": return list_of_texts_matching
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	336 for m in self.texts:
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	337 if m.hit_test(pos,dc): list_of_texts_matching.append(m)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	338 return list_of_texts_matching
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	339
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	340 def hit_test_lines(self, pos, dc):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	341 list_of_lines_matching = []
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	342 if self.canvas.layers['fog'].use_fog == 1:
151 06f10429eedc Traipse Alpha 'OpenRPG' {091125-00} sirebral parents: 139 diff changeset	343 if self.canvas.frame.session.role != "GM": return list_of_lines_matching
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	344 for m in self.lines:
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	345 if m.hit_test(pos): list_of_lines_matching.append(m)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	346 return list_of_lines_matching
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	347
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	348 def find_line(self, pt):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	349 scale = self.canvas.layers['grid'].mapscale
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	350 dc = wx.ClientDC( self.canvas )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	351 self.canvas.PrepareDC( dc )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	352 dc.SetUserScale(scale,scale)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	353 line_list = self.hit_test_lines(pt,dc)
151 06f10429eedc Traipse Alpha 'OpenRPG' {091125-00} sirebral parents: 139 diff changeset	354 if line_list: return line_list[0]
06f10429eedc Traipse Alpha 'OpenRPG' {091125-00} sirebral parents: 139 diff changeset	355 else: return None
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	356
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	357 def setcolor(self, color):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	358 r,g,b = color.Get()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	359 self.color = self.r_h.hexstring(r,g,b)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	360
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	361 def sethexcolor(self, hexcolor):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	362 self.color = hexcolor
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	363
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	364 def setwidth(self, width):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	365 self.width = int(width)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	366
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	367 def set_font(self, font):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	368 self.font = font
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	369
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	370 def add_text(self, text_string, pos, style, pointsize, weight, color="#000000"):
163 565ab3d84430 Traipse Alpha 'OpenRPG' {091202-00} sirebral parents: 151 diff changeset	371 id = 'text-' + self.canvas.session.get_next_id()
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 20 diff changeset	372 text = WhiteboardText(id,text_string, pos, style, pointsize, weight, color)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	373 self.texts.append(text)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	374 xml_str = "<map><whiteboard>"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	375 xml_str += text.toxml("new")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	376 xml_str += "</whiteboard></map>"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	377 self.canvas.frame.session.send(xml_str)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	378 self.canvas.Refresh(True)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	379
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	380 def draw_working_line(self, dc, line_string):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	381 scale = self.canvas.layers['grid'].mapscale
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	382 dc.SetPen(wx.BLACK_PEN)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	383 dc.SetBrush(wx.BLACK_BRUSH)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	384 pen = wx.BLACK_PEN
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	385 pen.SetColour(self.color)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	386 pen.SetWidth(self.width)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	387 dc.SetPen(pen)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	388 dc.SetUserScale(scale,scale)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	389 pointArray = line_string.split(";")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	390 x2 = y2 = -999
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	391 for m in range(len(pointArray)-1):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	392 x = pointArray[m]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	393 points = x.split(",")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	394 x1 = int(points[0])
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	395 y1 = int(points[1])
151 06f10429eedc Traipse Alpha 'OpenRPG' {091125-00} sirebral parents: 139 diff changeset	396 if x2 != -999: dc.DrawLine(x2,y2,x1,y1)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	397 x2 = x1
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	398 y2 = y1
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	399 dc.SetPen(wx.NullPen)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	400 dc.SetBrush(wx.NullBrush)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	401
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	402 def layerToXML(self, action="update"):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	403 """ format """
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	404 white_string = ""
151 06f10429eedc Traipse Alpha 'OpenRPG' {091125-00} sirebral parents: 139 diff changeset	405 if self.lines:
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	406 for l in self.lines: white_string += l.toxml(action)
151 06f10429eedc Traipse Alpha 'OpenRPG' {091125-00} sirebral parents: 139 diff changeset	407 if self.texts:
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	408 for l in self.texts: white_string += l.toxml(action)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	409 if len(white_string):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	410 s = "<whiteboard"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	411 s += " serial='" + str(self.serial_number) + "'"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	412 s += ">"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	413 s += white_string
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	414 s += "</whiteboard>"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	415 return s
151 06f10429eedc Traipse Alpha 'OpenRPG' {091125-00} sirebral parents: 139 diff changeset	416 else: return ""
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	417
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	418 def layerTakeDOM(self, xml_dom):
139 8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	419 serial_number = xml_dom.getAttribute('serial')
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	420 if serial_number != "": self.serial_number = int(serial_number)
139 8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	421 children = xml_dom._get_childNodes()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	422 for l in children:
139 8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	423 nodename = l._get_nodeName()
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	424 action = l.getAttribute("action")
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	425 id = l.getAttribute('id')
163 565ab3d84430 Traipse Alpha 'OpenRPG' {091202-00} sirebral parents: 151 diff changeset	426 try:
565ab3d84430 Traipse Alpha 'OpenRPG' {091202-00} sirebral parents: 151 diff changeset	427 if self.serial_number < int(id.split('-')[2]): self.serial_number = int(id.split('-')[2])
565ab3d84430 Traipse Alpha 'OpenRPG' {091202-00} sirebral parents: 151 diff changeset	428 except: pass
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	429 if action == "del":
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	430 if nodename == 'line':
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	431 line = self.get_line_by_id(id)
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	432 if line != None: self.lines.remove(line)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	433 elif nodename == 'text':
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	434 text = self.get_text_by_id(id)
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	435 if text != None: self.texts.remove(text)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	436 elif action == "new":
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	437 if nodename == "line":
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	438 try:
139 8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	439 line_string = l.getAttribute('line_string')
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	440 upperleftx = l.getAttribute('upperleftx')
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	441 upperlefty = l.getAttribute('upperlefty')
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	442 lowerrightx = l.getAttribute('lowerrightx')
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	443 lowerrighty = l.getAttribute('lowerrighty')
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	444 upperleft = wx.Point(int(upperleftx),int(upperlefty))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	445 lowerright = wx.Point(int(lowerrightx),int(lowerrighty))
139 8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	446 color = l.getAttribute('color')
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	447 if color == '#0000000': color = '#000000'
139 8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	448 id = l.getAttribute('id')
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	449 width = int(l.getAttribute('width'))
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	450 except:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	451 line_string = upperleftx = upperlefty = lowerrightx = lowerrighty = color = 0
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	452 continue
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 20 diff changeset	453 line = WhiteboardLine(id, line_string, upperleft, lowerright, color, width)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	454 self.lines.append(line)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	455 elif nodename == "text":
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	456 try:
139 8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	457 text_string = l.getAttribute('text_string')
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	458 style = l.getAttribute('style')
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	459 pointsize = l.getAttribute('pointsize')
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	460 weight = l.getAttribute('weight')
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	461 color = l.getAttribute('color')
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	462 if color == '#0000000': color = '#000000'
139 8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	463 id = l.getAttribute('id')
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	464 posx = l.getAttribute('posx')
8e07c1a2c69b Traipse Alpha 'OpenRPG' {091123-00} sirebral parents: 138 diff changeset	465 posy = l.getAttribute('posy')
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	466 pos = wx.Point(0,0)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	467 pos.x = int(posx)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	468 pos.y = int(posy)
151 06f10429eedc Traipse Alpha 'OpenRPG' {091125-00} sirebral parents: 139 diff changeset	469 except: continue
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 20 diff changeset	470 text = WhiteboardText(id, text_string, pos, style, pointsize, weight, color)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	471 self.texts.append(text)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	472 else:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	473 if nodename == "line":
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	474 line = self.get_line_by_id(id)
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	475 if line: line.takedom(l)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	476 if nodename == "text":
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	477 text = self.get_text_by_id(id)
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	478 if text: text.takedom(l)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	479
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	480 def add_temp_line(self, line_string):
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 0 diff changeset	481 line = WhiteboardLine(0, line_string, wx.Point(0,0), wx.Point(0,0),
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 20 diff changeset	482 color=self.color, width=self.width)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	483 self.lines.append(line)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	484 return line
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	485
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	486 def del_temp_line(self, line):
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	487 if line: self.lines.remove(line)

Mercurial > traipse_dev

annotate orpg/mapper/whiteboard.py @ 220:9611ba80cf99 alpha