/[thuban]/branches/WIP-pyshapelib-bramz/Thuban/UI/legend.py
ViewVC logotype

Diff of /branches/WIP-pyshapelib-bramz/Thuban/UI/legend.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1119 by bh, Mon Jun 2 10:37:59 2003 UTC revision 1129 by bh, Wed Jun 4 18:36:52 2003 UTC
# Line 201  class LegendTree(wxTreeCtrl): Line 201  class LegendTree(wxTreeCtrl):
201          self.mainWindow = mainWindow          self.mainWindow = mainWindow
202          self.map = None          self.map = None
203          self.parent = parent          self.parent = parent
         self.layer2id = {}  
204          self.changing_selection = 0          self.changing_selection = 0
205    
206          #          #
# Line 228  class LegendTree(wxTreeCtrl): Line 227  class LegendTree(wxTreeCtrl):
227    
228          self.SetMap(map)          self.SetMap(map)
229    
230        def find_layer(self, layer):
231            """Return the tree item for the layer"""
232            root = self.GetRootItem()
233            id, cookie = self.GetFirstChild(root, 0)
234            while id.IsOk():
235                if self.GetPyData(id) is layer:
236                    return id
237                id, cookie = self.GetNextChild(root, cookie)
238            return None
239    
240      def _OnClose(self, event):      def _OnClose(self, event):
241          self.SetMap(None)          self.SetMap(None)
242    
# Line 378  class LegendTree(wxTreeCtrl): Line 387  class LegendTree(wxTreeCtrl):
387      def _OnMsgLayerChanged(self, layer):      def _OnMsgLayerChanged(self, layer):
388          assert isinstance(layer, BaseLayer)          assert isinstance(layer, BaseLayer)
389    
390          id = self.layer2id[layer]          id = self.find_layer(layer)
391          assert id.IsOk()          assert id is not None
392    
393          self.__FillTreeLayer(id)          self.__FillTreeLayer(id)
394          self.__UpdateSelection()          self.__UpdateSelection()
# Line 395  class LegendTree(wxTreeCtrl): Line 404  class LegendTree(wxTreeCtrl):
404      def _OnMsgMapLayersAdded(self, map):      def _OnMsgMapLayersAdded(self, map):
405          assert map is self.map          assert map is self.map
406    
407            # Build a dict with all layers known by the the tree as keys
408            layers = {}
409          root = self.GetRootItem()          root = self.GetRootItem()
410            id, cookie = self.GetFirstChild(root, 0)
411            while id.IsOk():
412                layers[self.GetPyData(id)] = 1
413                id, cookie = self.GetNextChild(root, cookie)
414    
415            # Add layers in the map but not in the dict
416          i = 0          i = 0
417          for l in map.Layers():          for l in map.Layers():
418              if not self.layer2id.has_key(l):              if not l in layers:
419                  self.__AddLayer(i, l)                  self.__AddLayer(i, l)
420    
421          self.__UpdateSelection()          self.__UpdateSelection()
# Line 409  class LegendTree(wxTreeCtrl): Line 425  class LegendTree(wxTreeCtrl):
425    
426          layers = map.Layers()          layers = map.Layers()
427    
428          for layer, id in self.layer2id.items():          root = self.GetRootItem()
429              if layer not in layers:          id, cookie = self.GetFirstChild(root, 0)
430                  if id.IsOk():          while id.IsOk():
431                      self.__RemoveLayer(id)              if self.GetPyData(id) not in layers:
432                    self.__RemoveLayer(id)
433                id, cookie = self.GetNextChild(root, cookie)
434    
435    
436          self.__UpdateSelection()          self.__UpdateSelection()
437    
# Line 424  class LegendTree(wxTreeCtrl): Line 443  class LegendTree(wxTreeCtrl):
443    
444      def _OnMsgLayerTitleChanged(self, layer):      def _OnMsgLayerTitleChanged(self, layer):
445    
446          id = self.layer2id[layer]          id = self.find_layer(layer)
447          if id.IsOk():          if id.IsOk():
448              self.SetItemText(id, layer.Title())              self.SetItemText(id, layer.Title())
449          self.__UpdateSelection()          self.__UpdateSelection()
# Line 516  class LegendTree(wxTreeCtrl): Line 535  class LegendTree(wxTreeCtrl):
535          self.SetPyData(id, l)          self.SetPyData(id, l)
536          self.__SetVisibilityStyle(l.Visible(), id)          self.__SetVisibilityStyle(l.Visible(), id)
537    
         self.layer2id[l] = id  
   
538          self.__FillTreeLayer(id)          self.__FillTreeLayer(id)
539          self.Expand(id)          self.Expand(id)
540    
# Line 537  class LegendTree(wxTreeCtrl): Line 554  class LegendTree(wxTreeCtrl):
554          layer.Unsubscribe(TITLE_CHANGED, self._OnMsgLayerTitleChanged)          layer.Unsubscribe(TITLE_CHANGED, self._OnMsgLayerTitleChanged)
555    
556          self.Delete(id)          self.Delete(id)
         del self.layer2id[layer]  
557    
558      def DeleteChildren(self, pid):      def DeleteChildren(self, pid):
559          id, cookie = self.GetFirstChild(pid, 123)          id, cookie = self.GetFirstChild(pid, 123)
# Line 589  class LegendTree(wxTreeCtrl): Line 605  class LegendTree(wxTreeCtrl):
605          self.SetItemFont(id, font)          self.SetItemFont(id, font)
606                    
607      def __ShowHideLayer(self, layer):      def __ShowHideLayer(self, layer):
608          parent = self.layer2id[layer]          parent = self.find_layer(layer)
609          assert parent.IsOk()          assert parent.IsOk()
610    
611          visible = layer.Visible()          visible = layer.Visible()
Legend:
Removed from v.1119  
changed lines
  Added in v.1129
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26