Steve Harris
|
7f13d82b95
|
Merge branch 'development_on_ss_builds' (with 12.9.1-5) into development
Conflicts:
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGribGridResource.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelDataRequestJob.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelGeneratorJob.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWarningResource.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java
Former-commit-id: 772c4359da [formerly 51eb89eb2a ] [formerly 91e39617cb ] [formerly 772c4359da [formerly 51eb89eb2a ] [formerly 91e39617cb ] [formerly a71dac6cad [formerly 91e39617cb [formerly b9db13cf5bff60511d815f92f0239a4313498265]]]]
Former-commit-id: a71dac6cad
Former-commit-id: fd6e8d5b63 [formerly dbcb28ce77 ] [formerly 1be860f8d952be20f92f7830faeba102244c82ba [formerly 87a602dfee ]]
Former-commit-id: 8e63ec5399842340c4f27680b2ed51ba425ae251 [formerly 0b647c0c9d ]
Former-commit-id: 3f44e46a6f
|
2012-08-27 09:53:55 -05:00 |
|
Max Schenkelberg
|
d1bc6e2b45
|
Issue #28 Changed ResourceList so it can be extended to allow duplicates. Removed deleted files from ISerializableObject files. Made TileSetRenderable properly issue refresh when images were still being requested. Made true color code work by only showing intersecting areas of all bands on screen. Made so shader files would be reread in if edited.
Change-Id: Ib2ce27522c59f25ce1cef65e6d7665e28963f081
Former-commit-id: 97759c7ce1 [formerly 1f84ddbddf ] [formerly 75b2cdff47 ] [formerly 97759c7ce1 [formerly 1f84ddbddf ] [formerly 75b2cdff47 ] [formerly c4812b7745 [formerly 75b2cdff47 [formerly 291edbc6bd69815e003179e9ce708b6fdad254ad]]]]
Former-commit-id: c4812b7745
Former-commit-id: 8fb5b29881 [formerly 6f96fa5045 ] [formerly 991a8632682c94855dfb4abec915f0eae9146f28 [formerly 7f506ce81d ]]
Former-commit-id: 8d591ae44fba6435f779585c9883742d906d181e [formerly 8e894dba11 ]
Former-commit-id: 713f9be08b
|
2012-08-23 17:37:12 -05:00 |
|
Max Schenkelberg
|
950e2bff73
|
Issue #28 Cleaned up True Color code and removed old MultiChannel code. Adding capping index back to indexing.glsl and added no data value to ColorMapParameters that should be used for finding no data values in shader and in java. True color dialog was written but not hooked in yet as need to still think about single resource tied to multiple channels and serializing changes.
Change-Id: I20bff443fe4c9b9330c0a66779218227c48df014
Former-commit-id: 79d98841a0 [formerly fc06265360 ] [formerly b69d2cad1c ] [formerly 79d98841a0 [formerly fc06265360 ] [formerly b69d2cad1c ] [formerly 1b406ecfca [formerly b69d2cad1c [formerly 564b38b30562a371cf0345de572b32ea8f53e82e]]]]
Former-commit-id: 1b406ecfca
Former-commit-id: 56496dc03e [formerly 47cefd1513 ] [formerly 71e7ec51b8b8299ebc4b78fb5367003fc83ce4f5 [formerly aa9df46a1d ]]
Former-commit-id: 408d45a6b996130822ce865675f4446c9ea19f79 [formerly 362d34bee0 ]
Former-commit-id: dcbab7d58f
|
2012-08-20 14:47:14 -05:00 |
|
root
|
73466bae44
|
Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: bb7b5341dd [formerly 0987fc6b3d ] [formerly cb46f57879 ] [formerly bb7b5341dd [formerly 0987fc6b3d ] [formerly cb46f57879 ] [formerly 5a453ee984 [formerly cb46f57879 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]]
Former-commit-id: 5a453ee984
Former-commit-id: 791f3f5b85 [formerly 537dbadf64 ] [formerly 9fa79e8d9e9e82e29b8bae3cd42dbb3e0f9f0f26 [formerly 8a66b2f209 ]]
Former-commit-id: 167e4e289205b778c1de6873be7610daf3a39f5f [formerly 1792158ef8 ]
Former-commit-id: 0eb9520e15
|
2012-08-15 22:15:20 +00:00 |
|
Max Schenkelberg
|
de0b465ed8
|
Issue #28 Implemented generic true color resource with new extension. Wrote new, more efficient, accurate, and scalable TileSet rendering/managing code to replace AbstractTileSet which VIIRS uses since it took over 10s to load a single frame of data with AbstractTileSet and around 20-30s to load a single true color frame of VIIRS. Put true color code in separate projects to encapsulate functionality. Resources need not depend on these projects, they just have to set the ImagingProvider in their ImagingCapability and true color resource can be loaded through a bundle file.
Change-Id: I624edb115b02611470e2e434e27759c45600111c
Former-commit-id: 5c4ba85189 [formerly d6522f8e3a ] [formerly 93e8619fa5 ] [formerly 5c4ba85189 [formerly d6522f8e3a ] [formerly 93e8619fa5 ] [formerly 09b0db0a13 [formerly 93e8619fa5 [formerly 7d75620c07c992ab74a8305a69ed87817f8f0639]]]]
Former-commit-id: 09b0db0a13
Former-commit-id: 84e54dbb2a [formerly 107efcaee3 ] [formerly 2ae9659aef573b9f509312fe7c176e5105ef0760 [formerly 784c43ab7c ]]
Former-commit-id: 59e7bf476ae030aaebacd8f558cbeb93ba2064bb [formerly 79f15e475e ]
Former-commit-id: 3d43480508
|
2012-08-13 12:20:05 -05:00 |
|
Steve Harris
|
5d5bcddfd2
|
Merge branch 'ss_builds' (12.8.1-5) into development_on_ss_builds
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/AbstractParmManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/VCModuleJobPool.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/GFEColorbarResource.java
edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
rpms/awips2.64/Installer.h5py/component.spec
rpms/awips2.64/Installer.python/component.spec
rpms/awips2.64/Installer.python/src/lapack.patch1
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
rpms/python.site-packages/Installer.pupynere/component.spec
Former-commit-id: 0557c9a0c6 [formerly fb47934159 ] [formerly 6d77b94217 ] [formerly 0557c9a0c6 [formerly fb47934159 ] [formerly 6d77b94217 ] [formerly 51e38ca887 [formerly 6d77b94217 [formerly 1b17cebeb85f871d950bd02e27141b11d977c3ad]]]]
Former-commit-id: 51e38ca887
Former-commit-id: 330c7a877c [formerly d2291ba23f ] [formerly 01cf1f328ecb5a3b2a058b016779fc32e6f68081 [formerly 3476fe755b ]]
Former-commit-id: 398f1f615222e7408fca287d0787208690bcb094 [formerly e892eb4628 ]
Former-commit-id: 078b4fff3c
|
2012-08-01 12:43:12 -05:00 |
|
Steve Harris
|
1098368e19
|
12.8.1-5 baseline
Former-commit-id: 2e804fc8c4 [formerly 2653ddc2e3 ] [formerly fd2abfb6f1 ] [formerly 2e804fc8c4 [formerly 2653ddc2e3 ] [formerly fd2abfb6f1 ] [formerly cd49ef3eda [formerly fd2abfb6f1 [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]]]
Former-commit-id: cd49ef3eda
Former-commit-id: 4f47148ced [formerly dab00b12e6 ] [formerly 470040dd3334156744a98f7368531647893ed93d [formerly e0c3722fd1 ]]
Former-commit-id: 573a0cc46f2d0efe2e8514f12ca675b4673c9160 [formerly e86949a8d3 ]
Former-commit-id: d3be09bd74
|
2012-08-01 10:45:37 -05:00 |
|
Nate Jensen
|
0e19b5d039
|
Issue #882 fix auto updates, more efficiently set simulated time
Change-Id: I29f497df91920618e5271bf0ff436547d6225413
Former-commit-id: 903803754a [formerly ac8d12ce13 ] [formerly 3d07fc8ebf ] [formerly 903803754a [formerly ac8d12ce13 ] [formerly 3d07fc8ebf ] [formerly dbe185f3a0 [formerly 3d07fc8ebf [formerly da03e63d10f5f7b6fa77d0e302b11e7501475e22]]]]
Former-commit-id: dbe185f3a0
Former-commit-id: f66f383270 [formerly 4e0a0f10dc ] [formerly ab836393cd25791396a8a3346ebf7c847d8cf286 [formerly 67edb6917d ]]
Former-commit-id: 9b11ec3cc52438936b484082a0158ba2ae5dc7b2 [formerly 70d269fc34 ]
Former-commit-id: c2558bdb79
|
2012-07-26 17:43:29 -05:00 |
|
Ben Steffensmeier
|
6eb98d7da6
|
Issue #772 switch satellite from offscreen rendering to mosaic for a more well defined graphics API.
Change-Id: If293a65f577f13f6ba2ccae41b100dd9542d6998
Former-commit-id: 0a7be21041 [formerly 5bf019e1bb ] [formerly 74a69d1fb9 ] [formerly 0a7be21041 [formerly 5bf019e1bb ] [formerly 74a69d1fb9 ] [formerly 79ab850efa [formerly 74a69d1fb9 [formerly 009e769a180898cb62e9df4a604b40e139cf2886]]]]
Former-commit-id: 79ab850efa
Former-commit-id: bd239a7466 [formerly 612e586a6c ] [formerly 2abc2a1aad032ea41191229591abdad0597e5bc9 [formerly 4182352f8c ]]
Former-commit-id: 39b4671391b3bfabbf74e741042e72abfc079daa [formerly a0b80d6e96 ]
Former-commit-id: 317c75a71e
|
2012-07-10 16:04:56 -05:00 |
|
Steve Harris
|
c74431ba29
|
12.6.1-9 baseline
Former-commit-id: 32fdf6ed3b [formerly 7c064b6868 ] [formerly 2c0ff851ca ] [formerly 32fdf6ed3b [formerly 7c064b6868 ] [formerly 2c0ff851ca ] [formerly 27afa60345 [formerly 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]]
Former-commit-id: 27afa60345
Former-commit-id: e528bb0df2 [formerly dc50bc8443 ] [formerly 39c28d347eb5aeecbc48481fe6871268a89c0c2d [formerly 4f7bb90bb0 ]]
Former-commit-id: 38b944b7b39fc0e1e6c5f5e0171cfa20b64068e4 [formerly d5fa61041b ]
Former-commit-id: 37f2b6e138
|
2012-07-10 07:53:49 -05:00 |
|
Max Schenkelberg
|
aa709bc1ce
|
Issue #626 Moved code from NPP branch in old repo to new common/core setup. Involved adding multichannel imagery code into new baseline. Cleaning up derived parameters to support more than just FloatDataRecords as well as search the full localization hierarchy contributing derived paramters and not just base/site/user files (NPP Derived parameters are in NPP plugin, not cave etc directory where all others reside). Also removed calls to deprecated useBuiltInColorBar function
Amend: Fixed Richard's comments
Change-Id: Ie406098bbc73fe6bf53bfb9bb103d7422c6c57d3
Former-commit-id: 3bff06cf92 [formerly 7d13c7d339 ] [formerly 9bbb68a547 ] [formerly 3bff06cf92 [formerly 7d13c7d339 ] [formerly 9bbb68a547 ] [formerly 98c2ec7dc5 [formerly 9bbb68a547 [formerly 9d3fd9e078c9c1a2995d2f8ebe4eca757b480050]]]]
Former-commit-id: 98c2ec7dc5
Former-commit-id: 58abd127b7 [formerly c6d324aaeb ] [formerly 16ed73fb714995ccf7fe67f7b63b429bcc378657 [formerly 7286b4e962 ]]
Former-commit-id: 6353460f49cb2fb59cc8a8385f88fe8159290a8a [formerly d876190d68 ]
Former-commit-id: 3325ed5deb
|
2012-07-06 16:01:47 -05:00 |
|
Ben Steffensmeier
|
dc9dc339d2
|
Issue #704 introduce canvas based rendering for making KML screen overlays
Change-Id: I6fc7873d98fe140ebea84899b7e4732719866def
Former-commit-id: f9e9d6d938 [formerly e3c0387f6e ] [formerly 02e2c7b579 ] [formerly f9e9d6d938 [formerly e3c0387f6e ] [formerly 02e2c7b579 ] [formerly 881896c21b [formerly 02e2c7b579 [formerly bb83a95f5f00cce75b47e7fab084cf3258f65aba]]]]
Former-commit-id: 881896c21b
Former-commit-id: 3fa351fb39 [formerly 8a86a66376 ] [formerly 6b4ac8ca33a3ba829b9cd0a5317eb13bdf0c6f14 [formerly b0f5013c7c ]]
Former-commit-id: ac8d38c5918395f5ad4152b0b195a28e8d5fc3d4 [formerly bce842f480 ]
Former-commit-id: 44d3823a51
|
2012-06-28 13:58:29 -05:00 |
|
Bryan Kowal
|
e05b247e3b
|
Merge branch 'ss_sync' (OB12.6.1-10) into development
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
edexOsgi/build.edex/deploy-install.xml
edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
rpms/awips2-rpm.db
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 455d7b90a9 [formerly b1b294c401 ] [formerly a33740e915 ] [formerly 455d7b90a9 [formerly b1b294c401 ] [formerly a33740e915 ] [formerly b87b66abc5 [formerly a33740e915 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]]]
Former-commit-id: b87b66abc5
Former-commit-id: dfd75b4c72 [formerly b4917e6708 ] [formerly 351fe6f4caaff528740139f88451b1dae35f0c83 [formerly 9a7d0492fe ]]
Former-commit-id: 0eec5560d9e68707684a8349e50debb048bda384 [formerly 611925412d ]
Former-commit-id: 2e5a850d28
|
2012-06-27 17:21:48 -05:00 |
|
Steve Harris
|
c7356570ae
|
Revert "12.6.1-10 baseline"
This reverts commit 8d09188a88 [formerly 95e7f4fc0c ] [formerly 86d53e7788dde0abd1f819349208edb1cf7464ba [formerly aecc6a8474 ]] [formerly 530dfc0563 [formerly f8497470fc ] [formerly c1748a5eb25e81f51401dbad2116292ba34e48b2 [formerly b33c5bdfcf ]]] [formerly a2c0893d1a ] [formerly 16fd236f2d [formerly 06f1c7b73c ] [formerly ddde63eee0 ] [formerly 16fd236f2d [formerly 06f1c7b73c ] [formerly ddde63eee0 ] [formerly a2c0893d1a [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]]].
Former-commit-id: 584f7eddf8 [formerly 62cf6a9f92 ] [formerly b4b1f6975f ] [formerly 584f7eddf8 [formerly 62cf6a9f92 ] [formerly b4b1f6975f ] [formerly 25198a5cd6 [formerly b4b1f6975f [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]]]
Former-commit-id: 25198a5cd6
Former-commit-id: 944e3148d4 [formerly 333fd9c64e ] [formerly 52c1eb5688c898376b24c6add0a2d1a4c3ff2981 [formerly 8367fb50f5 ]]
Former-commit-id: 0bc0b7e1c450b6264ca8eb9457b80c79a047f13a [formerly 75f77df418 ]
Former-commit-id: e77a15c047
|
2012-06-21 08:51:08 -05:00 |
|
Steve Harris
|
8d09188a88
|
12.6.1-10 baseline
Former-commit-id: 16fd236f2d [formerly 06f1c7b73c ] [formerly ddde63eee0 ] [formerly 16fd236f2d [formerly 06f1c7b73c ] [formerly ddde63eee0 ] [formerly a2c0893d1a [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]]
Former-commit-id: a2c0893d1a
Former-commit-id: 530dfc0563 [formerly f8497470fc ] [formerly c1748a5eb25e81f51401dbad2116292ba34e48b2 [formerly b33c5bdfcf ]]
Former-commit-id: 86d53e7788dde0abd1f819349208edb1cf7464ba [formerly aecc6a8474 ]
Former-commit-id: 95e7f4fc0c
|
2012-06-21 08:38:48 -05:00 |
|
Ben Steffensmeier
|
b55bf099f1
|
Issue #704 add INCOMPLETE PaintStatus to indicate a frame will require more painting later
Former-commit-id: 7bd0cce0a1 [formerly c2191c83dc ] [formerly d317777ee6 ] [formerly 7bd0cce0a1 [formerly c2191c83dc ] [formerly d317777ee6 ] [formerly 0c69731e18 [formerly d317777ee6 [formerly 65e7e8b2c891d1938f0b98c3c8737f18517fe27f]]]]
Former-commit-id: 0c69731e18
Former-commit-id: acbf7fd3b5 [formerly 8b107023d1 ] [formerly c5371f37fe36db2e2f33d1cc3ac56441d034b0d1 [formerly b55a4f026c ]]
Former-commit-id: 5dc0b8c70d6e5a44a1db2255eb73085b81017657 [formerly 63b55f454f ]
Former-commit-id: 19ce6f7e77
|
2012-06-20 14:13:37 -05:00 |
|
Bryan Kowal
|
14f81556c3
|
Merge branch '11-Collaboration' into development
Conflicts:
cave/com.raytheon.viz.alerts/src/com/raytheon/viz/alerts/jobs/AutoUpdater.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
Former-commit-id: 9e7907ecd7 [formerly 9361f3eb94 ] [formerly f528e10391 ] [formerly 9e7907ecd7 [formerly 9361f3eb94 ] [formerly f528e10391 ] [formerly f0e3b957e3 [formerly f528e10391 [formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]]]]
Former-commit-id: f0e3b957e3
Former-commit-id: ac72941bf0 [formerly 21e8618852 ] [formerly a8e6aa8338ee37d89f37110fad7307c33a5ad620 [formerly 1ee59eac71 ]]
Former-commit-id: 48ce0712d4d33976ae0cc1184df65a9ee61a5ba8 [formerly cbc8964e5b ]
Former-commit-id: a6d1f97dec
|
2012-06-18 11:16:28 -05:00 |
|
Ben Steffensmeier
|
f80cab90bf
|
Issue #704 rewrite shared meshes and tilesets to be more efficient and less deprecated.
Change-Id: I9f6ebba1bd75682b56a1e8de5a8d0b8974153f97
Former-commit-id: d0354ad4e4 [formerly 2da8a0df2f ] [formerly aad1eb18b0 ] [formerly d0354ad4e4 [formerly 2da8a0df2f ] [formerly aad1eb18b0 ] [formerly 9068e049cb [formerly aad1eb18b0 [formerly 901f061f9e19f39cf5096a394cbd238c5562d733]]]]
Former-commit-id: 9068e049cb
Former-commit-id: e1139e8bcc [formerly bded5dde2b ] [formerly b1a38642bb839232d00e6dd72ecd1785344a38a9 [formerly dd496b3d90 ]]
Former-commit-id: 7d72e749d750c93e98bf6d01ef30660c39424b1b [formerly 541f1b74f3 ]
Former-commit-id: 1a3e1ba291
|
2012-06-14 16:44:19 -05:00 |
|
Ben Steffensmeier
|
533fc946f9
|
Issue #704 various core changes to make things work smoothly in kml
Change-Id: I048f9dfdb411a95765410f48fddb54aa8eefbd16
Former-commit-id: 93fe267859 [formerly 2c27ec20b5 ] [formerly d187436589 ] [formerly 93fe267859 [formerly 2c27ec20b5 ] [formerly d187436589 ] [formerly 58356c49cb [formerly d187436589 [formerly faec1cb4e4e0ef6444da31971b937ad3ee79160a]]]]
Former-commit-id: 58356c49cb
Former-commit-id: a77d4b3564 [formerly 352648586a ] [formerly 17d4d41f9a31f859cf44b9807748609d104b685d [formerly e604271c54 ]]
Former-commit-id: cd083b91aacf58b0d502f10fe82a3966ba4342cb [formerly 3e4b09847b ]
Former-commit-id: 117c77bfe0
|
2012-06-14 16:41:05 -05:00 |
|
Max Schenkelberg
|
e773643f7a
|
Issue #697 added support for multiple editors
Change-Id: Ic3ac12bb9368f0ec54dd8151ba1876002ff44e82
Former-commit-id: 816500d7c4 [formerly 51c2a41e68 ] [formerly dd99479eeb ] [formerly 816500d7c4 [formerly 51c2a41e68 ] [formerly dd99479eeb ] [formerly fceef3c5a1 [formerly dd99479eeb [formerly 3afc7b49cb42c005a0e9cf5221e35fc3ab78007a]]]]
Former-commit-id: fceef3c5a1
Former-commit-id: ea948bbb82 [formerly f0d2893e97 ] [formerly f94add25d0e7e6bf562b43f3ede6e45e7d953f95 [formerly e5e1a4de6a ]]
Former-commit-id: 0763957c65637dd50362099f2ea1a0663adf6a1a [formerly f2e34fe03c ]
Former-commit-id: 7bac48f643
|
2012-06-13 17:52:11 -05:00 |
|
Steve Harris
|
a45d1b99e1
|
Removed duplicate method created by merge
Former-commit-id: 787b82079e [formerly 282682ccc1 ] [formerly 5f66b0995a ] [formerly 787b82079e [formerly 282682ccc1 ] [formerly 5f66b0995a ] [formerly 308737bff8 [formerly 5f66b0995a [formerly 90fc678948690cc74488e6e1fd18cf8c72c5c0c9]]]]
Former-commit-id: 308737bff8
Former-commit-id: 1dfba0c41c [formerly 383f9d2d56 ] [formerly 193d13e25a301eced23e253c03817720893c41dc [formerly 55b4d7c5da ]]
Former-commit-id: 17fcfe21c5a7a6a71cb9d46ffde283702dcb2baf [formerly 0de9e03c5a ]
Former-commit-id: b3c2646e5e
|
2012-06-13 08:41:24 -05:00 |
|
Steve Harris
|
ec9204fa94
|
Merge branch 'ss_sync' (OB12.5.1-15) into 11-Collaboration
Conflicts:
cave/build/p2-build.xml
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/RotatePanelsHandler.java
cave/com.raytheon.uf.viz.radar.gl/src/com/raytheon/uf/viz/radar/gl/mosaic/GLMosaicImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
ncep/com.raytheon.uf.viz.ncep.core.feature/feature.xml
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/OutlookAttrDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/WatchFormatMsgDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/vaadialog/CcfpTimeDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/file/FileTools.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProdTypeDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProductConfigureDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/producttypes/ProdType.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/AbstractPgenDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenTextDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenWatchBoxAddDelCntyHandler.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/conditionalfilter/ConditionalFilterHelpDialog.java
Former-commit-id: 03383359f3 [formerly af6c0529ad ] [formerly 2f20a86a30 ] [formerly 03383359f3 [formerly af6c0529ad ] [formerly 2f20a86a30 ] [formerly 48860df690 [formerly 2f20a86a30 [formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]]]]
Former-commit-id: 48860df690
Former-commit-id: 6c0d8be39e [formerly d7a4853091 ] [formerly 2439ad1c1bff354f69594e31d7a2a27f4fc21bc4 [formerly 27b50c57bd ]]
Former-commit-id: e4fb4019cc599080c632d3e4becfebc21fb21929 [formerly 2838ca117f ]
Former-commit-id: 70a928d039
|
2012-06-12 14:37:12 -05:00 |
|
Steve Harris
|
883d66bc46
|
12.6.1-5 baseline
Former-commit-id: 1ad64ffa98 [formerly 09f73b0601 ] [formerly c99afab05f ] [formerly 1ad64ffa98 [formerly 09f73b0601 ] [formerly c99afab05f ] [formerly 8947efbc7f [formerly c99afab05f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]]]
Former-commit-id: 8947efbc7f
Former-commit-id: d5c94ccef2 [formerly b69fa75919 ] [formerly 1cc870696aedf27ab003448e1146bd540b248a33 [formerly a945ed8e6d ]]
Former-commit-id: fc6eb550115880692c0f2fd68727ccec55d0eef7 [formerly 91e65230ad ]
Former-commit-id: 3b468d9f50
|
2012-06-11 16:23:47 -05:00 |
|
Steve Harris
|
581546a5eb
|
12.6.1-3 baseline
Former-commit-id: bc96eba820 [formerly 7c5306b795 ] [formerly 42f3513175 ] [formerly bc96eba820 [formerly 7c5306b795 ] [formerly 42f3513175 ] [formerly d57eb02b9e [formerly 42f3513175 [formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]]]]
Former-commit-id: d57eb02b9e
Former-commit-id: 471fa3ac04 [formerly 32c0464d79 ] [formerly 3b70f39d074d5d11b45290eba7eec94d80be38de [formerly 1fdc0aa237 ]]
Former-commit-id: 47799c2c228b75794e62bf6b17a80d2d42cdf2cc [formerly ca8baf18a3 ]
Former-commit-id: 518fa79f7f
|
2012-06-11 16:23:47 -05:00 |
|
Steve Harris
|
b54ad5af66
|
Merge branch 'ss_sync' (OB12.5.1-15) into 9-Wes2Bridge
Conflicts:
cots/org.jboss.cache/.project
edexOsgi/build.edex/esb/conf/spring/project.properties
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/bufr/BUFRSection1.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/time/TimeTools.java
javaUtilities/com.raytheon.wes2bridge.utility.product/.project
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/src/gov/noaa/nws/ncep/common/dataplugin/ssha/SshaRecord.java
ncep/gov.noaa.nws.ncep.common.staticdata/.project
Former-commit-id: 975053c3dc [formerly c7024992a3 ] [formerly 37793c86b1 ] [formerly 975053c3dc [formerly c7024992a3 ] [formerly 37793c86b1 ] [formerly d325d496f5 [formerly 37793c86b1 [formerly a435e6464a78345b5036e3060430375dc53e4faf]]]]
Former-commit-id: d325d496f5
Former-commit-id: 5e0e2d2c48 [formerly 23c34c469a ] [formerly 788e16ce64aaeca91000aa565d43e89a27246362 [formerly cf3c768213 ]]
Former-commit-id: bbdcec83196c1a64fd2e31c1e9abdcf46698ab0b [formerly 3dd5b84aa2 ]
Former-commit-id: c01b096242
|
2012-06-11 15:24:03 -05:00 |
|
Steve Harris
|
46068c6716
|
12.5.1-15 baseline
Former-commit-id: 2f10c7a1e4 [formerly 8552902906 ] [formerly b13cbb7e00 ] [formerly 2f10c7a1e4 [formerly 8552902906 ] [formerly b13cbb7e00 ] [formerly 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 1f521a70b3 [formerly 97c4db937e ] [formerly 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f ]]
Former-commit-id: 5dd364497cd5da1357297a4b842e962ad3d5e006 [formerly 9054c5ab6c ]
Former-commit-id: 39ff9954f8
|
2012-06-08 13:39:48 -05:00 |
|
Max Schenkelberg
|
3eeef7434c
|
Issue #664 Changed hydro legend resource to be system resource
Change-Id: I769463a967ee1ec76a9a3c09d48d27106caa0937
Former-commit-id: dc92eaa3f0 [formerly dbb8a6b93d ] [formerly 3cd4f75170 ] [formerly dc92eaa3f0 [formerly dbb8a6b93d ] [formerly 3cd4f75170 ] [formerly 85a7897b1e [formerly 3cd4f75170 [formerly 9a726e2686e7ed79c1a436156a16e98083608e14]]]]
Former-commit-id: 85a7897b1e
Former-commit-id: 74dd7173a0 [formerly a8e2e4c8c1 ] [formerly 14b5ed35874d5152f32ea760356e95afc51ea0f1 [formerly f5c8240c92 ]]
Former-commit-id: e11e7f8efa62b04eaa375d0fbd85008d42dfcce7 [formerly 69b203439e ]
Former-commit-id: 58c5d00acd
|
2012-06-05 13:44:48 -05:00 |
|
Max Schenkelberg
|
837e2ec68f
|
Issue #239 Got IColormapShadedShapeExtension implemented
Change-Id: Idb2b5a894530b739cd8b00f8f3b294f186d5143f
Former-commit-id: 08140e9b63 [formerly c98b6e28c7 ] [formerly ae8236aa21 ] [formerly 08140e9b63 [formerly c98b6e28c7 ] [formerly ae8236aa21 ] [formerly 1c11323103 [formerly ae8236aa21 [formerly 6ddfe51e93d62145678d87ed3db208e90d3146e3]]]]
Former-commit-id: 1c11323103
Former-commit-id: 9cb3b84ce3 [formerly d0d619b048 ] [formerly 4a28dfac37939215f47adb67f15bbc9eadc8a631 [formerly 696c2f4894 ]]
Former-commit-id: 4b11afb7f6df142dc0c5694ce99fc748e00197fb [formerly f2bd302796 ]
Former-commit-id: e80b6c8dce
|
2012-05-23 09:14:21 -05:00 |
|
Steve Harris
|
e460104ec9
|
12.5.1-6 baseline
Former-commit-id: ba6d779949 [formerly df80148db6 ] [formerly 24474489f9 ] [formerly ba6d779949 [formerly df80148db6 ] [formerly 24474489f9 ] [formerly fa87dc6cf1 [formerly 24474489f9 [formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]]]]
Former-commit-id: fa87dc6cf1
Former-commit-id: bc695ee025 [formerly 4792884ab2 ] [formerly 0fa00c0acf0db00500f5839edb5595f4cd6535d5 [formerly c452cce633 ]]
Former-commit-id: 61f9f0b1d1e0d73dbd8918f64faa0a6bc9672dfa [formerly 2738af2019 ]
Former-commit-id: 26ed02c3dc
|
2012-05-16 16:41:22 -05:00 |
|
Max Schenkelberg
|
85c39021ca
|
Issue #239 Added IShadedShape capability to remote target
Change-Id: I9616a1dff3ba7f73ed1382027dd725928587efad
Former-commit-id: 3cff79f5e9 [formerly 193bc7e249 ] [formerly 1ca2a9ce13 ] [formerly 3cff79f5e9 [formerly 193bc7e249 ] [formerly 1ca2a9ce13 ] [formerly 0e5fd5cd15 [formerly 1ca2a9ce13 [formerly a2f8c091c08d47d7b8354071e0ceedc978168a29]]]]
Former-commit-id: 0e5fd5cd15
Former-commit-id: c5a6acfedb [formerly 25b9975bc3 ] [formerly 91754fe9fa71f33b72a85b7c2a6da5b65a021772 [formerly b764f03353 ]]
Former-commit-id: 7a1838cada7072affd1e8201b4976a5b59f5f23f [formerly 3d58fb358e ]
Former-commit-id: bc6563c49f
|
2012-05-16 15:01:41 -05:00 |
|
Max Schenkelberg
|
6163af0b98
|
Issue #588 Got crude string rendering working. Doesn't quite look good if canvas bounds are not same size and legends are not handled specially
Change-Id: I8f3d0560869178598f160fb2e7914c45f656a860
Former-commit-id: 3682b81e6b [formerly 5fca70461f ] [formerly 31243a9dfe ] [formerly 3682b81e6b [formerly 5fca70461f ] [formerly 31243a9dfe ] [formerly 074b9aba8c [formerly 31243a9dfe [formerly 24b673fcc45a4da27ac349bdebf8b48f6405607b]]]]
Former-commit-id: 074b9aba8c
Former-commit-id: d37d5bafb5 [formerly d2d6a4d1eb ] [formerly 43b689e5c63e3b6456373be48d379fad297a3633 [formerly d22b403f48 ]]
Former-commit-id: 398ffadb9fe15e12cd189ef2b9e89a167f43b5b4 [formerly fc471eb557 ]
Former-commit-id: 0f3d4cf0e4
|
2012-05-10 18:03:00 -05:00 |
|
Max Schenkelberg
|
2d167af343
|
Issue #588 Added serialization adapter registration to better support serializing DrawableString objects
Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056
Former-commit-id: 82298cb03b [formerly 06ee0bbf6f ] [formerly 78e1bd2c62 ] [formerly 82298cb03b [formerly 06ee0bbf6f ] [formerly 78e1bd2c62 ] [formerly 1f5abc6e20 [formerly 78e1bd2c62 [formerly 6c456c0bad00aaa1fea67f90a4633b3e14a78495]]]]
Former-commit-id: 1f5abc6e20
Former-commit-id: 985ee5a034 [formerly 2db836b296 ] [formerly 0465afe50a2e0abf332ee9d7e74c28a75a577f5d [formerly 3ca8ca6f01 ]]
Former-commit-id: ae5df9ba1774095dd47fab5b8b61888b552632fc [formerly 6cd18a09dc ]
Former-commit-id: 5729c0acc5
|
2012-05-09 15:02:30 -05:00 |
|
Steve Harris
|
2f6ae50479
|
Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge
Conflicts:
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
All of these were 'self-resolved' when kdiff3 invoked
Former-commit-id: fc70139990 [formerly d7f7c26582 ] [formerly 092efd6072 ] [formerly fc70139990 [formerly d7f7c26582 ] [formerly 092efd6072 ] [formerly 31b3e87ffa [formerly 092efd6072 [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]]]
Former-commit-id: 31b3e87ffa
Former-commit-id: fe7ac96625 [formerly 53d2822329 ] [formerly 606a1f5f70c4344a8a6b5b7da1c351cf7707cda2 [formerly 98447412f8 ]]
Former-commit-id: 3940ab38fea505f445ec4019600081324e15e68d [formerly 7ee04eb560 ]
Former-commit-id: d040b14742
|
2012-05-09 13:19:47 -05:00 |
|
Steve Harris
|
c76fddc7e4
|
Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration
Conflicts:
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java
Former-commit-id: bcc12e03ed [formerly 572e1bb476 ] [formerly 27bc369818 ] [formerly bcc12e03ed [formerly 572e1bb476 ] [formerly 27bc369818 ] [formerly 58037cb5d1 [formerly 27bc369818 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]]]
Former-commit-id: 58037cb5d1
Former-commit-id: 43f936900c [formerly 9c9e01dbda ] [formerly ec875d4e25b0d41a71abbea662364ddefd6fe144 [formerly 63ea8599d7 ]]
Former-commit-id: c26989a65231e5bf4f604b7a06a750251f0cd612 [formerly 7978d3b640 ]
Former-commit-id: 1d2ad9224a
|
2012-05-09 13:14:00 -05:00 |
|
Steve Harris
|
6715112613
|
12.5.1-2 baseline
Former-commit-id: c1bc408f84 [formerly ac708c050d ] [formerly 84d191e7b6 ] [formerly c1bc408f84 [formerly ac708c050d ] [formerly 84d191e7b6 ] [formerly b36c69cc67 [formerly 84d191e7b6 [formerly ff847bf86803a485212f08a098be13bc3d83b0b8]]]]
Former-commit-id: b36c69cc67
Former-commit-id: 8025cc609e [formerly f6300cd995 ] [formerly 22cf2530d98a6c3d2d24e8ef75454ae00fe19292 [formerly a821111fbf ]]
Former-commit-id: db29a95fc27cec97c5d6fcf7b21e22c5e97b5236 [formerly 377ae76413 ]
Former-commit-id: ef49f63d8d
|
2012-05-03 19:17:13 -05:00 |
|
Max Schenkelberg
|
c94d7965b5
|
Issue #587 Got colorbars rendering properly
Change-Id: I9fe1b846e68dbdc947202cfcfe88aa7c8e1c1103
Former-commit-id: 120415f663 [formerly 0f6240eaea ] [formerly d4c10e5548 ] [formerly 120415f663 [formerly 0f6240eaea ] [formerly d4c10e5548 ] [formerly c81c225a6e [formerly d4c10e5548 [formerly 218d9138f8c096d3f99305e2f3ac80b3b30c9cfe]]]]
Former-commit-id: c81c225a6e
Former-commit-id: 5056e1689b [formerly 726c543266 ] [formerly 26da60b90fed75fefa7c7b072d9e37d5dceb286f [formerly c6edfad263 ]]
Former-commit-id: 17e817f125710b8e9fd9aa72d95c5754ccb32543 [formerly 1189dba8a7 ]
Former-commit-id: 42c569430b
|
2012-05-03 13:07:43 -05:00 |
|
Max Schenkelberg
|
0a5e7d6a0a
|
Issue #239 Fixed bug with mosaic being up and starting a session
Change-Id: Ibe0b238806e3cb55b65a38da5a93caeddadc2c01
Former-commit-id: 918a417e51 [formerly 3ffb18b767 ] [formerly a045f6f3b9 ] [formerly 918a417e51 [formerly 3ffb18b767 ] [formerly a045f6f3b9 ] [formerly b82eb49055 [formerly a045f6f3b9 [formerly 3155b7b27c0c9ddc8557ac8a0240548b0d50292c]]]]
Former-commit-id: b82eb49055
Former-commit-id: a77524a3c5 [formerly 887177aa84 ] [formerly 57f260c947b3fc3c2e2883f06031b6787b085456 [formerly 6a1b035c2d ]]
Former-commit-id: 791d1c7e80ed49ab6bdd71028cc768d0a89c5b65 [formerly f4bd13133e ]
Former-commit-id: e9e4327ec9
|
2012-05-02 10:20:20 -05:00 |
|
Steve Harris
|
3419f72215
|
Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
used git cherry-pick -m 1 879a2e0
Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline
Conflicts:
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java
Conflicts:
ncep/gov.noaa.nws.ncep.viz.rsc.mosaic/src/gov/noaa/nws/ncep/viz/rsc/mosaic/rsc/RadarRadialResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncradar/src/gov/noaa/nws/ncep/viz/rsc/ncradar/rsc/RadarImageResource.java
Former-commit-id: fe946166ed [formerly 4ec294b525 ] [formerly 2ed7249613 ] [formerly fe946166ed [formerly 4ec294b525 ] [formerly 2ed7249613 ] [formerly 7b75b781ad [formerly 2ed7249613 [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]]]
Former-commit-id: 7b75b781ad
Former-commit-id: 3992b18e28 [formerly 7c7fc97131 ] [formerly 228c26d32b0b13d4cccf51b188ca617ec417aba4 [formerly 6dd3ee8809 ]]
Former-commit-id: 7a3a10e1ab59cf68f5e1476abff39883afb9ef4b [formerly fd9e226b35 ]
Former-commit-id: 491aa53a0c
|
2012-05-01 18:31:09 -05:00 |
|
Steve Harris
|
7f90924706
|
12.4.1-10 baseline
Former-commit-id: 7fa9dbd5fb [formerly 4bfbdad17d ] [formerly 9f8cb727a5 ] [formerly 7fa9dbd5fb [formerly 4bfbdad17d ] [formerly 9f8cb727a5 ] [formerly 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 40aa780b3d [formerly 33a67cdd82 ] [formerly 73930fb29d0c1e91204e76e6ebfdbe757414f319 [formerly a28d70b5c5 ]]
Former-commit-id: a16a1b4dd44fc344ee709abbe262aeed58a8339b [formerly e5543a0e86 ]
Former-commit-id: 0c25458510
|
2012-05-01 18:06:13 -05:00 |
|
Dave Hladky
|
8f500ff6d6
|
Issue #15 Re-wrote SimDate integration for menus, alert observers after
merge headache.
Former-commit-id: 37da8763eb [formerly 42a12fa7a5 ] [formerly 1b7473572f ] [formerly 37da8763eb [formerly 42a12fa7a5 ] [formerly 1b7473572f ] [formerly 5b7ecea866 [formerly 1b7473572f [formerly 647b7ac154dbdaf945231b231f491bbca86d2a24]]]]
Former-commit-id: 5b7ecea866
Former-commit-id: 9ae2445f9f [formerly a1a3a361dd ] [formerly d98bc5d5887a016d68a6737704a6fb5e552d838c [formerly 61e31c62ff ]]
Former-commit-id: 07953e4b449645e4adcfef80f1595ec0513eb00f [formerly d2e16d486b ]
Former-commit-id: 7fc0c65ef4
|
2012-04-30 13:43:34 -05:00 |
|
Max Schenkelberg
|
8fafc768ae
|
Added network logging for http traffic
Change-Id: I69f571fba23fc03e0d850180650f61b4581e8a25
Former-commit-id: a31ad22113 [formerly 2cc5794428 ] [formerly a912786429 ] [formerly a31ad22113 [formerly 2cc5794428 ] [formerly a912786429 ] [formerly f74b6b4a93 [formerly a912786429 [formerly 7696dd610b5d6f0fc3620db461de68ba06c61699]]]]
Former-commit-id: f74b6b4a93
Former-commit-id: 24fb2b356b [formerly 7bb4057d32 ] [formerly 8c89c3d5f0f25a3c5cb1d95eb759b2d2e999dff8 [formerly 2d25e8bb78 ]]
Former-commit-id: 1141c5a73ef20b9b2e65c981fb05a96c27b88f21 [formerly 936fa688c0 ]
Former-commit-id: cd7fe895bc
|
2012-04-25 17:28:52 -05:00 |
|
Steve Harris
|
ad3bb08978
|
12.4.1-10 baseline
Former-commit-id: 931087306f [formerly 418489e726 ] [formerly 704b75e1a1 ] [formerly 931087306f [formerly 418489e726 ] [formerly 704b75e1a1 ] [formerly 01457fbbde [formerly 704b75e1a1 [formerly 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a]]]]
Former-commit-id: 01457fbbde
Former-commit-id: caab7c1fbb [formerly 97caaa0327 ] [formerly bd1ff6d9b99902d235b63b9c84d31f1a058625ee [formerly aabc3842ac ]]
Former-commit-id: 8277df75752720d65ab600e9a692b7a94f2111c5 [formerly 3ed3a665cb ]
Former-commit-id: f1eb6efb23
|
2012-04-24 15:38:29 -05:00 |
|
Nate Jensen
|
b930b25977
|
Issue #443 better logging of traffic
Change-Id: Ia968b79a9d6ee1e5224678ac63684fb9c7aa5b81
Former-commit-id: 36c4c4e66e [formerly 14f70d1122 ] [formerly a4b0addeee ] [formerly 36c4c4e66e [formerly 14f70d1122 ] [formerly a4b0addeee ] [formerly 39ebbc3913 [formerly a4b0addeee [formerly 4a7faa743900edada4ecf8b42aa3315515617e71]]]]
Former-commit-id: 39ebbc3913
Former-commit-id: 49d8f6c799 [formerly 83e6f5acf4 ] [formerly 529b68b96d852df4ba7ded4f9d68e14a00cc3e18 [formerly 8130c22b64 ]]
Former-commit-id: a83d2bb5a6626f09d2951421f7552384f89a7fdc [formerly 776ef738f7 ]
Former-commit-id: 2bce81c6c8
|
2012-04-23 11:23:22 -05:00 |
|
Max Schenkelberg
|
70c1389120
|
Issue #239 Started persistable object event pattern. Made construction
of single color images cheaper to allow object construction to happen
immediately
Former-commit-id: 3f4defd7a4 [formerly 9d0eecb9b1 ] [formerly 523c90b697 ] [formerly 3f4defd7a4 [formerly 9d0eecb9b1 ] [formerly 523c90b697 ] [formerly da5e17d6e3 [formerly 523c90b697 [formerly 995ddaebb670eb1689aeb44e3cb760731db46e80]]]]
Former-commit-id: da5e17d6e3
Former-commit-id: 005381bf33 [formerly baf778717f ] [formerly 99493f0a6512f938cc206c6c3028723ee75fa6ad [formerly f05528979d ]]
Former-commit-id: e630994f79260e9196ebbd39360478c957ab5c8d [formerly 04cf9dba60 ]
Former-commit-id: f6a582c033
|
2012-04-19 16:03:07 -05:00 |
|
Steve Harris
|
0cf19dc505
|
Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline
Conflicts:
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java
Former-commit-id: 634d40a156 [formerly 63f11892e8 ] [formerly 4d7572a632 ] [formerly 634d40a156 [formerly 63f11892e8 ] [formerly 4d7572a632 ] [formerly 625cd4262c [formerly 4d7572a632 [formerly 5e1b9319941eed516a08a135a2049c14bad77863]]]]
Former-commit-id: 625cd4262c
Former-commit-id: 6aa0898aae [formerly e86dc647be ] [formerly f6efcfd8ee5a2a4ca8ad3ed217945853b75bfa5f [formerly def458753d ]]
Former-commit-id: 8ce2584572b74cd38fac4b323558490c8c29e686 [formerly 19657ae52d ]
Former-commit-id: 9b8c6e395d
|
2012-04-19 11:11:02 -05:00 |
|
Steve Harris
|
5b35d8a6e0
|
12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd ] [formerly 67a5a68300 ] [formerly 4767b0e069 [formerly 750b7543dd ] [formerly 67a5a68300 ] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188 [formerly a2a6a18fae ] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd ]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c ]
Former-commit-id: 74b66d9683
|
2012-04-18 15:18:16 -05:00 |
|
Max Schenkelberg
|
acf9369ddf
|
Issue #239 Got reprojection event working
Former-commit-id: 46c1cf8e39 [formerly 6efccf10a5 ] [formerly 29f24e3ec5 ] [formerly 46c1cf8e39 [formerly 6efccf10a5 ] [formerly 29f24e3ec5 ] [formerly 005beff18a [formerly 29f24e3ec5 [formerly 99e432cd258c9bf570a66be4702d28ac68204052]]]]
Former-commit-id: 005beff18a
Former-commit-id: 819dd84dd6 [formerly 8096fc5ad3 ] [formerly 8a78d45f0fa487976a4676705a2ced495365e4af [formerly 044f21e405 ]]
Former-commit-id: fb0b45cfb9dda20064ca4b44df06d4e89c58424a [formerly fef058d9c6 ]
Former-commit-id: 0e60d7deb0
|
2012-04-18 14:01:09 -05:00 |
|
Max Schenkelberg
|
c1dcff8853
|
Issue #239 Fixed mosaic bug, refactored dispatching colormap images so
mosaic could resuse
Former-commit-id: ee7595c10b [formerly c1ebd04d4d ] [formerly 40ca446e53 ] [formerly ee7595c10b [formerly c1ebd04d4d ] [formerly 40ca446e53 ] [formerly 29184d46ce [formerly 40ca446e53 [formerly aea5c30443970933bf1517ced6d7e91a1008c9d5]]]]
Former-commit-id: 29184d46ce
Former-commit-id: cda6539168 [formerly e68e6130a0 ] [formerly d1c4de5262708c6e3906138f931f0ffb04bab9b6 [formerly a82f07b25d ]]
Former-commit-id: d904e2ed0b4a7ac3c464191af37ad8415e5b07e3 [formerly 78126cd777 ]
Former-commit-id: b681ea25a2
|
2012-04-17 13:09:07 -05:00 |
|
Max Schenkelberg
|
48b3aa1ef6
|
Issue #239 Added wireframe shape capability
Former-commit-id: 9b8f9de1fa [formerly 7900e78944 ] [formerly 12dcb4b044 ] [formerly 9b8f9de1fa [formerly 7900e78944 ] [formerly 12dcb4b044 ] [formerly 5be2b4e745 [formerly 12dcb4b044 [formerly f56dd661225103b08b1d51a9f0cb174bd73340eb]]]]
Former-commit-id: 5be2b4e745
Former-commit-id: 6120d53cc0 [formerly 3e781ede4f ] [formerly ea1488b7dd2da24d9175bcf1e6e1bc795640ef82 [formerly f6a2f5e55c ]]
Former-commit-id: c93b11401aa9baa4f85b0b2e7780d92ad1c9a720 [formerly 12c672e400 ]
Former-commit-id: 96a6f4f647
|
2012-04-12 14:46:08 -05:00 |
|
Max Schenkelberg
|
ddf76545a3
|
Issue #239 got offscreen rendering working for clients
Former-commit-id: da48c4f6ac [formerly b1687af0ac ] [formerly 5ae0ed10d5 ] [formerly da48c4f6ac [formerly b1687af0ac ] [formerly 5ae0ed10d5 ] [formerly 2de39bb487 [formerly 5ae0ed10d5 [formerly f41733465eb0ee048fb76a0d5467ce456d1cf7c9]]]]
Former-commit-id: 2de39bb487
Former-commit-id: 36938dc222 [formerly 0f62e40dda ] [formerly 0c28e5b5dcdc3b47b56f77d8ab45a6f1e98aba12 [formerly 1a340bb6e5 ]]
Former-commit-id: 4946590b37e1b2938bce0df65e42d885499e5331 [formerly 8c70d7b4d6 ]
Former-commit-id: cc8542f7fb
|
2012-04-12 10:45:50 -05:00 |
|