traipse_dev: orpg/mapper/map.py annotate

annotate orpg/mapper/map.py @ 76:37a11fea3304 ornery-dev

More clean up. Images now posts a Chat Info post if image doesn't load.

author	sirebral
date	Sat, 22 Aug 2009 04:02:14 -0500
parents	449a8900f9ac
children	2f2bebe9c77f dcf4fbe09b70

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/map.py
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	21 # Author: OpenRPG
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: map.py,v 1.73 2007/12/07 20:39:49 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:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	27 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	28 __version__ = "$Id: map.py,v 1.73 2007/12/07 20:39:49 digitalxero Exp $"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	29
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	30 from map_version import MAP_VERSION
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	31 from map_msg import *
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	32 from min_dialogs import *
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	33 from map_prop_dialog import *
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: 66 diff changeset	34
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	35 import random
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	36 import os
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	37 import thread
76 37a11fea3304 More clean up. Images now posts a Chat Info post if image doesn't load. sirebral parents: 71 diff changeset	38 #import gc #Garbage Collecter Needed?
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	39 import traceback
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: 66 diff changeset	40
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	41 from miniatures_handler import *
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	42 from whiteboard_handler import *
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	43 from background_handler import *
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	44 from grid_handler import *
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	45 from map_handler import *
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: 66 diff changeset	46 from fog_handler import *
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: 66 diff changeset	47
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: 66 diff changeset	48 from orpg.dirpath import dir_struct
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: 66 diff changeset	49 from images import ImageHandler
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 20 diff changeset	50 from orpg.orpgCore import component
76 37a11fea3304 More clean up. Images now posts a Chat Info post if image doesn't load. sirebral parents: 71 diff changeset	51 from orpg.tools.orpg_settings import settings
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	52
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	53 # Various marker modes for player tools on the map
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	54 MARKER_MODE_NONE = 0
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	55 MARKER_MODE_MEASURE = 1
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	56 MARKER_MODE_TARGET = 2
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	57 MARKER_MODE_AREA_TARGET = 3
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	58
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	59 class MapCanvas(wx.ScrolledWindow):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	60 def __init__(self, parent, ID, isEditor=0):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	61 self.parent = parent
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 20 diff changeset	62 self.session = component.get("session")
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	63 wx.ScrolledWindow.__init__(self, parent, ID,
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	64 style=wx.HSCROLL \| wx.VSCROLL \| wx.FULL_REPAINT_ON_RESIZE \| wx.SUNKEN_BORDER )
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	65 self.frame = parent
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	66 self.MAP_MODE = 1 #Mode 1 = MINI, 2 = DRAW, 3 = TAPE MEASURE
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	67 self.layers = {}
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	68 self.layers['bg'] = layer_back_ground(self)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	69 self.layers['grid'] = grid_layer(self)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	70 self.layers['whiteboard'] = whiteboard_layer(self)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	71 self.layers['miniatures'] = miniature_layer(self)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	72 self.layers['fog'] = fog_layer(self)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	73 self.Bind(wx.EVT_ERASE_BACKGROUND, self.on_erase_background)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	74 self.Bind(wx.EVT_PAINT, self.on_paint)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	75 self.Bind(wx.EVT_LEFT_DOWN, self.on_left_down)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	76 self.Bind(wx.EVT_LEFT_DCLICK, self.on_left_dclick)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	77 self.Bind(wx.EVT_LEFT_UP, self.on_left_up)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	78 self.Bind(wx.EVT_RIGHT_DOWN, self.on_right_down)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	79 self.Bind(wx.EVT_MOTION, self.on_motion)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	80 self.Bind(wx.EVT_SCROLLWIN, self.on_scroll)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	81 self.Bind(wx.EVT_CHAR, self.on_char)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	82 self.Bind(wx.EVT_SIZE, self.on_resize)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	83 self.set_size((1000,1000))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	84 self.root_dir = os.getcwd()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	85 self.size_change = 0
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	86 self.isEditor = isEditor
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	87 self.map_version = MAP_VERSION
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	88 self.cacheSize = 32
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	89 # Create the marker mode attributes for the map
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	90 self.markerMode = MARKER_MODE_NONE
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	91 self.markerStart = wx.Point( -1, -1 )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	92 self.markerStop = wx.Point( -1, -1 )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	93 self.markerMidpoint = wx.Point( -1, -1 )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	94 self.markerAngle = 0.0
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	95 # Optimization of map refreshing during busy map load
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	96 self.lastRefreshValue = 0
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	97 self.requireRefresh = 0
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	98 self.lastRefreshTime = 0
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	99 self.zoom_display_timer = wx.Timer(self, wx.NewId())
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	100 self.Bind(wx.EVT_TIMER, self.better_refresh, self.zoom_display_timer)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	101 random.seed( time.time() )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	102 self.image_timer = wx.Timer(self, wx.NewId())
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	103 self.Bind(wx.EVT_TIMER, self.processImages, self.image_timer)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	104 self.image_timer.Start(100)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	105 # Used to check if we've used the user cache size value
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	106 self.cacheSizeSet = False
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	107 self.inside = 0
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	108 # miniatures drag
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	109 self.drag = None
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	110
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	111 def better_refresh(self, event=None):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	112 self.Refresh(True)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	113
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	114 def pre_destory_cleanup(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	115 self.layers["miniatures"].del_all_miniatures()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	116
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	117 def processImages(self, evt=None):
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 20 diff changeset	118 self.session = component.get("session")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	119 if self.session.my_role() == self.session.ROLE_LURKER or (str(self.session.group_id) == '0' and str(self.session.status) == '1'):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	120 cidx = self.parent.get_tab_index("Background")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	121 self.parent.layer_tabs.EnableTab(cidx, False)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	122 cidx = self.parent.get_tab_index("Grid")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	123 self.parent.layer_tabs.EnableTab(cidx, False)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	124 cidx = self.parent.get_tab_index("Miniatures")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	125 self.parent.layer_tabs.EnableTab(cidx, False)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	126 cidx = self.parent.get_tab_index("Whiteboard")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	127 self.parent.layer_tabs.EnableTab(cidx, False)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	128 cidx = self.parent.get_tab_index("Fog")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	129 self.parent.layer_tabs.EnableTab(cidx, False)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	130 cidx = self.parent.get_tab_index("General")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	131 self.parent.layer_tabs.EnableTab(cidx, False)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	132 else:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	133 cidx = self.parent.get_tab_index("Background")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	134 if not self.parent.layer_tabs.GetEnabled(cidx):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	135 cidx = self.parent.get_tab_index("Miniatures")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	136 self.parent.layer_tabs.EnableTab(cidx, True)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	137 cidx = self.parent.get_tab_index("Whiteboard")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	138 self.parent.layer_tabs.EnableTab(cidx, True)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	139 cidx = self.parent.get_tab_index("Background")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	140 self.parent.layer_tabs.EnableTab(cidx, False)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	141 cidx = self.parent.get_tab_index("Grid")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	142 self.parent.layer_tabs.EnableTab(cidx, False)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	143 cidx = self.parent.get_tab_index("Fog")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	144 self.parent.layer_tabs.EnableTab(cidx, False)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	145 cidx = self.parent.get_tab_index("General")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	146 self.parent.layer_tabs.EnableTab(cidx, False)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	147 if self.session.my_role() == self.session.ROLE_GM:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	148 cidx = self.parent.get_tab_index("Background")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	149 self.parent.layer_tabs.EnableTab(cidx, True)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	150 cidx = self.parent.get_tab_index("Grid")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	151 self.parent.layer_tabs.EnableTab(cidx, True)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	152 cidx = self.parent.get_tab_index("Fog")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	153 self.parent.layer_tabs.EnableTab(cidx, True)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	154 cidx = self.parent.get_tab_index("General")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	155 self.parent.layer_tabs.EnableTab(cidx, True)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	156 if not self.cacheSizeSet:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	157 self.cacheSizeSet = True
76 37a11fea3304 More clean up. Images now posts a Chat Info post if image doesn't load. sirebral parents: 71 diff changeset	158 cacheSize = component.get('settings').get_setting("ImageCacheSize")
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	159 if len(cacheSize): self.cacheSize = int(cacheSize)
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: 66 diff changeset	160 else: pass
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	161 if not ImageHandler.Queue.empty():
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	162 (path, image_type, imageId) = ImageHandler.Queue.get()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	163 img = wx.ImageFromMime(path[1], path[2]).ConvertToBitmap()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	164 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	165 # Now, apply the image to the proper object
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	166 if image_type == "miniature":
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	167 min = self.layers['miniatures'].get_miniature_by_id(imageId)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	168 min.set_bmp(img)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	169 elif image_type == "background" or image_type == "texture":
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	170 self.layers['bg'].bg_bmp = img
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	171 if image_type == "background": self.set_size([img.GetWidth(), img.GetHeight()])
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	172 except: pass
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	173 # Flag that we now need to refresh!
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	174 self.requireRefresh += 1
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	175
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: 66 diff changeset	176 """ Randomly purge an item from the cache, while this is lamo, it does
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: 66 diff changeset	177 keep the cache from growing without bounds, which is pretty important!"""
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	178 if len(ImageHandler.Cache) >= self.cacheSize:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	179 ImageHandler.cleanCache()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	180 else:
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: 66 diff changeset	181 """ Now, make sure not only that we require a refresh, but that enough time has
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: 66 diff changeset	182 gone by since our last refresh. This keeps back to back refreshing occuring during
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: 66 diff changeset	183 large map loads. Of course, we are now trying to pack as many image refreshes as
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: 66 diff changeset	184 we can into a single cycle."""
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	185 if self.requireRefresh and (self.requireRefresh == self.lastRefreshValue):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	186 if (self.lastRefreshTime) < time.time():
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	187 self.requireRefresh = 0
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	188 self.lastRefreshValue = 0
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	189 self.lastRefreshTime = time.time()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	190 self.Refresh(True)
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	191 else: self.lastRefreshValue = self.requireRefresh
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	192
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	193 def on_scroll(self, evt):
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	194 if self.drag: self.drag.Hide()
76 37a11fea3304 More clean up. Images now posts a Chat Info post if image doesn't load. sirebral parents: 71 diff changeset	195 if component.get('settings').get_setting("AlwaysShowMapScale") == "1": self.printscale()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	196 evt.Skip()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	197
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	198 def on_char(self, evt):
76 37a11fea3304 More clean up. Images now posts a Chat Info post if image doesn't load. sirebral parents: 71 diff changeset	199 if component.get('settings').get_setting("AlwaysShowMapScale") == "1": self.printscale()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	200 evt.Skip()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	201
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	202 def printscale(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	203 wx.BeginBusyCursor()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	204 dc = wx.ClientDC(self)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	205 self.PrepareDC(dc)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	206 self.showmapscale(dc)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	207 self.Refresh(True)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	208 wx.EndBusyCursor()
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 send_map_data(self, action="update"):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	211 wx.BeginBusyCursor()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	212 send_text = self.toxml(action)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	213 if send_text:
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	214 if not self.isEditor: self.frame.session.send(send_text)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	215 wx.EndBusyCursor()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	216
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	217 def get_size(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	218 return self.size
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	219
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	220 def set_size(self, size):
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	221 if size[0] < 300: size = (300, size[1])
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	222 if size[1] < 300: size = (size[0], 300)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	223 self.size_changed = 1
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	224 self.size = size
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	225 self.fix_scroll()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	226 self.layers['fog'].resize(size)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	227
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	228 def fix_scroll(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	229 scale = self.layers['grid'].mapscale
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	230 pos = self.GetViewStart()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	231 unit = self.GetScrollPixelsPerUnit()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	232 pos = [pos[0]unit[0],pos[1]unit[1]]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	233 size = self.GetClientSize()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	234 unit = [10scale,10scale]
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: 66 diff changeset	235 if (unit[0] == 0 or unit[1] == 0): return
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	236 pos[0] /= unit[0]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	237 pos[1] /= unit[1]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	238 mx = [int(self.size[0]scale/unit[0])+1, int(self.size[1]scale/unit[1]+1)]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	239 self.SetScrollbars(unit[0], unit[1], mx[0], mx[1], pos[0], pos[1])
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	240
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	241 def on_resize(self, evt):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	242 self.fix_scroll()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	243 wx.CallAfter(self.Refresh, True)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	244 evt.Skip()
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 def on_erase_background(self, evt):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	247 evt.Skip()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	248
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	249 def on_paint(self, evt):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	250 scale = self.layers['grid'].mapscale
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	251 scrollsize = self.GetScrollPixelsPerUnit()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	252 clientsize = self.GetClientSize()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	253 topleft1 = self.GetViewStart()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	254 topleft = [topleft1[0]scrollsize[0], topleft1[1]scrollsize[1]]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	255 if (clientsize[0] > 1) and (clientsize[1] > 1):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	256 dc = wx.MemoryDC()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	257 bmp = wx.EmptyBitmap(clientsize[0]+1, clientsize[1]+1)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	258 dc.SelectObject(bmp)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	259 dc.SetPen(wx.TRANSPARENT_PEN)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	260 dc.SetBrush(wx.Brush(self.GetBackgroundColour(), wx.SOLID))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	261 dc.DrawRectangle(0,0,clientsize[0]+1,clientsize[1]+1)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	262 dc.SetDeviceOrigin(-topleft[0], -topleft[1])
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	263 dc.SetUserScale(scale, scale)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	264 self.layers['bg'].layerDraw(dc, scale, topleft, clientsize)
19 78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	265 self.layers['grid'].layerDraw(dc, [topleft[0]/scale, topleft[1]/scale],
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	266 [clientsize[0]/scale, clientsize[1]/scale])
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	267 self.layers['miniatures'].layerDraw(dc, [topleft[0]/scale, topleft[1]/scale],
78407d627cba Beginning of Code Clean-up. Some code untested, may break! sirebral parents: 14 diff changeset	268 [clientsize[0]/scale, clientsize[1]/scale])
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	269 self.layers['whiteboard'].layerDraw(dc)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	270 self.layers['fog'].layerDraw(dc, topleft, clientsize)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	271 dc.SetPen(wx.NullPen)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	272 dc.SetBrush(wx.NullBrush)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	273 dc.SelectObject(wx.NullBitmap)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	274 del dc
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	275 wdc = self.preppaint()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	276 wdc.DrawBitmap(bmp, topleft[0], topleft[1])
76 37a11fea3304 More clean up. Images now posts a Chat Info post if image doesn't load. sirebral parents: 71 diff changeset	277 if settings.get_setting("AlwaysShowMapScale") == "1":
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	278 self.showmapscale(wdc)
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	279 try: evt.Skip()
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	280 except: pass
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	281
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	282 def preppaint(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	283 dc = wx.PaintDC(self)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	284 self.PrepareDC(dc)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	285 return (dc)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	286
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	287 def showmapscale(self, dc):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	288 scalestring = "Scale x" + `self.layers['grid'].mapscale`[:3]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	289 (textWidth, textHeight) = dc.GetTextExtent(scalestring)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	290 dc.SetUserScale(1, 1)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	291 dc.SetPen(wx.LIGHT_GREY_PEN)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	292 dc.SetBrush(wx.LIGHT_GREY_BRUSH)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	293 x = dc.DeviceToLogicalX(0)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	294 y = dc.DeviceToLogicalY(0)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	295 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	296 dc.SetPen(wx.RED_PEN)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	297 dc.DrawText(scalestring, x+1, y+1)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	298 dc.SetPen(wx.NullPen)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	299 dc.SetBrush(wx.NullBrush)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	300
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	301 def snapMarker(self, snapPoint):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	302 """Based on the position and unit size, figure out where we need to snap to. As is, on
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	303 a square grid, there are four possible places to snap. On a hex gid, there are 6 or 12 snap
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	304 points."""
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	305
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	306 # If snap to grid is disabled, simply return snapPoint unmodified
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	307 if self.layers['grid'].snap:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	308 # This means we need to determine where to snap our line. We will support
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	309 # snapping to four different snapPoints per square for now.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	310 # TODO!!!
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	311 if self.layers['grid'].mode == GRID_HEXAGON: size = self.layers['grid'].unit_size_y
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	312 else:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	313 size = int(self.layers['grid'].unit_size)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	314 # Find the uppper left hand corner of the grid we are to snap to
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	315 offsetX = (snapPoint.x / size) * size
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	316 offsetY = (snapPoint.y / size) * size
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	317 # Calculate the delta value between where we clicked and the square it is near
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	318 deltaX = snapPoint.x - offsetX
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	319 deltaY = snapPoint.y - offsetY
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	320 # Now, figure our what quadrant (x, y) we need to snap to
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	321 snapSize = size / 2
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	322 # Figure out the X snap placement
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	323 if deltaX <= snapSize: quadXPos = offsetX
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	324 else: quadXPos = offsetX + size
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	325 # Now, figure out the Y snap placement
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	326 if deltaY <= snapSize: quadYPos = offsetY
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	327 else: quadYPos = offsetY + size
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	328 # Create our snap snapPoint and return it
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	329 snapPoint = wx.Point( quadXPos, quadYPos )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	330 return snapPoint
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 # Bunch of math stuff for marking and measuring
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	333 def calcSlope(self, start, stop):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	334 """Calculates the slop of a line and returns it."""
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	335 if start.x == stop.x: s = 0.0001
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	336 else: s = float((stop.y - start.y)) / float((stop.x - start.x))
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	337 return s
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	338
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	339 def calcSlopeToAngle(self, slope):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	340 """Based on the input slope, the angle (in degrees) will be returned."""
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	341 # See if the slope is neg or positive
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	342 if slope == abs(slope):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	343 # Slope is positive, so make sure it's not zero
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	344 if slope == 0: a = 0
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	345 else: a = 360 - atan(slope) * (180.0/pi)
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	346 else: a = atan(abs(slope)) * (180.0/pi)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	347 return a
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	348
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	349 def calcLineAngle(self, start, stop):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	350 """Based on two points that are on a line, return the angle of that line."""
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	351 a = self.calcSlopeToAngle( self.calcSlope( start, stop ) )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	352 return a
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	353
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	354 def calcPixelDistance(self, start, stop):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	355 """Calculate the distance between two pixels and returns it. The calculated
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	356 distance is the Euclidean Distance, which is:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	357 d = sqrt( (x2 - x1)2 + (y2 - y1)2 )"""
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	358 d = sqrt( abs((stop.x - start.x)2 - (stop.y - start.y)2) )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	359 return d
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 calcUnitDistance(self, start, stop, lineAngle):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	362 distance = self.calcPixelDistance( start, stop )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	363 ln = "%0.2f" % lineAngle
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	364 if self.layers['grid'].mode == GRID_HEXAGON:
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	365 if ln == "0.00" or ln == "359.99": ud = distance / self.layers['grid'].unit_size_y
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	366 else: ud = (sqrt(abs((stop.x - start.x)2 + (stop.y - start.y)2))) / self.layers['grid'].unit_size_y
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	367 else:
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	368 if ln == "0.00" or ln == "359.99": ud = distance / self.layers['grid'].unit_size
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	369 else: ud = (sqrt(abs((stop.x - start.x)2 + (stop.y - start.y)2))) / self.layers['grid'].unit_size
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	370 #ud = sqrt( abs((stop.x - start.x)2 - (stop.y - start.y)2) )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	371 return ud
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	372
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	373 def on_tape_motion(self, evt):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	374 """Track mouse motion so we can update the marker visual every time it's moved"""
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	375 # Make sure we have a mode to do anything, otherwise, we ignore this
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	376 if self.markerMode:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	377 # Grap the current DC for all of the marker modes
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	378 dc = wx.ClientDC( self )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	379 self.PrepareDC( dc )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	380 dc.SetUserScale(self.layers['grid'].mapscale,self.layers['grid'].mapscale)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	381 # Grab the current map position
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	382 pos = self.snapMarker( evt.GetLogicalPosition( dc ) )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	383 # Enable brush optimizations
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: 66 diff changeset	384 # dc.SetOptimization( True )
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	385 # Set up the pen used for drawing our marker
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	386 dc.SetPen( wx.Pen(wx.RED, 1, wx.LONG_DASH) )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	387 # Now, based on the marker mode, draw the right thing
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	388 if self.markerMode == MARKER_MODE_MEASURE:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	389 if self.markerStop.x != -1 and self.markerStop.y != -1:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	390 # Set the DC function that we need
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	391 dc.SetLogicalFunction(wx.INVERT)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	392 # Erase old and Draw new marker line
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	393 dc.BeginDrawing()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	394 dc.DrawLine( self.markerStart.x, self.markerStart.y, self.markerStop.x, self.markerStop.y )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	395 dc.DrawLine( self.markerStart.x, self.markerStart.y, pos.x, pos.y )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	396 dc.EndDrawing()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	397 # Restore the default DC function
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	398 dc.SetLogicalFunction(wx.COPY)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	399 # As long as we are in marker mode, we ned to update the stop point
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	400 self.markerStop = pos
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	401 dc.SetPen(wx.NullPen)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	402 # Disable brush optimizations
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	403 #dc.SetOptimization( False )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	404 del dc
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	405
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	406 def on_tape_down(self, evt):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	407 """Greg's experimental tape measure code. Hopefully, when this is done, it will all be
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	408 modal based on a toolbar."""
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	409 dc = wx.ClientDC( self )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	410 self.PrepareDC( dc )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	411 dc.SetUserScale(self.layers['grid'].mapscale,self.layers['grid'].mapscale)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	412 pos = evt.GetLogicalPosition( dc )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	413 # If grid snap is enabled, then snap the tool to a proper position
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	414 pos = self.snapMarker( evt.GetLogicalPosition( dc ) )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	415 # Maker mode should really be set by a toolbar
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	416 self.markerMode = MARKER_MODE_MEASURE
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	417 # Erase the old line if her have one
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	418 if self.markerStart.x != -1 and self.markerStart.y != -1:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	419 # Enable brush optimizations
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	420 #dc.SetOptimization( True )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	421 # Set up the pen used for drawing our marker
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	422 dc.SetPen( wx.Pen(wx.RED, 1, wx.LONG_DASH) )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	423 # Set the DC function that we need
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	424 dc.SetLogicalFunction(wx.INVERT)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	425 # Draw the marker line
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	426 dc.BeginDrawing()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	427 dc.DrawLine( self.markerStart.x, self.markerStart.y, self.markerStop.x, self.markerStop.y )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	428 dc.EndDrawing()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	429 # Restore the default DC function and pen
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	430 dc.SetLogicalFunction(wx.COPY)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	431 dc.SetPen(wx.NullPen)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	432 # Disable brush optimizations
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	433 #dc.SetOptimization( False )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	434 # Save our current start and reset the stop value
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	435 self.markerStart = pos
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	436 self.markerStop = pos
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	437 del dc
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	438
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	439 def on_tape_up(self, evt):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	440 """When we release the middle button, disable any marking updates that we have been doing."""
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	441 # If we are in measure mode, draw the actual UNIT distance
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	442 if self.markerMode == MARKER_MODE_MEASURE:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	443 dc = wx.ClientDC( self )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	444 self.PrepareDC( dc )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	445 dc.SetUserScale(self.layers['grid'].mapscale,self.layers['grid'].mapscale)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	446 # Draw the measured distance on the DC. Since we want
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	447 # the text to match the line angle, calculate the angle
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	448 # of the line.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	449 lineAngle = self.calcLineAngle( self.markerStart, self.markerStop )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	450 distance = self.calcUnitDistance( self.markerStart, self.markerStop, lineAngle )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	451 midPoint = (self.markerStart + self.markerStop)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	452 midPoint.x /= 2
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	453 midPoint.y /= 2
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	454 # Adjust out font to be bigger & scaled
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	455 font = dc.GetFont()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	456 # Set the DC function that we need
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	457 dc.SetLogicalFunction(wx.INVERT)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	458 # Set the pen we want to use
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	459 dc.SetPen(wx.BLACK_PEN)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	460 # Now, draw the text at the proper angle on the canvas
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	461 self.markerMidpoint = midPoint
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	462 self.markerAngle = lineAngle
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	463 dText = "%0.2f Units" % (distance)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	464 dc.BeginDrawing()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	465 dc.DrawRotatedText( dText, midPoint.x, midPoint.y, lineAngle )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	466 dc.EndDrawing()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	467 # Restore the default font and DC
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	468 dc.SetFont(wx.NullFont)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	469 dc.SetLogicalFunction(wx.COPY)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	470 del font
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	471 del dc
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	472 self.markerMode = MARKER_MODE_NONE
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 # MODE 1 = MOVE, MODE 2 = whiteboard, MODE 3 = Tape measure
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	475 def on_left_down(self, evt):
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	476 if evt.ShiftDown(): self.on_tape_down (evt)
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	477 else: self.frame.on_left_down(evt)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	478
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	479 def on_right_down(self, evt):
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	480 if evt.ShiftDown(): pass
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	481 else: self.frame.on_right_down(evt)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	482
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	483 def on_left_dclick(self, evt):
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	484 if evt.ShiftDown(): pass
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	485 else: self.frame.on_left_dclick(evt)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	486
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	487 def on_left_up(self, evt):
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	488 if evt.ShiftDown(): self.on_tape_up(evt)
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 20 diff changeset	489 elif component.get("tree").dragging:
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 20 diff changeset	490 tree = component.get("tree")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	491 if tree.drag_obj.map_aware():
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	492 tree.drag_obj.on_send_to_map(evt)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	493 tree.dragging = False
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	494 tree.drag_obj = None
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	495 else: self.frame.on_left_up(evt)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	496
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	497 def on_motion(self, evt):
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	498 if evt.ShiftDown(): self.on_tape_motion(evt)
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 20 diff changeset	499 elif evt.LeftIsDown() and component.get("tree").dragging: pass
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	500 else: self.frame.on_motion(evt)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	501
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	502 def on_zoom_out(self, evt):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	503 if self.layers['grid'].mapscale > 0.2:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	504 # attempt to keep same logical point at center of screen
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	505 scale = self.layers['grid'].mapscale
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	506 scrollsize = self.GetScrollPixelsPerUnit()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	507 clientsize = self.GetClientSize()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	508 topleft1 = self.GetViewStart()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	509 topleft = [topleft1[0]scrollsize[0], topleft1[1]scrollsize[1]]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	510 scroll_x = (((topleft[0]+clientsize[0]/2)*(scale-.1)/scale)-clientsize[0]/2)/scrollsize[0]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	511 scroll_y = (((topleft[1]+clientsize[1]/2)*(scale-.1)/scale)-clientsize[1]/2)/scrollsize[1]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	512 self.Scroll(scroll_x, scroll_y)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	513 self.layers['grid'].mapscale -= .1
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	514 scalestring = "x" + `self.layers['grid'].mapscale`[:3]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	515 self.frame.get_current_layer_handler().zoom_out_button.SetToolTip(wx.ToolTip("Zoom out from " + scalestring) )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	516 self.frame.get_current_layer_handler().zoom_in_button.SetToolTip(wx.ToolTip("Zoom in from " + scalestring) )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	517 self.set_size(self.size)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	518 dc = wx.ClientDC(self)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	519 dc.BeginDrawing()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	520 scalestring = "Scale x" + `self.layers['grid'].mapscale`[:3]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	521 (textWidth,textHeight) = dc.GetTextExtent(scalestring)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	522 dc.SetPen(wx.LIGHT_GREY_PEN)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	523 dc.SetBrush(wx.LIGHT_GREY_BRUSH)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	524 dc.DrawRectangle(dc.DeviceToLogicalX(0),dc.DeviceToLogicalY(0),textWidth,textHeight)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	525 dc.SetPen(wx.RED_PEN)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	526 dc.DrawText(scalestring,dc.DeviceToLogicalX(0),dc.DeviceToLogicalY(0))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	527 dc.SetPen(wx.NullPen)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	528 dc.SetBrush(wx.NullBrush)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	529 dc.EndDrawing()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	530 del dc
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	531 self.zoom_display_timer.Start(500,1)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	532
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	533 def on_zoom_in(self, evt):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	534 # attempt to keep same logical point at center of screen
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	535 scale = self.layers['grid'].mapscale
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	536 scrollsize = self.GetScrollPixelsPerUnit()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	537 clientsize = self.GetClientSize()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	538 topleft1 = self.GetViewStart()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	539 topleft = [topleft1[0]scrollsize[0], topleft1[1]scrollsize[1]]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	540 scroll_x = (((topleft[0]+clientsize[0]/2)*(scale+.1)/scale)-clientsize[0]/2)/scrollsize[0]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	541 scroll_y = (((topleft[1]+clientsize[1]/2)*(scale+.1)/scale)-clientsize[1]/2)/scrollsize[1]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	542 self.Scroll(scroll_x, scroll_y)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	543 self.layers['grid'].mapscale += .1
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	544 scalestring = "x" + `self.layers['grid'].mapscale`[:3]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	545 self.frame.get_current_layer_handler().zoom_out_button.SetToolTip(wx.ToolTip("Zoom out from " + scalestring) )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	546 self.frame.get_current_layer_handler().zoom_in_button.SetToolTip(wx.ToolTip("Zoom in from " + scalestring) )
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	547 self.set_size(self.size)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	548 dc = wx.ClientDC(self)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	549 dc.BeginDrawing()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	550 scalestring = "Scale x" + `self.layers['grid'].mapscale`[:3]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	551 (textWidth,textHeight) = dc.GetTextExtent(scalestring)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	552 dc.SetPen(wx.LIGHT_GREY_PEN)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	553 dc.SetBrush(wx.LIGHT_GREY_BRUSH)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	554 dc.DrawRectangle(dc.DeviceToLogicalX(0), dc.DeviceToLogicalY(0), textWidth,textHeight)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	555 dc.SetPen(wx.RED_PEN)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	556 dc.DrawText(scalestring, dc.DeviceToLogicalX(0), dc.DeviceToLogicalY(0))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	557 dc.SetPen(wx.NullPen)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	558 dc.SetBrush(wx.NullBrush)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	559 dc.EndDrawing()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	560 del dc
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	561 self.zoom_display_timer.Start(500, 1)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	562
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	563 def on_prop(self, evt):
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 20 diff changeset	564 self.session = component.get("session")
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 20 diff changeset	565 self.chat = component.get("chat")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	566 if (self.session.my_role() != self.session.ROLE_GM):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	567 self.chat.InfoPost("You must be a GM to use this feature")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	568 return
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	569 dlg = general_map_prop_dialog(self.frame.GetParent(),self.size,self.layers['bg'],self.layers['grid'])
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	570 if dlg.ShowModal() == wx.ID_OK:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	571 self.set_size(dlg.size)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	572 self.send_map_data()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	573 self.Refresh(False)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	574 dlg.Destroy()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	575 os.chdir(self.root_dir)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	576
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	577 def add_miniature(self, min_url, min_label='', min_unique=-1):
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	578 if min_unique == -1: min_unique = not self.use_serial
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	579 if min_url == "" or min_url == "http://": return
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	580 if min_url[:7] != "http://" : min_url = "http://" + min_url
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	581 # make label
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	582 wx.BeginBusyCursor()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	583 if self.auto_label:
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	584 if min_label == '': min_label = self.get_label_from_url( min_url )
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	585 if not min_unique and self.use_serial:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	586 min_label = '%s %d' % ( min_label, self.layers['miniatures'].next_serial() )
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	587 else: min_label = ""
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	588 if self.frame.min_url.FindString(min_url) == -1: self.frame.min_url.Append(min_url)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	589 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	590 id = 'mini-' + self.frame.session.get_next_id()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	591 self.layers['miniatures'].add_miniature(id, min_url, label=min_label)
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: 66 diff changeset	592 except:
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	593 self.layers['miniatures'].rollback_serial()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	594 wx.EndBusyCursor()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	595 self.send_map_data()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	596 self.Refresh(False)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	597
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	598 def get_label_from_url(self, url=''):
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: 66 diff changeset	599 if url == '': return ''
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	600 start = url.rfind("/")+1
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	601 label = url[start:len(url)-4]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	602 return label
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	603
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	604 def toxml(self, action="update"):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	605 if action == "new":
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	606 self.size_changed = 1
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	607 xml_str = "<map version='" + self.map_version + "'"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	608 changed = self.size_changed
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	609 if self.size_changed:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	610 xml_str += " sizex='" + str(self.size[0]) + "'"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	611 xml_str += " sizey='" + str(self.size[1]) + "'"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	612 s = ""
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	613 keys = self.layers.keys()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	614 for k in keys:
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	615 if (k != "fog" or action != "update"): s += self.layers[k].layerToXML(action)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	616 self.size_changed = 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: 66 diff changeset	617 if s: return xml_str + " action='" + action + "'>" + s + "</map>"
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	618 else:
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: 66 diff changeset	619 if changed: return xml_str + " action='" + action + "'/>"
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: 66 diff changeset	620 else: return ""
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	621
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	622 def takexml(self, xml):
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: 66 diff changeset	623 """
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: 66 diff changeset	624 Added Process Dialog to display during long map parsings
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: 66 diff changeset	625 as well as a try block with an exception traceback to try
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: 66 diff changeset	626 and isolate some of the map related problems users have been
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: 66 diff changeset	627 experiencing --Snowdog 5/15/03
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: 66 diff changeset	628
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: 66 diff changeset	629 Apparently Process Dialog causes problems with linux.. commenting it out. sheez.
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: 66 diff changeset	630 --Snowdog 5/27/03
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: 66 diff changeset	631 """
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	632 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	633 #parse the map DOM
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	634 xml_dom = parseXml(xml)
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: 66 diff changeset	635 if xml_dom == None: return
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	636 node_list = xml_dom.getElementsByTagName("map")
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: 66 diff changeset	637 if len(node_list) < 1: pass
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	638 else:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	639 # set map version to incoming data so layers can convert
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	640 self.map_version = node_list[0].getAttribute("version")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	641 action = node_list[0].getAttribute("action")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	642 if action == "new":
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	643 self.layers = {}
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	644 try: self.layers['bg'] = layer_back_ground(self)
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	645 except: pass
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	646 try: self.layers['grid'] = grid_layer(self)
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	647 except: pass
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	648 try: self.layers['miniatures'] = miniature_layer(self)
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	649 except: pass
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	650 try: self.layers['whiteboard'] = whiteboard_layer(self)
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	651 except: pass
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	652 try: self.layers['fog'] = fog_layer(self)
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	653 except: pass
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	654 sizex = node_list[0].getAttribute("sizex")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	655 if sizex != "":
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	656 sizex = int(float(sizex))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	657 sizey = self.size[1]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	658 self.set_size((sizex,sizey))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	659 self.size_changed = 0
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	660 sizey = node_list[0].getAttribute("sizey")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	661 if sizey != "":
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	662 sizey = int(float(sizey))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	663 sizex = self.size[0]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	664 self.set_size((sizex,sizey))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	665 self.size_changed = 0
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	666 children = node_list[0]._get_childNodes()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	667 #fog layer must be computed first, so that no data is inadvertently revealed
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	668 for c in children:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	669 name = c._get_nodeName()
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	670 if name == "fog": self.layers[name].layerTakeDOM(c)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	671 for c in children:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	672 name = c._get_nodeName()
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	673 if name != "fog": self.layers[name].layerTakeDOM(c)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	674 # all map data should be converted, set map version to current version
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	675 self.map_version = MAP_VERSION
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	676 self.Refresh(False)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	677 xml_dom.unlink() # eliminate circular refs
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: 66 diff changeset	678 except: pass
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	679
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	680 def re_ids_in_xml(self, xml):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	681 new_xml = ""
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	682 tmp_map = map_msg()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	683 xml_dom = parseXml(str(xml))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	684 node_list = xml_dom.getElementsByTagName("map")
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: 66 diff changeset	685 if len(node_list) < 1: pass
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	686 else:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	687 tmp_map.init_from_dom(node_list[0])
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	688 if tmp_map.children.has_key("miniatures"):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	689 miniatures_layer = tmp_map.children["miniatures"]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	690 if miniatures_layer:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	691 minis = miniatures_layer.get_children().keys()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	692 if minis:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	693 for mini in minis:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	694 m = miniatures_layer.children[mini]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	695 id = 'mini-' + self.frame.session.get_next_id()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	696 m.init_prop("id", id)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	697 # This allows for backward compatibility with older maps which do not
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	698 # have a whiteboard node. As such, if it's not there, we'll just happily
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	699 # move on and process as always.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	700 if tmp_map.children.has_key("whiteboard"):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	701 whiteboard_layer = tmp_map.children["whiteboard"]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	702 if whiteboard_layer:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	703 lines = whiteboard_layer.get_children().keys()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	704 if lines:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	705 for line in lines:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	706 l = whiteboard_layer.children[line]
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	707 if l.tagname == 'line': id = 'line-' + self.frame.session.get_next_id()
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	708 elif l.tagname == 'text': id = 'text-' + self.frame.session.get_next_id()
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	709 elif l.tagname == 'circle': id = 'circle-' + self.frame.session.get_next_id()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	710 l.init_prop("id", id)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	711 new_xml = tmp_map.get_all_xml()
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	712 if xml_dom: xml_dom.unlink()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	713 return str(new_xml)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	714
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	715 class map_wnd(wx.Panel):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	716 def __init__(self, parent, id):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	717 wx.Panel.__init__(self, parent, id)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	718 self.canvas = MapCanvas(self, -1)
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 20 diff changeset	719 self.session = component.get('session')
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 20 diff changeset	720 self.chat = component.get('chat')
c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 20 diff changeset	721 self.top_frame = component.get('frame')
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	722 self.root_dir = os.getcwd()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	723 self.current_layer = 2
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	724 self.layer_tabs = orpgTabberWnd(self, style=FNB.FNB_NO_X_BUTTON\|FNB.FNB_BOTTOM\|FNB.FNB_NO_NAV_BUTTONS)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	725 self.layer_handlers = []
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	726 self.layer_handlers.append(background_handler(self.layer_tabs,-1,self.canvas))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	727 self.layer_tabs.AddPage(self.layer_handlers[0],"Background")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	728 self.layer_handlers.append(grid_handler(self.layer_tabs,-1,self.canvas))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	729 self.layer_tabs.AddPage(self.layer_handlers[1],"Grid")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	730 self.layer_handlers.append(miniatures_handler(self.layer_tabs,-1,self.canvas))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	731 self.layer_tabs.AddPage(self.layer_handlers[2],"Miniatures", True)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	732 self.layer_handlers.append(whiteboard_handler(self.layer_tabs,-1,self.canvas))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	733 self.layer_tabs.AddPage(self.layer_handlers[3],"Whiteboard")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	734 self.layer_handlers.append(fog_handler(self.layer_tabs,-1,self.canvas))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	735 self.layer_tabs.AddPage(self.layer_handlers[4],"Fog")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	736 self.layer_handlers.append(map_handler(self.layer_tabs,-1,self.canvas))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	737 self.layer_tabs.AddPage(self.layer_handlers[5],"General")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	738 self.layer_tabs.SetSelection(2)
14 0b8b7e3ed78d Adding fixes from OpenRPG 1.8.0 sirebral parents: 0 diff changeset	739 self.sizer = wx.BoxSizer(wx.VERTICAL)
0b8b7e3ed78d Adding fixes from OpenRPG 1.8.0 sirebral parents: 0 diff changeset	740 self.sizer.Add(self.canvas, 1, wx.EXPAND)
0b8b7e3ed78d Adding fixes from OpenRPG 1.8.0 sirebral parents: 0 diff changeset	741 self.sizer.Add(self.layer_tabs, 0, wx.EXPAND)
0b8b7e3ed78d Adding fixes from OpenRPG 1.8.0 sirebral parents: 0 diff changeset	742 self.SetSizer(self.sizer)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	743 self.Bind(FNB.EVT_FLATNOTEBOOK_PAGE_CHANGED, self.on_layer_change)
14 0b8b7e3ed78d Adding fixes from OpenRPG 1.8.0 sirebral parents: 0 diff changeset	744 #self.Bind(wx.EVT_SIZE, self.on_size)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	745 self.Bind(wx.EVT_LEAVE_WINDOW, self.OnLeave)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	746 self.load_default()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	747
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	748 def OnLeave(self, evt):
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	749 if "__WXGTK__" in wx.PlatformInfo: wx.SetCursor(wx.StockCursor(wx.CURSOR_ARROW))
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	750
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	751 def load_default(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	752 if self.session.is_connected() and (self.session.my_role() != self.session.ROLE_GM) and (self.session.use_roles()):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	753 self.chat.InfoPost("You must be a GM to use this feature")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	754 return
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 20 diff changeset	755 f = open(dir_struct["template"] + "default_map.xml")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	756 self.new_data(f.read())
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	757 f.close()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	758 self.canvas.send_map_data("new")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	759 if not self.session.is_connected() and (self.session.my_role() != self.session.ROLE_GM):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	760 self.session.update_role("GM")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	761
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	762 def new_data(self, data):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	763 self.canvas.takexml(data)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	764 self.update_tools()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	765
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	766 def on_save(self,evt):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	767 if (self.session.my_role() != self.session.ROLE_GM):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	768 self.chat.InfoPost("You must be a GM to use this feature")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	769 return
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 20 diff changeset	770 d = wx.FileDialog(self.GetParent(), "Save map data", dir_struct["user"], "", "*.xml", wx.SAVE)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	771 if d.ShowModal() == wx.ID_OK:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	772 f = open(d.GetPath(), "w")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	773 data = '<nodehandler class="min_map" icon="compass" module="core" name="miniature Map">'
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	774 data += self.canvas.toxml("new")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	775 data += "</nodehandler>"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	776 data = data.replace(">",">\n")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	777 f.write(data)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	778 f.close()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	779 d.Destroy()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	780 os.chdir(self.root_dir)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	781
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	782 def on_open(self, evt):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	783 if self.session.is_connected() and (self.session.my_role() != self.session.ROLE_GM) and (self.session.use_roles()):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	784 self.chat.InfoPost("You must be a GM to use this feature")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	785 return
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 20 diff changeset	786 d = wx.FileDialog(self.GetParent(), "Select a file", dir_struct["user"], "", "*.xml", wx.OPEN)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	787 if d.ShowModal() == wx.ID_OK:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	788 f = open(d.GetPath())
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	789 map_string = f.read()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	790 new_xml = self.canvas.re_ids_in_xml(map_string)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	791 if new_xml:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	792 self.canvas.takexml(new_xml)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	793 self.canvas.send_map_data("new")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	794 self.update_tools()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	795 if not self.session.is_connected() and (self.session.my_role() != self.session.ROLE_GM):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	796 self.session.update_role("GM")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	797 d.Destroy()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	798 os.chdir(self.root_dir)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	799
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	800 def get_current_layer_handler(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	801 return self.layer_handlers[self.current_layer]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	802
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	803 def get_tab_index(self, layer):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	804 """Return the index of a chatpanel in the wxNotebook."""
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	805 for i in xrange(self.layer_tabs.GetPageCount()):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	806 if (self.layer_tabs.GetPageText(i) == layer):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	807 return i
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	808 return 0
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	809
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	810 def on_layer_change(self, evt):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	811 layer = self.layer_tabs.GetPage(evt.GetSelection())
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	812 for i in xrange(0, len(self.layer_handlers)):
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	813 if layer == self.layer_handlers[i]: self.current_layer = i
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	814 if self.current_layer == 0:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	815 bg = self.layer_handlers[0]
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	816 if (self.session.my_role() != self.session.ROLE_GM): bg.url_path.Show(False)
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	817 else: bg.url_path.Show(True)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	818 self.canvas.Refresh(False)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	819 evt.Skip()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	820
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	821 def on_left_down(self, evt):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	822 self.layer_handlers[self.current_layer].on_left_down(evt)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	823
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	824 #double click handler added by Snowdog 5/03
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	825 def on_left_dclick(self, evt):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	826 self.layer_handlers[self.current_layer].on_left_dclick(evt)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	827
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	828 def on_right_down(self, evt):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	829 self.layer_handlers[self.current_layer].on_right_down(evt)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	830
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	831 def on_left_up(self, evt):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	832 self.layer_handlers[self.current_layer].on_left_up(evt)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	833
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	834 def on_motion(self, evt):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	835 self.layer_handlers[self.current_layer].on_motion(evt)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	836
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	837 def MapBar(self, id, data):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	838 self.canvas.MAP_MODE = data
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: 66 diff changeset	839 if id == 1: self.canvas.MAP_MODE = data
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	840
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	841 def set_map_focus(self, evt):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	842 self.canvas.SetFocus()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	843
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	844 def pre_exit_cleanup(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	845 # do some pre exit clean up for bitmaps or other objects
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	846 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	847 ImageHandler.flushCache()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	848 self.canvas.pre_destory_cleanup()
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: 66 diff changeset	849 except: pass
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	850
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	851 def update_tools(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	852 for h in self.layer_handlers:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	853 h.update_info()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	854
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	855 def on_hk_map_layer(self, evt):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	856 id = self.top_frame.mainmenu.GetHelpString(evt.GetId())
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	857 if id == "Background Layer": self.current_layer = self.get_tab_index("Background")
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	858 if id == "Grid Layer": self.current_layer = self.get_tab_index("Grid")
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	859 if id == "Miniature Layer": self.current_layer = self.get_tab_index("Miniatures")
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	860 elif id == "Whiteboard Layer": self.current_layer = self.get_tab_index("Whiteboard")
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	861 elif id == "Fog Layer": self.current_layer = self.get_tab_index("Fog")
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	862 elif id == "General Properties": self.current_layer = self.get_tab_index("General")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	863 self.layer_tabs.SetSelection(self.current_layer)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	864
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	865 def on_flush_cache(self, evt):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	866 ImageHandler.flushCache()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	867
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	868 def build_menu(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	869 # temp menu
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	870 menu = wx.Menu()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	871 item = wx.MenuItem(menu, wx.ID_ANY, "&Load Map", "Load Map")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	872 self.top_frame.Bind(wx.EVT_MENU, self.on_open, item)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	873 menu.AppendItem(item)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	874 item = wx.MenuItem(menu, wx.ID_ANY, "&Save Map", "Save Map")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	875 self.top_frame.Bind(wx.EVT_MENU, self.on_save, item)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	876 menu.AppendItem(item)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	877 menu.AppendSeparator()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	878 item = wx.MenuItem(menu, wx.ID_ANY, "Background Layer\tCtrl+1", "Background Layer")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	879 self.top_frame.Bind(wx.EVT_MENU, self.on_hk_map_layer, item)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	880 menu.AppendItem(item)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	881 item = wx.MenuItem(menu, wx.ID_ANY, "Grid Layer\tCtrl+2", "Grid Layer")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	882 self.top_frame.Bind(wx.EVT_MENU, self.on_hk_map_layer, item)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	883 menu.AppendItem(item)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	884 item = wx.MenuItem(menu, wx.ID_ANY, "Miniature Layer\tCtrl+3", "Miniature Layer")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	885 self.top_frame.Bind(wx.EVT_MENU, self.on_hk_map_layer, item)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	886 menu.AppendItem(item)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	887 item = wx.MenuItem(menu, wx.ID_ANY, "Whiteboard Layer\tCtrl+4", "Whiteboard Layer")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	888 self.top_frame.Bind(wx.EVT_MENU, self.on_hk_map_layer, item)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	889 menu.AppendItem(item)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	890 item = wx.MenuItem(menu, wx.ID_ANY, "Fog Layer\tCtrl+5", "Fog Layer")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	891 self.top_frame.Bind(wx.EVT_MENU, self.on_hk_map_layer, item)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	892 menu.AppendItem(item)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	893 item = wx.MenuItem(menu, wx.ID_ANY, "General Properties\tCtrl+6", "General Properties")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	894 self.top_frame.Bind(wx.EVT_MENU, self.on_hk_map_layer, item)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	895 menu.AppendItem(item)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	896 menu.AppendSeparator()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	897 item = wx.MenuItem(menu, wx.ID_ANY, "&Flush Image Cache\tCtrl+F", "Flush Image Cache")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	898 self.top_frame.Bind(wx.EVT_MENU, self.on_flush_cache, item)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	899 menu.AppendItem(item)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	900 menu.AppendSeparator()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	901 item = wx.MenuItem(menu, wx.ID_ANY, "&Properties", "Properties")
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	902 self.top_frame.Bind(wx.EVT_MENU, self.canvas.on_prop, item)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	903 menu.AppendItem(item)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	904 self.top_frame.mainmenu.Insert(2, menu, '&Map')
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	905
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	906 def get_hot_keys(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	907 self.build_menu()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	908 return []

Mercurial > traipse_dev

annotate orpg/mapper/map.py @ 76:37a11fea3304 ornery-dev