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

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-26 11:03:25 +0200 (Tue, 26 Jul 2011)
New Revision: 3674

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/alpha.py
Log:
Merged revisions 448 via svnmerge from 
svn+ssh://wald.intevation.org/greater/trunk/GREAT-ER

........
  r448 | aheinecke | 2011-07-14 12:16:46 +0200 (Thu, 14 Jul 2011) | 3 lines
  
  Fix alpha mode tables by using the "newer" QueryTableFrame which inherits from
  Table Frame but adds some nice features
........



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-447
   + /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-448

Modified: branches/3.0.0-all-models/GREAT-ER/ChangeLog
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/ChangeLog	2011-07-25 14:54:37 UTC (rev 3673)
+++ branches/3.0.0-all-models/GREAT-ER/ChangeLog	2011-07-26 09:03:25 UTC (rev 3674)
@@ -76,7 +76,10 @@
 		  Use this to a abort a simulation now
 	* Greater/Modules/alpha.py:
 		- Resolve fixme to bring already opened dialogs to front
+		- Fix alpha mode tables by using the "newer" QueryTableFrame
+		  which inherits from Table Frame and adds some nice features
 
+
 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/alpha.py
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/Greater/Modules/alpha.py	2011-07-25 14:54:37 UTC (rev 3673)
+++ branches/3.0.0-all-models/GREAT-ER/Greater/Modules/alpha.py	2011-07-26 09:03:25 UTC (rev 3674)
@@ -15,7 +15,7 @@
 
 
 from Thuban.UI.command import registry, Command
-from Thuban.UI.tableview import TableFrame
+from Thuban.UI.tableview import QueryTableFrame
 
 from Greater.UI.context import context_results_exist, context_catchment_open
 
@@ -26,7 +26,7 @@
     name = "discharge_table"
     dialog = window.get_open_dialog(name)
     if dialog is None:
-        dialog = TableFrame(window, name, "Discharge Table", table)
+        dialog = QueryTableFrame(window, name, "Discharge Table", table)
         window.add_dialog(name, dialog)
         dialog.Show(True)
     else:
@@ -41,7 +41,7 @@
     name = "session_discharge_table"
     dialog = window.get_open_dialog(name)
     if dialog is None:
-        dialog = TableFrame(window, name, "Session Discharge Table", table)
+        dialog = QueryQueryTableFrame(window, name, "Session Discharge Table", table)
         window.add_dialog(name, dialog)
         dialog.Show(True)
     else:
@@ -56,7 +56,7 @@
     name = "market_discharge_table"
     dialog = window.get_open_dialog(name)
     if dialog is None:
-        dialog = TableFrame(window, name, "Market Discharge Table", table)
+        dialog = QueryTableFrame(window, name, "Market Discharge Table", table)
         window.add_dialog(name, dialog)
         dialog.Show(True)
     else:
@@ -69,7 +69,7 @@
     name = "stretch_table"
     dialog = window.get_open_dialog(name)
     if dialog is None:
-        dialog = TableFrame(window, name, "Stretch Table", table)
+        dialog = QueryTableFrame(window, name, "Stretch Table", table)
         window.add_dialog(name, dialog)
         dialog.Show(True)
     else:
@@ -82,7 +82,7 @@
     name = "discharge_results_table"
     dialog = window.get_open_dialog(name)
     if dialog is None:
-        dialog = TableFrame(window, name, "Discharge Results Table", table)
+        dialog = QueryTableFrame(window, name, "Discharge Results Table", table)
         window.add_dialog(name, dialog)
         dialog.Show(True)
     else:
@@ -95,7 +95,7 @@
     name = "stretch_results_table"
     dialog = window.get_open_dialog(name)
     if dialog is None:
-        dialog = TableFrame(window, name, "Stretch Results Table", table)
+        dialog = QueryTableFrame(window, name, "Stretch Results Table", table)
         window.add_dialog(name, dialog)
         dialog.Show(True)
     else: