Nate Jensen
5082d42bd5
Merge "Issue #2241 fix tear off menus in practice mode" into development
...
Former-commit-id: 1882acee982a0c73fb2547eb9ecb0a1882acee982a0c73fb2547eb9ecb0a5fe4c08ab647eb9ecb0a5fe4c08ab628455b8d4260ee75d3dff77b99b51ce115f8581bee8020b667
2014-04-14 09:28:34 -05:00
Richard Peter
6de4d778b5
Merge "Issue #2947 Minor satellite and derived parameter improvements." into development
...
Former-commit-id: 84bb4e5e3297fb03df0291e941f60a84bb4e5e3297fb03df0291e941f60a9ef8347f2391e941f60a9ef8347f23d5149f4409a4eba6e6dfffd74e6787c072d0d0ca4ca584c465
2014-04-11 19:33:31 -05:00
Ben Steffensmeier
98337b3f0d
Issue #2947 Minor satellite and derived parameter improvements.
...
Former-commit-id: 4004fe2d182d66e58671dd794a3c124004fe2d182d66e58671dd794a3c12428f3a2d8bdd794a3c12428f3a2d8ba224105467b120feab6f6c92b645f00b6ca5641725c850b9d8
2014-04-11 17:37:59 -05:00
Ben Steffensmeier
ef9b1b0790
Issue #2947 Switch derived parameter space amtching to use IGridGeometryProvider.
...
Former-commit-id: 3efa47aafdca78a04d95d5b91d88463efa47aafdca78a04d95d5b91d88461ad8396366d5b91d88461ad839636648a6b0fdf8b707e3b6dbfb85857ff57ca12d26a943e975b11e
2014-04-11 17:34:38 -05:00
Richard Peter
626ab0bd58
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: 9b12d9ddafcd51f3fa873575d6586f9b12d9ddafcd51f3fa873575d6586f21ae3b5fcd3575d6586f21ae3b5fcd56089894f2d65b11d404a7ec0bcf66b6482f2e54a22345ea6b
2014-04-11 16:23:09 -05:00
Roger Ferrel
8870f7412f
Issue #2862 Implements locks on case creation.
...
Change-Id: Ic0975b699e54b30f152422782e11ac04c310cb1b
Former-commit-id: 67399901a016fab01b8b5570261d7467399901a016fab01b8b5570261d74cfea0489d75570261d74cfea0489d7bd722b378ac5de39c162d66a346c65ac1946609e6f127a05e0
2014-04-11 16:07:58 -05:00
brian.dyke
e205810cba
Merge branch 'master_14.2.2' into asm_14.2.2
...
Former-commit-id: c75dba32e96a9ccba3936575f77fe3c75dba32e96a9ccba3936575f77fe3a8d6d58f316575f77fe3a8d6d58f3116a261d7f688ddd667b6ad63114f161c4e02168cf299a28f9b
2014-04-11 10:58:48 -04:00
Richard Peter
2daaee7db2
Merge "Issue #2864 - Change how saved subset files are stored." into development
...
Former-commit-id: ce74b40f0b69c6217ae98a682a5e23ce74b40f0b69c6217ae98a682a5e23695878c6aa8a682a5e23695878c6aaed571fbebdb4cc44faa00fa4180959e858f14a8cb6c8960328
2014-04-11 09:41:31 -05:00
Mike Duff
8f8f5ddd1c
Issue #2864 - Change how saved subset files are stored.
...
Change-Id: I57c68196a633a55a6f9c1548eff7ad449fadb88c
Former-commit-id: 3404a4beb4a58f279b5482cf444d6f3404a4beb4a58f279b5482cf444d6f890faf2d7382cf444d6f890faf2d736e9e743fdcdc2a5b0c6f6d8bead4a7583a4b1cea8b46df102d
2014-04-11 08:27:42 -05:00
Nate Jensen
5896c3c48b
Merge "Issue #2937 Connect to the venue after the feed view is available." into development
...
Former-commit-id: 86acc1b95bc7593d61c45fc6942fab86acc1b95bc7593d61c45fc6942fabb3b9dbff675fc6942fabb3b9dbff671de04d9b2b7f321595994a395ff2bcff5519566f0bac0fa185
2014-04-10 16:59:17 -05:00
Everett Kladstrup
32b9f37475
Issue #2725 Moving derivparam plugins to the lowest applicable features
...
Former-commit-id: c22e8323d17fd3d7ce3db074c88957c22e8323d17fd3d7ce3db074c88957ed0c157e33b074c88957ed0c157e331c2141ee3970a383f68db9f67d3bae5f280b73529327eebf87
2014-04-10 16:00:22 -05:00
Matt Nash
9f6410615b
Issue #2241 fix tear off menus in practice mode
...
Change-Id: I52a2e9be64bff8a044b148666b7ad77670a6f64e
Former-commit-id: 4dc5f614b3f5e333c15481c4976c964dc5f614b3f5e333c15481c4976c960eed368ac481c4976c960eed368ac4edd8c9185ed91e77641b46df69447b17f43a61146fc553f812
2014-04-10 14:50:06 -05:00
Everett Kladstrup
8c48ae0c7f
Issue #2725 Put derivparam plugins in viz and edex separately
...
Former-commit-id: e543570a0790244ad7ecd76aaed2f0e543570a0790244ad7ecd76aaed2f01a8a05cd0ed76aaed2f01a8a05cd0e2bdc415769fa9ee97662db413dc65f1a68ea889a1467f1a316
2014-04-10 14:08:42 -05:00
Brad Gonzales
34981c24ea
Issue #2937 Connect to the venue after the feed view is available.
...
Change-Id: I6e560014308e6d17c8d7af525ded82d2399fa936
Former-commit-id: 0380e02c775fcec27765cc0fd1e9af0380e02c775fcec27765cc0fd1e9afea03096031cc0fd1e9afea03096031ccc4bc5a27e41f9defa43b25edad9a8f72707b3a91d546d015
2014-04-10 14:01:53 -05:00
Nate Jensen
7e9282fde2
Merge "Issue #1803 fix redbook sharing in collaboration" into development
...
Former-commit-id: 30dbefd6c374a7189143e88519c5e330dbefd6c374a7189143e88519c5e3666b271528e88519c5e3666b271528b36e4b7b655d17f07d25573981b0d54cffa919037cae36a45e
2014-04-10 13:50:55 -05:00
Mike Duff
408059b7e3
Issue #2892 - Fix problems loading saved configs for data browser dialog.
...
Change-Id: I73b98714642f5852f7209fd8533d49aa473412f9
Former-commit-id: 578aa18528635684bb4e33a2259cf4578aa18528635684bb4e33a2259cf4da65756e3b33a2259cf4da65756e3b29b9ea212fa23608ec5967ff4371b3bc82bf8f86b432d6a4f6
2014-04-10 13:31:42 -05:00
Brian.Dyke
f77319aa5b
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: b6e4e2339473be1016c08c2f601b59b6e4e2339473be1016c08c2f601b599cce8eb0d18c2f601b599cce8eb0d170e228a893afc1da9015ff51498036f051b95a7afbefee3e1d
2014-04-10 13:26:42 -04:00
David Gillingham
cb52793865
Issue #3004 : Move ClearPracticeVTECTableRequest and its handler from gfe to activetable plugin.
...
Change-Id: I46b1d79f1b6602254febff5d7c3d8f655a22bf2d
Former-commit-id: 41393ac5a11c7e650e6ac8a6dc876941393ac5a11c7e650e6ac8a6dc8769da31ab2042c8a6dc8769da31ab2042969dccd3660385a4395e72229cfb9489046665f62ab21ac335
2014-04-10 11:24:40 -05:00
Nate Jensen
f77b444ed2
Issue #1803 fix redbook sharing in collaboration
...
Change-Id: I7e5d887d8dd46fec02966d9ea4723252d7cda31e
Former-commit-id: b591e667364cccdac37e1efb9a2a4db591e667364cccdac37e1efb9a2a4d4a826332e91efb9a2a4d4a826332e9678fdc5e2e2750a173dca191b473e2a3fef22e8b71e01e0264
2014-04-10 10:50:33 -05:00
Nate Jensen
d0dc37282a
Merge "Issue #2725 Add new project to alertviz feature" into development
...
Former-commit-id: d784482c4556b820ab97ec40cb3dfcd784482c4556b820ab97ec40cb3dfceaf1382178ec40cb3dfceaf13821781822ef2a7ea0e2342126952586230a8c6704e442c2f1f5542a
2014-04-09 16:07:25 -05:00
Everett Kladstrup
159fbc311c
Issue #2725 Add new project to alertviz feature
...
Former-commit-id: e4be485bf7963ce8716ee4633811fce4be485bf7963ce8716ee4633811fc02b47e4d5ae4633811fc02b47e4d5a2c4f13742bc2a96ba98555638c0916a00b1dd9f6de0f935f69
2014-04-09 16:01:57 -05:00
Richard Peter
52a54f5e9f
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: efd1003a50567609044395eba8dcf6efd1003a50567609044395eba8dcf6b15d28853095eba8dcf6b15d28853047795836f2f1b85f696473aab15d85b667e0509f421b2716a4
2014-04-09 16:00:54 -05:00
Nate Jensen
6e7aafce71
Merge "Issue #2950 Fix GL errors when mosaicing or using ginormous colormaps." into development
...
Former-commit-id: 3a88116cb1ad961bb84d0dd55f63ba3a88116cb1ad961bb84d0dd55f63ba88d0e400fb0dd55f63ba88d0e400fbd39ebe23fedfac2a42c2a2c4c638525a2f9a2e04560bdaf4c8
2014-04-09 14:07:09 -05:00
Everett Kladstrup
5a57115156
Issue #2725 Remove datacube plugin from viz.core feature
...
Former-commit-id: ffdcf503cab670fa67f650346d5aecffdcf503cab670fa67f650346d5aecef21ea5c1f50346d5aecef21ea5c1fdfbf285867fd9bd8282a9faba2afbf21c7199512136af85d0c
2014-04-09 13:59:11 -05:00
Everett Kladstrup
d10f5398f1
Issue #2725 Add new plugin to uf.viz.base feature
...
Former-commit-id: 11e432a9a591673b18b08d918404d511e432a9a591673b18b08d918404d528364c86188d918404d528364c86189248f426c8d968a60023378193b61f64dad45a1c619ccff21b
2014-04-09 13:43:09 -05:00
Ben Steffensmeier
98ed8197a6
Issue #2950 Fix GL errors when mosaicing or using ginormous colormaps.
...
Former-commit-id: e74539a3e39c5eb936d35328415054e74539a3e39c5eb936d35328415054daff2b9d9d5328415054daff2b9d9d73083d370e88f5dbe81df5271a94d6cf81a60e7c28f06f5bfc
2014-04-09 13:19:21 -05:00
Nate Jensen
35d43dfe6a
Merge "Issue #2785 - Throw error when CollaborationConnection needs connection and it doesn't exist" into development
...
Former-commit-id: af412382b6187a895056b58bb8500caf412382b6187a895056b58bb8500c2c2e324401b58bb8500c2c2e324401344f074849f574c535f58999051f044af6b91229edc55ee2ca
2014-04-09 11:22:07 -05:00
Nate Jensen
66f604ece7
Merge "Issue #2950 Add option to interpolate image colors." into development
...
Former-commit-id: 5aa9e39af60da28c9c7a1f2809ced05aa9e39af60da28c9c7a1f2809ced0d729cc70af1f2809ced0d729cc70af4281ca09516f36916c31c46073679391ef6f7b9c801f6f7a5c
2014-04-09 11:20:59 -05:00
Nate Jensen
e2273ed91d
Merge "Issue #2950 Support dynamic color counts for color map editing." into development
...
Former-commit-id: 992a00b18c6989999e955129002e91992a00b18c6989999e955129002e915bad21f3e65129002e915bad21f3e67c7b5851a758516f3a9f92f0182d3fa08e3a4f1a4fe2e3a01b
2014-04-09 11:20:04 -05:00
Brian.Dyke
38a8f60a43
Merged 1354 -7 and -8 into 1412
...
Former-commit-id: 7de936dfbae4136f79dd947194c9987de936dfbae4136f79dd947194c998929b736038947194c998929b736038a6ebdbfc3ad76d3a26cb5163a31a66462952ce658ef50f023b
2014-04-09 11:39:07 -04:00
Mike Duff
5c337b904a
Issue #2785 - Throw error when CollaborationConnection needs connection and it doesn't exist
...
Change-Id: I2f2234da42e9210b574f7489fc37da0a63bf2133
Former-commit-id: 981306d4745e39f5a61c23474c5ead981306d4745e39f5a61c23474c5eadeafa177f4b23474c5eadeafa177f4b612ee41f8d1363155c34ee80debc366e6ac425af494c577a1b
2014-04-09 10:17:22 -05:00
Richard Peter
f302a409bb
Merge "Issue #2725 Move derived parameters logic to common" into development
...
Former-commit-id: b86321616b16e1018dd9ea4d09c674b86321616b16e1018dd9ea4d09c674ed25b71ff1ea4d09c674ed25b71ff18ee15aba37a32e066d95ce7e0f9a315fd649238617f405cbaa
2014-04-09 09:33:56 -05:00
Nate Jensen
58c07a218e
Merge "Issue #2920 Fix serialization of DrawStringEvent." into development
...
Former-commit-id: c8ed0594616aa42816ecabee6815adc8ed0594616aa42816ecabee6815ad143c3e1801abee6815ad143c3e1801165ad125139899b9ecab0ea487feec030857c8a9a396472116
2014-04-09 09:32:39 -05:00
Everett Kladstrup
f815fbcb60
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: eab13586028b19b3601a06d6961c0feab13586028b19b3601a06d6961c0f069904151806d6961c0f069904151829ce7781c986bf2b5ea0260d0beddcd96b56c91a7b2683532a
2014-04-09 09:31:12 -05:00
Ben Steffensmeier
7cab1bdb01
Issue #2920 Fix serialization of DrawStringEvent.
...
Former-commit-id: b921f6bb4ed09b87736a0abf71f719b921f6bb4ed09b87736a0abf71f719d43e5abf290abf71f719d43e5abf2902596282ca41e508b0da6327c3a6734e33194b36b81d14f2ea
2014-04-09 09:21:45 -05:00
Nate Jensen
f25d331ee0
Merge "Issue #2785 - Change connection order of events Fixed classpath Change-Id: I15296306ee105a54379a370da7d53c7e46dc34bb" into development
...
Former-commit-id: 323e6beb3e44f93acd4d847481950c323e6beb3e44f93acd4d847481950cea3a8e29c3847481950cea3a8e29c3d252a009657a9f211997e99ad67adaf487346af783917ecb21
2014-04-09 08:50:45 -05:00
Ben Steffensmeier
883474adf0
Issue #2950 Support dynamic color counts for color map editing.
...
Former-commit-id: c23ef567069d7504e2c3c5a48642ebc23ef567069d7504e2c3c5a48642ebc805a5fed7c5a48642ebc805a5fed74c72a79253cf3456c6cd16446101a4e0ff68736e80476e1f60
2014-04-08 15:27:57 -05:00
Ben Steffensmeier
ae3e9e92cd
Issue #2950 Add option to interpolate image colors.
...
Former-commit-id: 5dee593089c2e028f178bd3ad2a4775dee593089c2e028f178bd3ad2a477525cf4053fbd3ad2a477525cf4053fc8fa54c867de4386e1029481062a4396ad01ec91ac3489121d
2014-04-08 15:19:00 -05:00
Nate Jensen
61e4984dda
Merge "Issue #2920 Allow strings to use mulitple styles." into development
...
Former-commit-id: f0ef64f03cb793ce20bc811364eb73f0ef64f03cb793ce20bc811364eb733fff4e77d4811364eb733fff4e77d4df17c6698041a70981662fdac5fec2a87b131d947d8ea4b1cb
2014-04-08 14:28:44 -05:00
Mike Duff
dc7d97752f
Issue #2785 - Change connection order of events
...
Fixed classpath
Change-Id: I15296306ee105a54379a370da7d53c7e46dc34bb
Former-commit-id: 7c9a7d609ebdde561f8aefefe62e0f7c9a7d609ebdde561f8aefefe62e0f7da1547c22efefe62e0f7da1547c226fd58b37782b67272b607145820d623c6c0824ce2b520fe31e
2014-04-08 14:14:20 -05:00
Nate Jensen
2feed8888a
Issue #2968 improve efficiency by only compressing/serializing persisted
...
objects once
Change-Id: Iba90717d049571b801254852a7fd5a73202701f2
Former-commit-id: 0949264e48579584c346e3df98635a0949264e48579584c346e3df98635aaaf2d3c8a4e3df98635aaaf2d3c8a4c557c6570a45ccb7d7fe8cb284d2c2773dad337d65e26b4418
2014-04-08 12:59:16 -05:00
Brian.Dyke
44ef143788
Merge branch 'master_14.2.1' into master_14.2.2
...
Former-commit-id: 518167e0bb529059851a20fef0f15b518167e0bb529059851a20fef0f15b79c7ec7ae920fef0f15b79c7ec7ae9824e1f6d1420c27a479d538b02e42bc58835a7e3c99b4f3027
2014-04-08 13:05:12 -04:00
Nate Jensen
199dcb3422
Merge "Issue #2968 fix buffer thread safety issues" into development
...
Former-commit-id: cb858dc39eccb6c8fc2ce3e5a25484cb858dc39eccb6c8fc2ce3e5a25484a03ca229e7e3e5a25484a03ca229e7c38fd5990ff16f51aa12ac7f0b69a446f7341c1400a0ffd1b1
2014-04-08 09:46:11 -05:00
Nate Jensen
9211cb1f0c
Issue #2968 fix buffer thread safety issues
...
Change-Id: I8c8cbf69ea9821ce82fc72b98cf17b0b5f1a93c2
Former-commit-id: 917e1ed8fd5c775618e3e11a5c4559917e1ed8fd5c775618e3e11a5c4559f2b18b76f2e11a5c4559f2b18b76f23649961255f5d594bddcae9c53fd05e936e5cac3a2d09fd948
2014-04-07 17:30:27 -05:00
Mike Duff
d25712d022
Issue #2860 - Implement the redbook upper air model graphics and cpc charts for NDM
...
Change-Id: If01865b85f7ed18edea63757426cb76e44587b0e
Former-commit-id: 97fb67b7b209802cfde2692d8841d197fb67b7b209802cfde2692d8841d1418c80640e692d8841d1418c80640e49d3dd00ba7bb7f3c4eb80bb9e41f5cd81b821b343bd945f3f
2014-04-07 16:17:28 -05:00
Nate Jensen
5de4fc4b2c
Issue #2959 fix watches/warnings handling of color change
...
Change-Id: Ic8d510e6cce1949d784cd480e58cf4347527b79e
Former-commit-id: 4aea30fbea300c26820f5a1877d8a34aea30fbea300c26820f5a1877d8a3e4c52e83e25a1877d8a3e4c52e83e243b52d63403167c3bd965cb4f195f9224b711195d30cf9f381
2014-04-07 13:31:58 -05:00
Ben Steffensmeier
85c4c3e521
Issue #2920 Allow strings to use mulitple styles.
...
Former-commit-id: 72f68e9e2bddc97933b832016d540172f68e9e2bddc97933b832016d5401bb205cdef932016d5401bb205cdef9045013ad87963901f6b15b55eb6e395b23b2f5b00ab850c00f
2014-04-04 16:16:06 -05:00
Ben Steffensmeier
bcfffbe1ed
Issue #2973 Use correct area for expanding subgrid requests.
...
Former-commit-id: 4e60abfd335b3a8dccbf90f17506914e60abfd335b3a8dccbf90f1750691000f259cf490f1750691000f259cf4ffa4a7a73ed52be1875d7b2f82ff307bd153a6965306c9969d
2014-04-04 13:17:36 -05:00
Brian.Dyke
ae3f5dbff6
Merged 1354 -5 and -6 into 1412 based on 1411-25
...
Former-commit-id: 2eec862ebb17477e7db16a28fcb1562eec862ebb17477e7db16a28fcb156dd98c213c76a28fcb156dd98c213c78ba2694d8e47d90952119f37f61cf8be574897cc39b5e7fe67
2014-04-04 12:57:32 -04:00
steve.naples
ec7e7b856e
ASM #471 Updated Radar Bias Table Dialog to pass other office id and bias properly.
...
Change-Id: I3566b9e6bb5f29000beded0b6912b6771ebc85f5
Former-commit-id: 5d7cf6c09875be620d0df6636a3dd75d7cf6c09875be620d0df6636a3dd77624f7ab75f6636a3dd77624f7ab7586c06b5632cfa9c6f01c050238ee44571efe359632e931cead
2014-04-04 15:30:18 +00:00
