brian.dyke
864e83994e
Merge branch 'master_14.3.1' into asm_14.3.1
...
Merge 14.3.1-2 into ASM
Former-commit-id: ffad42f2ef8bda882ed0ffad42f2ef8bda882ed04621d660894621d66089c27ffd06781939a06cedd6287274b2
2014-04-28 13:25:41 -04:00
steve.naples
b5e6653935
ASM #528 Updated DrawPolygonDlg to remember location when opened and closed.
...
Change-Id: I19ec2f2e1898506387d053b8ada80d2d2d67cf7c
Former-commit-id: 58b091e37be0b6f674f358b091e37be0b6f674f3760fc00028760fc00028399702b22bbed2334f5726da8e332a
2014-04-28 13:55:21 +00:00
Brian.Dyke
f31d8cc8cf
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: f0b8ea5822fb1f5aa593f0b8ea5822fb1f5aa5933524838f9f3524838f9fbf3758efa3029f5753adc6d3fe6952
2014-04-25 11:06:11 -04:00
Brian.Dyke
2161c569ea
Merge branch 'master_14.2.1' into master_14.2.2
...
Former-commit-id: 88d44a31292a4fe3dbae88d44a31292a4fe3dbaea7c9ddc05ea7c9ddc05e953236aad8911c0c6c1726cb172a04
2014-04-23 14:05:50 -04:00
brian.dyke
8f28d7213d
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: c7d785d503805af72ef8c7d785d503805af72ef824316a7f6624316a7f66ab43d20b28acc904e4e88540e0de6f
2014-04-22 16:50:57 -04:00
Brian.Dyke
8275f3907f
Merge branch 'asm_14.2.2' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.2
...
Former-commit-id: 53ce26a9b61aec3b369853ce26a9b61aec3b3698645fe64a4a645fe64a4a66974e17b94eb3317f8059cbfdf093
2014-04-17 14:42:44 -04:00
Brian.Dyke
de500c093f
Merged 14.2.1 -17, -18 into 1422-3
...
Former-commit-id: 9df6fb2d4d12a482e1d79df6fb2d4d12a482e1d7b8829139a2b8829139a26f358189170ea7c51ad7a925ba6219
2014-04-17 14:42:35 -04:00
Nate Jensen
f607630d72
Issue #3018 addressing code review comments
...
Former-commit-id: 54951100afe327f5e0bf54951100afe327f5e0bf8ba6b2722d8ba6b2722d81f8f6f3288b6650c8983737ad85b6
2014-04-17 09:28:47 -05:00
Ron Anderson
d704f90445
Merge "Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock" into omaha_14.2.1
...
Former-commit-id: 85a1f55ea0f9a393172f85a1f55ea0f9a393172f1ba72371be1ba72371be2139c2308e7d09397faa94f852cda7
2014-04-16 18:02:11 -05:00
Nate Jensen
de32624fdf
Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock
...
Former-commit-id: 781ec3ecd6a085b71c81781ec3ecd6a085b71c81c362af04f3c362af04f31a40bc4824e1caa66625e4aeb8394d
2014-04-16 17:25:09 -05:00
Nate Jensen
64e7ac4225
Issue #3039 fix ifpImage class cast exception
...
Former-commit-id: a5edace0732b6db445c0a5edace0732b6db445c031fb61e82431fb61e82419f0be6afca1dd7f24fa7e7bbfd784
2014-04-16 16:17:05 -05:00
Ron Anderson
072102dff0
Issue #3016 Fix ColormappedImage and ColorMapper.
...
Change-Id: Ic4828f393ef628b16a2a29e78446f3569974cc5b
Former-commit-id: 2a68e875a56e0147169f2a68e875a56e0147169f9f085a08569f085a0856a6fa60f40d4622ad9b8a56a1b8b682
2014-04-15 17:22:12 -05:00
Richard Peter
4ca584c465
Merge "Issue #2947 Minor satellite and derived parameter improvements." into development
...
Former-commit-id: 97fb03df0291e941f60a97fb03df0291e941f60a9ef8347f239ef8347f23a4eba6e6dfffd74e6787c072d0d0ca
2014-04-11 19:33:31 -05:00
Ben Steffensmeier
25c850b9d8
Issue #2947 Minor satellite and derived parameter improvements.
...
Former-commit-id: 2d66e58671dd794a3c122d66e58671dd794a3c12428f3a2d8b428f3a2d8bb120feab6f6c92b645f00b6ca56417
2014-04-11 17:37:59 -05:00
Richard Peter
a22345ea6b
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: cd51f3fa873575d6586fcd51f3fa873575d6586f21ae3b5fcd21ae3b5fcdd65b11d404a7ec0bcf66b6482f2e54
2014-04-11 16:23:09 -05:00
Qinglu.Lin
a849842e06
ASM #505 - Color table editor does not allow enough significant digits
...
Change-Id: I2b98ec0de0ebef7b585574d063ddf87834edd44a
Former-commit-id: 6741deb3c23bae8533606741deb3c23bae85336018804fe98e18804fe98edd6ff185c72659a9ce4d1c242f9e50
2014-04-11 12:22:44 -04:00
brian.dyke
f299a28f9b
Merge branch 'master_14.2.2' into asm_14.2.2
...
Former-commit-id: 6a9ccba3936575f77fe36a9ccba3936575f77fe3a8d6d58f31a8d6d58f3188ddd667b6ad63114f161c4e02168c
2014-04-11 10:58:48 -04:00
Richard Peter
b6c8960328
Merge "Issue #2864 - Change how saved subset files are stored." into development
...
Former-commit-id: 69c6217ae98a682a5e2369c6217ae98a682a5e23695878c6aa695878c6aab4cc44faa00fa4180959e858f14a8c
2014-04-11 09:41:31 -05:00
Mike Duff
8b46df102d
Issue #2864 - Change how saved subset files are stored.
...
Change-Id: I57c68196a633a55a6f9c1548eff7ad449fadb88c
Former-commit-id: a58f279b5482cf444d6fa58f279b5482cf444d6f890faf2d73890faf2d73dc2a5b0c6f6d8bead4a7583a4b1cea
2014-04-11 08:27:42 -05:00
Nate Jensen
0bac0fa185
Merge "Issue #2937 Connect to the venue after the feed view is available." into development
...
Former-commit-id: c7593d61c45fc6942fabc7593d61c45fc6942fabb3b9dbff67b3b9dbff677f321595994a395ff2bcff5519566f
2014-04-10 16:59:17 -05:00
Everett Kladstrup
9327eebf87
Issue #2725 Moving derivparam plugins to the lowest applicable features
...
Former-commit-id: 7fd3d7ce3db074c889577fd3d7ce3db074c88957ed0c157e33ed0c157e3370a383f68db9f67d3bae5f280b7352
2014-04-10 16:00:22 -05:00
Everett Kladstrup
1467f1a316
Issue #2725 Put derivparam plugins in viz and edex separately
...
Former-commit-id: 90244ad7ecd76aaed2f090244ad7ecd76aaed2f01a8a05cd0e1a8a05cd0efa9ee97662db413dc65f1a68ea889a
2014-04-10 14:08:42 -05:00
Brad Gonzales
91d546d015
Issue #2937 Connect to the venue after the feed view is available.
...
Change-Id: I6e560014308e6d17c8d7af525ded82d2399fa936
Former-commit-id: 5fcec27765cc0fd1e9af5fcec27765cc0fd1e9afea03096031ea03096031e41f9defa43b25edad9a8f72707b3a
2014-04-10 14:01:53 -05:00
Nate Jensen
7cae36a45e
Merge "Issue #1803 fix redbook sharing in collaboration" into development
...
Former-commit-id: 74a7189143e88519c5e374a7189143e88519c5e3666b271528666b2715285d17f07d25573981b0d54cffa91903
2014-04-10 13:50:55 -05:00
Brian.Dyke
fbefee3e1d
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: 73be1016c08c2f601b5973be1016c08c2f601b599cce8eb0d19cce8eb0d1afc1da9015ff51498036f051b95a7a
2014-04-10 13:26:42 -04:00
David Gillingham
2ab21ac335
Issue #3004 : Move ClearPracticeVTECTableRequest and its handler from gfe to activetable plugin.
...
Change-Id: I46b1d79f1b6602254febff5d7c3d8f655a22bf2d
Former-commit-id: 1c7e650e6ac8a6dc87691c7e650e6ac8a6dc8769da31ab2042da31ab20420385a4395e72229cfb9489046665f6
2014-04-10 11:24:40 -05:00
Nate Jensen
71e01e0264
Issue #1803 fix redbook sharing in collaboration
...
Change-Id: I7e5d887d8dd46fec02966d9ea4723252d7cda31e
Former-commit-id: 4cccdac37e1efb9a2a4d4cccdac37e1efb9a2a4d4a826332e94a826332e92750a173dca191b473e2a3fef22e8b
2014-04-10 10:50:33 -05:00
Nate Jensen
c2f1f5542a
Merge "Issue #2725 Add new project to alertviz feature" into development
...
Former-commit-id: 56b820ab97ec40cb3dfc56b820ab97ec40cb3dfceaf1382178eaf1382178a0e2342126952586230a8c6704e442
2014-04-09 16:07:25 -05:00
Everett Kladstrup
de0f935f69
Issue #2725 Add new project to alertviz feature
...
Former-commit-id: 963ce8716ee4633811fc963ce8716ee4633811fc02b47e4d5a02b47e4d5ac2a96ba98555638c0916a00b1dd9f6
2014-04-09 16:01:57 -05:00
Richard Peter
421b2716a4
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: 567609044395eba8dcf6567609044395eba8dcf6b15d288530b15d288530f1b85f696473aab15d85b667e0509f
2014-04-09 16:00:54 -05:00
Nate Jensen
560bdaf4c8
Merge "Issue #2950 Fix GL errors when mosaicing or using ginormous colormaps." into development
...
Former-commit-id: ad961bb84d0dd55f63baad961bb84d0dd55f63ba88d0e400fb88d0e400fbdfac2a42c2a2c4c638525a2f9a2e04
2014-04-09 14:07:09 -05:00
Everett Kladstrup
136af85d0c
Issue #2725 Remove datacube plugin from viz.core feature
...
Former-commit-id: b670fa67f650346d5aecb670fa67f650346d5aecef21ea5c1fef21ea5c1ffd9bd8282a9faba2afbf21c7199512
2014-04-09 13:59:11 -05:00
Everett Kladstrup
619ccff21b
Issue #2725 Add new plugin to uf.viz.base feature
...
Former-commit-id: 91673b18b08d918404d591673b18b08d918404d528364c861828364c8618d968a60023378193b61f64dad45a1c
2014-04-09 13:43:09 -05:00
Ben Steffensmeier
28f06f5bfc
Issue #2950 Fix GL errors when mosaicing or using ginormous colormaps.
...
Former-commit-id: 9c5eb936d353284150549c5eb936d35328415054daff2b9d9ddaff2b9d9d88f5dbe81df5271a94d6cf81a60e7c
2014-04-09 13:19:21 -05:00
Nate Jensen
edc55ee2ca
Merge "Issue #2785 - Throw error when CollaborationConnection needs connection and it doesn't exist" into development
...
Former-commit-id: 187a895056b58bb8500c187a895056b58bb8500c2c2e3244012c2e324401f574c535f58999051f044af6b91229
2014-04-09 11:22:07 -05:00
Nate Jensen
801f6f7a5c
Merge "Issue #2950 Add option to interpolate image colors." into development
...
Former-commit-id: 0da28c9c7a1f2809ced00da28c9c7a1f2809ced0d729cc70afd729cc70af6f36916c31c46073679391ef6f7b9c
2014-04-09 11:20:59 -05:00
Nate Jensen
4fe2e3a01b
Merge "Issue #2950 Support dynamic color counts for color map editing." into development
...
Former-commit-id: 6989999e955129002e916989999e955129002e915bad21f3e65bad21f3e658516f3a9f92f0182d3fa08e3a4f1a
2014-04-09 11:20:04 -05:00
Brian.Dyke
8ef50f023b
Merged 1354 -7 and -8 into 1412
...
Former-commit-id: e4136f79dd947194c998e4136f79dd947194c998929b736038929b736038d76d3a26cb5163a31a66462952ce65
2014-04-09 11:39:07 -04:00
Mike Duff
494c577a1b
Issue #2785 - Throw error when CollaborationConnection needs connection and it doesn't exist
...
Change-Id: I2f2234da42e9210b574f7489fc37da0a63bf2133
Former-commit-id: 5e39f5a61c23474c5ead5e39f5a61c23474c5eadeafa177f4beafa177f4b1363155c34ee80debc366e6ac425af
2014-04-09 10:17:22 -05:00
Richard Peter
17f405cbaa
Merge "Issue #2725 Move derived parameters logic to common" into development
...
Former-commit-id: 16e1018dd9ea4d09c67416e1018dd9ea4d09c674ed25b71ff1ed25b71ff1a32e066d95ce7e0f9a315fd6492386
2014-04-09 09:33:56 -05:00
Nate Jensen
a396472116
Merge "Issue #2920 Fix serialization of DrawStringEvent." into development
...
Former-commit-id: 6aa42816ecabee6815ad6aa42816ecabee6815ad143c3e1801143c3e18019899b9ecab0ea487feec030857c8a9
2014-04-09 09:32:39 -05:00
Everett Kladstrup
7b2683532a
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: 8b19b3601a06d6961c0f8b19b3601a06d6961c0f0699041518069904151886bf2b5ea0260d0beddcd96b56c91a
2014-04-09 09:31:12 -05:00
Ben Steffensmeier
b81d14f2ea
Issue #2920 Fix serialization of DrawStringEvent.
...
Former-commit-id: d09b87736a0abf71f719d09b87736a0abf71f719d43e5abf29d43e5abf2941e508b0da6327c3a6734e33194b36
2014-04-09 09:21:45 -05:00
Nate Jensen
83917ecb21
Merge "Issue #2785 - Change connection order of events Fixed classpath Change-Id: I15296306ee105a54379a370da7d53c7e46dc34bb" into development
...
Former-commit-id: 44f93acd4d847481950c44f93acd4d847481950cea3a8e29c3ea3a8e29c37a9f211997e99ad67adaf487346af7
2014-04-09 08:50:45 -05:00
Ben Steffensmeier
80476e1f60
Issue #2950 Support dynamic color counts for color map editing.
...
Former-commit-id: 9d7504e2c3c5a48642eb9d7504e2c3c5a48642ebc805a5fed7c805a5fed7cf3456c6cd16446101a4e0ff68736e
2014-04-08 15:27:57 -05:00
Ben Steffensmeier
ac3489121d
Issue #2950 Add option to interpolate image colors.
...
Former-commit-id: c2e028f178bd3ad2a477c2e028f178bd3ad2a477525cf4053f525cf4053fde4386e1029481062a4396ad01ec91
2014-04-08 15:19:00 -05:00
Nate Jensen
7d8ea4b1cb
Merge "Issue #2920 Allow strings to use mulitple styles." into development
...
Former-commit-id: b793ce20bc811364eb73b793ce20bc811364eb733fff4e77d43fff4e77d441a70981662fdac5fec2a87b131d94
2014-04-08 14:28:44 -05:00
Mike Duff
2b520fe31e
Issue #2785 - Change connection order of events
...
Fixed classpath
Change-Id: I15296306ee105a54379a370da7d53c7e46dc34bb
Former-commit-id: bdde561f8aefefe62e0fbdde561f8aefefe62e0f7da1547c227da1547c222b67272b607145820d623c6c0824ce
2014-04-08 14:14:20 -05:00
Nate Jensen
65e26b4418
Issue #2968 improve efficiency by only compressing/serializing persisted
...
objects once
Change-Id: Iba90717d049571b801254852a7fd5a73202701f2
Former-commit-id: 579584c346e3df98635a579584c346e3df98635aaaf2d3c8a4aaf2d3c8a445ccb7d7fe8cb284d2c2773dad337d
2014-04-08 12:59:16 -05:00
Brian.Dyke
c99b4f3027
Merge branch 'master_14.2.1' into master_14.2.2
...
Former-commit-id: 529059851a20fef0f15b529059851a20fef0f15b79c7ec7ae979c7ec7ae920c27a479d538b02e42bc58835a7e3
2014-04-08 13:05:12 -04:00
