Richard Peter
c8484145dd
Merge branch 'omaha_13.4.1' (13.4.1-11) into development
...
Conflicts:
ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/src/gov/noaa/nws/ncep/common/dataplugin/ntrans/NtransRecord.java
ncep/gov.noaa.nws.ncep.viz.resources/src/gov/noaa/nws/ncep/viz/resources/manager/RscBundleDisplayMngr.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageDisplay.java
ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageResource.java
ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/imageProperties/ImagingDialog.java
ncep/gov.noaa.nws.ncep.viz.ui.display/META-INF/MANIFEST.MF
ncep/gov.noaa.nws.ncep.viz.ui.display/src/gov/noaa/nws/ncep/viz/ui/display/NCDisplayPane.java
Former-commit-id: efd545925e
[formerly 3d84e1dd53
] [formerly 8aa4b0025c
] [formerly efd545925e
[formerly 3d84e1dd53
] [formerly 8aa4b0025c
] [formerly 930ff50fb8
[formerly 8aa4b0025c
[formerly 8a78f99345016db3d38c0b846a8a6ccf77fb3e89]]]]
Former-commit-id: 930ff50fb8
Former-commit-id: ffe0b35085
[formerly 76f11f00ae
] [formerly 46e481dc9690072f98dbbc406652f3eb9dc84d1f [formerly 81ae3ea8bf
]]
Former-commit-id: ec9c4ee8853532d468f5912a752730400ce59ccd [formerly 046de916fd
]
Former-commit-id: 7966576f23
2013-05-21 12:11:21 -05:00
Steve Harris
0b9bf76434
13.4.1-10 baseline
...
Former-commit-id: 294c127b0a
[formerly 68fe2134b8
] [formerly 9a403b3615
] [formerly 294c127b0a
[formerly 68fe2134b8
] [formerly 9a403b3615
] [formerly 92152778b9
[formerly 9a403b3615
[formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]]]]
Former-commit-id: 92152778b9
Former-commit-id: ac83fff244
[formerly 7e04d8cd13
] [formerly 8c493e450ca4bda573630558025eb5e5d0941004 [formerly b1fc4e625b
]]
Former-commit-id: 3963e7aafef444157e59ab93198e8eb33ab5acb5 [formerly 322036ea82
]
Former-commit-id: b41118326c
2013-05-20 10:52:47 -04:00
Ben Steffensmeier
c903521884
Issue #1532 Delete uf.common.image and clean up the mess it left behind.
...
Former-commit-id: 8e2333d0d7
[formerly d27d30c2db
] [formerly f46686a6e2
] [formerly 8e2333d0d7
[formerly d27d30c2db
] [formerly f46686a6e2
] [formerly 2ca86633d6
[formerly f46686a6e2
[formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]]]]
Former-commit-id: 2ca86633d6
Former-commit-id: 4936191404
[formerly 334af0001b
] [formerly fa7abe8431fbbdea60e6504cd61a867956d20856 [formerly 5068b18c6a
]]
Former-commit-id: 387e3e95805ed9aa6efd193b1112d4ae6d8ac95a [formerly 0778375180
]
Former-commit-id: 866c873f71
2013-02-28 17:00:56 -06:00
Steve Harris
005d9ccae2
13.1.2-7 baseline
...
Former-commit-id: 0b15dff12b
[formerly a8d90da9c0
] [formerly 4f86b07eb0
] [formerly 0b15dff12b
[formerly a8d90da9c0
] [formerly 4f86b07eb0
] [formerly 42189b5f88
[formerly 4f86b07eb0
[formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]]]]
Former-commit-id: 42189b5f88
Former-commit-id: 4c8e604619
[formerly f1256f2a9e
] [formerly 14e868b80bdcdb7270336e9346e3a2f321283073 [formerly b7f1dbe72b
]]
Former-commit-id: bc0b5a7bf290d46a49a6251bcf649c05a7b9d563 [formerly 775a338b90
]
Former-commit-id: 1ef10eaf2c
2013-01-11 16:12:09 -05:00
Steve Harris
ccb16b9b44
12.12.1-4 baseline
...
Former-commit-id: b968ab5135
[formerly b91b7f0fae
] [formerly 85130eb611
] [formerly b968ab5135
[formerly b91b7f0fae
] [formerly 85130eb611
] [formerly 57578da521
[formerly 85130eb611
[formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]]]
Former-commit-id: 57578da521
Former-commit-id: 4300583fc2
[formerly e35a321a8c
] [formerly 91397e4ab74890ddf2ddf5f2f930941cbb021f93 [formerly 628ca9e5c6
]]
Former-commit-id: 83b699079d09b1ae989d5d92097f6ebe23a8c242 [formerly 493f335c0b
]
Former-commit-id: 2c2bfc949d
2012-11-14 14:19:20 -06:00
Steve Harris
23dc8deeb0
12.7.1-8 baseline
...
Former-commit-id: b242dd98d6
[formerly 11f96dbedd
] [formerly 16bf591a33
] [formerly b242dd98d6
[formerly 11f96dbedd
] [formerly 16bf591a33
] [formerly c42ae0fa39
[formerly 16bf591a33
[formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]]]
Former-commit-id: c42ae0fa39
Former-commit-id: e1eb7f5972
[formerly f2102bfb24
] [formerly 02bef853ef7c7fae6630b12e89ad4d9ef11bc391 [formerly 9f97182964
]]
Former-commit-id: 8c3889c2ea3f00fe58aa1f356c175dee2c28f99c [formerly 9aabe438b9
]
Former-commit-id: 36e2ad3023
2012-07-19 16:20:40 -05:00
Steve Harris
3419f72215
Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
...
used git cherry-pick -m 1 879a2e0
Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline
Conflicts:
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java
Conflicts:
ncep/gov.noaa.nws.ncep.viz.rsc.mosaic/src/gov/noaa/nws/ncep/viz/rsc/mosaic/rsc/RadarRadialResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncradar/src/gov/noaa/nws/ncep/viz/rsc/ncradar/rsc/RadarImageResource.java
Former-commit-id: fe946166ed
[formerly 4ec294b525
] [formerly 2ed7249613
] [formerly fe946166ed
[formerly 4ec294b525
] [formerly 2ed7249613
] [formerly 7b75b781ad
[formerly 2ed7249613
[formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]]]
Former-commit-id: 7b75b781ad
Former-commit-id: 3992b18e28
[formerly 7c7fc97131
] [formerly 228c26d32b0b13d4cccf51b188ca617ec417aba4 [formerly 6dd3ee8809
]]
Former-commit-id: 7a3a10e1ab59cf68f5e1476abff39883afb9ef4b [formerly fd9e226b35
]
Former-commit-id: 491aa53a0c
2012-05-01 18:31:09 -05:00
Steve Harris
7f90924706
12.4.1-10 baseline
...
Former-commit-id: 7fa9dbd5fb
[formerly 4bfbdad17d
] [formerly 9f8cb727a5
] [formerly 7fa9dbd5fb
[formerly 4bfbdad17d
] [formerly 9f8cb727a5
] [formerly 8485b90ff8
[formerly 9f8cb727a5
[formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 40aa780b3d
[formerly 33a67cdd82
] [formerly 73930fb29d0c1e91204e76e6ebfdbe757414f319 [formerly a28d70b5c5
]]
Former-commit-id: a16a1b4dd44fc344ee709abbe262aeed58a8339b [formerly e5543a0e86
]
Former-commit-id: 0c25458510
2012-05-01 18:06:13 -05:00
Steve Harris
0cf19dc505
Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
...
Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline
Conflicts:
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java
Former-commit-id: 634d40a156
[formerly 63f11892e8
] [formerly 4d7572a632
] [formerly 634d40a156
[formerly 63f11892e8
] [formerly 4d7572a632
] [formerly 625cd4262c
[formerly 4d7572a632
[formerly 5e1b9319941eed516a08a135a2049c14bad77863]]]]
Former-commit-id: 625cd4262c
Former-commit-id: 6aa0898aae
[formerly e86dc647be
] [formerly f6efcfd8ee5a2a4ca8ad3ed217945853b75bfa5f [formerly def458753d
]]
Former-commit-id: 8ce2584572b74cd38fac4b323558490c8c29e686 [formerly 19657ae52d
]
Former-commit-id: 9b8c6e395d
2012-04-19 11:11:02 -05:00
Steve Harris
5b35d8a6e0
12.4.1-4 baseline
...
Former-commit-id: 4767b0e069
[formerly 750b7543dd
] [formerly 67a5a68300
] [formerly 4767b0e069
[formerly 750b7543dd
] [formerly 67a5a68300
] [formerly 2a216f333c
[formerly 67a5a68300
[formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188
[formerly a2a6a18fae
] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd
]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c
]
Former-commit-id: 74b66d9683
2012-04-18 15:18:16 -05:00
Max Schenkelberg
42696fd296
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: 5a61f3ae23
[formerly 8fb7eccb73
] [formerly 6e5964df9d
] [formerly 5a61f3ae23
[formerly 8fb7eccb73
] [formerly 6e5964df9d
] [formerly 50765e8a34
[formerly 6e5964df9d
[formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]]]]
Former-commit-id: 50765e8a34
Former-commit-id: 458f5970aa
[formerly 8f08fab0a7
] [formerly 87c83af55da8aec24c975aa2f80b06b4449fa969 [formerly cf440b3884
]]
Former-commit-id: 732d389245ce92a580088b9302b87702dca2b03d [formerly 6378e8c4ee
]
Former-commit-id: 9366a5f308
2012-03-14 09:49:32 -05:00
Roger Ferrel
6d90dce0b7
Issue #181
...
Added files to index.
Former-commit-id: 7324dcd368
[formerly e3d3629375
] [formerly cf1383a412
] [formerly 7324dcd368
[formerly e3d3629375
] [formerly cf1383a412
] [formerly beae8e7e59
[formerly cf1383a412
[formerly 874ae116e412c39b73dc3cc74ee3f3a3b02d82f7]]]]
Former-commit-id: beae8e7e59
Former-commit-id: 901d493ecf
[formerly 49dfa99cc5
] [formerly c8669b5ab7910607c5f11760fd75aaf1865a062e [formerly e1fc0b48c1
]]
Former-commit-id: 58f45807010c2a34d66569d325b876da780850a4 [formerly 03ad145679
]
Former-commit-id: 57bc02d754
2012-01-26 15:05:25 -06:00
Roger Ferrel
c42448a8d5
Issue #181
...
Changes from January ncep_cave
Former-commit-id: aa10b2f656
[formerly ae0981ac0f
] [formerly 7427aeaf29
] [formerly aa10b2f656
[formerly ae0981ac0f
] [formerly 7427aeaf29
] [formerly fa42f2dc60
[formerly 7427aeaf29
[formerly 6a878c3c5f400c53d39d7920c0619362aaafb946]]]]
Former-commit-id: fa42f2dc60
Former-commit-id: 38f1182c6e
[formerly 9475b22c54
] [formerly f688e047f0ccf0adc31f824c5e1224b8d1c1598b [formerly 376f6868b6
]]
Former-commit-id: 16e6613039d30140d16a08ef42c054c08fe5a737 [formerly 0d2ef82d19
]
Former-commit-id: 80b5a2049b
2012-01-26 09:26:07 -06:00
root
7dbd17a5aa
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 133dc97f67
[formerly a02aeb236c
] [formerly 9f19e3f712
] [formerly 133dc97f67
[formerly a02aeb236c
] [formerly 9f19e3f712
] [formerly 06a8b51d6d
[formerly 9f19e3f712
[formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 9bb8decbcf
[formerly 8e80217e59
] [formerly 377dcd10b9
[formerly 3360eb6c5f
]]
Former-commit-id: 377dcd10b9
Former-commit-id: e2ecdcfe33
2012-01-06 08:55:05 -06:00