Commit graph

131 commits

Author SHA1 Message Date
Steve Harris
2d928d328e 12.9.1-5 baseline
Former-commit-id: a1d931fd44 [formerly 61f269f54c] [formerly a1d931fd44 [formerly 61f269f54c] [formerly f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 7fb0b17bd5 [formerly 72824561cb]
Former-commit-id: 9b5c2094ed
2012-08-21 15:27:03 -05:00
Max Schenkelberg
dcbab7d58f 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: fc06265360 [formerly b69d2cad1c] [formerly fc06265360 [formerly b69d2cad1c] [formerly 1b406ecfca [formerly 564b38b30562a371cf0345de572b32ea8f53e82e]]]
Former-commit-id: 1b406ecfca
Former-commit-id: 47cefd1513 [formerly aa9df46a1d]
Former-commit-id: 362d34bee0
2012-08-20 14:47:14 -05:00
root
0eb9520e15 Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: 0987fc6b3d [formerly cb46f57879] [formerly 0987fc6b3d [formerly cb46f57879] [formerly 5a453ee984 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]
Former-commit-id: 5a453ee984
Former-commit-id: 537dbadf64 [formerly 8a66b2f209]
Former-commit-id: 1792158ef8
2012-08-15 22:15:20 +00:00
Steve Harris
16d7d955fc 12.9.1-1 baseline
Former-commit-id: 8309193ce9 [formerly 31ae7ea218] [formerly 8309193ce9 [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: aed7a644df [formerly 0c5d9e2416]
Former-commit-id: 63bcadf121
2012-08-15 13:59:00 -05:00
Steve Harris
5fc58b8e12 Merge branch 'development' into Enhanced_points
Former-commit-id: e372481f81 [formerly 346d775f57] [formerly e372481f81 [formerly 346d775f57] [formerly f7f97d9f54 [formerly 25026a4d9955b76039bf25861380cadebff19665]]]
Former-commit-id: f7f97d9f54
Former-commit-id: 73e357c39d [formerly 031b655ab5]
Former-commit-id: 14923a89e9
2012-08-15 13:35:47 -05:00
Max Schenkelberg
3d43480508 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: d6522f8e3a [formerly 93e8619fa5] [formerly d6522f8e3a [formerly 93e8619fa5] [formerly 09b0db0a13 [formerly 7d75620c07c992ab74a8305a69ed87817f8f0639]]]
Former-commit-id: 09b0db0a13
Former-commit-id: 107efcaee3 [formerly 784c43ab7c]
Former-commit-id: 79f15e475e
2012-08-13 12:20:05 -05:00
Roger Ferrel
4e15803926 Issue #875 Markers and group added to Cave.
Amend: Removed python file

Amemd: Changes based on reviewer comments and additon of popup menus in the PontsMgrDlg.

Amend: deleted unwanted .project file

Amend: Removed comment out code and fix class descriptions

Amend: Changes based on reviewer comments.

Change-Id: I32c9dd754d1bfa06b470872b052b61e42adf11e8

Former-commit-id: b3c357c964 [formerly 2e3fc4b400] [formerly b3c357c964 [formerly 2e3fc4b400] [formerly f4ae8eb150 [formerly c8e5bf1a82979ebc2445acb88682e32ca8813f43]]]
Former-commit-id: f4ae8eb150
Former-commit-id: 69f22fe6bb [formerly ae41499ba2]
Former-commit-id: 4e356b8a13
2012-08-08 13:35:47 -05:00
Steve Harris
078b4fff3c 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: fb47934159 [formerly 6d77b94217] [formerly fb47934159 [formerly 6d77b94217] [formerly 51e38ca887 [formerly 1b17cebeb85f871d950bd02e27141b11d977c3ad]]]
Former-commit-id: 51e38ca887
Former-commit-id: d2291ba23f [formerly 3476fe755b]
Former-commit-id: e892eb4628
2012-08-01 12:43:12 -05:00
Steve Harris
d3be09bd74 12.8.1-5 baseline
Former-commit-id: 2653ddc2e3 [formerly fd2abfb6f1] [formerly 2653ddc2e3 [formerly fd2abfb6f1] [formerly cd49ef3eda [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]]
Former-commit-id: cd49ef3eda
Former-commit-id: dab00b12e6 [formerly e0c3722fd1]
Former-commit-id: e86949a8d3
2012-08-01 10:45:37 -05:00
Nate Jensen
c2558bdb79 Issue #882 fix auto updates, more efficiently set simulated time
Change-Id: I29f497df91920618e5271bf0ff436547d6225413

Former-commit-id: ac8d12ce13 [formerly 3d07fc8ebf] [formerly ac8d12ce13 [formerly 3d07fc8ebf] [formerly dbe185f3a0 [formerly da03e63d10f5f7b6fa77d0e302b11e7501475e22]]]
Former-commit-id: dbe185f3a0
Former-commit-id: 4e0a0f10dc [formerly 67edb6917d]
Former-commit-id: 70d269fc34
2012-07-26 17:43:29 -05:00
Ben Steffensmeier
317c75a71e Issue #772 switch satellite from offscreen rendering to mosaic for a more well defined graphics API.
Change-Id: If293a65f577f13f6ba2ccae41b100dd9542d6998

Former-commit-id: 5bf019e1bb [formerly 74a69d1fb9] [formerly 5bf019e1bb [formerly 74a69d1fb9] [formerly 79ab850efa [formerly 009e769a180898cb62e9df4a604b40e139cf2886]]]
Former-commit-id: 79ab850efa
Former-commit-id: 612e586a6c [formerly 4182352f8c]
Former-commit-id: a0b80d6e96
2012-07-10 16:04:56 -05:00
Steve Harris
37f2b6e138 12.6.1-9 baseline
Former-commit-id: 7c064b6868 [formerly 2c0ff851ca] [formerly 7c064b6868 [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]
Former-commit-id: 27afa60345
Former-commit-id: dc50bc8443 [formerly 4f7bb90bb0]
Former-commit-id: d5fa61041b
2012-07-10 07:53:49 -05:00
Max Schenkelberg
3325ed5deb 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: 7d13c7d339 [formerly 9bbb68a547] [formerly 7d13c7d339 [formerly 9bbb68a547] [formerly 98c2ec7dc5 [formerly 9d3fd9e078c9c1a2995d2f8ebe4eca757b480050]]]
Former-commit-id: 98c2ec7dc5
Former-commit-id: c6d324aaeb [formerly 7286b4e962]
Former-commit-id: d876190d68
2012-07-06 16:01:47 -05:00
Ben Steffensmeier
44d3823a51 Issue #704 introduce canvas based rendering for making KML screen overlays
Change-Id: I6fc7873d98fe140ebea84899b7e4732719866def

Former-commit-id: e3c0387f6e [formerly 02e2c7b579] [formerly e3c0387f6e [formerly 02e2c7b579] [formerly 881896c21b [formerly bb83a95f5f00cce75b47e7fab084cf3258f65aba]]]
Former-commit-id: 881896c21b
Former-commit-id: 8a86a66376 [formerly b0f5013c7c]
Former-commit-id: bce842f480
2012-06-28 13:58:29 -05:00
Bryan Kowal
2e5a850d28 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: b1b294c401 [formerly a33740e915] [formerly b1b294c401 [formerly a33740e915] [formerly b87b66abc5 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]]
Former-commit-id: b87b66abc5
Former-commit-id: b4917e6708 [formerly 9a7d0492fe]
Former-commit-id: 611925412d
2012-06-27 17:21:48 -05:00
Steve Harris
e77a15c047 Revert "12.6.1-10 baseline"
This reverts commit 95e7f4fc0c [formerly aecc6a8474] [formerly f8497470fc [formerly b33c5bdfcf]] [formerly a2c0893d1a] [formerly 06f1c7b73c [formerly ddde63eee0] [formerly 06f1c7b73c [formerly ddde63eee0] [formerly a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]].


Former-commit-id: 62cf6a9f92 [formerly b4b1f6975f] [formerly 62cf6a9f92 [formerly b4b1f6975f] [formerly 25198a5cd6 [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]]
Former-commit-id: 25198a5cd6
Former-commit-id: 333fd9c64e [formerly 8367fb50f5]
Former-commit-id: 75f77df418
2012-06-21 08:51:08 -05:00
Steve Harris
95e7f4fc0c 12.6.1-10 baseline
Former-commit-id: 06f1c7b73c [formerly ddde63eee0] [formerly 06f1c7b73c [formerly ddde63eee0] [formerly a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]
Former-commit-id: a2c0893d1a
Former-commit-id: f8497470fc [formerly b33c5bdfcf]
Former-commit-id: aecc6a8474
2012-06-21 08:38:48 -05:00
Ben Steffensmeier
19ce6f7e77 Issue #704 add INCOMPLETE PaintStatus to indicate a frame will require more painting later
Former-commit-id: c2191c83dc [formerly d317777ee6] [formerly c2191c83dc [formerly d317777ee6] [formerly 0c69731e18 [formerly 65e7e8b2c891d1938f0b98c3c8737f18517fe27f]]]
Former-commit-id: 0c69731e18
Former-commit-id: 8b107023d1 [formerly b55a4f026c]
Former-commit-id: 63b55f454f
2012-06-20 14:13:37 -05:00
Bryan Kowal
a6d1f97dec 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: 9361f3eb94 [formerly f528e10391] [formerly 9361f3eb94 [formerly f528e10391] [formerly f0e3b957e3 [formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]]]
Former-commit-id: f0e3b957e3
Former-commit-id: 21e8618852 [formerly 1ee59eac71]
Former-commit-id: cbc8964e5b
2012-06-18 11:16:28 -05:00
Ben Steffensmeier
1a3e1ba291 Issue #704 rewrite shared meshes and tilesets to be more efficient and less deprecated.
Change-Id: I9f6ebba1bd75682b56a1e8de5a8d0b8974153f97

Former-commit-id: 2da8a0df2f [formerly aad1eb18b0] [formerly 2da8a0df2f [formerly aad1eb18b0] [formerly 9068e049cb [formerly 901f061f9e19f39cf5096a394cbd238c5562d733]]]
Former-commit-id: 9068e049cb
Former-commit-id: bded5dde2b [formerly dd496b3d90]
Former-commit-id: 541f1b74f3
2012-06-14 16:44:19 -05:00
Ben Steffensmeier
117c77bfe0 Issue #704 various core changes to make things work smoothly in kml
Change-Id: I048f9dfdb411a95765410f48fddb54aa8eefbd16

Former-commit-id: 2c27ec20b5 [formerly d187436589] [formerly 2c27ec20b5 [formerly d187436589] [formerly 58356c49cb [formerly faec1cb4e4e0ef6444da31971b937ad3ee79160a]]]
Former-commit-id: 58356c49cb
Former-commit-id: 352648586a [formerly e604271c54]
Former-commit-id: 3e4b09847b
2012-06-14 16:41:05 -05:00
Max Schenkelberg
7bac48f643 Issue #697 added support for multiple editors
Change-Id: Ic3ac12bb9368f0ec54dd8151ba1876002ff44e82

Former-commit-id: 51c2a41e68 [formerly dd99479eeb] [formerly 51c2a41e68 [formerly dd99479eeb] [formerly fceef3c5a1 [formerly 3afc7b49cb42c005a0e9cf5221e35fc3ab78007a]]]
Former-commit-id: fceef3c5a1
Former-commit-id: f0d2893e97 [formerly e5e1a4de6a]
Former-commit-id: f2e34fe03c
2012-06-13 17:52:11 -05:00
Steve Harris
b3c2646e5e Removed duplicate method created by merge
Former-commit-id: 282682ccc1 [formerly 5f66b0995a] [formerly 282682ccc1 [formerly 5f66b0995a] [formerly 308737bff8 [formerly 90fc678948690cc74488e6e1fd18cf8c72c5c0c9]]]
Former-commit-id: 308737bff8
Former-commit-id: 383f9d2d56 [formerly 55b4d7c5da]
Former-commit-id: 0de9e03c5a
2012-06-13 08:41:24 -05:00
Steve Harris
70a928d039 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: af6c0529ad [formerly 2f20a86a30] [formerly af6c0529ad [formerly 2f20a86a30] [formerly 48860df690 [formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]]]
Former-commit-id: 48860df690
Former-commit-id: d7a4853091 [formerly 27b50c57bd]
Former-commit-id: 2838ca117f
2012-06-12 14:37:12 -05:00
Steve Harris
3b468d9f50 12.6.1-5 baseline
Former-commit-id: 09f73b0601 [formerly c99afab05f] [formerly 09f73b0601 [formerly c99afab05f] [formerly 8947efbc7f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]]
Former-commit-id: 8947efbc7f
Former-commit-id: b69fa75919 [formerly a945ed8e6d]
Former-commit-id: 91e65230ad
2012-06-11 16:23:47 -05:00
Steve Harris
518fa79f7f 12.6.1-3 baseline
Former-commit-id: 7c5306b795 [formerly 42f3513175] [formerly 7c5306b795 [formerly 42f3513175] [formerly d57eb02b9e [formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]]]
Former-commit-id: d57eb02b9e
Former-commit-id: 32c0464d79 [formerly 1fdc0aa237]
Former-commit-id: ca8baf18a3
2012-06-11 16:23:47 -05:00
Steve Harris
c01b096242 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: c7024992a3 [formerly 37793c86b1] [formerly c7024992a3 [formerly 37793c86b1] [formerly d325d496f5 [formerly a435e6464a78345b5036e3060430375dc53e4faf]]]
Former-commit-id: d325d496f5
Former-commit-id: 23c34c469a [formerly cf3c768213]
Former-commit-id: 3dd5b84aa2
2012-06-11 15:24:03 -05:00
Steve Harris
39ff9954f8 12.5.1-15 baseline
Former-commit-id: 8552902906 [formerly b13cbb7e00] [formerly 8552902906 [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 97c4db937e [formerly 676ea3192f]
Former-commit-id: 9054c5ab6c
2012-06-08 13:39:48 -05:00
Max Schenkelberg
58c5d00acd Issue #664 Changed hydro legend resource to be system resource
Change-Id: I769463a967ee1ec76a9a3c09d48d27106caa0937

Former-commit-id: dbb8a6b93d [formerly 3cd4f75170] [formerly dbb8a6b93d [formerly 3cd4f75170] [formerly 85a7897b1e [formerly 9a726e2686e7ed79c1a436156a16e98083608e14]]]
Former-commit-id: 85a7897b1e
Former-commit-id: a8e2e4c8c1 [formerly f5c8240c92]
Former-commit-id: 69b203439e
2012-06-05 13:44:48 -05:00
Max Schenkelberg
e80b6c8dce Issue #239 Got IColormapShadedShapeExtension implemented
Change-Id: Idb2b5a894530b739cd8b00f8f3b294f186d5143f

Former-commit-id: c98b6e28c7 [formerly ae8236aa21] [formerly c98b6e28c7 [formerly ae8236aa21] [formerly 1c11323103 [formerly 6ddfe51e93d62145678d87ed3db208e90d3146e3]]]
Former-commit-id: 1c11323103
Former-commit-id: d0d619b048 [formerly 696c2f4894]
Former-commit-id: f2bd302796
2012-05-23 09:14:21 -05:00
Steve Harris
26ed02c3dc 12.5.1-6 baseline
Former-commit-id: df80148db6 [formerly 24474489f9] [formerly df80148db6 [formerly 24474489f9] [formerly fa87dc6cf1 [formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]]]
Former-commit-id: fa87dc6cf1
Former-commit-id: 4792884ab2 [formerly c452cce633]
Former-commit-id: 2738af2019
2012-05-16 16:41:22 -05:00
Max Schenkelberg
bc6563c49f Issue #239 Added IShadedShape capability to remote target
Change-Id: I9616a1dff3ba7f73ed1382027dd725928587efad

Former-commit-id: 193bc7e249 [formerly 1ca2a9ce13] [formerly 193bc7e249 [formerly 1ca2a9ce13] [formerly 0e5fd5cd15 [formerly a2f8c091c08d47d7b8354071e0ceedc978168a29]]]
Former-commit-id: 0e5fd5cd15
Former-commit-id: 25b9975bc3 [formerly b764f03353]
Former-commit-id: 3d58fb358e
2012-05-16 15:01:41 -05:00
Max Schenkelberg
0f3d4cf0e4 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: 5fca70461f [formerly 31243a9dfe] [formerly 5fca70461f [formerly 31243a9dfe] [formerly 074b9aba8c [formerly 24b673fcc45a4da27ac349bdebf8b48f6405607b]]]
Former-commit-id: 074b9aba8c
Former-commit-id: d2d6a4d1eb [formerly d22b403f48]
Former-commit-id: fc471eb557
2012-05-10 18:03:00 -05:00
Max Schenkelberg
5729c0acc5 Issue #588 Added serialization adapter registration to better support serializing DrawableString objects
Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056

Former-commit-id: 06ee0bbf6f [formerly 78e1bd2c62] [formerly 06ee0bbf6f [formerly 78e1bd2c62] [formerly 1f5abc6e20 [formerly 6c456c0bad00aaa1fea67f90a4633b3e14a78495]]]
Former-commit-id: 1f5abc6e20
Former-commit-id: 2db836b296 [formerly 3ca8ca6f01]
Former-commit-id: 6cd18a09dc
2012-05-09 15:02:30 -05:00
Steve Harris
d040b14742 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: d7f7c26582 [formerly 092efd6072] [formerly d7f7c26582 [formerly 092efd6072] [formerly 31b3e87ffa [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]]
Former-commit-id: 31b3e87ffa
Former-commit-id: 53d2822329 [formerly 98447412f8]
Former-commit-id: 7ee04eb560
2012-05-09 13:19:47 -05:00
Steve Harris
1d2ad9224a 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: 572e1bb476 [formerly 27bc369818] [formerly 572e1bb476 [formerly 27bc369818] [formerly 58037cb5d1 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]]
Former-commit-id: 58037cb5d1
Former-commit-id: 9c9e01dbda [formerly 63ea8599d7]
Former-commit-id: 7978d3b640
2012-05-09 13:14:00 -05:00
Steve Harris
ef49f63d8d 12.5.1-2 baseline
Former-commit-id: ac708c050d [formerly 84d191e7b6] [formerly ac708c050d [formerly 84d191e7b6] [formerly b36c69cc67 [formerly ff847bf86803a485212f08a098be13bc3d83b0b8]]]
Former-commit-id: b36c69cc67
Former-commit-id: f6300cd995 [formerly a821111fbf]
Former-commit-id: 377ae76413
2012-05-03 19:17:13 -05:00
Max Schenkelberg
42c569430b Issue #587 Got colorbars rendering properly
Change-Id: I9fe1b846e68dbdc947202cfcfe88aa7c8e1c1103

Former-commit-id: 0f6240eaea [formerly d4c10e5548] [formerly 0f6240eaea [formerly d4c10e5548] [formerly c81c225a6e [formerly 218d9138f8c096d3f99305e2f3ac80b3b30c9cfe]]]
Former-commit-id: c81c225a6e
Former-commit-id: 726c543266 [formerly c6edfad263]
Former-commit-id: 1189dba8a7
2012-05-03 13:07:43 -05:00
Max Schenkelberg
e9e4327ec9 Issue #239 Fixed bug with mosaic being up and starting a session
Change-Id: Ibe0b238806e3cb55b65a38da5a93caeddadc2c01

Former-commit-id: 3ffb18b767 [formerly a045f6f3b9] [formerly 3ffb18b767 [formerly a045f6f3b9] [formerly b82eb49055 [formerly 3155b7b27c0c9ddc8557ac8a0240548b0d50292c]]]
Former-commit-id: b82eb49055
Former-commit-id: 887177aa84 [formerly 6a1b035c2d]
Former-commit-id: f4bd13133e
2012-05-02 10:20:20 -05:00
Steve Harris
491aa53a0c 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: 4ec294b525 [formerly 2ed7249613] [formerly 4ec294b525 [formerly 2ed7249613] [formerly 7b75b781ad [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]]
Former-commit-id: 7b75b781ad
Former-commit-id: 7c7fc97131 [formerly 6dd3ee8809]
Former-commit-id: fd9e226b35
2012-05-01 18:31:09 -05:00
Steve Harris
0c25458510 12.4.1-10 baseline
Former-commit-id: 4bfbdad17d [formerly 9f8cb727a5] [formerly 4bfbdad17d [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 33a67cdd82 [formerly a28d70b5c5]
Former-commit-id: e5543a0e86
2012-05-01 18:06:13 -05:00
Dave Hladky
7fc0c65ef4 Issue #15 Re-wrote SimDate integration for menus, alert observers after
merge headache.

Former-commit-id: 42a12fa7a5 [formerly 1b7473572f] [formerly 42a12fa7a5 [formerly 1b7473572f] [formerly 5b7ecea866 [formerly 647b7ac154dbdaf945231b231f491bbca86d2a24]]]
Former-commit-id: 5b7ecea866
Former-commit-id: a1a3a361dd [formerly 61e31c62ff]
Former-commit-id: d2e16d486b
2012-04-30 13:43:34 -05:00
Max Schenkelberg
cd7fe895bc Added network logging for http traffic
Change-Id: I69f571fba23fc03e0d850180650f61b4581e8a25

Former-commit-id: 2cc5794428 [formerly a912786429] [formerly 2cc5794428 [formerly a912786429] [formerly f74b6b4a93 [formerly 7696dd610b5d6f0fc3620db461de68ba06c61699]]]
Former-commit-id: f74b6b4a93
Former-commit-id: 7bb4057d32 [formerly 2d25e8bb78]
Former-commit-id: 936fa688c0
2012-04-25 17:28:52 -05:00
Steve Harris
f1eb6efb23 12.4.1-10 baseline
Former-commit-id: 418489e726 [formerly 704b75e1a1] [formerly 418489e726 [formerly 704b75e1a1] [formerly 01457fbbde [formerly 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a]]]
Former-commit-id: 01457fbbde
Former-commit-id: 97caaa0327 [formerly aabc3842ac]
Former-commit-id: 3ed3a665cb
2012-04-24 15:38:29 -05:00
Nate Jensen
2bce81c6c8 Issue #443 better logging of traffic
Change-Id: Ia968b79a9d6ee1e5224678ac63684fb9c7aa5b81

Former-commit-id: 14f70d1122 [formerly a4b0addeee] [formerly 14f70d1122 [formerly a4b0addeee] [formerly 39ebbc3913 [formerly 4a7faa743900edada4ecf8b42aa3315515617e71]]]
Former-commit-id: 39ebbc3913
Former-commit-id: 83e6f5acf4 [formerly 8130c22b64]
Former-commit-id: 776ef738f7
2012-04-23 11:23:22 -05:00
Max Schenkelberg
f6a582c033 Issue #239 Started persistable object event pattern. Made construction
of single color images cheaper to allow object construction to happen
immediately 

Former-commit-id: 9d0eecb9b1 [formerly 523c90b697] [formerly 9d0eecb9b1 [formerly 523c90b697] [formerly da5e17d6e3 [formerly 995ddaebb670eb1689aeb44e3cb760731db46e80]]]
Former-commit-id: da5e17d6e3
Former-commit-id: baf778717f [formerly f05528979d]
Former-commit-id: 04cf9dba60
2012-04-19 16:03:07 -05:00
Steve Harris
9b8c6e395d 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: 63f11892e8 [formerly 4d7572a632] [formerly 63f11892e8 [formerly 4d7572a632] [formerly 625cd4262c [formerly 5e1b9319941eed516a08a135a2049c14bad77863]]]
Former-commit-id: 625cd4262c
Former-commit-id: e86dc647be [formerly def458753d]
Former-commit-id: 19657ae52d
2012-04-19 11:11:02 -05:00
Steve Harris
74b66d9683 12.4.1-4 baseline
Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: a2a6a18fae [formerly a4e519f3cd]
Former-commit-id: 8cd5974f4c
2012-04-18 15:18:16 -05:00
Max Schenkelberg
0e60d7deb0 Issue #239 Got reprojection event working
Former-commit-id: 6efccf10a5 [formerly 29f24e3ec5] [formerly 6efccf10a5 [formerly 29f24e3ec5] [formerly 005beff18a [formerly 99e432cd258c9bf570a66be4702d28ac68204052]]]
Former-commit-id: 005beff18a
Former-commit-id: 8096fc5ad3 [formerly 044f21e405]
Former-commit-id: fef058d9c6
2012-04-18 14:01:09 -05:00
Max Schenkelberg
b681ea25a2 Issue #239 Fixed mosaic bug, refactored dispatching colormap images so
mosaic could resuse

Former-commit-id: c1ebd04d4d [formerly 40ca446e53] [formerly c1ebd04d4d [formerly 40ca446e53] [formerly 29184d46ce [formerly aea5c30443970933bf1517ced6d7e91a1008c9d5]]]
Former-commit-id: 29184d46ce
Former-commit-id: e68e6130a0 [formerly a82f07b25d]
Former-commit-id: 78126cd777
2012-04-17 13:09:07 -05:00