Commit graph

3250 commits

Author SHA1 Message Date
Ana Rivera
aac45623bc VLab Issue #3617 - DCS_266 Ingest & Display HRRR Model Data
Change-Id: Ic43d3a3f51d70cd41ef8e34ccde9d1f5aee3007b

Former-commit-id: c5a4f22a24b6c1eced689c6ae437558a9a6cbc9e
2014-05-08 20:10:24 +00:00
Mike Duff
b23473ee8a Issue #3026 - NullPointer fix, test classpath fix
Change-Id: Iabc347e51a276fd4c8beb3fd512d928f184767f1

Former-commit-id: 8e70b7ae1eef7a18ddffa6d6c88d10bdd0043bcc
2014-05-08 15:02:54 -05:00
Lee Venable
92517d3ca2 Merge "Issue #2060 fix auto-update errors with grids in non-map displays" into omaha_14.3.1
Former-commit-id: a47409fd1673c9584c46aba496be1b7203d9c45d
2014-05-08 14:47:03 -05:00
Mike Duff
8498235fd8 Issue #3026 - Implement HPE bias source labels on FFMP and volume browser displays
Change-Id: Ib17ff7cfcb5efcb1737804800a93ec4f82bc6f13

Former-commit-id: 57755db0d6d77f32d64b4b569bb0af88002a23da
2014-05-08 14:36:54 -05:00
Nate Jensen
3e3035b6f1 Issue #2060 fix auto-update errors with grids in non-map displays
Change-Id: Id99693f6fd54d56a4a1255f7ee5e2308e2f5d9de

Former-commit-id: a139113883f69be89a0e0a771f8d6f48d3948686
2014-05-08 14:08:06 -05:00
Kiran.Shrestha
f013b49282 ASM #506 - TextWS: Unable to save unofficial text products from text editor.
Change-Id: I27aab39c7af355f660d873b1a17b7d94209fb13b

Former-commit-id: 1ac375914b05ea937439b6c0802291f49ff38938
2014-05-08 15:07:42 -04:00
Michael Gamazaychikov
e7341afe4d ASM #526 - Duration menu disabled after creating text for a COR SVS.
Change-Id: I23135a56247ba75c7ce980b5eddcf4e7dd30aebf

Former-commit-id: f934537da168238e76f0be04fc518f6ad315637e
2014-05-08 14:02:21 +01:00
Juliya Dynina
d6a796c476 Merge "ASM #514 - Line of Storms functionality behaving oddly in WarnGen" into asm_14.3.1
Former-commit-id: 433a3be9362e151d8da6af2d69cdcd50f4a87b93
2014-05-07 14:18:01 -05:00
Ben Steffensmeier
d7cb05fd92 Issue #3119 Optimize plot rendering.
Former-commit-id: 006df5b77f8f09e0b083b3c3e644744653f3d269
2014-05-07 13:27:48 -05:00
Brian.Dyke
f27d1b1efe Merged 13.5.5 -4 into 1412
Former-commit-id: 5644361dffaae25c63748a52c23506907210c741
2014-05-07 13:07:15 -04:00
Nate Jensen
d271dfb1a5 Merge "Issue #3117 update satellite inventory for new sectors or elements." into omaha_14.3.1
Former-commit-id: 37c2d25d9ff0076d1cab4f818e45c6ccead82105
2014-05-06 17:09:56 -05:00
Ben Steffensmeier
bbbf957ba8 Issue #3117 update satellite inventory for new sectors or elements.
Former-commit-id: 35845fa63be35661893d31510f83e2d9ab6f60af
2014-05-06 16:19:58 -05:00
Nate Jensen
a583493711 Merge "Issue #3076 added clear all to shared display sessions" into omaha_14.3.1
Former-commit-id: 26eb2500104f7afe3fb07ddd66299aa1486375d2
2014-05-06 16:15:41 -05:00
Nate Jensen
71b4227061 Issue #2060 fill in units on GridRecords created from URIs
Change-Id: Ic7c1594c1442d8463c5050bdefb434995ffc7f8a

Former-commit-id: 949d132cf3260db5f75ea665f21601ab91440958
2014-05-06 12:26:21 -05:00
Brian.Dyke
238e8f7ba1 Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
Former-commit-id: c6ba49e1206ed113b57a9fa39f5720ee9b3b979a
2014-05-06 11:34:46 -04:00
Brian.Dyke
90fecdc71e Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline-14.2.1 into master_14.2.1
Former-commit-id: 9adc24725f9bd3499d8f498990413df7718de83e
2014-05-06 11:25:15 -04:00
Chip Gobs
65d2135ac2 VLab Issue #3454 (OHD Dual-Pol enhancements for MPE and HPE/HPN (DCS #167,DCS #168) and PostAnalysis (DR #9784) )
Change-Id: Id96c25de545144d769309fef608c431d67d1bada

Former-commit-id: 1f43b57d7dffe0d1c4002ff9f1dd789a47b97734
2014-05-06 10:48:35 -04:00
Brian Clements
f545c548cc Issue #3076 added clear all to shared display sessions
Former-commit-id: 9e4a518f2ecbe86fed87fbb6dac7fad08ffb33eb
2014-05-06 09:30:07 -05:00
Lee Venable
a6c2260dd1 Issue #3109 - removed code that sets the Cave cursor.
Change-Id: I1d6d640c5abafffdea29f1e2e835142fe6598470

Former-commit-id: d875f73ff44986b2c7862f0dee06504d576fd96b
2014-05-05 16:13:31 -05:00
Melissa Porricel
42c36a5e80 ASM #481 - Add Guam GFSDNG to AWIPS
Change-Id: Iebf45e4b94fcf25aa32554f4363d0dc25f3e47ca

Former-commit-id: 012fa438f085498027402c1cd0897dd13c0d4edc
2014-05-05 14:56:58 -04:00
Dave Hladky
333bf8b36d Merge branch 'master_14.3.1' (14.3.1-3) into omaha_14.3.1
Conflicts:
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/RetrievalGeneratorUtilities.java

Former-commit-id: 2e5ee5565d1847490e46c59866b14f77555e2a7e
2014-05-05 12:15:14 -05:00
Qinglu.Lin
18e92f03c1 ASM #514 - Line of Storms functionality behaving oddly in WarnGen
Change-Id: I0bd2b9e4200b5acbb19a06caa45f18d36346de39

Former-commit-id: 66a6c50cd501358e0c8c993631b288aa78dfdc97
2014-05-05 11:54:56 -04:00
Nate Jensen
e9b3041170 Merge "Issue #2956 more safety checks" into omaha_14.3.1
Former-commit-id: c4d06eea732629d5fac66593269ec82b9ee6463d
2014-05-05 09:45:11 -05:00
Steve Harris
6ef3b9f1e5 Merge branch 'master_14.1.2' (-2) into master_14.2.1 (-22)
Conflicts:
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_60.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_70.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_80.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_90.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/HeaderTextComp.java
	cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
	cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCSurgeProb.xml
	edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/TPCSurgeProbPostProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/master_grib2_lookup.txt
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/parameterNameAlias.txt
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/largeGribPatterns.xml

Former-commit-id: c782956ef32875130bd97a0bdbffdf005e1940e3
2014-05-05 08:21:02 -05:00
Juliya Dynina
cf742e4dc0 Merge "ASM #545 Hydrobase IngestFilter GUI fixes" into asm_14.3.1
Former-commit-id: b2e7c4aa26c341caae58f9007d070c873c2d94ab
2014-05-02 12:37:00 -05:00
Xuezhi.Wei
c4fc2f169b ASM #545 Hydrobase IngestFilter GUI fixes
Change-Id: I368113a8ccb0356198a52a9d5c8a39247dce68e8

Former-commit-id: a8710a68e4aa28861c03c5d988bc36a553704c31
2014-05-02 16:55:36 +00:00
steve.naples
b58b7d3d5a ASM #253 Update MPE Bias Table to allow reverting modified bias, back to original value.
Change-Id: I1f84133404e14f7debb66e66735aa0d96a92b316

Former-commit-id: 2f608451c941efcc5372f0d0870ac72409f518e3
2014-05-02 16:15:04 +00:00
Richard Peter
478cedd3a3 Merge "Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change" into omaha_14.3.1
Former-commit-id: f124cee1070a3dd0e09cb54f773f63095f18bd16
2014-05-02 09:50:40 -05:00
Richard Peter
a9b088146c Issue #2854: Pack commons.lang for alertviz
Change-Id: Ib6eb59c6cbdb5b52acc051aec4339445fdc14166

Former-commit-id: 7d69b9fdc60b0c07121eab0119cf45b1624653cd
2014-05-01 16:30:21 -05:00
Nate Jensen
f4d20c41f4 Issue #2956 more safety checks
Change-Id: I3984fa2b534b16b2e4485e1f66d65f8df48b2e4e

Former-commit-id: a24190f35b87351a5f699ac05041bec7a13a1cdb
2014-05-01 16:28:16 -05:00
Nate Jensen
137818d03a Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change
Change-Id: I25bd1305568d26940b69565f53a06661955f240b

Former-commit-id: 6f8ef50f7cf8f245f749bf8ff9dbcc33a1d64d64
2014-05-01 16:20:35 -05:00
David Gillingham
aa78ed1b69 Issue #3105: Ensure ParmManager adds mutable db to internal db list if db is created during initialization.
Change-Id: I85de2a8182abcd0504ceee75076a3c7a72905daf

Former-commit-id: 3d8a23e2e2802d19768de47c61cedb723ec53c8f
2014-05-01 16:19:51 -05:00
Matthew Howard
55b1198186 Merge "ASM #507 - Fix incorrect FFMP gap calculation" into asm_14.3.1
Former-commit-id: ef1c0313455700304e9dc8e130f2b8658fdd1ed7
2014-05-01 16:07:11 -05:00
Richard Peter
4056f53fa2 Issue #2854: Fix features.
Change-Id: Iab5371d51b5a582387bfd9a8ef8bdd595d1dd0fe

Former-commit-id: 0d675fd5b0fdb0adceef0052adaf31c1c9a7911b
2014-05-01 14:47:41 -05:00
brian.dyke
5d7b8eca6a Merge branch 'master_14.3.1-3' into asm_14.3.1
Former-commit-id: c31c7837568ec4a8fd1516a9e9cd115df30cee40
2014-05-01 15:20:36 -04:00
Ben Steffensmeier
d98bdd64d8 Issue #3100 Time match mosaics on data update.
Former-commit-id: 3655558c91224a57a31cfb25389cee33258e0227
2014-05-01 14:17:33 -05:00
Qinglu.Lin
e489658072 ASM #123 Zone UGC line not locked
Change-Id: I5eb7ed0bee68599fe4ece0810fe76cb5c794d29c

Former-commit-id: 108895dccefb42c71d0f47b13bfd64591e8dca98
2014-05-01 14:49:27 -04:00
Steve Harris
c8ba70a146 Merge branch 'omaha_14.3.1-NHDA' into omaha_14.3.1
Former-commit-id: 36d5942b4a7f1df9b69388b40d0f6c866d9d30b8
2014-05-01 13:25:15 -05:00
Brian Clements
3ca4f8cc52 Issue #2903 changed commons.lang to match other unpacking foss
Former-commit-id: ee24eaf54704dcfdf698089a8269e055f7856c80
2014-05-01 12:34:09 -05:00
Gang.Zhang
74dc7a5d7c ASM #507 - Fix incorrect FFMP gap calculation
Change-Id: Iecfdcaa07aca79b0e17396a794851cec0e6cba25

Former-commit-id: 9b33d5187b4535d5500762e15e35e89ccbf5f5da
2014-05-01 15:49:48 +01:00
Brian Clements
873efa1c64 Issue #2903 set commons.lang to unpack in feature to fix odd bug
collaboration gets in a state where commons.lang is no longer found
setting unpack to true might help


Former-commit-id: b27a714c2cbdf2f13eb0c494ace4cbd016ef8132
2014-04-30 17:52:43 -05:00
Richard Peter
de9eb60629 Merge "Issue #2992 Updated DD list of active registries Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca" into omaha_14.3.1
Former-commit-id: 4e6364a24d5f9354946455218cc394fbda4a11ed
2014-04-30 17:43:50 -05:00
Dave Hladky
c352643c79 Issue #2992 Updated DD list of active registries
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca

Former-commit-id: a34955102d1316135c4151210daba0e5807ff6c9
2014-04-30 17:38:28 -05:00
Juliya Dynina
d804167bb2 Merge "ASM #525 - Text Workstation expiration pop-up inconsistent" into asm_14.3.1
Former-commit-id: ceb84b3c7de12a1c64f389a800125443920fbf41
2014-04-30 14:53:36 -05:00
Richard Peter
f80e16d0c9 Merge "Issue #2946 Fix auxillary purge rules." into omaha_14.3.1-NHDA
Former-commit-id: 31d75a4b82413b015353055668defab0095ef893
2014-04-30 14:49:24 -05:00
Nate Jensen
8cbea21f32 Issue #2060 fix FFG processing
Change-Id: I2338c4b311e1d660bc53933633c645e07a1687b0

Former-commit-id: 14ce9854abc51b2791b5f93756ae12cbe69b8589
2014-04-30 13:08:26 -05:00
Ron Anderson
374e8224f1 Issue #3097 Fix return type for SmartScript.getGrids()
Change-Id: I13cfa413c5efa32216d08276be57825aff8c0ca0

Former-commit-id: 1b0bc4789a7166911762d9947552fe54bfe0a137
2014-04-30 17:26:57 +00:00
Brian.Dyke
278aab6b6f Merge branch 'master_14.2.2-6' into master_14.3.1 (at 14.3.1-2)
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionTableComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubscriptionApprovalDlg.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/web/RegistryDataAccessService.java
	edexOsgi/com.raytheon.uf.edex.ogc.registry/src/com/raytheon/uf/edex/ogc/registry/RegistryCollectorAddon.java

Former-commit-id: 64c3766ed570885a796f846b889d40413e8250c6
2014-04-30 12:57:09 -04:00
Juliya Dynina
d37490acb1 Merge "ASM #511 changes to transmit_rfc_bias calls from MPE" into asm_14.3.1
Former-commit-id: a129795302a562e68638bb5e5764f54a8dcc331e
2014-04-30 07:41:27 -05:00
Loubna.Bousaidi
760ee964d6 ASM #511 changes to transmit_rfc_bias calls from MPE
Change-Id: I40c582b8d2c97e16593b8abbf8a8051e21c93004

Former-commit-id: a6033a982c80e822d9f4cb62a70b9722d79432c6
2014-04-29 21:09:34 +00:00