[Greater-commits] r3671 - in branches/3.0.0-all-models/GREAT-ER: . Greater/UI

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-25 16:48:52 +0200 (Mon, 25 Jul 2011)
New Revision: 3671

Modified:
   branches/3.0.0-all-models/GREAT-ER/
   branches/3.0.0-all-models/GREAT-ER/Greater/UI/mainwindow.py
Log:
Merged revisions 434,443-444 via svnmerge from 
svn+ssh://wald.intevation.org/greater/trunk/GREAT-ER

........
  r434 | bricks | 2011-07-13 11:52:30 +0200 (Wed, 13 Jul 2011) | 3 lines
  
  Add svn ignores *.swp and tags
  in trunk/GREAT-ER-DB/impl/postgresql/test also ignore temp dir
........
  r443 | aheinecke | 2011-07-14 11:15:50 +0200 (Thu, 14 Jul 2011) | 3 lines
  
  Gdal is only optional in GREATER so the import can not be hard
  Also import PIL.Image instead of image
........
  r444 | aheinecke | 2011-07-14 11:18:45 +0200 (Thu, 14 Jul 2011) | 2 lines
  
  Use the correct name in the about dialog for PIL
........



Property changes on: branches/3.0.0-all-models/GREAT-ER
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/GREAT-ER:1-232,310,312-315,319,322,327,333,335,340-344,346-347,368,375,397-398,400,403,410,412-431
   + /trunk/GREAT-ER:1-232,310,312-315,319,322,327,333,335,340-344,346-347,368,375,397-398,400,403,410,412-431,434-445
Name: svn:ignore
   + tags
*.swp


Modified: branches/3.0.0-all-models/GREAT-ER/Greater/UI/mainwindow.py
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/Greater/UI/mainwindow.py	2011-07-25 14:44:08 UTC (rev 3670)
+++ branches/3.0.0-all-models/GREAT-ER/Greater/UI/mainwindow.py	2011-07-25 14:48:52 UTC (rev 3671)
@@ -33,9 +33,8 @@
 import Greater.version
 import SciParam.version
 import numpy.version
-import Image
+import PIL.Image
 import twisted.copyright
-import osgeo.gdal
 import reportlab
 from wxPython.wx import __version__ as wxPython_version
 
@@ -161,7 +160,6 @@
                "  %s\n"\
                "  %s\n"\
                "  %s\n"\
-               "  %s\n"\
                % (Greater.version.longversion,
                   greater_model_version,
                   api_version[0], api_version[1],
@@ -170,9 +168,8 @@
                   SciParam.version.longversion,
                   "wxPython %s" % wxPython_version,
                   "NumPy %s" % numpy.version.version,
-                  "Python Image Library %s" % Image.VERSION,
+                  "Python Image Library %s" % PIL.Image.VERSION,
                   "%s" % twisted.copyright.longversion,
-                  "Gdal %s" % osgeo.gdal.__version__,
                   "Reportlab %s" % reportlab.Version,
                   )