Lee Venable
70cc279e37
Merge "Issue #2892 - Fix problems loading saved configs for data browser dialog." into development
...
Former-commit-id: 09afdba1fe1a3738c8fdf6601d6bccd4a6ce546df6601d6bccd4a6ce546dcaf31402d7bf4f3c75ef
2014-04-14 14:09:03 -05:00
Richard Peter
4aad8cf61c
Merge "Issue #2862 Implements locks on case creation." into development
...
Former-commit-id: 50624b548a22a01edbb719755418f8181ffee3db19755418f8181ffee3db0abb97820bc4853e7982
2014-04-14 13:28:26 -05:00
Richard Peter
b5fa843960
Issue #2726 : Edex graceful shutdown.
...
Refactored to use inheritance and separate logic where possible.
Addressed comments.
Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6
Former-commit-id: 909571ebcae4be1f24e7dbba727f3d17196b5dcddbba727f3d17196b5dcd8b279966d1ff87317bd4
2014-04-14 13:10:11 -05:00
Nate Jensen
28455b8d42
Merge "Issue #2241 fix tear off menus in practice mode" into development
...
Former-commit-id: 1882acee982a0c73fb2547eb9ecb0a5fe4c08ab647eb9ecb0a5fe4c08ab6f77b99b51c60ee75d3df
2014-04-14 09:28:34 -05:00
Richard Peter
d5149f4409
Merge "Issue #2947 Minor satellite and derived parameter improvements." into development
...
Former-commit-id: 84bb4e5e3297fb03df0291e941f60a9ef8347f2391e941f60a9ef8347f23ffd74e6787a4eba6e6df
2014-04-11 19:33:31 -05:00
Ben Steffensmeier
a224105467
Issue #2947 Minor satellite and derived parameter improvements.
...
Former-commit-id: 4004fe2d182d66e58671dd794a3c12428f3a2d8bdd794a3c12428f3a2d8b6c92b645f0b120feab6f
2014-04-11 17:37:59 -05:00
Ben Steffensmeier
48a6b0fdf8
Issue #2947 Switch derived parameter space amtching to use IGridGeometryProvider.
...
Former-commit-id: 3efa47aafdca78a04d95d5b91d88461ad8396366d5b91d88461ad8396366fb85857ff5b707e3b6db
2014-04-11 17:34:38 -05:00
Richard Peter
56089894f2
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: 9b12d9ddafcd51f3fa873575d6586f21ae3b5fcd3575d6586f21ae3b5fcda7ec0bcf66d65b11d404
2014-04-11 16:23:09 -05:00
Roger Ferrel
bd722b378a
Issue #2862 Implements locks on case creation.
...
Change-Id: Ic0975b699e54b30f152422782e11ac04c310cb1b
Former-commit-id: 67399901a016fab01b8b5570261d74cfea0489d75570261d74cfea0489d7d66a346c65c5de39c162
2014-04-11 16:07:58 -05:00
brian.dyke
16a261d7f6
Merge branch 'master_14.2.2' into asm_14.2.2
...
Former-commit-id: c75dba32e96a9ccba3936575f77fe3a8d6d58f316575f77fe3a8d6d58f31ad63114f1688ddd667b6
2014-04-11 10:58:48 -04:00
Richard Peter
ed571fbebd
Merge "Issue #2864 - Change how saved subset files are stored." into development
...
Former-commit-id: ce74b40f0b69c6217ae98a682a5e23695878c6aa8a682a5e23695878c6aa0fa4180959b4cc44faa0
2014-04-11 09:41:31 -05:00
Mike Duff
6e9e743fdc
Issue #2864 - Change how saved subset files are stored.
...
Change-Id: I57c68196a633a55a6f9c1548eff7ad449fadb88c
Former-commit-id: 3404a4beb4a58f279b5482cf444d6f890faf2d7382cf444d6f890faf2d736d8bead4a7dc2a5b0c6f
2014-04-11 08:27:42 -05:00
Nate Jensen
1de04d9b2b
Merge "Issue #2937 Connect to the venue after the feed view is available." into development
...
Former-commit-id: 86acc1b95bc7593d61c45fc6942fabb3b9dbff675fc6942fabb3b9dbff674a395ff2bc7f32159599
2014-04-10 16:59:17 -05:00
Everett Kladstrup
1c2141ee39
Issue #2725 Moving derivparam plugins to the lowest applicable features
...
Former-commit-id: c22e8323d17fd3d7ce3db074c88957ed0c157e33b074c88957ed0c157e33b9f67d3bae70a383f68d
2014-04-10 16:00:22 -05:00
Matt Nash
edd8c9185e
Issue #2241 fix tear off menus in practice mode
...
Change-Id: I52a2e9be64bff8a044b148666b7ad77670a6f64e
Former-commit-id: 4dc5f614b3f5e333c15481c4976c960eed368ac481c4976c960eed368ac446df69447bd91e77641b
2014-04-10 14:50:06 -05:00
Everett Kladstrup
2bdc415769
Issue #2725 Put derivparam plugins in viz and edex separately
...
Former-commit-id: e543570a0790244ad7ecd76aaed2f01a8a05cd0ed76aaed2f01a8a05cd0edb413dc65ffa9ee97662
2014-04-10 14:08:42 -05:00
Brad Gonzales
ccc4bc5a27
Issue #2937 Connect to the venue after the feed view is available.
...
Change-Id: I6e560014308e6d17c8d7af525ded82d2399fa936
Former-commit-id: 0380e02c775fcec27765cc0fd1e9afea03096031cc0fd1e9afea030960313b25edad9ae41f9defa4
2014-04-10 14:01:53 -05:00
Nate Jensen
b36e4b7b65
Merge "Issue #1803 fix redbook sharing in collaboration" into development
...
Former-commit-id: 30dbefd6c374a7189143e88519c5e3666b271528e88519c5e3666b271528573981b0d55d17f07d25
2014-04-10 13:50:55 -05:00
Mike Duff
29b9ea212f
Issue #2892 - Fix problems loading saved configs for data browser dialog.
...
Change-Id: I73b98714642f5852f7209fd8533d49aa473412f9
Former-commit-id: 578aa18528635684bb4e33a2259cf4da65756e3b33a2259cf4da65756e3b67ff4371b3a23608ec59
2014-04-10 13:31:42 -05:00
Brian.Dyke
70e228a893
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: b6e4e2339473be1016c08c2f601b599cce8eb0d18c2f601b599cce8eb0d1ff51498036afc1da9015
2014-04-10 13:26:42 -04:00
David Gillingham
969dccd366
Issue #3004 : Move ClearPracticeVTECTableRequest and its handler from gfe to activetable plugin.
...
Change-Id: I46b1d79f1b6602254febff5d7c3d8f655a22bf2d
Former-commit-id: 41393ac5a11c7e650e6ac8a6dc8769da31ab2042c8a6dc8769da31ab204272229cfb940385a4395e
2014-04-10 11:24:40 -05:00
Nate Jensen
678fdc5e2e
Issue #1803 fix redbook sharing in collaboration
...
Change-Id: I7e5d887d8dd46fec02966d9ea4723252d7cda31e
Former-commit-id: b591e667364cccdac37e1efb9a2a4d4a826332e91efb9a2a4d4a826332e9a191b473e22750a173dc
2014-04-10 10:50:33 -05:00
Nate Jensen
1822ef2a7e
Merge "Issue #2725 Add new project to alertviz feature" into development
...
Former-commit-id: d784482c4556b820ab97ec40cb3dfceaf1382178ec40cb3dfceaf1382178952586230aa0e2342126
2014-04-09 16:07:25 -05:00
Everett Kladstrup
2c4f13742b
Issue #2725 Add new project to alertviz feature
...
Former-commit-id: e4be485bf7963ce8716ee4633811fc02b47e4d5ae4633811fc02b47e4d5a55638c0916c2a96ba985
2014-04-09 16:01:57 -05:00
Richard Peter
47795836f2
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: efd1003a50567609044395eba8dcf6b15d28853095eba8dcf6b15d28853073aab15d85f1b85f6964
2014-04-09 16:00:54 -05:00
Nate Jensen
d39ebe23fe
Merge "Issue #2950 Fix GL errors when mosaicing or using ginormous colormaps." into development
...
Former-commit-id: 3a88116cb1ad961bb84d0dd55f63ba88d0e400fb0dd55f63ba88d0e400fba2c4c63852dfac2a42c2
2014-04-09 14:07:09 -05:00
Everett Kladstrup
dfbf285867
Issue #2725 Remove datacube plugin from viz.core feature
...
Former-commit-id: ffdcf503cab670fa67f650346d5aecef21ea5c1f50346d5aecef21ea5c1f9faba2afbffd9bd8282a
2014-04-09 13:59:11 -05:00
Everett Kladstrup
9248f426c8
Issue #2725 Add new plugin to uf.viz.base feature
...
Former-commit-id: 11e432a9a591673b18b08d918404d528364c86188d918404d528364c8618378193b61fd968a60023
2014-04-09 13:43:09 -05:00
Ben Steffensmeier
73083d370e
Issue #2950 Fix GL errors when mosaicing or using ginormous colormaps.
...
Former-commit-id: e74539a3e39c5eb936d35328415054daff2b9d9d5328415054daff2b9d9df5271a94d688f5dbe81d
2014-04-09 13:19:21 -05:00
Nate Jensen
344f074849
Merge "Issue #2785 - Throw error when CollaborationConnection needs connection and it doesn't exist" into development
...
Former-commit-id: af412382b6187a895056b58bb8500c2c2e324401b58bb8500c2c2e3244018999051f04f574c535f5
2014-04-09 11:22:07 -05:00
Nate Jensen
4281ca0951
Merge "Issue #2950 Add option to interpolate image colors." into development
...
Former-commit-id: 5aa9e39af60da28c9c7a1f2809ced0d729cc70af1f2809ced0d729cc70afc4607367936f36916c31
2014-04-09 11:20:59 -05:00
Nate Jensen
7c7b5851a7
Merge "Issue #2950 Support dynamic color counts for color map editing." into development
...
Former-commit-id: 992a00b18c6989999e955129002e915bad21f3e65129002e915bad21f3e692f0182d3f58516f3a9f
2014-04-09 11:20:04 -05:00
Brian.Dyke
a6ebdbfc3a
Merged 1354 -7 and -8 into 1412
...
Former-commit-id: 7de936dfbae4136f79dd947194c998929b736038947194c998929b7360385163a31a66d76d3a26cb
2014-04-09 11:39:07 -04:00
Mike Duff
612ee41f8d
Issue #2785 - Throw error when CollaborationConnection needs connection and it doesn't exist
...
Change-Id: I2f2234da42e9210b574f7489fc37da0a63bf2133
Former-commit-id: 981306d4745e39f5a61c23474c5eadeafa177f4b23474c5eadeafa177f4bee80debc361363155c34
2014-04-09 10:17:22 -05:00
Richard Peter
8ee15aba37
Merge "Issue #2725 Move derived parameters logic to common" into development
...
Former-commit-id: b86321616b16e1018dd9ea4d09c674ed25b71ff1ea4d09c674ed25b71ff1ce7e0f9a31a32e066d95
2014-04-09 09:33:56 -05:00
Nate Jensen
165ad12513
Merge "Issue #2920 Fix serialization of DrawStringEvent." into development
...
Former-commit-id: c8ed0594616aa42816ecabee6815ad143c3e1801abee6815ad143c3e18010ea487feec9899b9ecab
2014-04-09 09:32:39 -05:00
Everett Kladstrup
29ce7781c9
Issue #2725 Move derived parameters logic to common
...
* Make derived parameters not use VizException
* Move derived parameters packages from the viz hierarchy
to the common hierarchy
* Move data cube classes that don't depend on derived parameters
to thier own plugin
* Moved DataCubeContainer and supporting frontend classes from
viz.core to viz.datacube
Former-commit-id: eab13586028b19b3601a06d6961c0f069904151806d6961c0f0699041518260d0beddc86bf2b5ea0
2014-04-09 09:31:12 -05:00
Ben Steffensmeier
02596282ca
Issue #2920 Fix serialization of DrawStringEvent.
...
Former-commit-id: b921f6bb4ed09b87736a0abf71f719d43e5abf290abf71f719d43e5abf296327c3a67341e508b0da
2014-04-09 09:21:45 -05:00
Nate Jensen
d252a00965
Merge "Issue #2785 - Change connection order of events Fixed classpath Change-Id: I15296306ee105a54379a370da7d53c7e46dc34bb" into development
...
Former-commit-id: 323e6beb3e44f93acd4d847481950cea3a8e29c3847481950cea3a8e29c3e99ad67ada7a9f211997
2014-04-09 08:50:45 -05:00
Ben Steffensmeier
4c72a79253
Issue #2950 Support dynamic color counts for color map editing.
...
Former-commit-id: c23ef567069d7504e2c3c5a48642ebc805a5fed7c5a48642ebc805a5fed716446101a4cf3456c6cd
2014-04-08 15:27:57 -05:00
Ben Steffensmeier
c8fa54c867
Issue #2950 Add option to interpolate image colors.
...
Former-commit-id: 5dee593089c2e028f178bd3ad2a477525cf4053fbd3ad2a477525cf4053f9481062a43de4386e102
2014-04-08 15:19:00 -05:00
Nate Jensen
df17c66980
Merge "Issue #2920 Allow strings to use mulitple styles." into development
...
Former-commit-id: f0ef64f03cb793ce20bc811364eb733fff4e77d4811364eb733fff4e77d42fdac5fec241a7098166
2014-04-08 14:28:44 -05:00
Mike Duff
6fd58b3778
Issue #2785 - Change connection order of events
...
Fixed classpath
Change-Id: I15296306ee105a54379a370da7d53c7e46dc34bb
Former-commit-id: 7c9a7d609ebdde561f8aefefe62e0f7da1547c22efefe62e0f7da1547c227145820d622b67272b60
2014-04-08 14:14:20 -05:00
Nate Jensen
c557c6570a
Issue #2968 improve efficiency by only compressing/serializing persisted
...
objects once
Change-Id: Iba90717d049571b801254852a7fd5a73202701f2
Former-commit-id: 0949264e48579584c346e3df98635aaaf2d3c8a4e3df98635aaaf2d3c8a48cb284d2c245ccb7d7fe
2014-04-08 12:59:16 -05:00
Brian.Dyke
824e1f6d14
Merge branch 'master_14.2.1' into master_14.2.2
...
Former-commit-id: 518167e0bb529059851a20fef0f15b79c7ec7ae920fef0f15b79c7ec7ae9538b02e42b20c27a479d
2014-04-08 13:05:12 -04:00
Nate Jensen
c38fd5990f
Merge "Issue #2968 fix buffer thread safety issues" into development
...
Former-commit-id: cb858dc39eccb6c8fc2ce3e5a25484a03ca229e7e3e5a25484a03ca229e7ac7f0b69a4f16f51aa12
2014-04-08 09:46:11 -05:00
Nate Jensen
3649961255
Issue #2968 fix buffer thread safety issues
...
Change-Id: I8c8cbf69ea9821ce82fc72b98cf17b0b5f1a93c2
Former-commit-id: 917e1ed8fd5c775618e3e11a5c4559f2b18b76f2e11a5c4559f2b18b76f2ae9c53fd05f5d594bddc
2014-04-07 17:30:27 -05:00
Mike Duff
49d3dd00ba
Issue #2860 - Implement the redbook upper air model graphics and cpc charts for NDM
...
Change-Id: If01865b85f7ed18edea63757426cb76e44587b0e
Former-commit-id: 97fb67b7b209802cfde2692d8841d1418c80640e692d8841d1418c80640e80bb9e41f57bb7f3c4eb
2014-04-07 16:17:28 -05:00
Nate Jensen
43b52d6340
Issue #2959 fix watches/warnings handling of color change
...
Change-Id: Ic8d510e6cce1949d784cd480e58cf4347527b79e
Former-commit-id: 4aea30fbea300c26820f5a1877d8a3e4c52e83e25a1877d8a3e4c52e83e25cb4f195f93167c3bd96
2014-04-07 13:31:58 -05:00
Ben Steffensmeier
045013ad87
Issue #2920 Allow strings to use mulitple styles.
...
Former-commit-id: 72f68e9e2bddc97933b832016d5401bb205cdef932016d5401bb205cdef95b55eb6e39963901f6b1
2014-04-04 16:16:06 -05:00
