[Greater-commits] r3672 - in branches/3.0.0-all-models/GREAT-ER: . Greater/Modules

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-25 16:51:12 +0200 (Mon, 25 Jul 2011)
New Revision: 3672

Modified:
   branches/3.0.0-all-models/GREAT-ER/
   branches/3.0.0-all-models/GREAT-ER/ChangeLog
   branches/3.0.0-all-models/GREAT-ER/Greater/Modules/model.py
Log:
Merged revisions 446 via svnmerge from 
svn+ssh://wald.intevation.org/greater/trunk/GREAT-ER

........
  r446 | aheinecke | 2011-07-14 11:34:17 +0200 (Thu, 14 Jul 2011) | 3 lines
  
  dlg.Update returns a tuple in this python version where the first value
  is set to False if the dialog is canceled
........



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,434-445
   + /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-446

Modified: branches/3.0.0-all-models/GREAT-ER/ChangeLog
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/ChangeLog	2011-07-25 14:48:52 UTC (rev 3671)
+++ branches/3.0.0-all-models/GREAT-ER/ChangeLog	2011-07-25 14:51:12 UTC (rev 3672)
@@ -45,7 +45,6 @@
 		- Change bugtracker to wald url.
 		- Add additional Version informations
 		- Update about dialog text and size
-
 	* Greater/Dialogs/editdischargedata.py Greater/Dialogs/editsession.py
 	Greater/Dialogs/errordialogs.py Greater/Dialogs/editsubstance.py
 	Greater/Dialogs/__init__.py Greater/Dialogs/selectmodel.py
@@ -71,6 +70,11 @@
 	Greater/UI/splashscreen.py Greater/UI/mainwindow.py Greater/UI/__init__.py
 	Greater/UI/application.py Greater/UI/session.py Greater/UI/context.py
 	Greater/UI/serialize.py: Update copyright to include 2011
+	* Greater/Modules/model.py: 
+		- In wxWidgets 2.8.12  dlg.Update returns a tuple
+		  where the first value is set to False if the dialog is canceled.
+		  Use this to a abort a simulation now
+
 2006-05-10  Frank Koormann   <frank at intevation.de>
 
 	* Greater/version.py: Updated version to 2.1.0.

Modified: branches/3.0.0-all-models/GREAT-ER/Greater/Modules/model.py
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/Greater/Modules/model.py	2011-07-25 14:48:52 UTC (rev 3671)
+++ branches/3.0.0-all-models/GREAT-ER/Greater/Modules/model.py	2011-07-25 14:51:12 UTC (rev 3672)
@@ -626,7 +626,7 @@
                 raise RuntimeError('GreaterModelError:8512:%s' % sys.exc_info()[1])
                 proceed=0
             if status[0] == 'initializing':
-                if not dlg.Update(int(status[1]), 'Initializing ...'):
+                if not dlg.Update(int(status[1]), 'Initializing ...')[0]:
                     try:
                         simserverconn.rpc.simulation.stop(simid)
                     except:
@@ -639,7 +639,7 @@
                     prev_status = ('waiting',
                                  'Waiting (for free computing resources) ...')
                 if not dlg.Update(0, 'Waiting (for free computing ' \
-                                       'resources) ...'):
+                                       'resources) ...')[0]:
                     try:
                         simserverconn.rpc.simulation.stop(simid)
                     except:
@@ -651,7 +651,7 @@
                     dlg.Update(100, prev_status[1]) # show 100% done
                     prev_status = ('running',
                                    'Running ...')
-                if not dlg.Update(int(status[1]), 'Running ...'):
+                if not dlg.Update(int(status[1]), 'Running ...')[0]:
                     try:
                         simserverconn.rpc.simulation.stop(simid)
                     except:
@@ -664,7 +664,7 @@
                     prev_status = ('writing_results',
                                    'Writing results to database ...')
                 if not dlg.Update(int(status[1]),
-                                  'Writing results to database ...'):
+                                  'Writing results to database ...')[0]:
                     try:
                         simserverconn.rpc.simulation.stop(simid)
                     except:
@@ -677,7 +677,7 @@
                     prev_status = ('stopping',
                                    'Stopping simulation ...')
                 if not dlg.Update(int(status[1]),
-                                  'Stopping simulation ...'):
+                                  'Stopping simulation ...')[0]:
                     try:
                         simserverconn.rpc.simulation.stop(simid)
                     except: