diff orpg/mapper/map.py @ 135:dcf4fbe09b70 beta

Traipse Beta 'OpenRPG' {091010-00} Traipse is a distribution of OpenRPG that is designed to be easy to setup and go. Traipse also makes it easy for developers to work on code without fear of sacrifice. 'Ornery-Orc' continues the trend of 'Grumpy' and adds fixes to the code. 'Ornery-Orc's main goal is to offer more advanced features and enhance the productivity of the user. Update Summary (Beta) Added Bookmarks Fix to Remote Admin Commands Minor fix to text based Server Fix to Pretty Print, from Core Fix to Splitter Nodes not being created Fix to massive amounts of images loading, from Core Added 'boot' command to remote admin Added confirmation window for sent nodes Minor changes to allow for portability to an OpenSUSE linux OS Miniatures Layer pop up box allows users to turn off Mini labels, from FlexiRPG Zoom Mouse plugin added Images added to Plugin UI Switching to Element Tree Map efficiency, from FlexiRPG Added Status Bar to Update Manager default_manifest.xml renamed to default_upmana.xml Cleaner clode for saved repositories New TrueDebug Class in orpg_log (See documentation for usage) Mercurial's hgweb folder is ported to upmana **Pretty important update that can help remove thousands of dead children from your gametree. **Children, <forms />, <group_atts />, <horizontal />, <cols />, <rows />, <height />, etc... are all tags now. Check your gametree and look for dead children!! **New Gamtree Recusion method, mapping, and context sensitivity. !!Alpha - Watch out for infinite loops!!
author sirebral
date Tue, 10 Nov 2009 14:11:28 -0600
parents 37a11fea3304
children e842a5f1b775
line wrap: on
line diff
--- a/orpg/mapper/map.py	Fri Sep 25 20:47:16 2009 -0500
+++ b/orpg/mapper/map.py	Tue Nov 10 14:11:28 2009 -0600
@@ -62,6 +62,7 @@
         self.session = component.get("session")
         wx.ScrolledWindow.__init__(self, parent, ID, 
             style=wx.HSCROLL | wx.VSCROLL | wx.FULL_REPAINT_ON_RESIZE | wx.SUNKEN_BORDER )
+        self.SetBackgroundStyle(wx.BG_STYLE_CUSTOM)
         self.frame = parent
         self.MAP_MODE = 1      #Mode 1 = MINI, 2 = DRAW, 3 = TAPE MEASURE
         self.layers = {}
@@ -108,6 +109,15 @@
         # miniatures drag
         self.drag = None
 
+        #self.Bind(wx.EVT_MOUSEWHEEL, self.MouseWheel)
+
+    def MouseWheel(self, evt):
+        if evt.CmdDown():
+            print evt.GetWheelRotation()
+            if evt.GetWheelRotation() > 0: self.on_zoom_in(None)
+            elif evt.GetWheelRotation() < 0: self.on_zoom_out(None)
+            else: pass
+
     def better_refresh(self, event=None):
         self.Refresh(True)
 
@@ -116,43 +126,21 @@
 
     def processImages(self, evt=None):
         self.session = component.get("session")
+        tabs = ['Background', 'Grid', 'Miniatures', 'Whiteboard', 'Fog', 'General']
         if self.session.my_role() == self.session.ROLE_LURKER or (str(self.session.group_id) == '0' and str(self.session.status) == '1'):
-            cidx = self.parent.get_tab_index("Background")
-            self.parent.layer_tabs.EnableTab(cidx, False)
-            cidx = self.parent.get_tab_index("Grid")
-            self.parent.layer_tabs.EnableTab(cidx, False)
-            cidx = self.parent.get_tab_index("Miniatures")
-            self.parent.layer_tabs.EnableTab(cidx, False)
-            cidx = self.parent.get_tab_index("Whiteboard")
-            self.parent.layer_tabs.EnableTab(cidx, False)
-            cidx = self.parent.get_tab_index("Fog")
-            self.parent.layer_tabs.EnableTab(cidx, False)
-            cidx = self.parent.get_tab_index("General")
-            self.parent.layer_tabs.EnableTab(cidx, False)
-        else:
-            cidx = self.parent.get_tab_index("Background")
-            if not self.parent.layer_tabs.GetEnabled(cidx):
-                cidx = self.parent.get_tab_index("Miniatures")
-                self.parent.layer_tabs.EnableTab(cidx, True)
-                cidx = self.parent.get_tab_index("Whiteboard")
-                self.parent.layer_tabs.EnableTab(cidx, True)
-                cidx = self.parent.get_tab_index("Background")
-                self.parent.layer_tabs.EnableTab(cidx, False)
-                cidx = self.parent.get_tab_index("Grid")
-                self.parent.layer_tabs.EnableTab(cidx, False)
-                cidx = self.parent.get_tab_index("Fog")
-                self.parent.layer_tabs.EnableTab(cidx, False)
-                cidx = self.parent.get_tab_index("General")
-                self.parent.layer_tabs.EnableTab(cidx, False)
-                if self.session.my_role() == self.session.ROLE_GM:
-                    cidx = self.parent.get_tab_index("Background")
-                    self.parent.layer_tabs.EnableTab(cidx, True)
-                    cidx = self.parent.get_tab_index("Grid")
-                    self.parent.layer_tabs.EnableTab(cidx, True)
-                    cidx = self.parent.get_tab_index("Fog")
-                    self.parent.layer_tabs.EnableTab(cidx, True)
-                    cidx = self.parent.get_tab_index("General")
-                    self.parent.layer_tabs.EnableTab(cidx, True)
+            for tab in tabs:
+                cidx = self.parent.get_tab_index(tab)
+                self.parent.tabs.EnableTab(cidx, False)
+        elif self.session.my_role() == self.session.ROLE_PLAYER:
+            for tab in tabs:
+                cidx = self.parent.get_tab_index(tab)
+                if tab == "Miniatures" or tab == "Whiteboard": 
+                    self.parent.tabs.EnableTab(cidx, True)
+                else: self.parent.tabs.EnableTab(cidx, False)
+        elif self.session.my_role() == self.session.ROLE_GM and str(self.session.group_id) != '0':
+            for tab in tabs:
+                cidx = self.parent.get_tab_index(tab)
+                self.parent.tabs.EnableTab(cidx, True)
         if not self.cacheSizeSet:
             self.cacheSizeSet = True
             cacheSize = component.get('settings').get_setting("ImageCacheSize")
@@ -160,19 +148,16 @@
             else: pass
         if not ImageHandler.Queue.empty():
             (path, image_type, imageId) = ImageHandler.Queue.get()
-            img = wx.ImageFromMime(path[1], path[2]).ConvertToBitmap()
-            try:
-                # Now, apply the image to the proper object
-                if image_type == "miniature":
-                    min = self.layers['miniatures'].get_miniature_by_id(imageId)
-                    min.set_bmp(img)
-                elif image_type == "background" or image_type == "texture":
-                    self.layers['bg'].bg_bmp = img
-                    if image_type == "background": self.set_size([img.GetWidth(), img.GetHeight()])
-            except: pass
+            img = wx.ImageFromMime(path[1], path[2])
+            # Now, apply the image to the proper object
+            if image_type == "miniature":
+                min = self.layers['miniatures'].get_miniature_by_id(imageId)
+                if min: min.set_bmp(img)
+            elif image_type == "background" or image_type == "texture":
+                self.layers['bg'].bg_bmp = img.ConvertToBitmap()
+                if image_type == "background": self.set_size([img.GetWidth(), img.GetHeight()])
             # Flag that we now need to refresh!
             self.requireRefresh += 1
-
             """ Randomly purge an item from the cache, while this is lamo, it does
                 keep the cache from growing without bounds, which is pretty important!"""
             if len(ImageHandler.Cache) >= self.cacheSize:
@@ -253,9 +238,10 @@
         topleft1 = self.GetViewStart()
         topleft = [topleft1[0]*scrollsize[0], topleft1[1]*scrollsize[1]]
         if (clientsize[0] > 1) and (clientsize[1] > 1):
-            dc = wx.MemoryDC()
-            bmp = wx.EmptyBitmap(clientsize[0]+1, clientsize[1]+1)
-            dc.SelectObject(bmp)
+            #dc = wx.MemoryDC()
+            #bmp = wx.EmptyBitmap(clientsize[0]+1, clientsize[1]+1)
+            #dc.SelectObject(bmp)
+            dc = wx.AutoBufferedPaintDC(self)
             dc.SetPen(wx.TRANSPARENT_PEN)
             dc.SetBrush(wx.Brush(self.GetBackgroundColour(), wx.SOLID))
             dc.DrawRectangle(0,0,clientsize[0]+1,clientsize[1]+1)
@@ -270,12 +256,12 @@
             self.layers['fog'].layerDraw(dc, topleft, clientsize)
             dc.SetPen(wx.NullPen)
             dc.SetBrush(wx.NullBrush)
-            dc.SelectObject(wx.NullBitmap)
-            del dc
-            wdc = self.preppaint()
-            wdc.DrawBitmap(bmp, topleft[0], topleft[1])
+            #dc.SelectObject(wx.NullBitmap)
+            #del dc
+            #wdc = self.preppaint()
+            #wdc.DrawBitmap(bmp, topleft[0], topleft[1])
             if settings.get_setting("AlwaysShowMapScale") == "1":
-                self.showmapscale(wdc)
+                self.showmapscale(dc)
         try: evt.Skip()
         except: pass
 
@@ -721,30 +707,35 @@
         self.top_frame = component.get('frame')
         self.root_dir = os.getcwd()
         self.current_layer = 2
-        self.layer_tabs = orpgTabberWnd(self, style=FNB.FNB_NO_X_BUTTON|FNB.FNB_BOTTOM|FNB.FNB_NO_NAV_BUTTONS)
-        self.layer_handlers = []
-        self.layer_handlers.append(background_handler(self.layer_tabs,-1,self.canvas))
-        self.layer_tabs.AddPage(self.layer_handlers[0],"Background")
-        self.layer_handlers.append(grid_handler(self.layer_tabs,-1,self.canvas))
-        self.layer_tabs.AddPage(self.layer_handlers[1],"Grid")
-        self.layer_handlers.append(miniatures_handler(self.layer_tabs,-1,self.canvas))
-        self.layer_tabs.AddPage(self.layer_handlers[2],"Miniatures", True)
-        self.layer_handlers.append(whiteboard_handler(self.layer_tabs,-1,self.canvas))
-        self.layer_tabs.AddPage(self.layer_handlers[3],"Whiteboard")
-        self.layer_handlers.append(fog_handler(self.layer_tabs,-1,self.canvas))
-        self.layer_tabs.AddPage(self.layer_handlers[4],"Fog")
-        self.layer_handlers.append(map_handler(self.layer_tabs,-1,self.canvas))
-        self.layer_tabs.AddPage(self.layer_handlers[5],"General")
-        self.layer_tabs.SetSelection(2)
+        self.tabs = orpgTabberWnd(self, style=FNB.FNB_NO_X_BUTTON|FNB.FNB_BOTTOM|FNB.FNB_NO_NAV_BUTTONS)
+        self.handlers = {}
+        self.handlers[0]=(background_handler(self.tabs,-1,self.canvas))
+        self.tabs.AddPage(self.handlers[0],"Background")
+        self.handlers[1]=(grid_handler(self.tabs,-1,self.canvas))
+        self.tabs.AddPage(self.handlers[1],"Grid")
+        self.handlers[2]=(miniatures_handler(self.tabs,-1,self.canvas))
+        self.tabs.AddPage(self.handlers[2],"Miniatures", True)
+        self.handlers[3]=(whiteboard_handler(self.tabs,-1,self.canvas))
+        self.tabs.AddPage(self.handlers[3],"Whiteboard")
+        self.handlers[4]=(fog_handler(self.tabs,-1,self.canvas))
+        self.tabs.AddPage(self.handlers[4],"Fog")
+        self.handlers[5]=(map_handler(self.tabs,-1,self.canvas))
+        self.tabs.AddPage(self.handlers[5],"General")
+        self.tabs.SetSelection(2)
         self.sizer = wx.BoxSizer(wx.VERTICAL)
         self.sizer.Add(self.canvas, 1, wx.EXPAND)
-        self.sizer.Add(self.layer_tabs, 0, wx.EXPAND)
+        self.sizer.Add(self.tabs, 0, wx.EXPAND)
         self.SetSizer(self.sizer)
         self.Bind(FNB.EVT_FLATNOTEBOOK_PAGE_CHANGED, self.on_layer_change)
         #self.Bind(wx.EVT_SIZE, self.on_size)
         self.Bind(wx.EVT_LEAVE_WINDOW, self.OnLeave)
         self.load_default()
 
+        ## Components for making Map Based plugins that create new tabs.
+        component.add('map_tabs', self.tabs)
+        component.add('map_layers', self.handlers)
+        component.add('map_wnd', self)
+
     def OnLeave(self, evt):
         if "__WXGTK__" in wx.PlatformInfo: wx.SetCursor(wx.StockCursor(wx.CURSOR_ARROW))
 
@@ -798,41 +789,41 @@
         os.chdir(self.root_dir)
 
     def get_current_layer_handler(self):
-        return self.layer_handlers[self.current_layer]
+        return self.handlers[self.current_layer]
 
     def get_tab_index(self, layer):
         """Return the index of a chatpanel in the wxNotebook."""
-        for i in xrange(self.layer_tabs.GetPageCount()):
-            if (self.layer_tabs.GetPageText(i) == layer):
+        for i in xrange(self.tabs.GetPageCount()):
+            if (self.tabs.GetPageText(i) == layer):
                 return i
         return 0
 
     def on_layer_change(self, evt):
-        layer = self.layer_tabs.GetPage(evt.GetSelection())
-        for i in xrange(0, len(self.layer_handlers)):
-            if layer == self.layer_handlers[i]: self.current_layer = i
+        layer = self.tabs.GetPage(evt.GetSelection())
+        for i in xrange(0, len(self.handlers)):
+            if layer == self.handlers[i]: self.current_layer = i
         if self.current_layer == 0:
-            bg = self.layer_handlers[0]
+            bg = self.handlers[0]
             if (self.session.my_role() != self.session.ROLE_GM): bg.url_path.Show(False)
             else: bg.url_path.Show(True)
         self.canvas.Refresh(False)
         evt.Skip()
 
     def on_left_down(self, evt):
-        self.layer_handlers[self.current_layer].on_left_down(evt)
+        self.handlers[self.current_layer].on_left_down(evt)
 
     #double click handler added by Snowdog 5/03
     def on_left_dclick(self, evt):
-        self.layer_handlers[self.current_layer].on_left_dclick(evt)
+        self.handlers[self.current_layer].on_left_dclick(evt)
 
     def on_right_down(self, evt):
-        self.layer_handlers[self.current_layer].on_right_down(evt)
+        self.handlers[self.current_layer].on_right_down(evt)
 
     def on_left_up(self, evt):
-        self.layer_handlers[self.current_layer].on_left_up(evt)
+        self.handlers[self.current_layer].on_left_up(evt)
 
     def on_motion(self, evt):
-        self.layer_handlers[self.current_layer].on_motion(evt)
+        self.handlers[self.current_layer].on_motion(evt)
 
     def MapBar(self, id, data):
         self.canvas.MAP_MODE = data
@@ -849,8 +840,8 @@
         except: pass
 
     def update_tools(self):
-        for h in self.layer_handlers:
-            h.update_info()
+        for h in self.handlers:
+            self.handlers[h].update_info()
 
     def on_hk_map_layer(self, evt):
         id = self.top_frame.mainmenu.GetHelpString(evt.GetId())
@@ -860,7 +851,7 @@
         elif id == "Whiteboard Layer": self.current_layer = self.get_tab_index("Whiteboard")
         elif id == "Fog Layer": self.current_layer = self.get_tab_index("Fog")
         elif id == "General Properties": self.current_layer = self.get_tab_index("General")
-        self.layer_tabs.SetSelection(self.current_layer)
+        self.tabs.SetSelection(self.current_layer)
 
     def on_flush_cache(self, evt):
         ImageHandler.flushCache()