Ben Steffensmeier
|
3d0a05a19f
|
Issue #189 fix bad merging of D2DGridDatabase
Former-commit-id: dcb1b45768 [formerly 58d11234e3] [formerly 0e22256a81 [formerly e945bf4020b869e56f2440a449d43acc8b0a9b16]]
Former-commit-id: 0e22256a81
Former-commit-id: 168987f453
|
2012-10-18 17:08:31 -05:00 |
|
Ben Steffensmeier
|
db2c9b41ec
|
Issue #189 fix unified grid problems found during install/upgrade on testbed
Former-commit-id: f3331dc743 [formerly 830a8bd7c2] [formerly 90b815d412 [formerly 4c444ce1a007f844010eb43846070d97d6c811bf]]
Former-commit-id: 90b815d412
Former-commit-id: ea2f15c0df
|
2012-10-18 13:27:37 -05:00 |
|
Ben Steffensmeier
|
fde1e73d58
|
Merge branch 'ss_builds' into Unified_Grid
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpcGuideNDFD.xml
Former-commit-id: de3769129c [formerly 8b7256b1ae] [formerly 266a2f317f [formerly f5ae7bbd116ddc19b4fd6c8518089fa11b78ec90]]
Former-commit-id: 266a2f317f
Former-commit-id: fed5a35af3
|
2012-10-12 12:45:50 -05:00 |
|
Ben Steffensmeier
|
43b47533aa
|
Issue #189 grid rollback scripts
Change-Id: I3528a978c649827578ae3488a5e2f67ae075e984
Former-commit-id: 42e2756eb9 [formerly 106c178ce7] [formerly b894cabe78 [formerly 8dc280e92f0512e05bac6fe01b33a8c21fc6b4f3]]
Former-commit-id: b894cabe78
Former-commit-id: 66ed210fea
|
2012-10-11 18:22:12 -05:00 |
|
Ben Steffensmeier
|
d6b85c32b5
|
Issue #189 updates to grid from code review comments
Former-commit-id: 8a5aa9adc9 [formerly 52f7d6d6fa] [formerly aa08ec7929 [formerly 25d6e51d9e748a6e05c93fdff0b641731360bfee]]
Former-commit-id: aa08ec7929
Former-commit-id: 8ae8e40f25
|
2012-10-10 16:32:38 -05:00 |
|
Ben Steffensmeier
|
4cacd4a7b1
|
Issue #189 minor fixes to grid for issues discovered during dev tests
Former-commit-id: fa380d06c1 [formerly 23da6e6494] [formerly 509c09ebb0 [formerly 4ae112f6fcc9c2d0bb8715033a80d265dbdfe8b4]]
Former-commit-id: 509c09ebb0
Former-commit-id: 59754c0f6a
|
2012-10-10 16:32:36 -05:00 |
|
Ben Steffensmeier
|
4178809218
|
Issue #189 updates to GFE from code review
Former-commit-id: bf80df2927 [formerly 3ff63d4ad3] [formerly 8afcbace62 [formerly a64647ddbd4f062602f092b828c080af2550f31a]]
Former-commit-id: 8afcbace62
Former-commit-id: c1ee94b3f3
|
2012-10-10 16:32:34 -05:00 |
|
Ben Steffensmeier
|
7572fa223e
|
Issue #189 remove some deprecated grib functionality
Former-commit-id: 589b08c5c2 [formerly 797616c72b] [formerly 6fb6762585 [formerly 25f8bfa8c8739f63e088aee7b3536e28620c6494]]
Former-commit-id: 6fb6762585
Former-commit-id: e4e6b0d037
|
2012-10-10 16:32:31 -05:00 |
|
Steve Harris
|
772c60efa4
|
12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b
Former-commit-id: 75901860c2 [formerly c12ee14e66] [formerly 1e02387ff1 [formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]]
Former-commit-id: 1e02387ff1
Former-commit-id: 42bf60b2fc
|
2012-10-08 13:26:20 -05:00 |
|
Ben Steffensmeier
|
cd13b386c4
|
Issue #189 switch uengine to grid
Former-commit-id: dd0330d68e [formerly fdd63e3c3b] [formerly 7016f72e88 [formerly 55b665ecc63d591aa4eabb76bca2a623cc0b1a2a]]
Former-commit-id: 7016f72e88
Former-commit-id: b50c4bd20d
|
2012-10-01 16:52:48 -05:00 |
|
Ben Steffensmeier
|
fcf1be0876
|
Issue #189 switch rpg to use grid data.
Former-commit-id: 985a00559b [formerly b702ebdf55] [formerly b5e4d73010 [formerly 2a166f22d69d2e83dce6f101145b542d8b4144c7]]
Former-commit-id: b5e4d73010
Former-commit-id: 77cc02e8c8
|
2012-10-01 16:51:53 -05:00 |
|
Ben Steffensmeier
|
1b8eb83696
|
Issue #189 switch ohd to grid.
Former-commit-id: 682b7b8817 [formerly 6879a81436] [formerly f34fc897b8 [formerly 6719880dd11c61f7c2ec54b2cede89ad2e3a5774]]
Former-commit-id: f34fc897b8
Former-commit-id: db20aec667
|
2012-10-01 16:33:08 -05:00 |
|
Ben Steffensmeier
|
b6fd0f6826
|
Issue #189 switch FFMP source config to grid.
Former-commit-id: 691753fef2 [formerly 4007fa442b] [formerly 0b2121d3af [formerly 85dac537f47cea6cc8ee6b0e0092c80544b6a89a]]
Former-commit-id: 0b2121d3af
Former-commit-id: ad8d2a2892
|
2012-10-01 16:10:32 -05:00 |
|
Ben Steffensmeier
|
22f5e57dc9
|
Issue #189 switch gfe to grid.
Former-commit-id: ddbd05372b [formerly 5cf650b61a] [formerly 4ab3357b8d [formerly 7c029a18dcfd9f955fd3a9a2351d5dfef6d18912]]
Former-commit-id: 4ab3357b8d
Former-commit-id: 18da7f96bd
|
2012-10-01 16:08:43 -05:00 |
|
Ben Steffensmeier
|
a7d78f268f
|
Issue #189 switch DAT to grid.
Former-commit-id: c2a12bbfdd [formerly 4d6358ec52] [formerly b3190ba34d [formerly a062b80648acb5d7ba664821bb9f65bdf985a971]]
Former-commit-id: b3190ba34d
Former-commit-id: a2b019d655
|
2012-10-01 15:38:53 -05:00 |
|
Ben Steffensmeier
|
a6561786fa
|
Issue #189 changes from code review comments for gridcoverage.
Former-commit-id: 516742e64a [formerly 94e4f2adb6] [formerly 7f99750ba5 [formerly cfac5882643a0bde47c6f81623dd80ec41604a82]]
Former-commit-id: 7f99750ba5
Former-commit-id: 57d35bb700
|
2012-10-01 12:49:28 -05:00 |
|
Steven Harris
|
f5e63d5f93
|
12.11.1-1 baseline
Former-commit-id: 0e86bfd1d3 [formerly 618aa3f316] [formerly feec28f274 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]
Former-commit-id: feec28f274
Former-commit-id: 8843ffd022
|
2012-09-27 15:57:45 -05:00 |
|
Steve Harris
|
b18e5b5f2e
|
12.10.1-7 baseline
Former-commit-id: 2ee78eaf6d [formerly b754630136] [formerly 7b37cfca85 [formerly 161fb1c0295ff4aa3b78d06ae248255d77a4e886]]
Former-commit-id: 7b37cfca85
Former-commit-id: 30592ab872
|
2012-09-25 10:21:10 -05:00 |
|
Ben Steffensmeier
|
9512238d6e
|
Issue #189 convert viz/d2d displays from grib to grid.
Former-commit-id: 8e5b20236d [formerly 9632663c0a] [formerly f918b6636f [formerly 003825d9634299773ad96843cc82d56ded8a1391]]
Former-commit-id: f918b6636f
Former-commit-id: 6c38e6abb2
|
2012-09-24 14:05:22 -05:00 |
|
Ben Steffensmeier
|
d1c3a0c1eb
|
Issue #189 convert grib decoder to produce both grib and grid records.
Change-Id: I12ea0a06f9ce941d77f5a4c0b2d7617f07550640
Former-commit-id: 5f787b6a6b [formerly 4be2aa88c7] [formerly 0132d35871 [formerly 20f41b849a468c968e866fc84ec9e50c13773f2b]]
Former-commit-id: 0132d35871
Former-commit-id: 174d8ad029
|
2012-09-20 12:24:35 -05:00 |
|
Ben Steffensmeier
|
762915184c
|
Issue #189 checkin of grid dataplugin
Change-Id: I49b57915d90e6f5b347960046fa4c97a27a93375
Former-commit-id: 82b83f6e14 [formerly ccc2ae2108] [formerly 9512cca8ea [formerly 0b026f5d9d5d86d464cb0ec2b411a59666939276]]
Former-commit-id: 9512cca8ea
Former-commit-id: 30d970eb95
|
2012-09-18 15:19:07 -05:00 |
|
Ben Steffensmeier
|
6b058ace34
|
Issue #189 checkin of gridcoverage plugin and switch existing grib to use new plugin
Change-Id: I060f13ce68e7947e54d62d25d90ebdad2666bece
Former-commit-id: 4fe2127bfb [formerly bd8eb7fc15] [formerly 05849f634d [formerly 8f164a7b948e462b14caf6576de2b898a9a4e880]]
Former-commit-id: 05849f634d
Former-commit-id: b547d9dd8f
|
2012-09-18 15:19:05 -05:00 |
|
Steve Harris
|
a903893a09
|
12.10.1-5 baseline
Former-commit-id: 82feb4de50 [formerly a96d35a1fa] [formerly 4fd8893e55 [formerly 28dc700c3ef97a134c8871c2c52086fe7db43035]]
Former-commit-id: 4fd8893e55
Former-commit-id: deed84c1a2
|
2012-09-17 15:42:31 -05:00 |
|
Steve Harris
|
107ae12457
|
Merge branch 'ss_builds' into Unified_Grid
Former-commit-id: b53075f288 [formerly 206e25cbd4] [formerly a821755cf3 [formerly 192e3b583fade6ba3d17be6a3f6248cb11a6a673]]
Former-commit-id: a821755cf3
Former-commit-id: 3a923433e6
|
2012-09-13 15:26:38 -05:00 |
|
Steve Harris
|
684feb34e5
|
12.10.1-4 baseline
Former-commit-id: e38e81ab8c [formerly fd19ca5624] [formerly 49c3861597 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]
Former-commit-id: 49c3861597
Former-commit-id: 2ba58a3576
|
2012-09-13 12:08:11 -05:00 |
|
Richard Peter
|
41eb2f3d9a
|
Merge "Issue #189 initial checkin of parameter plugin Change-Id: I6c99e88751c0b7913145801e0f0fb4efed8a281a" into Unified_Grid
Former-commit-id: 8c6a9c6719 [formerly 2c39f2e584] [formerly 54b7b9ed09 [formerly a0ec82d660d95f6d8e0866d03ccc6fa97b361a71]]
Former-commit-id: 54b7b9ed09
Former-commit-id: 7f93237af0
|
2012-09-12 11:45:08 -05:00 |
|
Steve Harris
|
f376a4b4db
|
12.10.1-3 baseline
Former-commit-id: de1639aea2 [formerly 21f430062b] [formerly 969e7e6dfd [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]
Former-commit-id: 969e7e6dfd
Former-commit-id: 438d139fdd
|
2012-09-11 16:00:38 -05:00 |
|
Steve Harris
|
ec74f638e5
|
12.10.1-2 baseline
Former-commit-id: dde1f4c54d [formerly 250f0ccac9] [formerly a66f3f4b60 [formerly 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c]]
Former-commit-id: a66f3f4b60
Former-commit-id: 34d2ddee9d
|
2012-09-11 15:50:57 -05:00 |
|
Ben Steffensmeier
|
a039d55916
|
Issue #189 initial checkin of parameter plugin
Change-Id: I6c99e88751c0b7913145801e0f0fb4efed8a281a
Former-commit-id: 0bfedb4e54 [formerly b3ead4e169] [formerly a563707ad5 [formerly 65d5edae30817a65dd46374c18907894d92f2972]]
Former-commit-id: a563707ad5
Former-commit-id: e3b5a5effc
|
2012-09-10 14:24:32 -05:00 |
|
Steve Harris
|
e720b8ed31
|
12.10.1-1 baseline
Former-commit-id: 0abf64b77c [formerly 195158c004] [formerly d708932029 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]
Former-commit-id: d708932029
Former-commit-id: 7bd9c63dc7
|
2012-09-04 12:07:27 -05:00 |
|
Steve Harris
|
dc5ec3d16d
|
12.9.1-11 baseline
Former-commit-id: d07c18918d [formerly 6eb6b0909b] [formerly fc405efab7 [formerly 046d9078b7aa87ff8df98142556713fe38d95c63]]
Former-commit-id: fc405efab7
Former-commit-id: a14374fcd4
|
2012-08-30 14:36:12 -05:00 |
|
Steve Harris
|
f43a5af47f
|
12.9.1-10 baseline
Former-commit-id: bdb45cdfae [formerly 3adc50a783] [formerly cb9b80f3a0 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]
Former-commit-id: cb9b80f3a0
Former-commit-id: dc08c5a71a
|
2012-08-30 14:28:27 -05:00 |
|
Steve Harris
|
34fa4b5804
|
12.9.1-5 baseline (with forgotten bin files now included)
Former-commit-id: 7a4f4ac493 [formerly b8ab6066f6] [formerly b77a4d40d7 [formerly e977bd92cef6986b14725164c9eaa417ecf359cf]]
Former-commit-id: b77a4d40d7
Former-commit-id: b2c0dd1abb
|
2012-08-22 16:00:33 -05:00 |
|
Steve Harris
|
7fb0b17bd5
|
12.9.1-5 baseline
Former-commit-id: a1d931fd44 [formerly 61f269f54c] [formerly f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: f2fac39428
Former-commit-id: 72824561cb
|
2012-08-21 15:27:03 -05:00 |
|
Steve Harris
|
d7d60cc623
|
12.9.1-4 baseline
Former-commit-id: 36c108e960 [formerly dcda3a2290] [formerly 33b95fb96d [formerly df38541c9df38c634626ae214f288b606004a768]]
Former-commit-id: 33b95fb96d
Former-commit-id: 9990bf909b
|
2012-08-15 15:19:10 -05:00 |
|
Steve Harris
|
a535b51eba
|
12.9.1-3 baseline
Former-commit-id: c11f7d396e [formerly 36d80b1f60] [formerly 84bbf2573e [formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]]
Former-commit-id: 84bbf2573e
Former-commit-id: edbbacfa8a
|
2012-08-15 14:26:10 -05:00 |
|
Steve Harris
|
de4c812834
|
12.9.1-2 baseline
Former-commit-id: 27871051e3 [formerly d1d877d319] [formerly a198b3a807 [formerly 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2]]
Former-commit-id: a198b3a807
Former-commit-id: 448ed038c2
|
2012-08-15 14:12:24 -05:00 |
|
Steve Harris
|
aed7a644df
|
12.9.1-1 baseline
Former-commit-id: 8309193ce9 [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]
Former-commit-id: 79ce6cfd97
Former-commit-id: 0c5d9e2416
|
2012-08-15 13:59:00 -05:00 |
|
Steve Harris
|
78d34d65d2
|
12.8.1-10 baseline
Former-commit-id: 6244359a80 [formerly b5e8fee24d] [formerly ca25d508ec [formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]]
Former-commit-id: ca25d508ec
Former-commit-id: d5563fc340
|
2012-08-06 09:34:26 -05:00 |
|
Steve Harris
|
dab00b12e6
|
12.8.1-5 baseline
Former-commit-id: 2653ddc2e3 [formerly fd2abfb6f1] [formerly cd49ef3eda [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]
Former-commit-id: cd49ef3eda
Former-commit-id: e0c3722fd1
|
2012-08-01 10:45:37 -05:00 |
|
Steve Harris
|
f2102bfb24
|
12.7.1-8 baseline
Former-commit-id: 11f96dbedd [formerly 16bf591a33] [formerly c42ae0fa39 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]
Former-commit-id: c42ae0fa39
Former-commit-id: 9f97182964
|
2012-07-19 16:20:40 -05:00 |
|
Steve Harris
|
dc50bc8443
|
12.6.1-9 baseline
Former-commit-id: 7c064b6868 [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]
Former-commit-id: 27afa60345
Former-commit-id: 4f7bb90bb0
|
2012-07-10 07:53:49 -05:00 |
|
Steve Harris
|
97c4db937e
|
12.5.1-15 baseline
Former-commit-id: 8552902906 [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 676ea3192f
|
2012-06-08 13:39:48 -05:00 |
|
Steve Harris
|
7c7fc97131
|
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 7b75b781ad [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]
Former-commit-id: 7b75b781ad
Former-commit-id: 6dd3ee8809
|
2012-05-01 18:31:09 -05:00 |
|
Steve Harris
|
33a67cdd82
|
12.4.1-10 baseline
Former-commit-id: 4bfbdad17d [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]
Former-commit-id: 8485b90ff8
Former-commit-id: a28d70b5c5
|
2012-05-01 18:06:13 -05:00 |
|
Steve Harris
|
e86dc647be
|
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 625cd4262c [formerly 5e1b9319941eed516a08a135a2049c14bad77863]]
Former-commit-id: 625cd4262c
Former-commit-id: def458753d
|
2012-04-19 11:11:02 -05:00 |
|
Steve Harris
|
a2a6a18fae
|
12.4.1-4 baseline
Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 2a216f333c
Former-commit-id: a4e519f3cd
|
2012-04-18 15:18:16 -05:00 |
|
Steve Harris
|
9845ef53f9
|
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 5cdda77afb [formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]]
Former-commit-id: 5cdda77afb
Former-commit-id: 6aa18f74f6
|
2012-03-30 09:50:48 -05:00 |
|
Steve Harris
|
8bc60b1e32
|
12.3.1-10 baseline
Former-commit-id: 0e4128712b [formerly 4068f5295f] [formerly 22bd792cd9 [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]
Former-commit-id: 22bd792cd9
Former-commit-id: ce3b74c605
|
2012-03-30 08:38:33 -05:00 |
|
Steve Harris
|
65aa72fee7
|
Merge branch 'sync_test' (VCModules) into ss_sync
Former-commit-id: 0665862abe [formerly 70357d90bc] [formerly a0abcf8120 [formerly e68338cecbe85a62835633e9aba0925344fb80f1]]
Former-commit-id: a0abcf8120
Former-commit-id: 6884520750
|
2012-03-29 10:03:05 -05:00 |
|