Steve Harris
bbc20f4a68
12.10.1-3 baseline (better than previous which was missing changeset 7d75620)
...
Former-commit-id: fd5e214e72
[formerly 077ced354e
[formerly af8ffe73c81cd980843f137800f9fbb453c9e2c0]]
Former-commit-id: 077ced354e
Former-commit-id: 22dac5c82e
2012-09-12 13:10:36 -05:00
Steve Harris
0403e7d0a9
12.10.1-3 baseline
...
Former-commit-id: 969e7e6dfd
[formerly 21f430062b
[formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]
Former-commit-id: 21f430062b
Former-commit-id: de1639aea2
2012-09-11 16:00:38 -05:00
Steve Harris
bb190a66a1
12.10.1-2 baseline
...
Former-commit-id: a66f3f4b60
[formerly 250f0ccac9
[formerly 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c]]
Former-commit-id: 250f0ccac9
Former-commit-id: dde1f4c54d
2012-09-11 15:50:57 -05:00
Steve Harris
7248f8b762
12.10.1-1 baseline
...
Former-commit-id: d708932029
[formerly 195158c004
[formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]
Former-commit-id: 195158c004
Former-commit-id: 0abf64b77c
2012-09-04 12:07:27 -05:00
Steve Harris
6784576fc9
12.9.1-12 baseline
...
Former-commit-id: 150bc967a5
[formerly 948766c387
[formerly 09035ea929c2e926b2dce13429c29d3fd3707880]]
Former-commit-id: 948766c387
Former-commit-id: 4bf4f0043a
2012-09-04 11:47:38 -05:00
Steve Harris
a2bb1dabe0
12.9.1-11 baseline
...
Former-commit-id: fc405efab7
[formerly 6eb6b0909b
[formerly 046d9078b7aa87ff8df98142556713fe38d95c63]]
Former-commit-id: 6eb6b0909b
Former-commit-id: d07c18918d
2012-08-30 14:36:12 -05:00
Steve Harris
264d870cbf
12.9.1-10 baseline
...
Former-commit-id: cb9b80f3a0
[formerly 3adc50a783
[formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]
Former-commit-id: 3adc50a783
Former-commit-id: bdb45cdfae
2012-08-30 14:28:27 -05:00
Steve Harris
77cbd6c1e5
12.9.1-5 baseline
...
Former-commit-id: f2fac39428
[formerly 61f269f54c
[formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: 61f269f54c
Former-commit-id: a1d931fd44
2012-08-21 15:27:03 -05:00
Steve Harris
71b024e3a1
12.9.1-4 baseline
...
Former-commit-id: 33b95fb96d
[formerly dcda3a2290
[formerly df38541c9df38c634626ae214f288b606004a768]]
Former-commit-id: dcda3a2290
Former-commit-id: 36c108e960
2012-08-15 15:19:10 -05:00
Steve Harris
8083b81729
12.9.1-3 baseline
...
Former-commit-id: 84bbf2573e
[formerly 36d80b1f60
[formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]]
Former-commit-id: 36d80b1f60
Former-commit-id: c11f7d396e
2012-08-15 14:26:10 -05:00
Steve Harris
ecba93c959
12.9.1-2 baseline
...
Former-commit-id: a198b3a807
[formerly d1d877d319
[formerly 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2]]
Former-commit-id: d1d877d319
Former-commit-id: 27871051e3
2012-08-15 14:12:24 -05:00
Steve Harris
b9fb1c89d4
12.9.1-1 baseline
...
Former-commit-id: 79ce6cfd97
[formerly 31ae7ea218
[formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]
Former-commit-id: 31ae7ea218
Former-commit-id: 8309193ce9
2012-08-15 13:59:00 -05:00
Steve Harris
79d4d91e46
12.8.1-10 baseline
...
Former-commit-id: ca25d508ec
[formerly b5e8fee24d
[formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]]
Former-commit-id: b5e8fee24d
Former-commit-id: 6244359a80
2012-08-06 09:34:26 -05:00
Steve Harris
2e804fc8c4
12.8.1-5 baseline
...
Former-commit-id: cd49ef3eda
[formerly fd2abfb6f1
[formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]
Former-commit-id: fd2abfb6f1
Former-commit-id: 2653ddc2e3
2012-08-01 10:45:37 -05:00
Steve Harris
b242dd98d6
12.7.1-8 baseline
...
Former-commit-id: c42ae0fa39
[formerly 16bf591a33
[formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]
Former-commit-id: 16bf591a33
Former-commit-id: 11f96dbedd
2012-07-19 16:20:40 -05:00
Steve Harris
32fdf6ed3b
12.6.1-9 baseline
...
Former-commit-id: 27afa60345
[formerly 2c0ff851ca
[formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]
Former-commit-id: 2c0ff851ca
Former-commit-id: 7c064b6868
2012-07-10 07:53:49 -05:00
Steve Harris
2f10c7a1e4
12.5.1-15 baseline
...
Former-commit-id: 3904c4ccf5
[formerly b13cbb7e00
[formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]
Former-commit-id: b13cbb7e00
Former-commit-id: 8552902906
2012-06-08 13:39:48 -05:00
Max Schenkelberg
e0a22310dc
Issue #358 Fixed merge errors when merging core_exp into ss_sync
...
Former-commit-id: e3d6962fe6
[formerly 3fe183277b
[formerly e8846fa2b5aa1ef2972f134a683246bc275a8067]]
Former-commit-id: 3fe183277b
Former-commit-id: 2ef208b263
2012-05-01 18:36:09 -05:00
Steve Harris
fe946166ed
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: 7b75b781ad
[formerly 2ed7249613
[formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]
Former-commit-id: 2ed7249613
Former-commit-id: 4ec294b525
2012-05-01 18:31:09 -05:00
Steve Harris
7fa9dbd5fb
12.4.1-10 baseline
...
Former-commit-id: 8485b90ff8
[formerly 9f8cb727a5
[formerly bf53d06834caa780226121334ac1bcf0534c3f16]]
Former-commit-id: 9f8cb727a5
Former-commit-id: 4bfbdad17d
2012-05-01 18:06:13 -05:00
Max Schenkelberg
9126809973
Issue #358 Fixed merge errors when merging core_exp into ss_sync
...
Former-commit-id: 90a5c20b5a
[formerly 1294fa0ca1
[formerly bd93246cccd1b123598006d7343eac265392695d]]
Former-commit-id: 1294fa0ca1
Former-commit-id: e03ee60c75
2012-04-19 11:11:34 -05:00
Steve Harris
634d40a156
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: 625cd4262c
[formerly 4d7572a632
[formerly 5e1b9319941eed516a08a135a2049c14bad77863]]
Former-commit-id: 4d7572a632
Former-commit-id: 63f11892e8
2012-04-19 11:11:02 -05:00
Steve Harris
4767b0e069
12.4.1-4 baseline
...
Former-commit-id: 2a216f333c
[formerly 67a5a68300
[formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 67a5a68300
Former-commit-id: 750b7543dd
2012-04-18 15:18:16 -05:00
Max Schenkelberg
25cf44a674
Issue #358 Fixed merge errors when merging core_exp into ss_sync
...
Former-commit-id: 07cf5069ba
[formerly 9b0d01f8b5
[formerly beb6a1d49fac8e3e7b2ba8cbc52a8980d06e9885]]
Former-commit-id: 9b0d01f8b5
Former-commit-id: 74458bfb73
2012-03-30 10:51:31 -05:00
Steve Harris
b4846ce8a8
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: 5cdda77afb
[formerly d3ad6095b7
[formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]]
Former-commit-id: d3ad6095b7
Former-commit-id: a4e4792bb5
2012-03-30 09:50:48 -05:00
Steve Harris
760ead2047
12.3.1-10 baseline
...
Former-commit-id: 22bd792cd9
[formerly 4068f5295f
[formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]
Former-commit-id: 4068f5295f
Former-commit-id: 0e4128712b
2012-03-30 08:38:33 -05:00
Steve Harris
b05701d2d7
Merge branch 'sync_test' (VCModules) into ss_sync
...
Former-commit-id: a0abcf8120
[formerly 70357d90bc
[formerly e68338cecbe85a62835633e9aba0925344fb80f1]]
Former-commit-id: 70357d90bc
Former-commit-id: 0665862abe
2012-03-29 10:03:05 -05:00
Max Schenkelberg
86d3763df0
Issue #358 Made wireframe shapes rely more on the grid geoemtry of the
...
descriptor than the actual descriptor as the descriptor is used purely
for convenience
Former-commit-id: f10f1a5319
[formerly 15a9245592
[formerly 265ccb3e22aa0122dbd74e83d0af202596c1941c]]
Former-commit-id: 15a9245592
Former-commit-id: 66eaffb9ee
2012-03-28 13:32:04 -05:00
Max Schenkelberg
a0663a2791
Issue #422 Set "numericValue" to null in RadarDefaultInterrogator in
...
case of "NO DATA"
Former-commit-id: b9085db25d
[formerly cd6ebd80d4
[formerly 89521a4df36d18ecb64b4cce248f150f0a0e4957]]
Former-commit-id: cd6ebd80d4
Former-commit-id: 468c812dde
2012-03-16 10:13:31 -05:00
Max Schenkelberg
1b8beb3f8d
Issue #358 Fixed sampling issue with mosaic resource with best
...
res resources
Former-commit-id: 258d57e825
[formerly cc111ab9ac
[formerly 8aaf5e65d7c8ecbced6252d4a98af6223c77d5a0]]
Former-commit-id: cc111ab9ac
Former-commit-id: 97edff9f7c
2012-03-16 09:03:50 -05:00
Max Schenkelberg
732c2ddb5c
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: 556a270a09
[formerly 719f87c261
[formerly f739d79bfd547adc295c716a1804f55f09b1bde1]]
Former-commit-id: 719f87c261
Former-commit-id: 10b720381b
2012-03-14 18:03:44 -05:00
Max Schenkelberg
5a61f3ae23
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: 50765e8a34
[formerly 6e5964df9d
[formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]]
Former-commit-id: 6e5964df9d
Former-commit-id: 8fb7eccb73
2012-03-14 09:49:32 -05:00
Max Schenkelberg
3beecc1cdf
Issue #358 Merging core drawing API improvements from Collaboration
...
Former-commit-id: 89f603f448
[formerly d43b0456d8
[formerly a266a93ec2dca3ffbd7d2fd1f9dc47d7e18e6904]]
Former-commit-id: d43b0456d8
Former-commit-id: 18805c68f7
2012-03-09 12:31:50 -06:00
David Gillingham
364b9e19b3
Issue #354 : Refactor AbstractParmManager to better handle ISC parm
...
pre-loading.
Former-commit-id: 494fbe93db
[formerly d68e3a7eea
[formerly e2c66b33fd8c71b0da6518c419296ab8141a07e3]]
Former-commit-id: d68e3a7eea
Former-commit-id: 1908212c27
2012-03-05 11:23:11 -06:00
David Gillingham
87de9d067b
Issue #346 : Convert GFE to use identity-based ListenerLists, increase
...
synchronization in Parm/VCParm to prevent leaking of VCParms through
ListenerLists.
Former-commit-id: 0c0f659896
[formerly f6f0ca24df
[formerly 5fc74409511903afa97949bc3cd1b3acf91c35e0]]
Former-commit-id: f6f0ca24df
Former-commit-id: bd01975367
2012-03-02 13:22:46 -06:00
Max Schenkelberg
fe1811c167
Issue #358 Committing NPP core rendering improvements merged with Thin
...
Client core improvements
Former-commit-id: 48b6d45f00
[formerly ae47d9683e
[formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]]
Former-commit-id: ae47d9683e
Former-commit-id: e2cd95d3f4
2012-03-01 16:59:40 -06:00
Steve Harris
994e79cfb3
Merge branch 'ss_sync' into sync_test
...
Former-commit-id: 787aed90f8
[formerly 951ecfe3dd
[formerly 7ebcf63686d75d58f8bfea92e825edaf49a30df1]]
Former-commit-id: 951ecfe3dd
Former-commit-id: 3b9c3e3474
2012-03-01 14:01:16 -06:00
Steve Harris
5bf956755a
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 9bdea0399f
[formerly c21bd2719c
[formerly c6eacfe2d5898deacf756f059a71b1c9f41500bb]]
Former-commit-id: c21bd2719c
Former-commit-id: 8794c4bcf6
2012-03-01 13:19:04 -06:00
Ben Steffensmeier
5395e71757
Issue #353 apply the server time offset before requesting updates instead of after so that way there is no time gap for the first request
...
Change-Id: I3ceb8cefbedc3b64ca207c559e8cd381f6f184fd
Former-commit-id: 7c2409eab0
[formerly 49cce84edf
[formerly 059b4fcb3224b37b4a235f57e2065b9506f29d46]]
Former-commit-id: 49cce84edf
Former-commit-id: aa90109f45
2012-03-01 12:44:43 -06:00
Steve Harris
27fb50d455
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: dd52eb4d40
[formerly 703cb6e748
[formerly 152f05b5ab3dc736f1d3d21dba09de79d98d4c9e]]
Former-commit-id: 703cb6e748
Former-commit-id: 98d1fbeb0e
2012-02-29 16:08:39 -06:00
Ben Steffensmeier
07d98eb7dc
Issue #353 add logic to syncronize times for thin client data updates..
...
Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1
Former-commit-id: c61e40c426
[formerly 5c303ed189
[formerly f94248823eed52b2d9f8c56af3dc7607b323fc1e]]
Former-commit-id: 5c303ed189
Former-commit-id: 56d97c95d5
2012-02-29 15:49:47 -06:00
Ben Steffensmeier
7c3545170d
Issue #352 initialize ThinClientDataUpdateTree as soon as component starts to ensure that it correctly sets the last query time.
...
Change-Id: I13d4af0a1529e31f78e998db6bbdee228e749e1f
Former-commit-id: d7a63995f1
[formerly 5dee50e7e9
[formerly d05beaa84618bc01d8cb711298523dc358bb4938]]
Former-commit-id: 5dee50e7e9
Former-commit-id: 3713d7a181
2012-02-28 15:20:37 -06:00
Steve Harris
e08a6e4b1c
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: a4538f0a48
[formerly aa597242f9
[formerly 9864ba5dd0627dd8c68fae64aa7fad1916e40a0f]]
Former-commit-id: aa597242f9
Former-commit-id: c45e7b888c
2012-02-27 11:32:49 -06:00
Ben Steffensmeier
8fd9d92f0a
Issue #345 fix swapping of nsharp since nsharp insists on using a disposed target
...
Change-Id: I5a814be6590c2704dcd681bad7af34f0f9143ad2
Former-commit-id: 637c051a23
[formerly 357dc4d88b
[formerly acec1c2a23f4e27bfd0844171fdca77ff5473050]]
Former-commit-id: 357dc4d88b
Former-commit-id: 20481daa1b
2012-02-24 14:57:23 -06:00
David Gillingham
586f77e788
Issue #346 : Create a dispose method for Parm and use it like AWIPS1's C++ destructor.
...
Change-Id: I2e8a4e82d5efd210e546abbaf8c0aba960803a9d
Former-commit-id: 5aa5b51a55
[formerly d79f7e9613
[formerly b6d7661be725d8a37a8294b0eda982208c35ecbe]]
Former-commit-id: d79f7e9613
Former-commit-id: ef903bc728
2012-02-23 14:40:25 -06:00
David Gillingham
adfd42b5ce
Issue #346 : Fix disappearing ISC data from VCParms, fix threading issues in Scalar/Vector pickup value dialogs.
...
Change-Id: If465b8daf5ef04a76084500425ac3114a48ab908
Former-commit-id: 85998bc654
[formerly 32b2c06988
[formerly 67aaf1c21e8372b4a84cb82cae62549502992651]]
Former-commit-id: 32b2c06988
Former-commit-id: 5a8ba0f0fb
2012-02-23 13:23:59 -06:00
Steve Harris
0be3703c7e
Merge branch '4-Thin_Client' (with OB12.2.1) into 104-integration
...
Conflicts:
edexOsgi/build.edex/deploy-install.xml
Seems to have solved itself or was not actually a conflict
Former-commit-id: 86e586befe
[formerly dcadf7baa4
[formerly 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637]]
Former-commit-id: dcadf7baa4
Former-commit-id: 4981170462
2012-02-23 12:38:55 -06:00
Steve Harris
ed66d12d24
Merge (pull) branch '4-Thin_Client' of ssh://lightning.omaha.us.ray.com:29418/thunder into 4-Thin_Client
...
Former-commit-id: a82f2c5750
[formerly 957d232286
[formerly de97ce5f9b687f7404a34cac0b1fc34df5f854cb]]
Former-commit-id: 957d232286
Former-commit-id: c0c0acfbe8
2012-02-23 10:19:54 -06:00
Steve Harris
5a96582f16
Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client
...
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
deleted 'H5U; PlotResource2.java was not edited
Former-commit-id: 7a10ca9766
[formerly d0bbbfefcc
[formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]
Former-commit-id: d0bbbfefcc
Former-commit-id: 92084b3f20
2012-02-23 10:06:18 -06:00
Ben Steffensmeier
13ecc7e4ea
Issue #345 allow double dispose of GLTarget
...
Change-Id: Ib433557f82bc0bc63fb537814bad47eab00be2be
Former-commit-id: 55aa66a510
[formerly 06c9d4cdcf
[formerly 8b906b245fd927ed79825b00dfba456a1c327fbb]]
Former-commit-id: 06c9d4cdcf
Former-commit-id: b776d953d7
2012-02-22 17:40:48 -06:00