xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5965 commits 31 branches 40 tags 3.8 GiB
Commit graph

103 commits

Author SHA1 Message Date
Ben Steffensmeier
f2466d6066 Issue #1804 Remove AlphanumericValues from radar HDF5. 
Former-commit-id: 7b7b708eee [formerly 6c741a9ab3] [formerly 7b7b708eee [formerly 6c741a9ab3] [formerly 86dffab17d [formerly 2c8170a332994405820a25d9052afd7bc8cbcd3f]]]
Former-commit-id: 86dffab17d
Former-commit-id: 160b6a7040 [formerly dfe8de96f2]
Former-commit-id: e176478c7a
 2013-03-18 17:16:44 -05:00
Steve Harris
481cee4c74 Merge branch 'omaha_13.3.1' into development 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java

Former-commit-id: 28ef804e1b [formerly b8f0635ad6] [formerly 28ef804e1b [formerly b8f0635ad6] [formerly 7fcf9f1cb2 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]]
Former-commit-id: 7fcf9f1cb2
Former-commit-id: 2a26783ba7 [formerly 900b9aadde]
Former-commit-id: 22bb7ecd33
 2013-03-18 16:52:00 -05:00
Steve Harris
9d4d1baefe Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1 
Conflicts (just history comments):
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/userPython/procedures/TCMWindTool.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java


Former-commit-id: 27c418812f [formerly 1a999fee5a] [formerly 27c418812f [formerly 1a999fee5a] [formerly c18b96dc4c [formerly 5927ff20543395733d9302eba2e6772315730a80]]]
Former-commit-id: c18b96dc4c
Former-commit-id: ea27f9cd17 [formerly 245afb28c8]
Former-commit-id: fc6748cb3e
 2013-03-18 16:43:22 -05:00
Steve Harris
1c2dffd66d 13.3.1-8 baseline 
Former-commit-id: bc9df0a8f9 [formerly f97d78994b] [formerly bc9df0a8f9 [formerly f97d78994b] [formerly c15b3ffe20 [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]]
Former-commit-id: c15b3ffe20
Former-commit-id: 81a3f29afc [formerly 5f492500ea]
Former-commit-id: 0c94cc97fb
 2013-03-18 15:43:32 -05:00
Dustin Johnson
be4fe08b9d Issue #1784 Move NCF bandwidth manager code to data delivery repo 
Amend:
  Publish JUnit test reports as XML, in support of Jenkins.
  Fix build/merge of 13.3.1 code so it compiles.

Change-Id: Ida653ee4ea8cd9d37f0b7d51f2d00db8fda38ca4

Former-commit-id: 2983ed29e4 [formerly 71365cd945] [formerly 2983ed29e4 [formerly 71365cd945] [formerly 1930183036 [formerly 60efd125706d618ae06eb84f959302213da2f7f1]]]
Former-commit-id: 1930183036
Former-commit-id: f5a3b57107 [formerly 48a96911c8]
Former-commit-id: 06b39b848b
 2013-03-13 08:39:08 -05:00
Steve Harris
346b22b196 Merge branch 'omaha_13.3.1' into development 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/skewt/bkgd/NsharpSkewTBackground.java

Former-commit-id: 36261cb095 [formerly 753a5213ab] [formerly 36261cb095 [formerly 753a5213ab] [formerly 0cd7e56e65 [formerly 7b68942012eaf060f364f1e474b2b93379e1b3d6]]]
Former-commit-id: 0cd7e56e65
Former-commit-id: bca46a1354 [formerly d5bcdb0015]
Former-commit-id: 5232592cfa
 2013-03-12 16:04:23 -05:00
Dave Hladky
cdfbcc7136 Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
	ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227

Former-commit-id: 5c65862b8f [formerly a1006667e0] [formerly 5c65862b8f [formerly a1006667e0] [formerly 4b08491880 [formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]]
Former-commit-id: 4b08491880
Former-commit-id: 155903d135 [formerly 6ea95002de]
Former-commit-id: 29ed641a13
 2013-03-12 15:48:34 -05:00
Steve Harris
c28f3aeb02 13.3.1-6 baseline 
Former-commit-id: 2e110bd151 [formerly 3a4c7931e1] [formerly 2e110bd151 [formerly 3a4c7931e1] [formerly 566b677d09 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]]
Former-commit-id: 566b677d09
Former-commit-id: 6fe4b16924 [formerly 4ed21b702b]
Former-commit-id: c6f379f59a
 2013-03-12 08:35:45 -05:00
Ben Steffensmeier
866c873f71 Issue #1532 Delete uf.common.image and clean up the mess it left behind. 
Former-commit-id: d27d30c2db [formerly f46686a6e2] [formerly d27d30c2db [formerly f46686a6e2] [formerly 2ca86633d6 [formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]]]
Former-commit-id: 2ca86633d6
Former-commit-id: 334af0001b [formerly 5068b18c6a]
Former-commit-id: 0778375180
 2013-02-28 17:00:56 -06:00
Max Schenkelberg
1073393fbb Issue #1638 Refactored viz/edex/common core projects to removed common and viz dependencies on edex projects 
Amend: Accepted ticket for work, again!  Ensured uframe product project was not deleted

Change-Id: Iaa7754f25d74d893f84a7f82df605fb906e1e719

Former-commit-id: 2611980ca4 [formerly 4ed4ef8d71] [formerly 2611980ca4 [formerly 4ed4ef8d71] [formerly e0ba97d547 [formerly 615fa06253cc5226ddbedbb7835f3f03cf4cbb5b]]]
Former-commit-id: e0ba97d547
Former-commit-id: 5617dfaa67 [formerly 6b1426dd34]
Former-commit-id: 453ac44050
 2013-02-27 11:50:38 -06:00
Ben Steffensmeier
932db84314 Issue #1659 Cache station in StationUtils 
Former-commit-id: 0ff907499c [formerly 842437870e] [formerly 0ff907499c [formerly 842437870e] [formerly 39bf907df7 [formerly 5bd8303893ad59a23571c0564984b21da9ffe785]]]
Former-commit-id: 39bf907df7
Former-commit-id: 8ebeb61cea [formerly 5be0eab696]
Former-commit-id: 02f1f6a065
 2013-02-25 16:25:55 -06:00
Steve Harris
a11c8dff6d Merge branch '13.2.1_delivery' into development 
Former-commit-id: da43a7a8ca [formerly 4bc8e9ab5c] [formerly da43a7a8ca [formerly 4bc8e9ab5c] [formerly 5ee47e098d [formerly 30e1ae8f245a60c780fcc79f54795ece0b28088f]]]
Former-commit-id: 5ee47e098d
Former-commit-id: b119d66cda [formerly 3ad515e28f]
Former-commit-id: d73efe8e86
 2013-02-06 11:12:01 -06:00
Steve Harris
f36867a520 13.2.1-5 baseline 
Former-commit-id: a6b3cde1ff [formerly 232734091d] [formerly a6b3cde1ff [formerly 232734091d] [formerly 146fcc6da8 [formerly c56f1fdc3e2419c5dd6bebbbb1e0e688bd5e0092]]]
Former-commit-id: 146fcc6da8
Former-commit-id: 7497a15e22 [formerly 1c602ec3a7]
Former-commit-id: bb0759d5ad
 2013-02-06 11:02:32 -06:00
Ben Steffensmeier
2334bfef69 Issue #1553 move radar units into common plugin for use in data access factory 
Change-Id: I32d01625bcbc6555b402048ebb34cee21f0b855f

Former-commit-id: e9d3c547ff [formerly 057654103d] [formerly e9d3c547ff [formerly 057654103d] [formerly 54d91281a6 [formerly c9faa8b98ce3687667363841f5955d8aebab6b1e]]]
Former-commit-id: 54d91281a6
Former-commit-id: df823559eb [formerly 8442c27bc6]
Former-commit-id: bbdd86c866
 2013-01-31 17:15:11 -06:00
Steve Harris
5ae95b956b 13.2.1-4 baseline 
Former-commit-id: ae2859d5a2 [formerly 8f2e7d4437] [formerly ae2859d5a2 [formerly 8f2e7d4437] [formerly 0d7f53b6f4 [formerly d4fd198979dbc5d77a6bf836685cb658e7ac6cfe]]]
Former-commit-id: 0d7f53b6f4
Former-commit-id: 3f25b862c8 [formerly 2998f750f4]
Former-commit-id: 0a4ef8c084
 2013-01-31 11:40:31 -06:00
Steve Harris
9ab34b7aeb 13.2.1-3 baseline 
Former-commit-id: 283147571f [formerly f45120a1f4] [formerly 283147571f [formerly f45120a1f4] [formerly 7a739c6a5b [formerly fc7291332a08966a746605aef725e1947ec9643c]]]
Former-commit-id: 7a739c6a5b
Former-commit-id: daca1c3e73 [formerly 3edfa1e0be]
Former-commit-id: dbaf4a3e39
 2013-01-29 15:52:43 -06:00
Steve Harris
eafa141b90 13.2.1-2 baseline 
Former-commit-id: 0006a2b6cb [formerly 7a7f7c45ca] [formerly 0006a2b6cb [formerly 7a7f7c45ca] [formerly c3e4551dfa [formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]]]
Former-commit-id: c3e4551dfa
Former-commit-id: 251a9c0195 [formerly 1153d80c5b]
Former-commit-id: 27706b8dcb
 2013-01-25 09:07:12 -06:00
Steve Harris
ab562e22a4 13.2.1-3 baseline 
Former-commit-id: a5a0da5c02 [formerly 7435527b25] [formerly a5a0da5c02 [formerly 7435527b25] [formerly 2b6ac028bd [formerly ba03739c3528638c5383528fd64674ae5af1ed64]]]
Former-commit-id: 2b6ac028bd
Former-commit-id: 9d248cff7a [formerly cc0fdef15c]
Former-commit-id: 082e66584a
 2013-01-23 11:24:17 -05:00
Steve Harris
2779f5c6d9 13.2.1-2 baseline 
Former-commit-id: 33bc5fd816 [formerly 83e9157df7] [formerly 33bc5fd816 [formerly 83e9157df7] [formerly 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]
Former-commit-id: 328c6dccad
Former-commit-id: d9be4dce21 [formerly 47cc08ac79]
Former-commit-id: 547c1dedd1
 2013-01-23 11:18:44 -05:00
Steve Harris
b7f180d9d3 13.1.2-6 baseline 
Former-commit-id: efd3392abe [formerly 8e5f9e0e6c] [formerly efd3392abe [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]
Former-commit-id: 59969775ad
Former-commit-id: 82a1ed77a4 [formerly dbcae57f57]
Former-commit-id: 05bdc0ecd2
 2013-01-06 14:55:11 -06:00
Steve Harris
f52ec0b0a0 13.1.2-2 baseline 
Former-commit-id: 51208e5515 [formerly c0c1d56f3a] [formerly 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: cd4185ef5c [formerly 941337c553]
Former-commit-id: b6fa9b4858
 2013-01-06 14:32:24 -06:00
Steve Harris
f8a9ae24cb 12.12.1-12 baseline 
Former-commit-id: 89def5cf03 [formerly e8e41630e8] [formerly 89def5cf03 [formerly e8e41630e8] [formerly 6d610f8e8a [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]]]
Former-commit-id: 6d610f8e8a
Former-commit-id: 69ab975fab [formerly 7bb37caa23]
Former-commit-id: 190378beeb
 2012-12-06 09:18:28 -06:00
Steve Harris
0b22b3c014 12.12.1-8 baseline 
Former-commit-id: 2d338b4cec [formerly 19962f41ba] [formerly 2d338b4cec [formerly 19962f41ba] [formerly 5093a7c442 [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]]]
Former-commit-id: 5093a7c442
Former-commit-id: ff4131c2ee [formerly ee06a94735]
Former-commit-id: ec2cdc1593
 2012-12-06 09:02:51 -06:00
Steve Harris
af59663a99 12.12.1-1 baseline 
Former-commit-id: c2839cc86d [formerly e4bd20a515] [formerly c2839cc86d [formerly e4bd20a515] [formerly e1498006c7 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]
Former-commit-id: e1498006c7
Former-commit-id: 4f243de928 [formerly 214fcd3b63]
Former-commit-id: a5be98d6de
 2012-11-07 12:41:20 -06:00
Steve Harris
35e34308c5 12.11.1-4 baseline 
Former-commit-id: 98171b5de9 [formerly d3497e47eb] [formerly 98171b5de9 [formerly d3497e47eb] [formerly 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]
Former-commit-id: 6958b861f0
Former-commit-id: 2c82d9cb07 [formerly cbbdb231ce]
Former-commit-id: 560f0d9cc3
 2012-10-16 13:27:07 -05:00
Steven Harris
2f855322f6 12.11.1-1 baseline 
Former-commit-id: 0e86bfd1d3 [formerly 618aa3f316] [formerly 0e86bfd1d3 [formerly 618aa3f316] [formerly feec28f274 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]
Former-commit-id: feec28f274
Former-commit-id: f5e63d5f93 [formerly 8843ffd022]
Former-commit-id: a544be6d83
 2012-09-27 15:57:45 -05:00
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
Steve Harris
7e1d1f6e08 12.9.1-4 baseline 
Former-commit-id: 36c108e960 [formerly dcda3a2290] [formerly 36c108e960 [formerly dcda3a2290] [formerly 33b95fb96d [formerly df38541c9df38c634626ae214f288b606004a768]]]
Former-commit-id: 33b95fb96d
Former-commit-id: d7d60cc623 [formerly 9990bf909b]
Former-commit-id: de9b64b501
 2012-08-15 15:19:10 -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
Steve Harris
36e2ad3023 12.7.1-8 baseline 
Former-commit-id: 11f96dbedd [formerly 16bf591a33] [formerly 11f96dbedd [formerly 16bf591a33] [formerly c42ae0fa39 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]]
Former-commit-id: c42ae0fa39
Former-commit-id: f2102bfb24 [formerly 9f97182964]
Former-commit-id: 9aabe438b9
 2012-07-19 16:20:40 -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
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
4ddcccc3c7 Issue #358 Fixed merge errors when merging core_exp into ss_sync 
Former-commit-id: 2ef208b263 [formerly 3fe183277b] [formerly 2ef208b263 [formerly 3fe183277b] [formerly e3d6962fe6 [formerly e8846fa2b5aa1ef2972f134a683246bc275a8067]]]
Former-commit-id: e3d6962fe6
Former-commit-id: 338f80fa87 [formerly 878de45ee6]
Former-commit-id: 9f72069996
 2012-05-01 18:36:09 -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
Max Schenkelberg
33d08f1496 Issue #358 Fixed merge errors when merging core_exp into ss_sync 
Former-commit-id: e03ee60c75 [formerly 1294fa0ca1] [formerly e03ee60c75 [formerly 1294fa0ca1] [formerly 90a5c20b5a [formerly bd93246cccd1b123598006d7343eac265392695d]]]
Former-commit-id: 90a5c20b5a
Former-commit-id: 51a826384e [formerly 65c864aff2]
Former-commit-id: 72a27b7ae0
 2012-04-19 11:11:34 -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
e8bc0cfa66 Issue #358 Fixed merge errors when merging core_exp into ss_sync 
Former-commit-id: 74458bfb73 [formerly 9b0d01f8b5] [formerly 74458bfb73 [formerly 9b0d01f8b5] [formerly 07cf5069ba [formerly beb6a1d49fac8e3e7b2ba8cbc52a8980d06e9885]]]
Former-commit-id: 07cf5069ba
Former-commit-id: 4234b91d5b [formerly 993cac891e]
Former-commit-id: f20e674318
 2012-03-30 10:51:31 -05:00
Steve Harris
1556e72eeb 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: a4e4792bb5 [formerly d3ad6095b7] [formerly a4e4792bb5 [formerly d3ad6095b7] [formerly 5cdda77afb [formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]]]
Former-commit-id: 5cdda77afb
Former-commit-id: 9845ef53f9 [formerly 6aa18f74f6]
Former-commit-id: 9fee09c9e4
 2012-03-30 09:50:48 -05:00
Steve Harris
293563cfe7 12.3.1-10 baseline 
Former-commit-id: 0e4128712b [formerly 4068f5295f] [formerly 0e4128712b [formerly 4068f5295f] [formerly 22bd792cd9 [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]]
Former-commit-id: 22bd792cd9
Former-commit-id: 8bc60b1e32 [formerly ce3b74c605]
Former-commit-id: 2e0f4b241b
 2012-03-30 08:38:33 -05:00
Steve Harris
0a7cb5fd7a Merge branch 'sync_test' (VCModules) into ss_sync 
Former-commit-id: 0665862abe [formerly 70357d90bc] [formerly 0665862abe [formerly 70357d90bc] [formerly a0abcf8120 [formerly e68338cecbe85a62835633e9aba0925344fb80f1]]]
Former-commit-id: a0abcf8120
Former-commit-id: 65aa72fee7 [formerly 6884520750]
Former-commit-id: 5a310acb18
 2012-03-29 10:03:05 -05:00
Max Schenkelberg
8878a9732d Issue #422 Set "numericValue" to null in RadarDefaultInterrogator in 
case of "NO DATA"

Former-commit-id: 468c812dde [formerly cd6ebd80d4] [formerly 468c812dde [formerly cd6ebd80d4] [formerly b9085db25d [formerly 89521a4df36d18ecb64b4cce248f150f0a0e4957]]]
Former-commit-id: b9085db25d
Former-commit-id: 81bc45f071 [formerly 954073b38c]
Former-commit-id: 645900727c
 2012-03-16 10:13:31 -05:00
Max Schenkelberg
e220ddf515 Issue #358 Fixed sampling issue with mosaic resource with best 
res resources

Former-commit-id: 97edff9f7c [formerly cc111ab9ac] [formerly 97edff9f7c [formerly cc111ab9ac] [formerly 258d57e825 [formerly 8aaf5e65d7c8ecbced6252d4a98af6223c77d5a0]]]
Former-commit-id: 258d57e825
Former-commit-id: 4e81d2432c [formerly 1e5c074e3b]
Former-commit-id: a3bda1957c
 2012-03-16 09:03:50 -05:00
Max Schenkelberg
d585d19f48 Issue #358 Fixed painting and sampling regression in radar mosaic due to 
core improvements from NPP in GL mosaic imaging extension and discovered
while testing IMesh improvements

Former-commit-id: 10b720381b [formerly 719f87c261] [formerly 10b720381b [formerly 719f87c261] [formerly 556a270a09 [formerly f739d79bfd547adc295c716a1804f55f09b1bde1]]]
Former-commit-id: 556a270a09
Former-commit-id: a4b859ae54 [formerly ba8af4dcc1]
Former-commit-id: 682aca1dda
 2012-03-14 18:03:44 -05:00
Max Schenkelberg
9366a5f308 Issue #358 Cleaned up mesh extension and API to use geotools for 
defining a mesh.  This is better practice than using arbitrary
MathTransform objects as it is well defined and allows for serialization
of the mesh to occur.

Former-commit-id: 8fb7eccb73 [formerly 6e5964df9d] [formerly 8fb7eccb73 [formerly 6e5964df9d] [formerly 50765e8a34 [formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]]]
Former-commit-id: 50765e8a34
Former-commit-id: 8f08fab0a7 [formerly cf440b3884]
Former-commit-id: 6378e8c4ee
 2012-03-14 09:49:32 -05:00
Max Schenkelberg
0f005d3521 Issue #358 Merging core drawing API improvements from Collaboration 
Former-commit-id: 18805c68f7 [formerly d43b0456d8] [formerly 18805c68f7 [formerly d43b0456d8] [formerly 89f603f448 [formerly a266a93ec2dca3ffbd7d2fd1f9dc47d7e18e6904]]]
Former-commit-id: 89f603f448
Former-commit-id: f78b932abb [formerly 4662ece060]
Former-commit-id: 1303289d12
 2012-03-09 12:31:50 -06:00
Max Schenkelberg
ae389f0b57 Issue #358 Committing NPP core rendering improvements merged with Thin 
Client core improvements

Former-commit-id: e2cd95d3f4 [formerly ae47d9683e] [formerly e2cd95d3f4 [formerly ae47d9683e] [formerly 48b6d45f00 [formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]]]
Former-commit-id: 48b6d45f00
Former-commit-id: 0554abdde0 [formerly 3212cc6ebb]
Former-commit-id: 585e979c76
 2012-03-01 16:59:40 -06:00
Ben Steffensmeier
f6b65b8467 Issue #228 change plots, grid icons, and radar icons 
to use a new PointImageExtension which provides an
interface for drawing images at a single point,
which kml can use to extract plot images.

Change-Id: I29b07ed4f9e8ea95ed131ab1eb3ca27efadaf0e2

Former-commit-id: 792dc75f4d [formerly d976603262] [formerly 792dc75f4d [formerly d976603262] [formerly 13a99abe7b [formerly 0f56c76ab830ef088a9576301c795dca7c855033]]]
Former-commit-id: 13a99abe7b
Former-commit-id: ec90cad810 [formerly 63ef103145]
Former-commit-id: 70e38a4506
 2012-02-01 12:45:56 -06:00
Ben Steffensmeier
a7bc0dc8f3 Issue #176 Change plots to no longer require id in updates. Change thin client updates to request pdo's instead of redoTimeMatching, which grabs any updates, not just new resource times. 
Change-Id: I23763bae287d5c49d3973707228e78144cc83ab1

Former-commit-id: 6194dc8210 [formerly 9cc983549d] [formerly 6194dc8210 [formerly 9cc983549d] [formerly 9254b762ff [formerly 94d4feb2973ed201d369a21126b3443606041179]]]
Former-commit-id: 9254b762ff
Former-commit-id: 75f49627c8 [formerly 484a0f64f8]
Former-commit-id: 0c4a26a41c
 2012-01-30 17:04:47 -06:00