Commit graph

3014 commits

Author SHA1 Message Date
Michael Gamazaychikov
588cfd0608 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
92202928c9 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
Melissa Porricel
92231e051d ASM #481 - Add Guam GFSDNG to AWIPS
Change-Id: Iebf45e4b94fcf25aa32554f4363d0dc25f3e47ca

Former-commit-id: 012fa438f085498027402c1cd0897dd13c0d4edc
2014-05-05 14:56:58 -04:00
Qinglu.Lin
d8753a4145 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
Juliya Dynina
9da4eaaad5 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
071a1ae06a ASM #545 Hydrobase IngestFilter GUI fixes
Change-Id: I368113a8ccb0356198a52a9d5c8a39247dce68e8

Former-commit-id: a8710a68e4aa28861c03c5d988bc36a553704c31
2014-05-02 16:55:36 +00:00
steve.naples
8a00348730 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
Matthew Howard
9e7a0e0a61 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
brian.dyke
d5c3f112c1 Merge branch 'master_14.3.1-3' into asm_14.3.1
Former-commit-id: c31c7837568ec4a8fd1516a9e9cd115df30cee40
2014-05-01 15:20:36 -04:00
Gang.Zhang
090ed29386 ASM #507 - Fix incorrect FFMP gap calculation
Change-Id: Iecfdcaa07aca79b0e17396a794851cec0e6cba25

Former-commit-id: 9b33d5187b4535d5500762e15e35e89ccbf5f5da
2014-05-01 15:49:48 +01:00
Juliya Dynina
4ef3cfa9c3 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
Brian.Dyke
63137ed69c 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
78bb549533 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
6d526cb1ff 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
Brian.Dyke
bdda2e9a7a Merge branch 'master_14.2.1' into master_14.2.2
Merge (14.2.1-21 into 14.2.2-5)


Former-commit-id: 9a017e543fc6be9fd0d7b9361bd2226bf2af6211
2014-04-29 12:07:21 -04:00
brian.dyke
4621d66089 Merge branch 'master_14.3.1' into asm_14.3.1
Merge 14.3.1-2 into ASM


Former-commit-id: 29bcb6987ee371f128b75eee84b65574d799135f
2014-04-28 13:25:41 -04:00
steve.naples
760fc00028 ASM #528 Updated DrawPolygonDlg to remember location when opened and closed.
Change-Id: I19ec2f2e1898506387d053b8ada80d2d2d67cf7c

Former-commit-id: ae0616b0b71e0d1952f2c3e8f461a4d8e79e934f
2014-04-28 13:55:21 +00:00
David Friedman
ae90da3011 ASM #525 - Text Workstation expiration pop-up inconsistent
Change-Id: I3867a0050962d97125ca6612fcded2fe62b48619

Former-commit-id: f7bfa197b1b61b69029efd8e225ba5dea22c17f2
2014-04-25 19:32:47 +00:00
Brian.Dyke
3524838f9f Merge branch 'master_14.2.2' into master_14.3.1
Merge (14.2.2-5 into 14.3.1-1)

Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java

Former-commit-id: f54d2c639a915db14f01f56a7fcc5841b60e1509
2014-04-25 11:06:11 -04:00
Brian.Dyke
a7c9ddc05e Merge branch 'master_14.2.1' into master_14.2.2
Former-commit-id: 64ca88d2ed7de18f9ed1f57edd2286bbc552135f
2014-04-23 14:05:50 -04:00
brian.dyke
24316a7f66 Merge branch 'master_14.3.1' into asm_14.3.1
Conflicts:
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorBar.java

Former-commit-id: 3f3c0a55218af9f27abce65c0ec3e8704485c36e
2014-04-22 16:50:57 -04:00
Dave Hladky
45059e722a Issue #3012 Various fixes.
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded

Former-commit-id: 212e15c397fe22c3bc074e054d608c0094ce8dad
2014-04-21 12:26:47 -05:00
Brian.Dyke
645fe64a4a Merge branch 'asm_14.2.2' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.2
Former-commit-id: 178acb792036869e903beea636c7216e1d3a4f58
2014-04-17 14:42:44 -04:00
Brian.Dyke
b8829139a2 Merged 14.2.1 -17, -18 into 1422-3
Former-commit-id: 712064db471de93da585f9c765bb4dfbe510df53
2014-04-17 14:42:35 -04:00
Nate Jensen
8ba6b2722d Issue #3018 addressing code review comments
Former-commit-id: 85d9dd0158ab873e1e9b76805853c712bb0c7c2c
2014-04-17 09:28:47 -05:00
Ron Anderson
1ba72371be Merge "Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock" into omaha_14.2.1
Former-commit-id: 6813b32786289503950322c02e32803299566c5d
2014-04-16 18:02:11 -05:00
Nate Jensen
c362af04f3 Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock
Former-commit-id: 7384a2d32ef554362a0693038e9b60a589afb86a
2014-04-16 17:25:09 -05:00
Nate Jensen
31fb61e824 Issue #3039 fix ifpImage class cast exception
Former-commit-id: a2fd849c603aebacce09662557bf1f008d379982
2014-04-16 16:17:05 -05:00
Ron Anderson
9f085a0856 Issue #3016 Fix ColormappedImage and ColorMapper.
Change-Id: Ic4828f393ef628b16a2a29e78446f3569974cc5b

Former-commit-id: f7d07544e07552c7fccf744c269ee4aa54dc745c
2014-04-15 17:22:12 -05:00
Richard Peter
9ef8347f23 Merge "Issue #2947 Minor satellite and derived parameter improvements." into development
Former-commit-id: 5bd4eed36c6d7c69b8fb70c6c7e021cbdd5d3b52
2014-04-11 19:33:31 -05:00
Ben Steffensmeier
428f3a2d8b Issue #2947 Minor satellite and derived parameter improvements.
Former-commit-id: d5fe527ff45e02cbbba3a92f2031d500db879839
2014-04-11 17:37:59 -05:00
Richard Peter
21ae3b5fcd Merge branch 'omaha_14.2.2' (14.2.2-3) into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Former-commit-id: bd13bc332bcdd87723bec8669885f4594ad483b9
2014-04-11 16:23:09 -05:00
Qinglu.Lin
18804fe98e ASM #505 - Color table editor does not allow enough significant digits
Change-Id: I2b98ec0de0ebef7b585574d063ddf87834edd44a

Former-commit-id: 2b9cb3e46fbd1598e95a4ea3a866741fed6603d9
2014-04-11 12:22:44 -04:00
brian.dyke
a8d6d58f31 Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 274338d3dfb6a839a59da8740ed968d8f0779d7d
2014-04-11 10:58:48 -04:00
Richard Peter
695878c6aa Merge "Issue #2864 - Change how saved subset files are stored." into development
Former-commit-id: 05fed9ffbd4c61601d6a42b2ef3dadefde7e1a3c
2014-04-11 09:41:31 -05:00
Mike Duff
890faf2d73 Issue #2864 - Change how saved subset files are stored.
Change-Id: I57c68196a633a55a6f9c1548eff7ad449fadb88c

Former-commit-id: 3052e5f92f4150fa82bfd93f512bb1670f926ec1
2014-04-11 08:27:42 -05:00
Nate Jensen
b3b9dbff67 Merge "Issue #2937 Connect to the venue after the feed view is available." into development
Former-commit-id: 11985e2127b29ee4e67288579c273d1ac75cc902
2014-04-10 16:59:17 -05:00
Everett Kladstrup
ed0c157e33 Issue #2725 Moving derivparam plugins to the lowest applicable features
Former-commit-id: 4397d0c6018858ab967110884cfdb7771c08e199
2014-04-10 16:00:22 -05:00
Everett Kladstrup
1a8a05cd0e Issue #2725 Put derivparam plugins in viz and edex separately
Former-commit-id: b349f878ffe5fb8fd231cc9286cce6542f0ed88e
2014-04-10 14:08:42 -05:00
Brad Gonzales
ea03096031 Issue #2937 Connect to the venue after the feed view is available.
Change-Id: I6e560014308e6d17c8d7af525ded82d2399fa936

Former-commit-id: 7b0e689a06eeee9f7c39dd79642fcde8e329c990
2014-04-10 14:01:53 -05:00
Nate Jensen
666b271528 Merge "Issue #1803 fix redbook sharing in collaboration" into development
Former-commit-id: 296b4dee5e8907296c45b8372b5dffe28a2b9f4c
2014-04-10 13:50:55 -05:00
Brian.Dyke
9cce8eb0d1 Merge branch 'master_14.1.2_to_master_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline into master_14.2.1
Former-commit-id: 4e5541582b38abcd744cf25549d007c9e8f1a104
2014-04-10 13:26:42 -04:00
David Gillingham
da31ab2042 Issue #3004: Move ClearPracticeVTECTableRequest and its handler from gfe to activetable plugin.
Change-Id: I46b1d79f1b6602254febff5d7c3d8f655a22bf2d

Former-commit-id: 6c5e65e538e145d31c84d2f81f7b41202ae41ad0
2014-04-10 11:24:40 -05:00
Nate Jensen
4a826332e9 Issue #1803 fix redbook sharing in collaboration
Change-Id: I7e5d887d8dd46fec02966d9ea4723252d7cda31e

Former-commit-id: fdf384ea4cedebbf06c5e4861a5a7cdcc72533b4
2014-04-10 10:50:33 -05:00
Nate Jensen
eaf1382178 Merge "Issue #2725 Add new project to alertviz feature" into development
Former-commit-id: 9cacee78da76f5da13b0a78a3e0a347a647050cf
2014-04-09 16:07:25 -05:00
Everett Kladstrup
02b47e4d5a Issue #2725 Add new project to alertviz feature
Former-commit-id: 804dae43dd8f5cfc90fb7f17c7549b5151f63c7e
2014-04-09 16:01:57 -05:00
Richard Peter
b15d288530 Merge branch 'master_14.1.2' into master_14.2.1
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
	cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	edexOsgi/build.edex/esb/conf/log4j.xml
	edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py

Former-commit-id: 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2
2014-04-09 16:00:54 -05:00
Nate Jensen
88d0e400fb Merge "Issue #2950 Fix GL errors when mosaicing or using ginormous colormaps." into development
Former-commit-id: 4d91a4fedbba2164f1e11a2fbaea8e0b1dbe6340
2014-04-09 14:07:09 -05:00
Everett Kladstrup
ef21ea5c1f Issue #2725 Remove datacube plugin from viz.core feature
Former-commit-id: 1c72a291c9623f3930ca71da67e87ef884c81a94
2014-04-09 13:59:11 -05:00
Everett Kladstrup
28364c8618 Issue #2725 Add new plugin to uf.viz.base feature
Former-commit-id: 828a32f1753a40613bb0351281458bee1d45cba6
2014-04-09 13:43:09 -05:00