Commit graph

1418 commits

Author SHA1 Message Date
Nate Jensen
32f74cfe32 Merge "Issue #1628 lower Xmx on windows in awips.product." into development
Former-commit-id: df11a1bc40 [formerly ae20ee7665] [formerly c1becf797a] [formerly 545caf22fb [formerly c1becf797a [formerly 8525b4ac1db570160253cf7bb180914967e0b647]]]
Former-commit-id: 545caf22fb
Former-commit-id: d31418ec7c77062c9087ed4434fdf6776b2c9630 [formerly 87a745eb2f]
Former-commit-id: 530d3bfa00
2013-02-25 09:31:20 -06:00
Mike Duff
5439b30b6a Issue #1552 - Implement FFMP Data Access
Peer review comments
Change-Id: Ibf11c96248972a86a6a0d779ba482cd133125b55

Former-commit-id: 018953526b [formerly 8a8e8f7a73] [formerly 8bddd467b1] [formerly 81649d346a [formerly 8bddd467b1 [formerly 544c90e8a0b5aba5470e60beac18d86d972c05cd]]]
Former-commit-id: 81649d346a
Former-commit-id: 3908739d5516b0d12bdcb9c95d991ddec48a13d9 [formerly b1a549a99f]
Former-commit-id: 01ef273417
2013-02-25 09:29:16 -06:00
Steve Harris
30efc4c86a 13.3.1-3 baseline
Former-commit-id: 4a0eea00b5 [formerly a55f438dd8] [formerly 6572452887] [formerly 8a64f142e5 [formerly 6572452887 [formerly dc9e245f83eb0136157f8ca71f80f7fb9eb04796]]]
Former-commit-id: 8a64f142e5
Former-commit-id: ef9a242ccd88bfb5175203c6f71d0491e5e16b07 [formerly 8d741715e3]
Former-commit-id: 05eb25f124
2013-02-25 10:24:53 -05:00
Steve Harris
f2428e968a 13.3.1-2 baseline
Former-commit-id: 0b3acc0130 [formerly 3e60b23072] [formerly df6d6f598e] [formerly 3d115ed3be [formerly df6d6f598e [formerly 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e]]]
Former-commit-id: 3d115ed3be
Former-commit-id: 3d35a57312645a04351b1cba8c83774e80dcc4da [formerly e8a51dc780]
Former-commit-id: 370ed98038
2013-02-25 10:18:36 -05:00
Mike Duff
421a832657 Issue #1620 - Fix set clean issue with job loader.
Change-Id: I1cf1e109ae3964ef95ebb9a2582622c31e271028

Former-commit-id: 6753072acf [formerly bfc1e66dfb] [formerly af8b97cd3c] [formerly 3340a9ddd8 [formerly af8b97cd3c [formerly c436049a244e3a7c0c7fb629673d8f15c46c72a8]]]
Former-commit-id: 3340a9ddd8
Former-commit-id: 55cd27a63897002d693beca349d622a730a08c37 [formerly c904dc42ef]
Former-commit-id: 9e177f44cd
2013-02-24 19:13:57 -06:00
Roger Ferrel
82804ac8bb Issue #1442 Fix null pointer exception in DecisonTree's searchTree
Change-Id: I5bf36da8aa6e8ef2a2efee08e01e232bff8eb7ef

Former-commit-id: 4337d23872 [formerly 07a103c3bb] [formerly 152715160e] [formerly 09b5996dac [formerly 152715160e [formerly 9ef63af71325c5b6694f41c78506d618078e0b9e]]]
Former-commit-id: 09b5996dac
Former-commit-id: 3f8334cdb8bbe5133624435d74cf48b95e4f2493 [formerly fd95a99596]
Former-commit-id: 186c71e5ac
2013-02-22 12:49:53 -06:00
Ben Steffensmeier
3dd76fdb04 Issue #1617 fixed vb sounding point selection for points which contain the word Point
Former-commit-id: 581c8ffcd5 [formerly be95659d4a] [formerly 1d8ad288b4] [formerly 5701309bcb [formerly 1d8ad288b4 [formerly d2aa45b1fb765ae3f24d96b39b789195d5c607ed]]]
Former-commit-id: 5701309bcb
Former-commit-id: fded4c4c5e2d488ca4c56730b284454ede5f92c1 [formerly 7c0f1bf788]
Former-commit-id: 2892e64677
2013-02-21 16:28:41 -06:00
Steve Harris
7e48d3e684 Merge branch 'development' into omaha_13.3.1
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java

Former-commit-id: abdc733151 [formerly 64744fdb19] [formerly a0573644c4] [formerly 2641d578e2 [formerly a0573644c4 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]
Former-commit-id: 2641d578e2
Former-commit-id: 4a25bf4d6d77c9356aa1e74660e835a98a31e78b [formerly 33dd2589f1]
Former-commit-id: 4f155a183a
2013-02-21 15:41:39 -06:00
Ben Steffensmeier
45bde9d742 Issue #1628 lower Xmx on windows in awips.product.
Former-commit-id: cb45175375 [formerly 86f30a647d] [formerly 62eaf8e947] [formerly 0bb2c03a83 [formerly 62eaf8e947 [formerly 39d24c906c0aae925b9c472569c1d9e99dbd6021]]]
Former-commit-id: 0bb2c03a83
Former-commit-id: 8b8fa33b6ea614af1b029854cb81e6b6be529d48 [formerly 4209a3cfb1]
Former-commit-id: dd2d3da9bb
2013-02-21 14:30:41 -06:00
Nate Jensen
e19664ab18 Merge "Issue #1635 Second Guidance source verification, general cleanup" into development
Former-commit-id: a8e81097fc [formerly 033b9e3852] [formerly a9c4e54287] [formerly 73f53bd513 [formerly a9c4e54287 [formerly 25ecfc3e6199294275abc8547c482388c55be724]]]
Former-commit-id: 73f53bd513
Former-commit-id: 82a8e0c1fe20524fc0676db0dbd1c0079f46a300 [formerly d7a57d2b34]
Former-commit-id: 6f9d3f55e5
2013-02-21 11:41:52 -06:00
Ron Anderson
bcc9d63d9c Merge "Issue #1506 fix for GFE evaluateRefSet() for non-queries" into development
Former-commit-id: 1661ad92f7 [formerly e6ec21bd53] [formerly 03c48b2f7a] [formerly 297c132c49 [formerly 03c48b2f7a [formerly 4397b9cad2c75e5d4fa3a1933394fadc8460153a]]]
Former-commit-id: 297c132c49
Former-commit-id: 53f8f259a85445c95a55275d90e6cf60b6620316 [formerly ff2370221a]
Former-commit-id: e61af5611a
2013-02-21 09:10:07 -06:00
Matt Nash
eec2ea4c29 Issue #1506 fix for GFE evaluateRefSet() for non-queries
Change-Id: I342ce5c5e0449b7f5f4f81865705ed55aff3c5a7

Former-commit-id: 0531052a2e [formerly 6f9621adb2] [formerly 2001d916ac] [formerly 492df9c238 [formerly 2001d916ac [formerly 2f9911c6e28fd3b5617353ec8de80c16f812c508]]]
Former-commit-id: 492df9c238
Former-commit-id: 210f7f89643e818406eeea19775de2c66f16305d [formerly 5d6a7a6140]
Former-commit-id: 84f3da4828
2013-02-21 09:01:33 -06:00
Steve Harris
96c7269df0 13.3.1-1 baseline
Former-commit-id: 9bdd52a626 [formerly 96768407a5] [formerly 0563d7ac18] [formerly cabc8cf8b4 [formerly 0563d7ac18 [formerly 841b0cf38549666c4f65f0d0cff3b92d76c9e795]]]
Former-commit-id: cabc8cf8b4
Former-commit-id: c69f91c8e87239b610a4a8da6e4238eb3011b229 [formerly 92e4c7ba19]
Former-commit-id: 0569ff413d
2013-02-21 09:36:59 -05:00
Lee Venable
1f81a1c057 Merge "Issue #1609 update style rules for msl-P contours" into development
Former-commit-id: e83cd69075 [formerly b82961dda2] [formerly 46aa0595d8] [formerly 7d2452e0ef [formerly 46aa0595d8 [formerly cb89924d5a8a751bd96fdfa3e2ccbed74c3ba815]]]
Former-commit-id: 7d2452e0ef
Former-commit-id: bc9255bcfe995e0997dcec117989f12c5ada3a41 [formerly fbaf19e184]
Former-commit-id: 997cebb2df
2013-02-20 18:03:30 -06:00
Ben Steffensmeier
070d80adf5 Issue #1609 update style rules for msl-P contours
Former-commit-id: bf9f3344d1 [formerly 6bf304ab80] [formerly e7f73db73c] [formerly f029f74a4f [formerly e7f73db73c [formerly 2137a2aae531d5550a59d7c5afd77a8d1fc28bc8]]]
Former-commit-id: f029f74a4f
Former-commit-id: f250772b236ea3b33c3494e51227e59db759d9a3 [formerly 5b9e13aa3d]
Former-commit-id: 894c7e7e62
2013-02-20 17:27:16 -06:00
Steve Harris
db712e1fcf 13.3.1-1 baseline
Former-commit-id: e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly d2a654625f [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]
Former-commit-id: d2a654625f
Former-commit-id: 42269f8019656ea35c9d11244f51d5ae9ac18ac0 [formerly 46d28be4a4]
Former-commit-id: e4435815c9
2013-02-20 16:19:40 -06:00
Dave Hladky
f439b63316 Issue #1635 Second Guidance source verification, general cleanup
Change-Id: Ie7807a653862335ae50e11337c47c7c7fcbde526

Former-commit-id: fdfbf59dba [formerly e7993c968d] [formerly 7b36b055f1] [formerly 41f2ea7efe [formerly 7b36b055f1 [formerly 798b106211b1248c7fc932cfb2ebccddf15a0d66]]]
Former-commit-id: 41f2ea7efe
Former-commit-id: 1169eb8cd11a2b8565eaf5607902f6898450127b [formerly b1c8f153e0]
Former-commit-id: 261d00c544
2013-02-20 16:13:08 -06:00
Mike Duff
9556ed337a Issue #1589 - Fix saving of custom subset areas in spatial subset tab
Change-Id: I4143de4c3ab78a6da4de407d9035e70e264fe95a

Former-commit-id: 9dfaee98a1 [formerly 4c47ee820d] [formerly 1511490c55] [formerly f845137930 [formerly 1511490c55 [formerly 09e0a2450e8e1c860ae3e8d6354320cc0b2b6d88]]]
Former-commit-id: f845137930
Former-commit-id: c5cf862b37d59c7a0d7c772771e98991dc35ae40 [formerly 7fcd553333]
Former-commit-id: de3d5aec9a
2013-02-20 14:57:58 -06:00
Nate Jensen
04a141d30f Issue #1639 Replaced monitor's ConcurrentHashMaps with data structures, removed references to FFMPCacheRecord
Change-Id: I24cbcbfe1b3cc5309a78469da9ba021f6953b0eb

Former-commit-id: 376a966852 [formerly e0884ed550] [formerly c2d4f8e164] [formerly e6e2d8905c [formerly c2d4f8e164 [formerly 4582146fd6f0ea348c7f4d01fdb68f6473439761]]]
Former-commit-id: e6e2d8905c
Former-commit-id: 7a4a9a6467cfdc2321c93cb906bc1f8119346908 [formerly a7b74e1f79]
Former-commit-id: f5a1165062
2013-02-20 13:48:26 -06:00
Ron Anderson
c0364ee665 Merge "Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default. Change-Id: I48738965df0da9052f810dfc1f312ed032693390" into development
Former-commit-id: 9c2caa95a0 [formerly 70050ac749] [formerly f1ad632c3f] [formerly 884d9ff787 [formerly f1ad632c3f [formerly ec5be70336a0f6bb6874c51b72b67046fbde2c68]]]
Former-commit-id: 884d9ff787
Former-commit-id: 0135351e11c5776ecfe36b40d5d95a0c1101bb82 [formerly 2c8d14406b]
Former-commit-id: 744391e3f6
2013-02-19 18:46:16 -06:00
Steve Harris
bca88ba9c7 Merge branch 'omaha_13.2.1' (13.2.1-8) into development
Former-commit-id: f1f5359a2f [formerly c2327ce33d] [formerly ea50a5db77] [formerly d123c044c3 [formerly ea50a5db77 [formerly 819f88fb8b26ec0a83164df82b31e9b824b49da8]]]
Former-commit-id: d123c044c3
Former-commit-id: d8887e78bdc5e20d85019ee8b30e177eceb18ccf [formerly 1c08acab38]
Former-commit-id: 81f1fb83a0
2013-02-19 12:22:00 -06:00
Roger Ferrel
317076ce71 Issue #1633 Change to WarnGenDialog so the checkFollowupSelection method uses Simulated Time.
Change-Id: I8d25084a88506f6e9bec72cfd40f02165d421869

Former-commit-id: 28b0f753fc [formerly a2e61d32a1] [formerly bdf58f534a1e9f71e4fb55fa7da4a957cb84b42d [formerly 1b693994a5]] [formerly 1d51a10f4b [formerly 1b693994a5 [formerly 011b0822a8942d6dc4307b0a422060d9a97c7f8d]]]
Former-commit-id: 1d51a10f4b
Former-commit-id: 1c5d3ed74cec47761bf7aea165a116a3c8bbdfbb [formerly 211a39c333]
Former-commit-id: 94eb5757b5
2013-02-18 12:15:39 -06:00
Richard Peter
9c0ff50ba0 Merge "Issue #1584 - FFMP performance stats and performance logger Peer review comments Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c" into development
Former-commit-id: 05f5f4daf3 [formerly 3c126b0ab1] [formerly 355e6d2c67] [formerly 4fb1cb27dc [formerly 355e6d2c67 [formerly a07a434ad71986aa4b474dd88e266035e347efa4]]]
Former-commit-id: 4fb1cb27dc
Former-commit-id: 434b4343506bf7b287825895ce602614fe47b40d [formerly 8991c1c86d]
Former-commit-id: 4f3d9ab931
2013-02-18 09:35:53 -06:00
Steve Harris
e6f3a88bd9 Merge branch 'master_13.2.1' (13.2.1-8) into omaha_13.2.1
Former-commit-id: 8a9c021b70 [formerly 15d6e6ad3b] [formerly ae66ccc3ee] [formerly acaef77d90 [formerly ae66ccc3ee [formerly 5e40606e95d506d213de3916f0f5d3a4eee7884a]]]
Former-commit-id: acaef77d90
Former-commit-id: 2db0d95e2593fe2ab6b520361f1d9c77362404b7 [formerly 8da2277243]
Former-commit-id: 2c7ff9b631
2013-02-18 09:14:13 -06:00
Steve Harris
db02d32440 13.2.1-8 baseline
Former-commit-id: d176ec1f38 [formerly 18da2e93d7] [formerly f81b382c04] [formerly 053156f02e [formerly f81b382c04 [formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]]
Former-commit-id: 053156f02e
Former-commit-id: 609380ceb2a4b7bcee69d80b0285d0756125ad49 [formerly c6d584758f]
Former-commit-id: 8cffb55371
2013-02-18 09:09:41 -06:00
Ron Anderson
d09967b88e Merge "Issue #1507: Improve responsiveness of menus that list smart tools or procedures by forcing UIControllers to be constructed at startup, not on demand." into development
Former-commit-id: 7d09df8468 [formerly cf0fc8d921] [formerly e70cfc5825] [formerly a6d87cdd7e [formerly e70cfc5825 [formerly a1e38ed2f2da79028b04589a548b16543700f08f]]]
Former-commit-id: a6d87cdd7e
Former-commit-id: a76fdb7843d8fd407d0de1a07b1a83103ec4b3cb [formerly 999ac02aea]
Former-commit-id: 292614bc25
2013-02-18 08:31:50 -06:00
Steve Harris
825a99770d 13.2.1-8 baseline
Former-commit-id: 1af911d098 [formerly da707ff25c] [formerly 27d88edcb9] [formerly 535a9402a7 [formerly 27d88edcb9 [formerly 1da0393f24829256c090d06ea8f7a0eca5e68bfd]]]
Former-commit-id: 535a9402a7
Former-commit-id: 0a9388f77add45c1702ce16113b0c20068e2d223 [formerly a68ce64f45]
Former-commit-id: 58bafc0068
2013-02-18 09:23:06 -05:00
Mike Duff
6628aea419 Issue #1584 - FFMP performance stats and performance logger
Peer review comments
Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c

Former-commit-id: 5331d05c64 [formerly 897262630c] [formerly 0b044dba9c] [formerly 9c1e0ab639 [formerly 0b044dba9c [formerly 1334488810c13f02e692c234a52d8f0f505a5846]]]
Former-commit-id: 9c1e0ab639
Former-commit-id: 269babb3d811c862c91f7c6f2b44a05605b7552e [formerly 079ec4b6dd]
Former-commit-id: 3e59308771
2013-02-18 08:16:57 -06:00
Richard Peter
67a541c54a Merge "Issue #1506 move away from using QueryScript on the UI thread, except where absolutely necessary we can run a synchronous operation" into development
Former-commit-id: c8d46448bf [formerly 5bf0e0e999] [formerly 51533ccab2] [formerly 70f270ff16 [formerly 51533ccab2 [formerly 07f3be5e44386a8138556b0269d3e731c6e1ef5f]]]
Former-commit-id: 70f270ff16
Former-commit-id: 5a84f9cf95566309fac283f2dc58dcbbe30280d4 [formerly 2299503559]
Former-commit-id: 1b112227a8
2013-02-15 16:40:04 -06:00
Richard Peter
720f324789 Merge "Issue #1608 Fixed group deletes in H5pyDataStore.py" into development
Former-commit-id: 69897b3aa2 [formerly b3e2ca7b30] [formerly a40ae4d8b2] [formerly a6fa92923f [formerly a40ae4d8b2 [formerly 46302aa76056b00ee6a21c8080274ba23d92dcda]]]
Former-commit-id: a6fa92923f
Former-commit-id: 8f5d31cba589ac5b371ec575b4cd127eeae8019e [formerly 5936f671ce]
Former-commit-id: 774ea0ede6
2013-02-15 16:33:00 -06:00
Ron Anderson
9fa2a2b3f0 Issue #1629 fix error storing preferences in GIS Viewer
Change-Id: Id677dd9206c16f8c95b022e31fcac7acc6b07eb6

Former-commit-id: 4b871f33cc [formerly d4a915b48d] [formerly 689c32a9c3] [formerly 354d8b0366 [formerly 689c32a9c3 [formerly 7d73fd3f0f2d8ebbbf75d5928b06202f5f7cd42a]]]
Former-commit-id: 354d8b0366
Former-commit-id: 936c2dfeb6b936ee28f4a3df3ab76ed70aa003e9 [formerly 4334fab2f9]
Former-commit-id: ca6ca60f22
2013-02-15 13:44:52 -06:00
David Gillingham
67c98b866c Issue #1507: Improve responsiveness of menus that list smart tools or procedures by forcing
UIControllers to be constructed at startup, not on demand.

Change-Id: Ifb492171ac4720e36f68da082c38d31c1de08132

Former-commit-id: 65b1aeb7f3 [formerly 9fae6695e2] [formerly 871364d630] [formerly da091b723d [formerly 871364d630 [formerly 463af46e64ed667efbc840d85f9babf3449780cc]]]
Former-commit-id: da091b723d
Former-commit-id: 2d27bf86785994cdfd9f88f8093afe2f1d435b78 [formerly 244bc9b270]
Former-commit-id: cc05bdae4e
2013-02-15 12:50:48 -06:00
Jonathan Sanchez
b4a051cf83 Issue #1624 Temporary fix for NullPointerException.
Former-commit-id: b07504916f [formerly 18dd00e488] [formerly f507d23fed] [formerly fea6b44036 [formerly f507d23fed [formerly f95a402347ae45ad133206bfea796b240decf0a6]]]
Former-commit-id: fea6b44036
Former-commit-id: 81c45a8e55f371727b4db8a17400440ba254b82d [formerly 1486022395]
Former-commit-id: 763280dd53
2013-02-15 12:31:21 -06:00
Lee Venable
b241812a72 Merge "Issue #1607 Added time variables for CORs." into development
Former-commit-id: 7d85071ae2 [formerly 628d0d9840] [formerly d94233499a] [formerly 91e016aa34 [formerly d94233499a [formerly 7a6200d4bfe21feb6e29603dd638876f50a66162]]]
Former-commit-id: 91e016aa34
Former-commit-id: 071a283e723cacbd51481fa4c13e68fbca37df1d [formerly 38bbca4895]
Former-commit-id: 5ec5918e45
2013-02-15 12:08:15 -06:00
Nate Jensen
218d26f676 Merge "Issue #1614 Refactor data access framework to use single request. Change-Id: Id3ed7afcf79dfb2ddeca1d9c2b632f90cc44d798" into development
Former-commit-id: 8722cf18fa [formerly 1b1e468e1f] [formerly f748815e22] [formerly f79f7db348 [formerly f748815e22 [formerly 55acd96d99a61170cbbc2b202e9562912b6fb0c3]]]
Former-commit-id: f79f7db348
Former-commit-id: 46c56447c7896eda732cfe5904eeba4f40dbdfdd [formerly a60cf277bc]
Former-commit-id: d6ba283efc
2013-02-15 11:56:11 -06:00
Ben Steffensmeier
a0f06eff69 Issue #1614 Refactor data access framework to use single request.
Change-Id: Id3ed7afcf79dfb2ddeca1d9c2b632f90cc44d798

Former-commit-id: d35b79d537 [formerly e771076275] [formerly 1393f3e3cf] [formerly 0933a5f596 [formerly 1393f3e3cf [formerly 5a9ae7df15633492b0d9fb648876cfb2bb2946b6]]]
Former-commit-id: 0933a5f596
Former-commit-id: 133a0064f1bda2cc9d635ce7bed097b681dd8dd1 [formerly f0f3c71d50]
Former-commit-id: 91bbdc3337
2013-02-15 11:39:56 -06:00
Ron Anderson
ffa635c5c3 Issue #1629 Attempt to fix error saving preferences in GIS Viewer
Change-Id: I982637de1cc898d9887849a8276a3693b9579d5b

Former-commit-id: 528ce62800 [formerly 3033238f1b] [formerly d574da6155] [formerly b76653a885 [formerly d574da6155 [formerly f0d1aa59c4971ed523e4f26b440134a417aec5d0]]]
Former-commit-id: b76653a885
Former-commit-id: 085730a171749caf4793b166e229b9102825e3a8 [formerly df84bf7f86]
Former-commit-id: 632bd48a45
2013-02-15 11:13:43 -06:00
Jonathan Sanchez
f47b82e1ae Issue #1607 Added time variables for CORs.
Former-commit-id: 092014d433 [formerly 38802d3df8] [formerly 6d968dc09d] [formerly 3025639923 [formerly 6d968dc09d [formerly 311f633ba47efcf3b13f77867e1fa32a584f3232]]]
Former-commit-id: 3025639923
Former-commit-id: 82add2e0659e51786287108a10a857ffcdbfc0c4 [formerly bb797eeb74]
Former-commit-id: 352d3dea5a
2013-02-15 09:59:12 -06:00
Ron Anderson
12f2ac0171 Issue #1608 Fixed group deletes in H5pyDataStore.py
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a

Former-commit-id: 9156b9ffe8 [formerly dc7c9edb87] [formerly a2a89fb4e7] [formerly 7c0a5d74bf [formerly a2a89fb4e7 [formerly dc9ac54903107224633b4e18d5caa345649d8266]]]
Former-commit-id: 7c0a5d74bf
Former-commit-id: 05e20f4050e6fac5a3d4a69d2e1baa354ff73eaf [formerly e952a4f179]
Former-commit-id: d69d628450
2013-02-15 09:03:41 -06:00
Dustin Johnson
72cb5b436b Issue #1596 Do not reschedule bandwidth allocations when a subscription is removed
Change-Id: I4016034e6bdc5e8acf4936a0f786906611e7ad41

Former-commit-id: c638eca350 [formerly 4be6c12ac6] [formerly 714ea1c8d8] [formerly 6e2f69939f [formerly 714ea1c8d8 [formerly 5f87319abc3712667abc6b454f49882b0f3fb45f]]]
Former-commit-id: 6e2f69939f
Former-commit-id: 11d3a956bd7f1cc9a0583c0a5584b6470fe49630 [formerly 1ef440f8ee]
Former-commit-id: d0ecd69456
2013-02-15 08:13:11 -06:00
Nate Jensen
2ea8bed072 Merge "Issue #1627 Sped up FFMp load by removing un-needed DB calls." into development
Former-commit-id: 7b50014701 [formerly be680f2523] [formerly 7cf29fbf39] [formerly 6d8b8dd774 [formerly 7cf29fbf39 [formerly c83110e509d662da0a4b1975bc1044fb7ffadb9e]]]
Former-commit-id: 6d8b8dd774
Former-commit-id: 36514f8fcd747455dbc8fbd4296f690655aa80f6 [formerly 0ce3009528]
Former-commit-id: ebb3394719
2013-02-14 16:39:23 -06:00
Ben Steffensmeier
4140260659 Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default.
Change-Id: I48738965df0da9052f810dfc1f312ed032693390

Former-commit-id: bd6e0f8462 [formerly 1940a92596] [formerly aa4c7526ff] [formerly 8c0e9d3d9e [formerly aa4c7526ff [formerly ccf08fbd82aac8b1ae1d4f42b455ec7c3f995970]]]
Former-commit-id: 8c0e9d3d9e
Former-commit-id: badd785e8aa7a433093d24b4c4bf0d45450daf4a [formerly 455aa4628f]
Former-commit-id: 086f6aabe9
2013-02-14 15:34:25 -06:00
Dave Hladky
7dd7e3c60a Issue #1627 Sped up FFMp load by removing un-needed DB calls.
Change-Id: Ice81630bd72b7f64d6f0817d2e531877b0072956

Former-commit-id: 51e0b648c2 [formerly 83fe9ca104] [formerly 8247da158f] [formerly a8f6635a6f [formerly 8247da158f [formerly db09538ad0664b8a7f3eb83f062a47490975f7b1]]]
Former-commit-id: a8f6635a6f
Former-commit-id: 43df1692452b561e0563a12fb2d7b4e6d7f53414 [formerly 4cd9b2e8b2]
Former-commit-id: 7f6381ec5c
2013-02-14 15:12:29 -06:00
Nate Jensen
3724151397 Merge "Issue #1569 Switched aggregate record writing to pypies. General sweep of ingestDAT" into development
Former-commit-id: ed195ae9e4 [formerly 5526ee7e8d] [formerly 1144f08e59] [formerly a3e0bf09ab [formerly 1144f08e59 [formerly a8fbe37f3f30721d7a14c653993758c1a9f2d2ad]]]
Former-commit-id: a3e0bf09ab
Former-commit-id: b34b2a8b576d4d26a79a47c3f0f154dd8bdc4ee2 [formerly 3f5b8b56ef]
Former-commit-id: b4aea0385c
2013-02-14 15:05:14 -06:00
Dave Hladky
ba8eb2b557 Issue #1569 Switched aggregate record writing to pypies. General sweep of ingestDAT
Change-Id: I693debea540667cfda6efe1496dd1084b8d0e950

Former-commit-id: 65f4e442bc [formerly 2655952304] [formerly 7b3a310f67] [formerly 381aec5976 [formerly 7b3a310f67 [formerly 2ea8409800917d8c9a4c76c3b63492a2eb1f2c62]]]
Former-commit-id: 381aec5976
Former-commit-id: a3bb927b21e71fee86b6ae81fd130425b9672bcf [formerly 5c66cbcd27]
Former-commit-id: a17dee033a
2013-02-14 13:58:32 -06:00
Lee Venable
021b0d1944 Merge "Issue #1605 Improved finding closest area locations. " into development
Former-commit-id: 2bc6178923 [formerly 4383968e23] [formerly b047a0393f] [formerly 60f3f46d19 [formerly b047a0393f [formerly 1c778e9c7140214bed727a2eac73c0461d134341]]]
Former-commit-id: 60f3f46d19
Former-commit-id: 14199f34eb2d9b3903ec0369994476b870a3aafe [formerly 4952a3f595]
Former-commit-id: dfef1c916a
2013-02-14 12:56:01 -06:00
Matt Nash
1844303e5d Issue #1506 move away from using QueryScript on the UI thread, except where
absolutely necessary we can run a synchronous operation

Change-Id: I4503d4e18e3f458b7df7c2d187e8880d5a3d2cc7

Former-commit-id: 2a42ae7a47 [formerly 75f51be7b2] [formerly bc954889eb] [formerly 5b136272a3 [formerly bc954889eb [formerly f6ef0f0ebc9002caad9a632515402b84280892fc]]]
Former-commit-id: 5b136272a3
Former-commit-id: f620d70c55f78938b7e41137630295768daa3ffe [formerly d29162c654]
Former-commit-id: 126537966c
2013-02-14 11:47:34 -06:00
Ron Anderson
65389ddcff Merge "Issue #1515: Better handle notifications received after disposing VCParms." into development
Former-commit-id: c34674110b [formerly 11212b51db] [formerly e04322f7ad] [formerly 96fee6ea56 [formerly e04322f7ad [formerly 1f5fbc207e533be5a7dde9651dd35743a0fc3a34]]]
Former-commit-id: 96fee6ea56
Former-commit-id: 3da1ec5d391f1861f769ed3a1649b6c08ae21bb6 [formerly b5ff9b6998]
Former-commit-id: 377e85913f
2013-02-14 11:13:26 -06:00
Jonathan Sanchez
003ae9b612 Issue #1605 Improved finding closest area locations.
Former-commit-id: e05b15e7be [formerly 4555420e82] [formerly 9641b67da4] [formerly 1722713689 [formerly 9641b67da4 [formerly b8a43d95121a1876dc8136bd5758e9452167fad2]]]
Former-commit-id: 1722713689
Former-commit-id: ab881bc4d23c7177114509bed49eff331e2a2c20 [formerly 459472a793]
Former-commit-id: c1a832ef3a
2013-02-14 11:12:23 -06:00
Ben Steffensmeier
fb7100ddc2 Issue #1614 allow locationNames for grid data access
Change-Id: I5d88708909b8f76ebdf6fac64a330854781ffae2

Former-commit-id: 31605a14aa [formerly ef7addb005] [formerly ab319bd3a8] [formerly 9b4de367e3 [formerly ab319bd3a8 [formerly 7fe101c9fdb9266cd7c16a6c0a7281b9f9836cc4]]]
Former-commit-id: 9b4de367e3
Former-commit-id: a85d7d1d1a99549985dadde8efd31a21ab2de327 [formerly 0995024482]
Former-commit-id: efaddb710c
2013-02-14 10:07:01 -06:00