[GRASS-SVN] r48320 -
grass/branches/releasebranch_6_4/gui/wxpython/gui_modules
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Sep 16 07:00:24 EDT 2011
Author: hamish
Date: 2011-09-16 04:00:24 -0700 (Fri, 16 Sep 2011)
New Revision: 48320
Modified:
grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/psmap_dialogs.py
Log:
spelling, inch -> naut miles: 100 * 1852 / 2.54 = 72913.3858267717 (merge from devbr6)
Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/psmap_dialogs.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/psmap_dialogs.py 2011-09-16 10:58:07 UTC (rev 48319)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/psmap_dialogs.py 2011-09-16 11:00:24 UTC (rev 48320)
@@ -89,16 +89,16 @@
self._unitsPage = { 'inch' : {'val': 1.0, 'tr' : _("inch")},
'point' : {'val': 72.0, 'tr' : _("point")},
'centimeter' : {'val': 2.54, 'tr' : _("centimeter")},
- 'milimeter' : {'val': 25.4, 'tr' : _("milimeter")}}
+ 'millimeter' : {'val': 25.4, 'tr' : _("millimeter")}}
self._unitsMap = { 'meters' : {'val': 0.0254, 'tr' : _("meters")},
'kilometers' : {'val': 2.54e-5, 'tr' : _("kilometers")},
'feet' : {'val': 1./12, 'tr' : _("feet")},
'miles' : {'val': 1./63360, 'tr' : _("miles")},
- 'nautical miles': {'val': 1/72913.44, 'tr' : _("nautical miles")}}
+ 'nautical miles': {'val': 1/72913.386, 'tr' : _("nautical miles")}}
self._units = { 'pixel' : {'val': ppi[0], 'tr' : _("pixel")},
'meter' : {'val': 0.0254, 'tr' : _("meter")},
- 'nautmiles' : {'val': 1/72913.44, 'tr' :_("nautical miles")},
+ 'nautmiles' : {'val': 1/72913.386, 'tr' :_("nautical miles")},
'degrees' : {'val': 0.0254 , 'tr' : _("degree")} #like 1 meter, incorrect
}
self._units.update(self._unitsPage)
@@ -5696,4 +5696,4 @@
return rasterType
else:
return None
-
\ No newline at end of file
+
More information about the grass-commit
mailing list