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

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

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

revision 910 by frank, Fri May 16 16:23:43 2003 UTC revision 940 by jonathan, Tue May 20 15:25:33 2003 UTC
# Line 34  from wxPython import wx Line 34  from wxPython import wx
34    
35  from wxproj import point_in_polygon_shape, shape_centroid  from wxproj import point_in_polygon_shape, shape_centroid
36    
   
37  from Thuban.Model.messages import MAP_PROJECTION_CHANGED, \  from Thuban.Model.messages import MAP_PROJECTION_CHANGED, \
38       MAP_LAYERS_CHANGED, LAYER_CHANGED, LAYER_VISIBILITY_CHANGED       MAP_LAYERS_CHANGED, LAYER_CHANGED, LAYER_VISIBILITY_CHANGED
39  from Thuban.Model.layer import SHAPETYPE_POLYGON, SHAPETYPE_ARC, \  from Thuban.Model.layer import SHAPETYPE_POLYGON, SHAPETYPE_ARC, \
# Line 378  class MapCanvas(wxWindow, Publisher): Line 377  class MapCanvas(wxWindow, Publisher):
377          dc = wxPaintDC(self)          dc = wxPaintDC(self)
378          clear = self.map is None or not self.map.HasLayers()          clear = self.map is None or not self.map.HasLayers()
379    
380          #wxBeginBusyCursor()          wxBeginBusyCursor()
381    
382          if not clear:          if not clear:
383              try:              try:
# Line 399  class MapCanvas(wxWindow, Publisher): Line 398  class MapCanvas(wxWindow, Publisher):
398              dc.Clear()              dc.Clear()
399              dc.EndDrawing()              dc.EndDrawing()
400    
401          #wxEndBusyCursor()          wxEndBusyCursor()
402    
403      def do_redraw(self):      def do_redraw(self):
404          # This should only be called if we have a non-empty map.          # This should only be called if we have a non-empty map.
# Line 459  class MapCanvas(wxWindow, Publisher): Line 458  class MapCanvas(wxWindow, Publisher):
458              dc = wxMetaFileDC(dlg.GetPath())              dc = wxMetaFileDC(dlg.GetPath())
459            
460              scale, offset, mapregion = OutputTransform(self.scale,              scale, offset, mapregion = OutputTransform(self.scale,
461                                                         self.canvas.offset,                                                         self.offset,
462                                                         self.GetSizeTuple(),                                                         self.GetSizeTuple(),
463                                                         dc.GetSizeTuple())                                                         dc.GetSizeTuple())
464    
# Line 529  class MapCanvas(wxWindow, Publisher): Line 528  class MapCanvas(wxWindow, Publisher):
528    
529      def set_view_transform(self, scale, offset):      def set_view_transform(self, scale, offset):
530          self.scale = scale          self.scale = scale
531            if self.scale < 0.0001:
532                self.scale = 0.0001
533    
534          self.offset = offset          self.offset = offset
535          self.full_redraw()          self.full_redraw()
536          self.issue(SCALE_CHANGED, scale)          self.issue(SCALE_CHANGED, scale)
# Line 563  class MapCanvas(wxWindow, Publisher): Line 565  class MapCanvas(wxWindow, Publisher):
565          scale = min(scalex, scaley)          scale = min(scalex, scaley)
566          offx = 0.5 * (width - (urx + llx) * scale)          offx = 0.5 * (width - (urx + llx) * scale)
567          offy = 0.5 * (height + (ury + lly) * scale)          offy = 0.5 * (height + (ury + lly) * scale)
568            print "scalex:", scalex, "scaley:", scaley
569          self.set_view_transform(scale, (offx, offy))          self.set_view_transform(scale, (offx, offy))
570    
571      def FitMapToWindow(self):      def FitMapToWindow(self):
Legend:
Removed from v.910  
changed lines
  Added in v.940
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26