← Back to branch summary

~ubuntu-branches/ubuntu/precise/grass/precise

« back to all changes in this revision

Viewing changes to gui/tcltk/gis.m/mapcanvas.tcl

  • Committer: Bazaar Package Importer
  • Author(s): Francesco Paolo Lovergine
  • Date: 2011-04-13 17:08:41 UTC
  • mfrom: (8.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20110413170841-ss1t9bic0d0uq0gz
Tags: 6.4.1-1
* New upstream version.
* Now build-dep on libjpeg-dev and current libreadline6-dev.
* Removed patch swig: obsolete.
* Policy bumped to 3.9.2, without changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gui/tcltk/gis.m/mapcanvas.tcl
478
478
            while {[gets $input line] >= 0} {
479
479
                if { [string equal "XY location (unprojected)" "$line"] } {
480
480
                    set mapunits "map units"
481
 
                set prj(proj) "xy"
482
481
                    break
483
482
                }
484
483
                regexp -nocase {^(.*):(.*)$} $line trash key value
485
484
                set key [string trim $key]
486
485
                set value [string trim $value]
487
 
                set prj($key) $value    
 
486
                set prj($key) $value
488
487
            }
489
488
 
490
489
        # Set for latlon locations
491
490
        if { [ info exist prj ] && $prj(proj) == "ll"} {set proj_is_ll 1}
492
491
        
493
492
        if {[catch {close $input} error]} {
494
 
                        GmLib::errmsg $error [G_msg "g.proj or projection error"]
495
 
                        return
496
 
            } 
 
493
                GmLib::errmsg $error [G_msg "g.proj or projection error"]
 
494
                return
 
495
            }
497
496
        }
498
497
        # Length is calculated from the map canvas arrows
499
498
        #  and so is measured & plotted in map units.
710
709
                cd $currdir
711
710
        }
712
711
 
 
712
        # cvdisplay might need new canvas coordinates. Coordconv has to be run first!
 
713
        MapCanvas::coordconv $mon
713
714
        GmTree::cvdisplay "root"
714
 
        set drawprog 100
715
 
 
716
 
        MapCanvas::coordconv $mon
 
715
        
717
716
        set drawprog 0
718
717
        $mapframe($mon) showstatusbar status
719
718
        return