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
Ron Anderson
3936bcaf65
Merge "Issue #2737 Make iscMosaic remove data from ISC when grids are deleted." into development
...
Former-commit-id: d4d7e8179983d660cf2e2042d975c2d4d7e8179983d660cf2e2042d975c2debde743562042d975c2debde74356bb12a4b904c3a4664534d4fabcc4b18f487dd5dce1fc1365af
2014-04-04 08:35:12 -05:00
Ron Anderson
725dfcaa99
Issue #2737 Make iscMosaic remove data from ISC when grids are deleted.
...
Change-Id: Ibf1255244b6e5856b5052e541727d427b331d9fe
Former-commit-id: 700d2ba37f51bb7f474d01ab6ce52d700d2ba37f51bb7f474d01ab6ce52dea250a253f01ab6ce52dea250a253f1c032ab6f04d9d2f59aade50c5e47d9e568e17491e9e4479c8
2014-04-03 16:56:36 -05:00
Richard Peter
13fd7fa4d9
Merge "Issue #2874 RTOFS temperature unit correction and style enhancements" into development
...
Former-commit-id: 024ba3b88768559ad7eff4a5c3ac93024ba3b88768559ad7eff4a5c3ac9305756d272cf4a5c3ac9305756d272ce20c238886878cc797db3c5d3fe932debf1c882857565fd0a2
2014-04-03 16:52:46 -05:00
Ben Steffensmeier
7337fcf30c
Issue #2874 RTOFS temperature unit correction and style enhancements
...
Former-commit-id: dae20b905af2c605f6d3a846430a84dae20b905af2c605f6d3a846430a843baaf6543da846430a843baaf6543d12d697fc1c92beb626b46125fee4e85b21c365f24e84bd90ee
2014-04-03 16:42:45 -05:00
Nate Jensen
a4fa903bac
Issue #2967 fix error when erasing the last piece of a telestrator line
...
Change-Id: I51a3a07848dfa8639f553f86a831f15e9965bf84
Former-commit-id: 0498ff757b4d0b0495fe3e6de492ec0498ff757b4d0b0495fe3e6de492ec6b3504a39c3e6de492ec6b3504a39c5059473b5e64731a98cb64dde020015f60b1f2c12fc6484506
2014-04-03 15:08:40 -05:00
Dave Hladky
d57ce04129
Issue #2974 added DD id to sub dialogs
...
Change-Id: I2392f4ef1736edd940998a83b4ecba43829f92e7
Former-commit-id: 246dfa699f030541d7015b6c972210246dfa699f030541d7015b6c972210ef337f77d25b6c972210ef337f77d27138f246cc48d96c7a19729cc250472ce82414b84d8b3e2553
2014-04-03 14:48:42 -05:00
Ron Anderson
de22018c08
Merge "Issue #2961 Fixed issue where ISC grids are selected based on the start time of the Fcst and not the grid that overlaps the spatial editor time." into development
...
Former-commit-id: 946a3857f939bcb64c7f90429229f7946a3857f939bcb64c7f90429229f752c2092e1c90429229f752c2092e1c11df67c9f43e144c80a62bee12cb020b3850d11ae3b7e2a24a
2014-04-03 14:27:41 -05:00
Richard Peter
53195f5f72
Merge "Issue #2889 user who issued change now shows in notification center Change-Id: I424b965fed273c491f2d80e220a0936eaa79f7cc" into development
...
Former-commit-id: bef54117fdba37332585f0330daea2bef54117fdba37332585f0330daea2b7bd68b3e7f0330daea2b7bd68b3e7ca4bf07f79695bb0c91e1dc927034cb678e44dbddd364594ad
2014-04-03 13:07:36 -05:00
Ron Anderson
29024b161e
Issue #2961 Fixed issue where ISC grids are selected based on the start time of the
...
Fcst and not the grid that overlaps the spatial editor time.
Change-Id: Ifb89fc1305db8a654067185064c3d570dfecd3b2
Former-commit-id: 660bc974e9a9be0658e4eb90c1f216660bc974e9a9be0658e4eb90c1f216db080f3ebaeb90c1f216db080f3eba5d84747472c880002b1ec7b392e36b1e546a1fedfdb60c48d0
2014-04-03 13:04:55 -05:00
Ron Anderson
27d225d4a5
Merge "Issue #2729 Fixed error handling in loadPreferences method of loadConfig.py" into development
...
Former-commit-id: dd532a6edbbbecf3d2dab67c36c08bdd532a6edbbbecf3d2dab67c36c08b822acbb32bb67c36c08b822acbb32b2a0c06c814b5680ce7f3f7910616ca4309f32433792a88f134
2014-04-03 12:57:16 -05:00
Ron Anderson
a30e21e0f8
Issue #2729 Fixed error handling in loadPreferences method of loadConfig.py
...
Change-Id: I75d37583d15decaeb50db0d70fc0ba1f3a8a7b7c
Former-commit-id: 426d0fcdd7bd7e41165311c8529862426d0fcdd7bd7e41165311c85298622abfe6de7711c85298622abfe6de77f35fcf7c6f8dcbe3a815bd502fbe07acb35f67ce1afd3fb1a4
2014-04-03 12:42:42 -05:00
Ron Anderson
93acb60fdf
Merge "Issue #2847 : Add option to export only selected parms to GFE KML export dialog." into development
...
Former-commit-id: 6d94c0be656fa61adbd4b61a1b346d6d94c0be656fa61adbd4b61a1b346d60f3ad27e2b61a1b346d60f3ad27e2048d7d363b6f9cadafa7d1e5fdd3655fb2f8e94d746bc34cc6
2014-04-03 11:47:15 -05:00
David Gillingham
684be4ea5f
Issue #2847 : Add option to export only selected parms to GFE KML export dialog.
...
Change-Id: I6f0111d0f8eaed302c18dcd08e4433a7e544e669
Former-commit-id: f32b34b7367e165846d2965d76c139f32b34b7367e165846d2965d76c1397f36b8ba9c965d76c1397f36b8ba9c87ce104d679fcb3f6920017ea69812797f1249050e67fffa35
2014-04-03 11:30:59 -05:00
Ron Anderson
360d0ba509
Issue #2729 Fixed error handling in loadPreferences method of loadConfig.py
...
Change-Id: Ic01c265f792d855751aeac9890953600d531c12c
Former-commit-id: ee8d561f817e58a73dbf8da64048e7ee8d561f817e58a73dbf8da64048e769cd6a15988da64048e769cd6a1598ec74556c48b16405ecb3dde9253f15b8e1eca0665309dbf14c
2014-04-02 18:22:51 -05:00
Ron Anderson
38a1d957aa
Issue #2961 Code clean up. Issue was fixed under #2703
...
Added listener to redo time matching when ISC mode changes
Change-Id: Ic2a883c6255a81cac1316d268225fb6078921cb1
Former-commit-id: 82062553f051ffcd7ce8f4b31b336a82062553f051ffcd7ce8f4b31b336aefb27793f4f4b31b336aefb27793f48463514df0c1e5e2fd18bfed3dc5216385c81420dfcdaadbe2
2014-04-02 16:55:02 -05:00
Dave Hladky
50c77e0a2f
Issue #2889 user who issued change now shows in notification center
...
Change-Id: I424b965fed273c491f2d80e220a0936eaa79f7cc
Former-commit-id: ec2c3b4af22d18b657a81671baaf10ec2c3b4af22d18b657a81671baaf109479219b731671baaf109479219b73b908654a8386287bb5dff26450c40d577b6402dafedb08a7eb
2014-04-02 14:06:25 -05:00
Nate Jensen
51502f7db5
Merge "Issue #2632 - Remove user from list on sign-off. Fixed check for available" into development
...
Former-commit-id: 72c8f1d844c0704488cc6b20d38b1a72c8f1d844c0704488cc6b20d38b1a579d2416cb6b20d38b1a579d2416cb5821a0e0e0d5d42f2f6b19560ebc7c62f1451e50691c4411fc
2014-04-02 11:23:02 -05:00
Mike Duff
a5a38133ca
Issue #2632 - Remove user from list on sign-off. Fixed check for available
...
Change-Id: I2a389e290b697dfe06be9b4fef8d5957676f3cbe
Former-commit-id: ac9678dc6e2a9b434883538261f6d5ac9678dc6e2a9b434883538261f6d5d5df936431538261f6d5d5df936431378909ad2c7aa5cebfb092f1a3a9aa0aea45197ace774c07a8
2014-04-02 10:08:45 -05:00
Nate Jensen
693d919d5b
Merge "Issue #2938 - Fix site/role change logic for messages" into development
...
Former-commit-id: 4ec98ab846654d5abb576637623c4f4ec98ab846654d5abb576637623c4feab75cab116637623c4feab75cab112b7a95598e4494674310a9e2e856d609f9090d3d7cfff411fb
2014-04-02 09:55:19 -05:00
Nate Jensen
ec99d06e8a
Merge "Issue #2952 - Change MPE fieldgen to use thriftSrv" into development
...
Former-commit-id: 6e7b3d21a18040bcd68d0b25f77fe86e7b3d21a18040bcd68d0b25f77fe8862d1de6c40b25f77fe8862d1de6c4427ded7bcfe1a62c357f2534fb0ab1f7baa0ee4bc6a43bacfd
2014-04-02 09:54:53 -05:00
Ron Anderson
f60398861b
Issue #2969 Fixed error when Topo parm is unloaded.
...
Fixed check state of Topography menu item.
Change-Id: I3cd13d91b489425e05efd68fd6bbbfd9a9d3cd4b
Former-commit-id: 4bb7f13198346984b8ab11fbd865584bb7f13198346984b8ab11fbd86558d55605529911fbd86558d5560552995001c1f2be3ac3d5de1bac7c5460f64e88052beb0033d7d3ef
2014-04-02 09:07:22 -05:00
