/[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 404 by bh, Fri Feb 14 17:40:26 2003 UTC revision 940 by jonathan, Tue May 20 15:25:33 2003 UTC
# Line 1  Line 1 
1  # Copyright (c) 2001, 2002, 2003 by Intevation GmbH  # Copyright (c) 2001, 2002, 2003 by Intevation GmbH
2  # Authors:  # Authors:
3  # Bernhard Herzog <[email protected]>  # Bernhard Herzog <[email protected]>
4    # Frank Koormann <[email protected]>
5  #  #
6  # This program is free software under the GPL (>=v2)  # This program is free software under the GPL (>=v2)
7  # Read the file COPYING coming with Thuban for details.  # Read the file COPYING coming with Thuban for details.
# Line 11  Classes for display of a map and interac Line 12  Classes for display of a map and interac
12    
13  __version__ = "$Revision$"  __version__ = "$Revision$"
14    
15    from Thuban import _
16    
17    import sys
18    import os.path
19    
20  from math import hypot  from math import hypot
21    
22  from wxPython.wx import wxWindow,\  from wxPython.wx import wxWindow,\
23       wxPaintDC, wxColour, wxClientDC, wxINVERT, wxTRANSPARENT_BRUSH, wxFont,\       wxPaintDC, wxColour, wxClientDC, wxINVERT, wxTRANSPARENT_BRUSH, wxFont,\
24       EVT_PAINT, EVT_LEFT_DOWN, EVT_LEFT_UP, EVT_MOTION, EVT_LEAVE_WINDOW       EVT_PAINT, EVT_LEFT_DOWN, EVT_LEFT_UP, EVT_MOTION, EVT_LEAVE_WINDOW, \
25         wxBITMAP_TYPE_XPM, wxBeginBusyCursor, wxEndBusyCursor, wxCursor, \
26         wxImageFromBitmap, wxPlatform
27    
28    # Export related stuff
29    if wxPlatform == '__WXMSW__':
30        from wxPython.wx import wxMetaFileDC
31    from wxPython.wx import wxFileDialog, wxSAVE, wxOVERWRITE_PROMPT, wxID_OK
32    
33  from wxPython import wx  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       LAYERS_CHANGED, LAYER_LEGEND_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, \
40       SHAPETYPE_POINT       SHAPETYPE_POINT
41  from Thuban.Model.label import ALIGN_CENTER, ALIGN_TOP, ALIGN_BOTTOM, \  from Thuban.Model.label import ALIGN_CENTER, ALIGN_TOP, ALIGN_BOTTOM, \
42       ALIGN_LEFT, ALIGN_RIGHT       ALIGN_LEFT, ALIGN_RIGHT
43  from Thuban.Lib.connector import Publisher  from Thuban.Lib.connector import Publisher
44    from Thuban.Model.color import Color
45    
46  from renderer import ScreenRenderer, PrinterRender  import resource
47    
48    from selection import Selection
49    from renderer import ScreenRenderer, ExportRenderer, PrinterRenderer
50    
51  import labeldialog  import labeldialog
52    
53  from messages import SELECTED_SHAPE, VIEW_POSITION  from messages import LAYER_SELECTED, SHAPES_SELECTED, VIEW_POSITION, \
54                         SCALE_CHANGED
55    
56    
57  #  #
# Line 215  class LabelTool(Tool): Line 231  class LabelTool(Tool):
231          self.view.LabelShapeAt(event.m_x, event.m_y)          self.view.LabelShapeAt(event.m_x, event.m_y)
232    
233    
   
   
234  class MapPrintout(wx.wxPrintout):  class MapPrintout(wx.wxPrintout):
235    
236      """      """
237      wxPrintout class for printing Thuban maps      wxPrintout class for printing Thuban maps
238      """      """
239    
240      def __init__(self, map):      def __init__(self, canvas, map, region, selected_layer, selected_shapes):
241          wx.wxPrintout.__init__(self)          wx.wxPrintout.__init__(self)
242            self.canvas = canvas
243          self.map = map          self.map = map
244            self.region = region
245            self.selected_layer = selected_layer
246            self.selected_shapes = selected_shapes
247    
248      def GetPageInfo(self):      def GetPageInfo(self):
249          return (1, 1, 1, 1)          return (1, 1, 1, 1)
# Line 239  class MapPrintout(wx.wxPrintout): Line 257  class MapPrintout(wx.wxPrintout):
257    
258      def draw_on_dc(self, dc):      def draw_on_dc(self, dc):
259          width, height = self.GetPageSizePixels()          width, height = self.GetPageSizePixels()
260          llx, lly, urx, ury = self.map.ProjectedBoundingBox()          scale, offset, mapregion = OutputTransform(self.canvas.scale,
261          scalex = width / (urx - llx)                                                     self.canvas.offset,
262          scaley = height / (ury - lly)                                                     self.canvas.GetSizeTuple(),
263          scale = min(scalex, scaley)                                                     self.GetPageSizePixels())
         offx = 0.5 * (width - (urx + llx) * scale)  
         offy = 0.5 * (height + (ury + lly) * scale)  
   
264          resx, resy = self.GetPPIPrinter()          resx, resy = self.GetPPIPrinter()
265          renderer = PrinterRender(dc, scale, (offx, offy), resolution = resx)          renderer = PrinterRenderer(dc, scale, offset, resolution = resy)
266          renderer.RenderMap(self.map)          x, y, width, height = self.region
267            canvas_scale = self.canvas.scale
268            renderer.RenderMap(self.map,
269                               (0,0,
270                                    (width/canvas_scale)*scale,
271                                    (height/canvas_scale)*scale),
272                                    mapregion,
273                               self.selected_layer, self.selected_shapes)
274          return wx.true          return wx.true
275    
276    
# Line 256  class MapCanvas(wxWindow, Publisher): Line 278  class MapCanvas(wxWindow, Publisher):
278    
279      """A widget that displays a map and offers some interaction"""      """A widget that displays a map and offers some interaction"""
280    
281      def __init__(self, parent, winid, interactor):      # Some messages that can be subscribed/unsubscribed directly through
282        # the MapCanvas come in fact from other objects. This is a dict
283        # mapping those messages to the names of the instance variables they
284        # actually come from. The delegation is implemented in the Subscribe
285        # and Unsubscribe methods
286        delegated_messages = {LAYER_SELECTED: "selection",
287                              SHAPES_SELECTED: "selection"}
288    
289        # Methods delegated to some instance variables. The delegation is
290        # implemented in the __getattr__ method.
291        delegated_methods = {"SelectLayer": "selection",
292                             "SelectShapes": "selection",
293                             "SelectedLayer": "selection",
294                             "HasSelectedLayer": "selection",
295                             "HasSelectedShapes": "selection",
296                             "SelectedShapes": "selection"}
297    
298        def __init__(self, parent, winid):
299          wxWindow.__init__(self, parent, winid)          wxWindow.__init__(self, parent, winid)
300          self.SetBackgroundColour(wxColour(255, 255, 255))          self.SetBackgroundColour(wxColour(255, 255, 255))
301    
# Line 282  class MapCanvas(wxWindow, Publisher): Line 321  class MapCanvas(wxWindow, Publisher):
321          # the bitmap serving as backing store          # the bitmap serving as backing store
322          self.bitmap = None          self.bitmap = None
323    
324          # the interactor          # the selection
325          self.interactor = interactor          self.selection = Selection()
326          self.interactor.Subscribe(SELECTED_SHAPE, self.shape_selected)          self.selection.Subscribe(SHAPES_SELECTED , self.shape_selected)
327    
328          # keep track of which layers/shapes are selected to make sure we          # keep track of which layers/shapes are selected to make sure we
329          # only redraw when necessary          # only redraw when necessary
# Line 303  class MapCanvas(wxWindow, Publisher): Line 342  class MapCanvas(wxWindow, Publisher):
342          wxWindow.__del__(self)          wxWindow.__del__(self)
343          Publisher.__del__(self)          Publisher.__del__(self)
344    
345        def Subscribe(self, channel, *args):
346            """Extend the inherited method to handle delegated messages.
347    
348            If channel is one of the delegated messages call the appropriate
349            object's Subscribe method. Otherwise just call the inherited
350            method.
351            """
352            if channel in self.delegated_messages:
353                object = getattr(self, self.delegated_messages[channel])
354                object.Subscribe(channel, *args)
355            else:
356                Publisher.Subscribe(self, channel, *args)
357    
358        def Unsubscribe(self, channel, *args):
359            """Extend the inherited method to handle delegated messages.
360    
361            If channel is one of the delegated messages call the appropriate
362            object's Unsubscribe method. Otherwise just call the inherited
363            method.
364            """
365            if channel in self.delegated_messages:
366                object = getattr(self, self.delegated_messages[channel])
367                object.Unsubscribe(channel, *args)
368            else:
369                Publisher.Unsubscribe(self, channel, *args)
370    
371        def __getattr__(self, attr):
372            if attr in self.delegated_methods:
373                return getattr(getattr(self, self.delegated_methods[attr]), attr)
374            raise AttributeError(attr)
375    
376      def OnPaint(self, event):      def OnPaint(self, event):
377          dc = wxPaintDC(self)          dc = wxPaintDC(self)
378          if self.map is not None and self.map.HasLayers():          clear = self.map is None or not self.map.HasLayers()
379              self.do_redraw()  
380          else:          wxBeginBusyCursor()
381    
382            if not clear:
383                try:
384                    self.do_redraw()
385                except:
386                    print "Error during drawing:", sys.exc_info()[0]
387                    clear = True
388    
389            if clear:
390              # If we've got no map or if the map is empty, simply clear              # If we've got no map or if the map is empty, simply clear
391              # the screen.              # the screen.
392    
# Line 319  class MapCanvas(wxWindow, Publisher): Line 398  class MapCanvas(wxWindow, Publisher):
398              dc.Clear()              dc.Clear()
399              dc.EndDrawing()              dc.EndDrawing()
400    
401            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.
405    
# Line 335  class MapCanvas(wxWindow, Publisher): Line 416  class MapCanvas(wxWindow, Publisher):
416              dc.BeginDrawing()              dc.BeginDrawing()
417    
418              # clear the background              # clear the background
419              dc.SetBrush(wx.wxWHITE_BRUSH)              #dc.SetBrush(wx.wxWHITE_BRUSH)
420              dc.SetPen(wx.wxTRANSPARENT_PEN)              #dc.SetPen(wx.wxTRANSPARENT_PEN)
421              dc.DrawRectangle(0, 0, width, height)              #dc.DrawRectangle(0, 0, width, height)
422                dc.SetBackground(wx.wxWHITE_BRUSH)
423              if 1: #self.interactor.selected_map is self.map:              dc.Clear()
424                  selected_layer = self.interactor.selected_layer  
425                  selected_shape = self.interactor.selected_shape              selected_layer = self.selection.SelectedLayer()
426              else:              selected_shapes = self.selection.SelectedShapes()
                 selected_layer = None  
                 selected_shape = None  
427    
428              # draw the map into the bitmap              # draw the map into the bitmap
429              renderer = ScreenRenderer(dc, self.scale, self.offset)              renderer = ScreenRenderer(dc, self.scale, self.offset)
# Line 352  class MapCanvas(wxWindow, Publisher): Line 431  class MapCanvas(wxWindow, Publisher):
431              # Pass the entire bitmap as update region to the renderer.              # Pass the entire bitmap as update region to the renderer.
432              # We're redrawing the whole bitmap, after all.              # We're redrawing the whole bitmap, after all.
433              renderer.RenderMap(self.map, (0, 0, width, height),              renderer.RenderMap(self.map, (0, 0, width, height),
434                                 selected_layer, selected_shape)                                 selected_layer, selected_shapes)
435    
436              dc.EndDrawing()              dc.EndDrawing()
437              dc.SelectObject(wx.wxNullBitmap)              dc.SelectObject(wx.wxNullBitmap)
# Line 366  class MapCanvas(wxWindow, Publisher): Line 445  class MapCanvas(wxWindow, Publisher):
445          clientdc.Blit(0, 0, width, height, dc, 0, 0)          clientdc.Blit(0, 0, width, height, dc, 0, 0)
446          clientdc.EndDrawing()          clientdc.EndDrawing()
447    
448        def Export(self):
449            if hasattr(self, "export_path"):
450                export_path = self.export_path
451            else:
452                export_path="."
453            dlg = wxFileDialog(self, _("Export Map"), export_path, "",
454                               "Enhanced Metafile (*.wmf)|*.wmf",
455                               wxSAVE|wxOVERWRITE_PROMPT)
456            if dlg.ShowModal() == wxID_OK:
457                self.export_path = os.path.dirname(dlg.GetPath())
458                dc = wxMetaFileDC(dlg.GetPath())
459        
460                scale, offset, mapregion = OutputTransform(self.scale,
461                                                           self.offset,
462                                                           self.GetSizeTuple(),
463                                                           dc.GetSizeTuple())
464    
465                selected_layer = self.selection.SelectedLayer()
466                selected_shapes = self.selection.SelectedShapes()
467    
468                renderer = ExportRenderer(dc, scale, offset)
469    
470                # Pass the entire bitmap as update region to the renderer.
471                # We're redrawing the whole bitmap, after all.
472                width, height = self.GetSizeTuple()
473                renderer.RenderMap(self.map,
474                                    (0,0,
475                                        (width/self.scale)*scale,
476                                        (height/self.scale)*scale),
477                                    mapregion,
478                                    selected_layer, selected_shapes)
479                dc.EndDrawing()
480                dc.Close()
481            dlg.Destroy()
482            
483      def Print(self):      def Print(self):
484          printer = wx.wxPrinter()          printer = wx.wxPrinter()
485          printout = MapPrintout(self.map)          width, height = self.GetSizeTuple()
486            selected_layer = self.selection.SelectedLayer()
487            selected_shapes = self.selection.SelectedShapes()
488            
489            printout = MapPrintout(self, self.map, (0, 0, width, height),
490                                   selected_layer, selected_shapes)
491          printer.Print(self, printout, wx.true)          printer.Print(self, printout, wx.true)
492          printout.Destroy()          printout.Destroy()
493    
494      def SetMap(self, map):      def SetMap(self, map):
495          redraw_channels = (LAYERS_CHANGED, LAYER_LEGEND_CHANGED,          redraw_channels = (MAP_LAYERS_CHANGED, LAYER_CHANGED,
496                             LAYER_VISIBILITY_CHANGED)                             LAYER_VISIBILITY_CHANGED)
497          if self.map is not None:          if self.map is not None:
498              for channel in redraw_channels:              for channel in redraw_channels:
# Line 381  class MapCanvas(wxWindow, Publisher): Line 500  class MapCanvas(wxWindow, Publisher):
500              self.map.Unsubscribe(MAP_PROJECTION_CHANGED,              self.map.Unsubscribe(MAP_PROJECTION_CHANGED,
501                                   self.projection_changed)                                   self.projection_changed)
502          self.map = map          self.map = map
503            self.selection.ClearSelection()
504          if self.map is not None:          if self.map is not None:
505              for channel in redraw_channels:              for channel in redraw_channels:
506                  self.map.Subscribe(channel, self.full_redraw)                  self.map.Subscribe(channel, self.full_redraw)
# Line 408  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)
537    
538      def proj_to_win(self, x, y):      def proj_to_win(self, x, y):
539          """\          """\
# Line 427  class MapCanvas(wxWindow, Publisher): Line 551  class MapCanvas(wxWindow, Publisher):
551    
552      def FitRectToWindow(self, rect):      def FitRectToWindow(self, rect):
553          """Fit the rectangular region given by rect into the window.          """Fit the rectangular region given by rect into the window.
554            
555          Set scale so that rect (in projected coordinates) just fits into          Set scale so that rect (in projected coordinates) just fits into
556          the window and center it.          the window and center it.
557          """          """
558          width, height = self.GetSizeTuple()          width, height = self.GetSizeTuple()
559          llx, lly, urx, ury = rect          llx, lly, urx, ury = rect
560          if llx == urx or lly == ury:          if llx == urx or lly == ury:
561              # zero with or zero height. Do Nothing              # zero width or zero height. Do Nothing
562              return              return
563          scalex = width / (urx - llx)          scalex = width / (urx - llx)
564          scaley = height / (ury - lly)          scaley = height / (ury - lly)
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):
572          """Fit the map to the window          """Fit the map to the window
573            
574          Set the scale so that the map fits exactly into the window and          Set the scale so that the map fits exactly into the window and
575          center it in the window.          center it in the window.
576          """          """
# Line 453  class MapCanvas(wxWindow, Publisher): Line 578  class MapCanvas(wxWindow, Publisher):
578          if bbox is not None:          if bbox is not None:
579              self.FitRectToWindow(bbox)              self.FitRectToWindow(bbox)
580    
581        def FitLayerToWindow(self, layer):
582            """Fit the given layer to the window.
583    
584            Set the scale so that the layer fits exactly into the window and
585            center it in the window.
586            """
587            
588            bbox = layer.LatLongBoundingBox()
589            if bbox is not None:
590                proj = self.map.GetProjection()
591                if proj is not None:
592                    bbox = proj.ForwardBBox(bbox)
593    
594                if bbox is not None:
595                    self.FitRectToWindow(bbox)
596    
597        def FitSelectedToWindow(self):
598            layer = self.selection.SelectedLayer()
599            shapes = self.selection.SelectedShapes()
600    
601            bbox = layer.ShapesBoundingBox(shapes)
602            if bbox is not None:
603                proj = self.map.GetProjection()
604                if proj is not None:
605                    bbox = proj.ForwardBBox(bbox)
606    
607                if bbox is not None:
608                    self.FitRectToWindow(bbox)
609    
610      def ZoomFactor(self, factor, center = None):      def ZoomFactor(self, factor, center = None):
611          """Multiply the zoom by factor and center on center.          """Multiply the zoom by factor and center on center.
612    
# Line 516  class MapCanvas(wxWindow, Publisher): Line 670  class MapCanvas(wxWindow, Publisher):
670      def PanTool(self):      def PanTool(self):
671          """Start the pan tool"""          """Start the pan tool"""
672          self.SelectTool(PanTool(self))          self.SelectTool(PanTool(self))
673            #img = resource.GetImageResource("pan", wxBITMAP_TYPE_XPM)
674            #bmp = resource.GetBitmapResource("pan", wxBITMAP_TYPE_XPM)
675            #print bmp
676            #img = wxImageFromBitmap(bmp)
677            #print img
678            #cur = wxCursor(img)
679            #print cur
680            #self.SetCursor(cur)
681    
682      def IdentifyTool(self):      def IdentifyTool(self):
683          """Start the identify tool"""          """Start the identify tool"""
# Line 594  class MapCanvas(wxWindow, Publisher): Line 756  class MapCanvas(wxWindow, Publisher):
756          # Even when the window becomes larger some parts of the bitmap          # Even when the window becomes larger some parts of the bitmap
757          # could be reused.          # could be reused.
758          self.full_redraw()          self.full_redraw()
759            pass
760    
761      def shape_selected(self, layer, shape):      def shape_selected(self, layer, shape):
762          """Redraw the map.          """Receiver for the SHAPES_SELECTED messages. Redraw the map."""
763            # The selection object takes care that it only issues
764          Receiver for the SELECTED_SHAPE messages. Try to redraw only          # SHAPES_SELECTED messages when the set of selected shapes has
765          when necessary.          # actually changed, so we can do a full redraw unconditionally.
766          """          # FIXME: We should perhaps try to limit the redraw to the are
767          # A redraw is necessary when the display has to change, which          # actually covered by the shapes before and after the selection
768          # means that either the status changes from having no selection          # change.
769          # to having a selection shape or vice versa, or when the fact          self.full_redraw()
         # whether there is a selection at all doesn't change, when the  
         # shape which is selected has changed (which means that layer or  
         # shapeid changes).  
         if ((shape is not None or self.last_selected_shape is not None)  
             and (shape != self.last_selected_shape  
                  or layer != self.last_selected_layer)):  
             self.full_redraw()  
   
         # remember the selection so we can compare when it changes again.  
         self.last_selected_layer = layer  
         self.last_selected_shape = shape  
770    
771      def unprojected_rect_around_point(self, x, y, dist):      def unprojected_rect_around_point(self, x, y, dist):
772          """return a rect dist pixels around (x, y) in unprojected corrdinates          """return a rect dist pixels around (x, y) in unprojected corrdinates
# Line 706  class MapCanvas(wxWindow, Publisher): Line 858  class MapCanvas(wxWindow, Publisher):
858              if not layer.Visible():              if not layer.Visible():
859                  continue                  continue
860    
861              filled = layer.fill is not None              filled = layer.GetClassification().GetDefaultFill() \
862              stroked = layer.stroke is not None                       is not Color.Transparent
863                stroked = layer.GetClassification().GetDefaultLineColor() \
864                          is not Color.Transparent
865    
866              layer_proj = layer.projection              layer_proj = layer.projection
867              if layer_proj is not None:              if layer_proj is not None:
# Line 786  class MapCanvas(wxWindow, Publisher): Line 940  class MapCanvas(wxWindow, Publisher):
940          # to deselect the currently selected layer, so we simply select          # to deselect the currently selected layer, so we simply select
941          # the already selected layer again.          # the already selected layer again.
942          if layer is None:          if layer is None:
943              layer = self.interactor.SelectedLayer()              layer = self.selection.SelectedLayer()
944          self.interactor.SelectLayerAndShape(layer, shape)              shapes = []
945            else:
946                shapes = [shape]
947            self.selection.SelectShapes(layer, shapes)
948          return result          return result
949    
950      def LabelShapeAt(self, x, y):      def LabelShapeAt(self, x, y):
# Line 845  class MapCanvas(wxWindow, Publisher): Line 1002  class MapCanvas(wxWindow, Publisher):
1002                      valign = ALIGN_CENTER                      valign = ALIGN_CENTER
1003                  label_layer.AddLabel(x, y, text,                  label_layer.AddLabel(x, y, text,
1004                                       halign = halign, valign = valign)                                       halign = halign, valign = valign)
1005    
1006    def OutputTransform(canvas_scale, canvas_offset, canvas_size, device_extend):
1007        """Calculate dimensions to transform canvas content to output device."""
1008        width, height = device_extend
1009    
1010        # Only 80 % of the with are available for the map
1011        width = width * 0.8
1012    
1013        # Define the distance of the map from DC border
1014        distance = 20
1015    
1016        if height < width:
1017            # landscape
1018            map_height = height - 2*distance
1019            map_width = map_height
1020        else:
1021            # portrait, recalibrate width (usually the legend width is too
1022            # small
1023            width = width * 0.9
1024            map_height = width - 2*distance
1025            map_width = map_height
1026        
1027        mapregion = (distance, distance,
1028                     distance+map_width, distance+map_height)
1029    
1030        canvas_width, canvas_height = canvas_size
1031        
1032        scalex = map_width / (canvas_width/canvas_scale)
1033        scaley = map_height / (canvas_height/canvas_scale)
1034        scale = min(scalex, scaley)
1035        canvas_offx, canvas_offy = canvas_offset
1036        offx = scale*canvas_offx/canvas_scale
1037        offy = scale*canvas_offy/canvas_scale
1038    
1039        return scale, (offx, offy), mapregion
Legend:
Removed from v.404  
changed lines
  Added in v.940
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26