Commit graph

1573 commits

Author SHA1 Message Date
Roger Ferrel
f271510075 Issue #1790 Changes for non-blocking AdministrationDlg.
Change-Id: Iec8d71c747ef5167cd49909caba33176519cd07d

Former-commit-id: f24bd5d02b [formerly e8093a3a56] [formerly f24bd5d02b [formerly e8093a3a56] [formerly 0194324742 [formerly aa671a4bcfbd26ade407a8e52c6fe5eac69eb83f]]]
Former-commit-id: 0194324742
Former-commit-id: 66ffbeb3a6 [formerly f3da79e406]
Former-commit-id: 5766931c23
2013-04-16 16:34:00 -05:00
Roger Ferrel
83fa6e1bf5 Issue #1790 Changes for non-blocking AddModifyLocationDlg.
Change-Id: Ice2d3a8bbeaff0689d2b4e0a2ba8bbee017fb080

Former-commit-id: 2d6c308083 [formerly 3c42ad8145] [formerly 2d6c308083 [formerly 3c42ad8145] [formerly f410ee5f89 [formerly 8e78b6799404059032f10b97e62d385e07852c53]]]
Former-commit-id: f410ee5f89
Former-commit-id: 9c8faa3b5b [formerly f576747b38]
Former-commit-id: cca9aca98b
2013-04-16 15:54:02 -05:00
Roger Ferrel
4a70d016bf Issue #1790 Changes for non-blocking ForecastAttributeDlg.
Change-Id: I3724d165f721f9664f69ede09864a9714e35405b

Former-commit-id: ad47a959f4 [formerly 2b2dabdc71] [formerly ad47a959f4 [formerly 2b2dabdc71] [formerly c1b7b2e3bd [formerly f4d3fdda15d34a454887c9a14b6deada7a698141]]]
Former-commit-id: c1b7b2e3bd
Former-commit-id: 6d6eb9b7c3 [formerly 1f0b994b9a]
Former-commit-id: 30dd322db4
2013-04-16 14:44:03 -05:00
Roger Ferrel
ae72f407b0 Issue #1790 Changes for non-blocking StationReportingStatusDlg.
Change-Id: Icd11c338c2bc7399c10205d10d3c11ff034d61d7

Former-commit-id: aa11977fd3 [formerly 1ba7a11037] [formerly aa11977fd3 [formerly 1ba7a11037] [formerly af0aa091f3 [formerly ec789fc71009b77d6f44b7eba606ba5259d253a8]]]
Former-commit-id: af0aa091f3
Former-commit-id: b49ab42ce1 [formerly 2020d82599]
Former-commit-id: c1e1f3786f
2013-04-16 12:51:18 -05:00
Mike Duff
00b3600ad6 Issue #1904 - FFMPConfig no longer able to be reset.
Change-Id: I9e7a7628ca1cd77964574fbc84c2cd2f78364872

Former-commit-id: 2323505f91 [formerly 18e5561dd2] [formerly 2323505f91 [formerly 18e5561dd2] [formerly f9c0de442f [formerly 5775e40e5f939ca847527ae562cba71dc3984a60]]]
Former-commit-id: f9c0de442f
Former-commit-id: b847733566 [formerly c0f6fe5199]
Former-commit-id: 5253e6e535
2013-04-15 13:02:58 -05:00
Dustin Johnson
c72a44eb9e Merge "Issue #1891 Fix sorting in pending subscription table" into development
Former-commit-id: 1aec1ca6cd [formerly 355e654c1e] [formerly 1aec1ca6cd [formerly 355e654c1e] [formerly d117a40e7c [formerly f1360b8ef80c343ad16b2345c500ea48c17ba209]]]
Former-commit-id: d117a40e7c
Former-commit-id: 9b1a6c153c [formerly d149e51484]
Former-commit-id: 66136037bb
2013-04-10 14:50:14 -05:00
Dustin Johnson
919fda0e8c Issue #1891 Fix sorting in pending subscription table
Amend:  Rename getRowData() to getDisplayData()

Change-Id: Icc433f289d87273524468d0cf4e1bc799df134aa

Former-commit-id: 8b6a9551a1 [formerly d9544f3b73] [formerly 8b6a9551a1 [formerly d9544f3b73] [formerly 36cdd94a65 [formerly b37624ebadc626e3dc30f669881d0b7bb87a7c45]]]
Former-commit-id: 36cdd94a65
Former-commit-id: a4519615ab [formerly f7505eefc2]
Former-commit-id: 6ee0d474f8
2013-04-10 14:04:55 -05:00
Max Schenkelberg
f1617ea662 Issue #1638 Added cache of PluginDao objects in PluginFactory so they can safely cache data internally by not being recreated every store operation. Added default names to sample actions
Amend: Create copy on write for PluginFactory

Change-Id: I5373d1efadc1ab3c5e368a3caae55a5ff85a2d6f

Former-commit-id: 1bec335fd7 [formerly 6e70b21f5f] [formerly 1bec335fd7 [formerly 6e70b21f5f] [formerly b695de3698 [formerly 4249c63fb4ee62862cb9bbaa36d47607ba6784e8]]]
Former-commit-id: b695de3698
Former-commit-id: e369546b51 [formerly f2a0f8223a]
Former-commit-id: 0b2fed1f34
2013-04-10 10:04:17 -05:00
Dustin Johnson
60e910e3d3 Issue #1826 Remove delivery/notify options for subscriptions
Change-Id: Ife37bb70a5b54c3602d5f73de337cb83f37a9509

Former-commit-id: f3526508f3 [formerly 11fd2d676b] [formerly f3526508f3 [formerly 11fd2d676b] [formerly 6bc69df127 [formerly 0bf00ff025ea916aeb0ee4cb093163cbd9cfe931]]]
Former-commit-id: 6bc69df127
Former-commit-id: 0578916ec1 [formerly b78f56f1ca]
Former-commit-id: b61292ce4d
2013-04-09 11:40:25 -05:00
Dustin Johnson
5958178516 Issue #1841 Split up PendingSubscription hierarchy in support of shared subscriptions.
Add ability to store/approve shared subscriptions.
Back out generics on subscription/pending subscriptions until guis are updated.

Change-Id: I84e1651ebcad0d398396752529981f28dbc341bf

Former-commit-id: cef805e79a [formerly 61346b1388] [formerly cef805e79a [formerly 61346b1388] [formerly f3bdede2c8 [formerly 5a8249a78daaeed19079e78f6c4f07b08e817ff0]]]
Former-commit-id: f3bdede2c8
Former-commit-id: 4b4eb8e406 [formerly 8c52cd190f]
Former-commit-id: fefc0dca3b
2013-04-05 12:41:02 -05:00
Greg Armendariz
df0146764b Merge "Issue #1859 - the Xss JVM parameter will now be included in the ini files for the 32-bit CAVE" into development
Former-commit-id: 6e0ced27dc [formerly d6d0e0131f] [formerly 6e0ced27dc [formerly d6d0e0131f] [formerly 71d400e09f [formerly fa1c24a0aa4004b9403e39ce94a99a88f423466e]]]
Former-commit-id: 71d400e09f
Former-commit-id: f452a4582a [formerly d463555ca3]
Former-commit-id: d176c441e7
2013-04-04 13:00:39 -05:00
Bryan Kowal
cc94b29199 Issue #1864 - datadelivery and kml are now dependent on the core viz feature.
Former-commit-id: 70c8ed6bc0 [formerly 3fac666de5] [formerly 70c8ed6bc0 [formerly 3fac666de5] [formerly 64c54f2110 [formerly c5b6f20402cfa47cbc421596b81139f24db2c552]]]
Former-commit-id: 64c54f2110
Former-commit-id: 6a66158097 [formerly 49ee55327d]
Former-commit-id: dda6a904ed
2013-04-04 12:48:59 -05:00
Steve Harris
a7b174bfaf Merge branch 'omaha_13.3.1' into development
Former-commit-id: 9879b94de9 [formerly 8b607f8228] [formerly 9879b94de9 [formerly 8b607f8228] [formerly 5c9a6b83cc [formerly ef87d76141000e00dc04ab0cc4db4ad80006b636]]]
Former-commit-id: 5c9a6b83cc
Former-commit-id: 0f53c46d7a [formerly ed8c0487fe]
Former-commit-id: 7eda24c3b0
2013-04-04 11:58:50 -05:00
Bryan Kowal
6032a8dd0c Issue #1859 - the Xss JVM parameter will now be included in the ini files for the 32-bit CAVE
Change-Id: I4d5a152dd44cd0a80405e04ce18d40e820bd06e6

Former-commit-id: c448651065 [formerly 03a2e82b77] [formerly c448651065 [formerly 03a2e82b77] [formerly 8d3c98eb5d [formerly 54f97bfeaecf8fc99d8572a94977d863c547fe17]]]
Former-commit-id: 8d3c98eb5d
Former-commit-id: 12e9b9d75b [formerly 5816ddaf77]
Former-commit-id: bd47c62789
2013-04-03 18:27:10 -05:00
Nate Jensen
b151421989 Merge "Issue #1735 ForecastPointDataRetrieve now uses DbQueryRequest to obtain forecast times in asscending order and option to limit times returned. Change reviewer comments." into development
Former-commit-id: f43ac8bbc3 [formerly 79a9d76915] [formerly f43ac8bbc3 [formerly 79a9d76915] [formerly 73d86e8926 [formerly eaabe1a4935051d003ed302de193cfb183118845]]]
Former-commit-id: 73d86e8926
Former-commit-id: e74f83d83a [formerly c87d157cbd]
Former-commit-id: 5be8ef079e
2013-04-03 17:28:49 -05:00
Steve Harris
dc0baf57ba Merge branch 'master_13.3.1' (13.3.1-18) into omaha_13.3.1
Former-commit-id: 2bc12f7a23 [formerly 0f000f4485] [formerly 2bc12f7a23 [formerly 0f000f4485] [formerly 327d05f3b5 [formerly 131cf22b16b3109fdc13a8346524fc8d2e230b7f]]]
Former-commit-id: 327d05f3b5
Former-commit-id: 0342b648b6 [formerly c7b9690456]
Former-commit-id: f22108c973
2013-04-03 15:52:19 -05:00
Ron Anderson
e5252cf3a4 Merge "Issue #1855 fix python threading in GFE procedures and smart tools" into omaha_13.3.1
Former-commit-id: b880af3c48 [formerly de856db77a] [formerly b880af3c48 [formerly de856db77a] [formerly c82968c1e6 [formerly 53ace4843058424627c3b670caa77972ddbe01be]]]
Former-commit-id: c82968c1e6
Former-commit-id: a633b96fdf [formerly 237e414b5d]
Former-commit-id: fb76bf6d49
2013-04-03 15:25:52 -05:00
Steve Harris
fc009792e3 13.3.1-18 baseline
Former-commit-id: f3e79bcc9d [formerly a2b098d86d] [formerly f3e79bcc9d [formerly a2b098d86d] [formerly ce6a06a7e3 [formerly 245ab5d951a10e74aba53b036001316e1c7653fe]]]
Former-commit-id: ce6a06a7e3
Former-commit-id: 0edd049e3b [formerly bf6c3b6762]
Former-commit-id: 044912d48b
2013-04-03 14:58:29 -05:00
Nate Jensen
f0abb60a1b Issue #1855 fix python threading in GFE procedures and smart tools
Change-Id: I6420338991c1961ce63ff944b516925f83a12994

Former-commit-id: 5c830c3c9c [formerly e3462292ab] [formerly 5c830c3c9c [formerly e3462292ab] [formerly fe24e34163 [formerly c4549e0279a3026adc2f7b40bb272fc4f59acf59]]]
Former-commit-id: fe24e34163
Former-commit-id: 1c6643e7de [formerly e18e798a94]
Former-commit-id: 01b25904ad
2013-04-03 14:33:24 -05:00
Lee Venable
542dfcaf9b Merge "Issue #1858 Handled creating a follow up when initial was created before 0z but issued after." into omaha_13.3.1
Former-commit-id: c8549e67d6 [formerly 40b8ecf27d] [formerly c8549e67d6 [formerly 40b8ecf27d] [formerly ff910d99fc [formerly ad96c48345c8b6f89ea337bd663cb7585981e941]]]
Former-commit-id: ff910d99fc
Former-commit-id: 3d129d4526 [formerly 36a15b3be1]
Former-commit-id: 5b0fb8eeaf
2013-04-03 14:14:41 -05:00
Nate Jensen
2c6e995faf Merge "Issue #1562 max's fix for topo with custom colormaps" into omaha_13.3.1
Former-commit-id: a109ec4601 [formerly dbbad421db] [formerly a109ec4601 [formerly dbbad421db] [formerly 1bc148b468 [formerly 0b617c32afd67c5f64efa89e18abfef0de51a00f]]]
Former-commit-id: 1bc148b468
Former-commit-id: 2d4dc636ce [formerly ec8cdfd8f0]
Former-commit-id: ab51de7da5
2013-04-03 14:13:14 -05:00
Nate Jensen
0e25d15232 Issue #1562 max's fix for topo with custom colormaps
Change-Id: I7ede37a61d39cdc091c95a7d888af9347ca7621e

Former-commit-id: d64e0a2a39 [formerly 057a929903] [formerly d64e0a2a39 [formerly 057a929903] [formerly 6c711f037c [formerly 88e676506f6dec74514c25260edcc44d9e0564d5]]]
Former-commit-id: 6c711f037c
Former-commit-id: 6ca17c5a2a [formerly 616612e550]
Former-commit-id: fb5bce6afe
2013-04-03 14:10:53 -05:00
Ron Anderson
3be7ce8bab Issue #1774 Moved wind component checking to GfeIngestNotificaionFilter
Change-Id: Ia34d564e6cfc8aaee4d254fbeca6f8e939acdc59

Former-commit-id: 34c8aad559 [formerly 3a3cdcbf46] [formerly 34c8aad559 [formerly 3a3cdcbf46] [formerly b703b4779e [formerly d8b7834dbdbe6479745cf9a56ff36283c21d3bd0]]]
Former-commit-id: b703b4779e
Former-commit-id: 0d57a752dc [formerly 065ba61389]
Former-commit-id: 2222201f43
2013-04-03 14:01:18 -05:00
Roger Ferrel
2cad51c18f Issue #1735 ForecastPointDataRetrieve now uses DbQueryRequest to obtain forecast times in asscending order and option to limit times returned.
Change reviewer comments.

Change-Id: Ida69b63198ffa5c229eedd3abb42c4f5f9e1d00d

Former-commit-id: f8d1a13c38 [formerly 54cbf656e9] [formerly f8d1a13c38 [formerly 54cbf656e9] [formerly d2aae617b2 [formerly b836dcb6d55dfbdf8e825fb194903d45a83382c8]]]
Former-commit-id: d2aae617b2
Former-commit-id: 2b4b10d643 [formerly 7b829a2fec]
Former-commit-id: ad658b46bf
2013-04-03 12:48:18 -05:00
Jonathan Sanchez
6f25295c90 Issue #1858 Handled creating a follow up when initial was created before
0z but issued after.

Former-commit-id: 9b547cab98 [formerly 9c322bf4b7] [formerly 9b547cab98 [formerly 9c322bf4b7] [formerly 799b8c57ef [formerly b123df8e9dea005c35865f4a71ef28b1d9c8cba8]]]
Former-commit-id: 799b8c57ef
Former-commit-id: 7ca110890a [formerly bd25782b7a]
Former-commit-id: 30a728e641
2013-04-03 11:43:59 -05:00
Ben Steffensmeier
eb98e23be1 Issue #1824 Fix Tile Geometry creation.
Former-commit-id: fe561d7af0 [formerly fedbc28588] [formerly fe561d7af0 [formerly fedbc28588] [formerly cfcc33cd7b [formerly 9c77d1a4d12dd8fd0c684bd48a7fc1a02a34dbac]]]
Former-commit-id: cfcc33cd7b
Former-commit-id: e0bbe368be [formerly 58d81f6556]
Former-commit-id: 15be152be1
2013-04-03 10:59:11 -05:00
Mike Duff
aef1bc779f Issue #1731 - fix problem with dmd updating.
Change-Id: I1f3eb576cf26a42195ca9c4cadfbeaeb77394af6

Former-commit-id: c3ab8259d5 [formerly 64cdb3c7fd] [formerly c3ab8259d5 [formerly 64cdb3c7fd] [formerly 23c8085402 [formerly a8c25cfced44c7e3edfd1b37af73b2af8753212b]]]
Former-commit-id: 23c8085402
Former-commit-id: bb14757eed [formerly 3f2f0937ce]
Former-commit-id: 5298fb6633
2013-04-02 16:22:23 -05:00
Nate Jensen
e0cb68cc06 Merge "Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development." into development
Former-commit-id: ab28523a09 [formerly f57358cff8] [formerly ab28523a09 [formerly f57358cff8] [formerly 8f9ec8dd2c [formerly 4f965dfb6a15e853eb64c9ebf4a646ba4ad156a8]]]
Former-commit-id: 8f9ec8dd2c
Former-commit-id: 1ad5bb1a52 [formerly 374eed35b3]
Former-commit-id: d1f53fb57e
2013-04-02 14:29:15 -05:00
Dustin Johnson
e57b8314d8 Issue #1841 Split up Subscription hierarchy in support of shared subscriptions.
Amend:
   Use TimeUtil.newGmtCalendar() and remove whitespace only change
   Add TODO for point data types.

Change-Id: If232ef50a63066e85b122d4247fa767fc31313d3

Former-commit-id: 48a2002e68 [formerly c981b7250f] [formerly 48a2002e68 [formerly c981b7250f] [formerly 6129d86be4 [formerly b91593c0a50114e4766ecf83d92e7f25b58bbbf8]]]
Former-commit-id: 6129d86be4
Former-commit-id: 644ed2396d [formerly dd8f4d8454]
Former-commit-id: 15ed8a6f58
2013-04-01 15:35:51 -05:00
Max Schenkelberg
ee60a2a80c Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development.
Change-Id: I37c3135794c991e2405d556823a22768dd491f00

Former-commit-id: 9d032f3e84 [formerly b32fbad9c8] [formerly 9d032f3e84 [formerly b32fbad9c8] [formerly 547190329b [formerly 7b37bda291882ff345d466f4338b6707ed84d4d5]]]
Former-commit-id: 547190329b
Former-commit-id: ba262e2bc5 [formerly 635388a7ad]
Former-commit-id: 80b0f7c159
2013-04-01 12:41:50 -05:00
Lee Venable
ca38aca6df Merge "Issue #1830 - Don't allow base level config files for FFMP" into development
Former-commit-id: e994040887 [formerly 4a8c4b64df] [formerly e994040887 [formerly 4a8c4b64df] [formerly f1e8faf9ff [formerly 9c117d43e77ffa074c8464771918116f8835b382]]]
Former-commit-id: f1e8faf9ff
Former-commit-id: 58c83b9662 [formerly 35d27f89f1]
Former-commit-id: e66a72fbed
2013-04-01 12:26:23 -05:00
Steve Harris
ac6704c7e9 Merge branch 'omaha_13.3.1' into development
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java

Former-commit-id: 736bb45741 [formerly 140765a43e] [formerly 736bb45741 [formerly 140765a43e] [formerly 437a04011a [formerly 4a7059ac9b104116fef4d0dab9a0108fb61b5a5c]]]
Former-commit-id: 437a04011a
Former-commit-id: 7b27767d7e [formerly 0b48e96314]
Former-commit-id: d0e61c59e8
2013-04-01 12:19:04 -05:00
Steve Harris
e74f4ae39e Merge branch 'master_13.3.1' (13.3.1-17) into omaha_13.3.1
Conflicts:
	rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE

Former-commit-id: 3b722f1076 [formerly 74a47b9bd9] [formerly 3b722f1076 [formerly 74a47b9bd9] [formerly 14c9de2259 [formerly 98ddc22749f0e5cdb0f4f8f0084ee742486461d5]]]
Former-commit-id: 14c9de2259
Former-commit-id: f85a1ab9ab [formerly a6dd28cc82]
Former-commit-id: 0fee31b1a8
2013-04-01 12:15:04 -05:00
Lee Venable
631444f8fa Merge "Issue #1790 Changes for non-blocking StationProfileDlg." into development
Former-commit-id: 7d73b8dacf [formerly fe89cb7fe4] [formerly 7d73b8dacf [formerly fe89cb7fe4] [formerly d3390596f4 [formerly fe244abd3f625d7334284d4657bd8f35737e86a5]]]
Former-commit-id: d3390596f4
Former-commit-id: 4e95ffe2ae [formerly 89da26a266]
Former-commit-id: e0d1017c14
2013-04-01 12:06:16 -05:00
Steve Harris
a112803c98 13.3.1-17 baseline
Former-commit-id: f28b85d42f [formerly 7bf9966dcb] [formerly f28b85d42f [formerly 7bf9966dcb] [formerly a3fe998f8f [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]]
Former-commit-id: a3fe998f8f
Former-commit-id: ef413da5f7 [formerly 4afa41d4e7]
Former-commit-id: 50becef97f
2013-04-01 12:04:56 -05:00
Steve Harris
e61c718b49 13.3.1-16 baseline
Former-commit-id: a262f22cee [formerly 51380726d4] [formerly a262f22cee [formerly 51380726d4] [formerly 3066dd33e5 [formerly 18321f88c2efedf141b84e7de18c200e1037f740]]]
Former-commit-id: 3066dd33e5
Former-commit-id: 6b75202d07 [formerly 36a4b3eb51]
Former-commit-id: c53a305b1e
2013-04-01 11:39:08 -05:00
Mike Duff
e07f3971c0 Issue #1830 - Don't allow base level config files for FFMP
Change-Id: Ib408e51eda5367a1d66684685935b6163acbbb77

Former-commit-id: fa8ca827d1 [formerly 261a39122d] [formerly fa8ca827d1 [formerly 261a39122d] [formerly 9c2ac87482 [formerly 9ecafb5aacbdb2928902435f342aa4547c2f5903]]]
Former-commit-id: 9c2ac87482
Former-commit-id: e627279d7c [formerly 11ca7c2c20]
Former-commit-id: 63489a0873
2013-04-01 11:36:53 -05:00
Richard Peter
1b229e3d61 Merge "Issue #1638 Added Auto updating localization file object and added more methods to RecordFactory to make more versatile" into development
Former-commit-id: 2fa88522ff [formerly e221223f8a] [formerly 2fa88522ff [formerly e221223f8a] [formerly 255617199c [formerly 6b3523df82d62d75db483baad329cc6d9a2ade13]]]
Former-commit-id: 255617199c
Former-commit-id: 65f317e56b [formerly ea4a599a5a]
Former-commit-id: 58a8049b64
2013-04-01 11:33:59 -05:00
Steve Harris
cc1ef45545 13.3.1-15 baseline
Former-commit-id: 4cf3ad6abb [formerly eb1dab3864] [formerly 4cf3ad6abb [formerly eb1dab3864] [formerly 3d8ed484be [formerly 369cf4feaee63c96725cb6efc5774b8f6b8cbf08]]]
Former-commit-id: 3d8ed484be
Former-commit-id: 2bf790aae3 [formerly d3cec5d3cb]
Former-commit-id: 4204273f21
2013-04-01 11:33:20 -05:00
Max Schenkelberg
a29eff544b Issue #1638 Added Auto updating localization file object and added more methods to RecordFactory to make more versatile
Amend: Fixed setting of nested field properties
Amend: Moved populating and creating map into PluginDataObject, fixed listener leak in AbstractVizResource
Amend: Added comments

Change-Id: I699ab6a669a11656044c1d55f0bca9d258528835

Former-commit-id: a508e9c8cb [formerly 321a29ffa4] [formerly a508e9c8cb [formerly 321a29ffa4] [formerly 51d976e5e2 [formerly 9eaa57677f77ff919f1a55ee7ad4b44a0613b97a]]]
Former-commit-id: 51d976e5e2
Former-commit-id: 8de3a70962 [formerly 1c35a54a9f]
Former-commit-id: 01c2d29c1b
2013-04-01 10:19:36 -05:00
Lee Venable
0a5a8d108a Merge "Issue #1790 Changes for non-blocking StationListDlg." into development
Former-commit-id: 7389bf5b29 [formerly 2875600910] [formerly 7389bf5b29 [formerly 2875600910] [formerly 0bfc05ce61 [formerly 4dad96cbc70936f43a65519eff70ac72c904c9e5]]]
Former-commit-id: 0bfc05ce61
Former-commit-id: ebfa8ea79c [formerly 3d683e98a9]
Former-commit-id: 034e16baa7
2013-04-01 09:40:59 -05:00
Roger Ferrel
c95d8692ff Issue #1790 Changes for non-blocking StationProfileDlg.
Change-Id: I669c9115dd1bb506acd025a451163aaf664593ef

Former-commit-id: e1b40f9f2f [formerly 0d269691e2] [formerly e1b40f9f2f [formerly 0d269691e2] [formerly d21cb5e2e8 [formerly 57eb492610a3cc2974badc6072c2a026f5640b79]]]
Former-commit-id: d21cb5e2e8
Former-commit-id: 86e21acae2 [formerly 944d03615e]
Former-commit-id: 9e3bee6562
2013-03-29 17:11:02 -05:00
Ben Steffensmeier
facdfdc501 Issue #1799 fix modal tools again.
Former-commit-id: cffac354e8 [formerly eeeede7288] [formerly cffac354e8 [formerly eeeede7288] [formerly 66af8daa11 [formerly c1a69f88df85478571394c0e125617c93100168d]]]
Former-commit-id: 66af8daa11
Former-commit-id: 11e6afa5fa [formerly 7082466303]
Former-commit-id: b3245f7a5d
2013-03-29 14:30:54 -05:00
Roger Ferrel
3a3e3674a8 Issue #1790 Changes for non-blocking StationListDlg.
Change-Id: Ib0cbfd64fca2d4dcbea68b5e0db8b34a5a7af6be

Former-commit-id: 281e7f53cb [formerly c5a95dcb44] [formerly 281e7f53cb [formerly c5a95dcb44] [formerly 6ad80607bc [formerly 5d68d67451c45d38a962f58c246b2effcd0cc253]]]
Former-commit-id: 6ad80607bc
Former-commit-id: ba0060522f [formerly de02460b11]
Former-commit-id: 99ebeac6fd
2013-03-29 13:46:51 -05:00
Roger Ferrel
791fbba888 Issue #1790 Last of the bug fixes. Reviewer changes
Change-Id: I451799e34e9621723c9d652f339c880da3aa7caa

Former-commit-id: 20f6baba0e [formerly 8f4492c63c] [formerly 20f6baba0e [formerly 8f4492c63c] [formerly 463407a40e [formerly 336427570fba81616b8d02f3ed2948042d7dbf41]]]
Former-commit-id: 463407a40e
Former-commit-id: 8c1116eaae [formerly ec5f32aec6]
Former-commit-id: c1ffc82920
2013-03-29 11:35:08 -05:00
Ron Anderson
8502dee456 Issue #1838 Fixed selected time range when Select Grids When Stepping is enabled.
Change-Id: I30417042d568e6471f8a684fab8bcc2387618089

Former-commit-id: 4ac9a4d9a8 [formerly 0f4fb125b0] [formerly 4ac9a4d9a8 [formerly 0f4fb125b0] [formerly c7cfcf0250 [formerly 3a3f0a47ac33d19259cfc447b0abedd9930e2c64]]]
Former-commit-id: c7cfcf0250
Former-commit-id: cd0f319ec5 [formerly 9cfa87f7e5]
Former-commit-id: 41b0758084
2013-03-29 10:48:26 -05:00
Nate Jensen
1b1d1a48d2 Merge "Issue #1774 Fix D2D accumulative parameter time ranges" into omaha_13.3.1
Former-commit-id: 3ad797690b [formerly 214b2ed4ba] [formerly 3ad797690b [formerly 214b2ed4ba] [formerly 1bf37125c4 [formerly d14cbd8b4a99316bbbf015e1392a34f63a1082d6]]]
Former-commit-id: 1bf37125c4
Former-commit-id: 946323416c [formerly 711fbe98d2]
Former-commit-id: a6a81a17d6
2013-03-28 17:02:14 -05:00
Ben Steffensmeier
788df8fc68 Issue #1799 fix activation of tools for new perspectives.
Former-commit-id: dcbed65681 [formerly 50a276a7e2] [formerly dcbed65681 [formerly 50a276a7e2] [formerly 4efa92ff49 [formerly a4c1e2f9526efa227b246b8dc4df9cb00566def1]]]
Former-commit-id: 4efa92ff49
Former-commit-id: 33de9bfc87 [formerly a415fb17ae]
Former-commit-id: a5e1593213
2013-03-28 15:47:36 -05:00
Ron Anderson
bef17d4f03 Issue #1774 Fix D2D accumulative parameter time ranges
Change-Id: I57b32881a30e89c999dae6db7753da83f9e949c1

Former-commit-id: 27e07ce4a9 [formerly 5bb47b7931] [formerly 27e07ce4a9 [formerly 5bb47b7931] [formerly b65ecfc151 [formerly aee839a85ec68c7eb80ef1e7236af6cb4666372b]]]
Former-commit-id: b65ecfc151
Former-commit-id: 33bcf5fee8 [formerly 3f2fa771d9]
Former-commit-id: 5eb1885dbd
2013-03-28 13:37:29 -05:00
Max Schenkelberg
4253d92576 Issue #1638 Fix merge error
Change-Id: Id75f4d6372cd77132bad82029cfb176ec4f19712

Former-commit-id: 25202d8534 [formerly 573b441662] [formerly 25202d8534 [formerly 573b441662] [formerly 2b58e3ce3f [formerly 9c7c89f148adba714839f9ff4fa9bdda10f0edc0]]]
Former-commit-id: 2b58e3ce3f
Former-commit-id: abcf4bf569 [formerly c9301b75ea]
Former-commit-id: 223f946b90
2013-03-28 10:20:54 -05:00