traipse_dev: orpg/mapper/miniatures.py annotate

annotate orpg/mapper/miniatures.py @ 119:9314d63c0941 alpha

Traipse Alpha 'OpenRPG' {091029-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: Adds Bookmarks (Alpha) with cool Smiley Star and Plus Symbol images! Changes made to the map for increased portability. SnowDog has changes planned in Core, though. Added an initial push to the BCG. Not much to see, just shows off how it is re-writing Main code. Fix to remote admin commands Minor fix to texted based server, works in /System/ folder Some Core changes to gametree to correctly disply Pretty Print, thanks David! Fix to Splitter Nodes not being created. Added images to Plugin Control panel for Autostart feature Fix to massive amounts of images loading; from Core fix to gsclient so with_statement imports Added 'boot' command to remote admin Prep work in Pass tool for remote admin rankings and different passwords, ei, Server, Admin, Moderator, etc. Remote Admin Commands more organized, more prep work. Added Confirmation window for sent nodes. Minor changes to allow for portability to an OpenSUSE linux OS (hopefully without breaking) {091028} 00: Made changes to gametree to start working with Element Tree, mostly from Core Minor changes to Map to start working with Element Tree, from Core Preliminary changes to map efficiency, from FlexiRPG Miniatures Layer pop up box allows users to turn off Mini labels, from FlexiRPG Changes to main.py to start working with Element Tree {091029} 00: Changes made to server to start working with Element Tree. Changes made to Meta Server Lib. Prepping test work for a multi meta network page. Minor bug fixed with mini to gametree Zoom Mouse plugin added. Known Issue: Disconnecting causes an server side error. XML data is not being passed correctly.

author	sirebral
date	Thu, 29 Oct 2009 20:35:28 -0500
parents	217fb049bd00
children	54446a995007

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/miniatures.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:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	24 # $Id: miniatures.py,v 1.46 2007/12/07 20:39:50 digitalxero Exp $
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 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	29 __version__ = "$Id: miniatures.py,v 1.46 2007/12/07 20:39:50 digitalxero Exp $"
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 import thread
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	33 import time
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	34 import urllib
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	35 import os.path
88 763a04270cf6 Traipse Alpha 'OpenRPG' {090917-02} sirebral parents: 76 diff changeset	36 import mimetypes
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	37
88 763a04270cf6 Traipse Alpha 'OpenRPG' {090917-02} sirebral parents: 76 diff changeset	38 import xml.dom.minidom as minidom
76 37a11fea3304 More clean up. Images now posts a Chat Info post if image doesn't load. sirebral parents: 71 diff changeset	39 from orpg.tools.orpg_settings import settings
37a11fea3304 More clean up. Images now posts a Chat Info post if image doesn't load. sirebral parents: 71 diff changeset	40
118 217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	41 from xml.etree.ElementTree import ElementTree, Element
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	42 from xml.etree.ElementTree import fromstring, tostring
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	43
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	44 MIN_STICKY_BACK = -0XFFFFFF
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	45 MIN_STICKY_FRONT = 0xFFFFFF
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	46
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	47 ##----------------------------------------
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	48 ## miniature object
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	49 ##----------------------------------------
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	50
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	51 FACE_NONE = 0
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	52 FACE_NORTH = 1
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	53 FACE_NORTHEAST = 2
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	54 FACE_EAST = 3
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	55 FACE_SOUTHEAST = 4
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	56 FACE_SOUTH = 5
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	57 FACE_SOUTHWEST = 6
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	58 FACE_WEST = 7
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	59 FACE_NORTHWEST = 8
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	60 SNAPTO_ALIGN_CENTER = 0
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	61 SNAPTO_ALIGN_TL = 1
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 cmp_zorder(first,second):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	64 f = first.zorder
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	65 s = second.zorder
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	66 if f == None: f = 0
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	67 if s == None: s = 0
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	68 if f == s: value = 0
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	69 elif f < s: value = -1
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	70 else: value = 1
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	71 return value
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	72
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	73 class BmpMiniature:
118 217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	74 def __init__(self, id, path, bmp, pos=cmpPoint(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: 21 diff changeset	75 heading=FACE_NONE, face=FACE_NONE, label="",
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: 21 diff changeset	76 locked=False, hide=False, snap_to_align=SNAPTO_ALIGN_CENTER,
118 217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	77 zorder=0, width=0, height=0, log=None, local=False, localPath='', localTime=-1, func='none'):
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	78 self.heading = heading
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	79 self.face = face
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	80 self.label = label
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	81 self.path = path
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	82 self.pos = pos
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	83 self.selected = False
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	84 self.locked = locked
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	85 self.snap_to_align = snap_to_align
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	86 self.hide = hide
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	87 self.id = id
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	88 self.zorder = zorder
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	89 self.left = 0
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	90 self.local = local
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	91 self.localPath = localPath
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	92 self.localTime = localTime
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	93 if not width: self.width = 0
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	94 else: self.width = width
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	95 if not height: self.height = 0
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	96 else: self.height = height
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	97 self.right = bmp.GetWidth()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	98 self.top = 0
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	99 self.bottom = bmp.GetHeight()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	100 self.isUpdated = False
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	101 self.gray = False
118 217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	102 print bmp
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	103 self.set_bmp(bmp)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	104
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	105 def __del__(self):
118 217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	106 del self.image
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	107 self.image = None
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	108
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	109 def set_bmp(self, bmp):
118 217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	110 ### Alpha ###
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	111 try: bmp = bmp.ConvertToImage()
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	112 except: pass
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	113 ### Still ironing out some kinks to FlexiRPG's map features ###
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	114 self.image = bmp
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	115 self.image.ConvertAlphaToMask()
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	116 self.generate_bmps()
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	117
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	118 def generate_bmps(self):
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	119 if self.width:
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	120 bmp = self.image.Copy()
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	121 bmp.Rescale(int(self.width), int(self.height))
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	122 else:
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	123 bmp = self.image
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	124 self.bmp = bmp.ConvertToBitmap()
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	125 self.bmp_gray = bmp.ConvertToGreyscale().ConvertToBitmap()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	126
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	127 def set_min_props(self, heading=FACE_NONE, face=FACE_NONE, label="", locked=False, hide=False, width=0, height=0):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	128 self.heading = heading
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	129 self.face = face
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	130 self.label = label
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	131 if locked: self.locked = True
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	132 else: self.locked = False
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	133 if hide: self.hide = True
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	134 else: self.hide = False
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	135 self.width = int(width)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	136 self.height = int(height)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	137 self.isUpdated = True
118 217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	138 self.generate_bmps()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	139
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	140 def hit_test(self, pt):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	141 rect = self.get_rect()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	142 result = None
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	143 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	144 return result
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	145
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	146 def get_rect(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	147 ret = wx.Rect(self.pos.x, self.pos.y, self.bmp.GetWidth(), self.bmp.GetHeight())
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	148 return ret
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	149
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	150 def draw(self, dc, mini_layer, op=wx.COPY):
118 217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	151 if self.hide and mini_layer.canvas.frame.session.my_role() == mini_layer.canvas.frame.session.ROLE_GM:
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	152 # set the width and height of the image
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	153 """
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	154 if self.width and self.height:
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	155 tmp_image = self.bmp.ConvertToImage()
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	156 tmp_image.Rescale(int(self.width), int(self.height))
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	157 tmp_image.ConvertAlphaToMask()
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	158 self.bmp = tmp_image.ConvertToBitmap()
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	159 mask = wx.Mask(self.bmp, wx.Colour(tmp_image.GetMaskRed(),
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	160 tmp_image.GetMaskGreen(), tmp_image.GetMaskBlue()))
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	161 self.bmp.SetMask(mask)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	162 del tmp_image
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	163 del mask
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	164 """
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	165 self.left = 0
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	166 self.right = self.bmp.GetWidth()
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	167 self.top = 0
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	168 self.bottom = self.bmp.GetHeight()
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	169 # grey outline
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	170 graypen = wx.Pen("gray", 1, wx.DOT)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	171 dc.SetPen(graypen)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	172 dc.SetBrush(wx.TRANSPARENT_BRUSH)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	173 #if width or height < 20 then offset = 1
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	174 if self.bmp.GetWidth() <= 20: xoffset = 1
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	175 else: xoffset = 5
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	176 if self.bmp.GetHeight() <= 20: yoffset = 1
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	177 else: yoffset = 5
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	178 dc.DrawRectangle(self.pos.x + xoffset,
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	179 self.pos.y + yoffset, self.bmp.GetWidth(),
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	180 self.bmp.GetHeight())
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	181 dc.SetBrush(wx.NullBrush)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	182 dc.SetPen(wx.NullPen)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	183 if mini_layer.show_labels:
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	184 ## draw label in the center of the mini
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	185 label = mini_layer.get_mini_label(self)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	186 if len(label):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	187 dc.SetTextForeground(wx.RED)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	188 (textWidth,textHeight) = dc.GetTextExtent(label)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	189 x = self.pos.x +((self.bmp.GetWidth() - textWidth) /2) - 1
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	190 y = self.pos.y + (self.bmp.GetHeight() / 2)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	191 dc.SetPen(wx.GREY_PEN)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	192 dc.SetBrush(wx.LIGHT_GREY_BRUSH)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	193 dc.DrawRectangle(x, y, textWidth+2, textHeight+2)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	194 if (textWidth+2 > self.right):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	195 self.right += int((textWidth+2-self.right)/2)+1
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	196 self.left -= int((textWidth+2-self.right)/2)+1
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	197 self.bottom = y+textHeight+2-self.pos.y
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	198 dc.SetPen(wx.NullPen)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	199 dc.SetBrush(wx.NullBrush)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	200 dc.DrawText(label, x+1, y+1)
118 217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	201
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	202 #selected outline
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	203 if self.selected:
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	204 dc.SetPen(wx.RED_PEN)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	205 dc.SetBrush(wx.TRANSPARENT_BRUSH)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	206 dc.DrawRectangle(self.pos.x, self.pos.y, self.bmp.GetWidth(), self.bmp.GetHeight())
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	207 dc.SetBrush(wx.NullBrush)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	208 dc.SetPen(wx.NullPen)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	209 return True
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	210 elif self.hide: return True
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	211
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	212 else:
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	213 bmp = self.bmp_gray if self.gray else self.bmp
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	214 try: dc.DrawBitmap(bmp, self.pos.x, self.pos.y, True)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	215 except: print bmp
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	216 self.left = 0
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	217 self.right = self.bmp.GetWidth()
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	218 self.top = 0
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	219 self.bottom = self.bmp.GetHeight()
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	220
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	221 # Draw the facing marker if needed
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	222 if self.face != 0:
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	223 x_mid = self.pos.x + (self.bmp.GetWidth()/2)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	224 x_right = self.pos.x + self.bmp.GetWidth()
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	225 y_mid = self.pos.y + (self.bmp.GetHeight()/2)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	226 y_bottom = self.pos.y + self.bmp.GetHeight()
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	227 dc.SetPen(wx.WHITE_PEN)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	228 dc.SetBrush(wx.RED_BRUSH)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	229 triangle = []
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	230
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	231 # Figure out which direction to draw the marker!!
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	232 tri_list = {
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	233 FACE_WEST: [cmpPoint(self.pos.x, self.pos.y), cmpPoint(self.pos.x-5, y_mid), cmpPoint(self.pos.x, y_bottom)],
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	234 FACE_EAST: [cmpPoint(x_right, self.pos.y), cmpPoint(x_right + 5, y_mid), cmpPoint(x_right, y_bottom)],
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	235 FACE_SOUTH: [cmpPoint(self.pos.x, y_bottom), cmpPoint(x_mid, y_bottom + 5), cmpPoint(x_right, y_bottom)],
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	236 FACE_NORTH: [cmpPoint(self.pos.x, self.pos.y), cmpPoint(x_mid, self.pos.y - 5), cmpPoint(x_right, self.pos.y)],
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	237 FACE_NORTHEAST: [cmpPoint(x_mid, self.pos.y), cmpPoint(x_right + 5, self.pos.y - 5), cmpPoint(x_right, y_mid), cmpPoint(x_right, self.pos.y)],
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	238 FACE_SOUTHEAST: [cmpPoint(x_right, y_mid), cmpPoint(x_right + 5, y_bottom + 5), cmpPoint(x_mid, y_bottom), cmpPoint(x_right, y_bottom)],
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	239 FACE_SOUTHWEST: [cmpPoint(x_mid, y_bottom), cmpPoint(self.pos.x - 5, y_bottom + 5),
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	240 cmpPoint(self.pos.x, y_mid), cmpPoint(self.pos.x, y_bottom)],
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	241 FACE_NORTHWEST: [cmpPoint(self.pos.x, y_mid), cmpPoint(self.pos.x - 5, self.pos.y - 5), cmpPoint(x_mid, self.pos.y), cmpPoint(self.pos.x, self.pos.y)]
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	242 }
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	243 for tri in tri_list[self.face]:
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	244 triangle.append(tri)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	245 del tri_list
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	246 dc.DrawPolygon(triangle)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	247 dc.SetBrush(wx.NullBrush)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	248 dc.SetPen(wx.NullPen)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	249
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	250 # Draw the heading if needed
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	251 if self.heading:
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	252 x_adjust = 0
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	253 y_adjust = 4
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	254 x_half = self.bmp.GetWidth()/2
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	255 y_half = self.bmp.GetHeight()/2
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	256 x_quarter = self.bmp.GetWidth()/4
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	257 y_quarter = self.bmp.GetHeight()/4
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	258 x_3quarter = x_quarter*3
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	259 y_3quarter = y_quarter*3
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	260 x_full = self.bmp.GetWidth()
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	261 y_full = self.bmp.GetHeight()
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	262 x_center = self.pos.x + x_half
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	263 y_center = self.pos.y + y_half
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	264 # Remember, the pen/brush must be a different color than the
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	265 # facing marker!!!! We'll use black/cyan for starters.
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	266 # Also notice that we will draw the heading on top of the
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	267 # larger facing marker.
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	268 dc.SetPen(wx.BLACK_PEN)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	269 dc.SetBrush(wx.CYAN_BRUSH)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	270 triangle = []
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	271 # Figure out which direction to draw the marker!!
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	272 tri_list = {
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	273 FACE_NORTH: [cmpPoint(x_center - x_quarter, y_center - y_half ), cmpPoint(x_center, y_center - y_3quarter ), cmpPoint(x_center + x_quarter, y_center - y_half)],
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	274 FACE_SOUTH: [cmpPoint(x_center - x_quarter, y_center + y_half ), cmpPoint(x_center, y_center + y_3quarter ), cmpPoint(x_center + x_quarter, y_center + y_half )],
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	275 FACE_NORTHEAST: [cmpPoint(x_center + x_quarter, y_center - y_half ), cmpPoint(x_center + x_3quarter, y_center - y_3quarter ), cmpPoint(x_center + x_half, y_center - y_quarter)],
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	276 FACE_EAST: [cmpPoint(x_center + x_half, y_center - y_quarter ), cmpPoint(x_center + x_3quarter, y_center ), cmpPoint(x_center + x_half, y_center + y_quarter )],
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	277 FACE_SOUTHEAST: [cmpPoint(x_center + x_half, y_center + y_quarter ), cmpPoint(x_center + x_3quarter, y_center + y_3quarter ), cmpPoint(x_center + x_quarter, y_center + y_half )],
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	278 FACE_SOUTHWEST: [cmpPoint(x_center - x_quarter, y_center + y_half ), cmpPoint(x_center - x_3quarter, y_center + y_3quarter ), cmpPoint(x_center - x_half, y_center + y_quarter )],
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	279 FACE_WEST: [cmpPoint(x_center - x_half, y_center + y_quarter ), cmpPoint(x_center - x_3quarter, y_center ), cmpPoint(x_center - x_half, y_center - y_quarter )],
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	280 FACE_NORTHWEST: [cmpPoint(x_center - x_half, y_center - y_quarter ), cmpPoint(x_center - x_3quarter, y_center - y_3quarter ), cmpPoint(x_center - x_quarter, y_center - y_half )]}
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	281 for tri in tri_list[self.heading]:
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	282 triangle.append(tri)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	283 del tri_list
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	284 dc.DrawPolygon(triangle)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	285 dc.SetBrush(wx.NullBrush)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	286 dc.SetPen(wx.NullPen)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	287 #selected outline
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	288 if self.selected:
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	289 dc.SetPen(wx.RED_PEN)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	290 dc.SetBrush(wx.TRANSPARENT_BRUSH)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	291 dc.DrawRectangle(self.pos.x, self.pos.y, self.bmp.GetWidth(), self.bmp.GetHeight())
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	292 dc.SetBrush(wx.NullBrush)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	293 dc.SetPen(wx.NullPen)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	294 if mini_layer.show_labels:
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	295 # draw label
118 217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	296 self.mini_label(mini_layer, dc)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	297 self.top-=5
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	298 self.bottom+=5
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	299 self.left-=5
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	300 self.right+=5
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	301 return True
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	302
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	303
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	304 def mini_label(self, mini_layer, dc):
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	305 label = mini_layer.get_mini_label(self)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	306 if len(label):
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	307 dc.SetTextForeground(wx.RED)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	308 (textWidth,textHeight) = dc.GetTextExtent(label)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	309 x = self.pos.x +((self.bmp.GetWidth() - textWidth) /2) - 1
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	310 y = self.pos.y + self.bmp.GetHeight() + 6
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	311 dc.SetPen(wx.WHITE_PEN)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	312 dc.SetBrush(wx.WHITE_BRUSH)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	313 dc.DrawRectangle(x,y,textWidth+2,textHeight+2)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	314 if (textWidth+2 > self.right):
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	315 self.right += int((textWidth+2-self.right)/2)+1
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	316 self.left -= int((textWidth+2-self.right)/2)+1
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	317 self.bottom = y+textHeight+2-self.pos.y
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	318 dc.SetPen(wx.NullPen)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	319 dc.SetBrush(wx.NullBrush)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	320 dc.DrawText(label,x+1,y+1)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	321
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	322 def toxml(self, action="update"):
118 217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	323 mini = Element('miniature')
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	324 if action == 'del':
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	325 mini.set('action', action)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	326 mini.set('id', str(self.id))
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	327 return tostring(mini)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	328 mini.set('action', action)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	329 mini.set('id', str(self.id))
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	330 mini.set('label', self.label)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	331 if self.pos != None:
118 217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	332 mini.set('posx', str(self.pos.x))
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	333 mini.set('posy', str(self.pos.y))
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	334 if self.heading != None: mini.set('heading', str(self.heading))
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	335 if self.face != None: mini.set('face', str(self.face))
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	336 if self.path != None: mini.set('path', str(urllib.quote(self.path).replace('%3A', ':')))
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	337 mini.set('locked', '1') if self.locked else mini.set('locked', '0')
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	338 mini.set('hide', '1') if self.hide else mini.set('hide', '0')
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	339 if self.snap_to_align != None: mini.set('align', str(self.snap_to_align))
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	340 if self.id != None: mini.set('zorder', str(self.zorder))
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	341 if self.width != None: mini.set('width', str(self.width))
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	342 if self.height != None: mini.set('height', str(self.height))
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	343 if self.local:
118 217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	344 mini.set('local', str(self.local))
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	345 mini.set('localPath', str(urllib.quote(self.localPath).replace('%3A', ':')))
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	346 mini.set('localTime', str(localTime))
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	347 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	348 self.isUpdated = False
118 217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	349 return mini
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	350 else: return ''
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	351
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	352 def takedom(self, xml_dom):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	353 self.id = xml_dom.getAttribute("id")
118 217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	354 if xml_dom.hasAttribute("posx"): self.pos.x = int(xml_dom.getAttribute("posx"))
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	355 if xml_dom.hasAttribute("posy"): self.pos.y = int(xml_dom.getAttribute("posy"))
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	356 if xml_dom.hasAttribute("heading"): self.heading = int(xml_dom.getAttribute("heading"))
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	357 if xml_dom.hasAttribute("face"): self.face = int(xml_dom.getAttribute("face"))
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	358 if xml_dom.hasAttribute("path"):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	359 self.path = urllib.unquote(xml_dom.getAttribute("path"))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	360 self.set_bmp(ImageHandler.load(self.path, 'miniature', self.id))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	361 if xml_dom.hasAttribute("locked"):
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	362 if xml_dom.getAttribute("locked") == '1' or xml_dom.getAttribute("locked") == 'True': self.locked = True
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	363 else: self.locked = False
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	364 if xml_dom.hasAttribute("hide"):
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	365 if xml_dom.getAttribute("hide") == '1' or xml_dom.getAttribute("hide") == 'True': self.hide = True
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	366 else: self.hide = False
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	367 if xml_dom.hasAttribute("label"):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	368 self.label = xml_dom.getAttribute("label")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	369 if xml_dom.hasAttribute("zorder"):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	370 self.zorder = int(xml_dom.getAttribute("zorder"))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	371 if xml_dom.hasAttribute("align"):
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	372 if xml_dom.getAttribute("align") == '1' or xml_dom.getAttribute("align") == 'True': self.snap_to_align = 1
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	373 else: self.snap_to_align = 0
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	374 if xml_dom.hasAttribute("width"):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	375 self.width = int(xml_dom.getAttribute("width"))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	376 if xml_dom.hasAttribute("height"):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	377 self.height = int(xml_dom.getAttribute("height"))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	378
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 ## miniature layer
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	381 ##-----------------------------
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	382 class miniature_layer(layer_base):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	383 def __init__(self, canvas):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	384 self.canvas = canvas
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	385 layer_base.__init__(self)
7 2b9e766f9dee Tests fixes issues with Linux GUI effecting miniatures sirebral parents: 0 diff changeset	386 self.id = -1 #added.
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	387 self.miniatures = []
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	388 self.serial_number = 0
118 217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	389 self.show_labels = True
7 2b9e766f9dee Tests fixes issues with Linux GUI effecting miniatures sirebral parents: 0 diff changeset	390 # Set the font of the labels to be the same as the chat window
2b9e766f9dee Tests fixes issues with Linux GUI effecting miniatures sirebral parents: 0 diff changeset	391 # only smaller.
76 37a11fea3304 More clean up. Images now posts a Chat Info post if image doesn't load. sirebral parents: 71 diff changeset	392 font_size = int(settings.get_setting('defaultfontsize'))
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	393 if (font_size >= 10): font_size -= 2
7 2b9e766f9dee Tests fixes issues with Linux GUI effecting miniatures sirebral parents: 0 diff changeset	394 self.label_font = wx.Font(font_size, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL,
76 37a11fea3304 More clean up. Images now posts a Chat Info post if image doesn't load. sirebral parents: 71 diff changeset	395 False, settings.get_setting('defaultfont'))
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	396
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	397 def next_serial(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	398 self.serial_number += 1
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	399 return self.serial_number
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	400
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	401 def get_next_highest_z(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	402 z = len(self.miniatures)+1
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	403 return z
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	404
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	405 def cleanly_collapse_zorder(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	406 # lock the zorder stuff
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	407 sorted_miniatures = self.miniatures[:]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	408 sorted_miniatures.sort(cmp_zorder)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	409 i = 0
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	410 for mini in sorted_miniatures:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	411 mini.zorder = i
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	412 i = i + 1
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	413 # unlock the zorder stuff
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	414
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	415 def collapse_zorder(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	416 # lock the zorder stuff
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	417 sorted_miniatures = self.miniatures[:]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	418 sorted_miniatures.sort(cmp_zorder)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	419 i = 0
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	420 for mini in sorted_miniatures:
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	421 if (mini.zorder != MIN_STICKY_BACK) and (mini.zorder != MIN_STICKY_FRONT): mini.zorder = i
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	422 else: pass
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	423 i = i + 1
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	424 # unlock the zorder stuff
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	425
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	426 def rollback_serial(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	427 self.serial_number -= 1
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	428
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 7 diff changeset	429 def add_miniature(self, id, path, pos=cmpPoint(0,0), label="", heading=FACE_NONE,
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 7 diff changeset	430 face=FACE_NONE, width=0, height=0, local=False, localPath='', localTime=-1):
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	431 bmp = ImageHandler.load(path, 'miniature', id)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	432 if bmp:
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 7 diff changeset	433 mini = BmpMiniature(id, path, bmp, pos, heading, face, label,
118 217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	434 zorder=self.get_next_highest_z(), width=width,
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: 21 diff changeset	435 height=height, local=local, localPath=localPath, localTime=localTime)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	436 self.miniatures.append(mini)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	437 xml_str = "<map><miniatures>"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	438 xml_str += mini.toxml("new")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	439 xml_str += "</miniatures></map>"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	440 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	441
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	442 def get_miniature_by_id(self, id):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	443 for mini in self.miniatures:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	444 if str(mini.id) == str(id):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	445 return mini
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	446 return None
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	447
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	448 def del_miniature(self, min):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	449 xml_str = "<map><miniatures>"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	450 xml_str += min.toxml("del")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	451 xml_str += "</miniatures></map>"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	452 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	453 self.miniatures.remove(min)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	454 del min
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	455 self.collapse_zorder()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	456
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	457 def del_all_miniatures(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	458 while len(self.miniatures):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	459 min = self.miniatures.pop()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	460 del min
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	461 self.collapse_zorder()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	462
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	463 def layerDraw(self, dc, topleft, size):
7 2b9e766f9dee Tests fixes issues with Linux GUI effecting miniatures sirebral parents: 0 diff changeset	464 dc.SetFont(self.label_font)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	465 sorted_miniatures = self.miniatures[:]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	466 sorted_miniatures.sort(cmp_zorder)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	467 for m in sorted_miniatures:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	468 if (m.pos.x>topleft[0]-m.right and
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	469 m.pos.y>topleft[1]-m.bottom and
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	470 m.pos.x<topleft[0]+size[0]-m.left and
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	471 m.pos.y<topleft[1]+size[1]-m.top):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	472 m.draw(dc, self)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	473
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	474 def find_miniature(self, pt, only_unlocked=False):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	475 min_list = []
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	476 for m in self.miniatures:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	477 if m.hit_test(pt):
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	478 if m.hide and self.canvas.frame.session.my_role() != self.canvas.frame.session.ROLE_GM: continue
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	479 if only_unlocked and not m.locked: min_list.append(m)
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	480 elif not only_unlocked and m.locked: min_list.append(m)
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	481 else: continue
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	482 if len(min_list) > 0:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	483 return min_list
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: 21 diff changeset	484 else: return None
0 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 layerToXML(self, action="update"):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	487 """ format """
118 217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	488 mini_string = ""
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	489 if self.miniatures:
118 217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	490 for m in self.miniatures: mini_string = m.toxml(action)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	491 if mini_string != '':
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	492 s = Element('miniatures')
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	493 s.set('serial', str(self.serial_number))
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	494 s.append(mini_string)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	495 return tostring(s)
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: 21 diff changeset	496 else: return ""
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	497
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	498 def layerTakeDOM(self, xml_dom):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	499 if xml_dom.hasAttribute('serial'):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	500 self.serial_number = int(xml_dom.getAttribute('serial'))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	501 children = xml_dom._get_childNodes()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	502 for c in children:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	503 action = c.getAttribute("action")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	504 id = c.getAttribute('id')
21 fdd70f11bc7e One too many deletes last time. This run tested on Linux and working sirebral parents: 20 diff changeset	505 if action == "del":
fdd70f11bc7e One too many deletes last time. This run tested on Linux and working sirebral parents: 20 diff changeset	506 mini = self.get_miniature_by_id(id)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	507 if mini:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	508 self.miniatures.remove(mini)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	509 del mini
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	510 elif action == "new":
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	511 pos = cmpPoint(int(c.getAttribute('posx')),int(c.getAttribute('posy')))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	512 path = urllib.unquote(c.getAttribute('path'))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	513 label = c.getAttribute('label')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	514 height = width = heading = face = snap_to_align = zorder = 0
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	515 locked = hide = False
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	516 if c.hasAttribute('height'): height = int(c.getAttribute('height'))
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	517 if c.hasAttribute('width'): width = int(c.getAttribute('width'))
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	518 if c.getAttribute('locked') == 'True' or c.getAttribute('locked') == '1': locked = True
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	519 if c.getAttribute('hide') == 'True' or c.getAttribute('hide') == '1': hide = True
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	520 if c.getAttribute('heading'): heading = int(c.getAttribute('heading'))
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	521 if c.hasAttribute('face'): face = int(c.getAttribute('face'))
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	522 if c.hasAttribute('align'): snap_to_align = int(c.getAttribute('align'))
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	523 if c.getAttribute('zorder'): zorder = int(c.getAttribute('zorder'))
118 217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	524 image = ImageHandler.load(path, 'miniature', id)
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	525 mini = BmpMiniature(id, path, image, pos, heading, face, label, locked, hide, snap_to_align, zorder, width, height, func='minis')
217fb049bd00 Traipse Alpha 'OpenRPG' {091028-00} sirebral parents: 88 diff changeset	526 self.miniatures.append(mini)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	527 if c.hasAttribute('local') and c.getAttribute('local') == 'True' and os.path.exists(urllib.unquote(c.getAttribute('localPath'))):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	528 localPath = urllib.unquote(c.getAttribute('localPath'))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	529 local = True
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	530 localTime = float(c.getAttribute('localTime'))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	531 if localTime-time.time() <= 144000:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	532 file = open(localPath, "rb")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	533 imgdata = file.read()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	534 file.close()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	535 filename = os.path.split(localPath)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	536 (imgtype,j) = mimetypes.guess_type(filename[1])
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	537 postdata = urllib.urlencode({'filename':filename[1], 'imgdata':imgdata, 'imgtype':imgtype})
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	538 thread.start_new_thread(self.upload, (postdata, localPath, True))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	539 # collapse the zorder. If the client behaved well, then nothing should change.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	540 # Otherwise, this will ensure that there's some kind of z-order
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	541 self.collapse_zorder()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	542 else:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	543 mini = self.get_miniature_by_id(id)
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	544 if mini: mini.takedom(c)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	545
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	546 def upload(self, postdata, filename, modify=False, pos=cmpPoint(0,0)):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	547 self.lock.acquire()
76 37a11fea3304 More clean up. Images now posts a Chat Info post if image doesn't load. sirebral parents: 71 diff changeset	548 url = settings.get_setting('ImageServerBaseURL')
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	549 file = urllib.urlopen(url, postdata)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	550 recvdata = file.read()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	551 file.close()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	552 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	553 xml_dom = minidom.parseString(recvdata)._get_documentElement()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	554 if xml_dom.nodeName == 'path':
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	555 path = xml_dom.getAttribute('url')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	556 path = urllib.unquote(path)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	557 if not modify:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	558 start = path.rfind("/") + 1
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	559 if self.canvas.parent.layer_handlers[2].auto_label: min_label = path[start:len(path)-4]
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	560 else: min_label = ""
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	561 id = 'mini-' + self.canvas.frame.session.get_next_id()
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 7 diff changeset	562 self.add_miniature(id, path, pos=pos, label=min_label, local=True,
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 7 diff changeset	563 localPath=filename, localTime=time.time())
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	564 else:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	565 self.miniatures[len(self.miniatures)-1].local = True
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	566 self.miniatures[len(self.miniatures)-1].localPath = filename
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	567 self.miniatures[len(self.miniatures)-1].localTime = time.time()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	568 self.miniatures[len(self.miniatures)-1].path = path
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	569 else:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	570 print xml_dom.getAttribute('msg')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	571 except Exception, e:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	572 print e
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	573 print recvdata
88 763a04270cf6 Traipse Alpha 'OpenRPG' {090917-02} sirebral parents: 76 diff changeset	574 finally:
763a04270cf6 Traipse Alpha 'OpenRPG' {090917-02} sirebral parents: 76 diff changeset	575 urllib.urlcleanup()
763a04270cf6 Traipse Alpha 'OpenRPG' {090917-02} sirebral parents: 76 diff changeset	576 self.lock.release()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	577 ####################################################################
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	578 ## helper function
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	579
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	580 def get_mini_label(self, mini):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	581 # override this to change the label displayed under each mini (and the label on hidden minis)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	582 return mini.label

Mercurial > traipse_dev

annotate orpg/mapper/miniatures.py @ 119:9314d63c0941 alpha