Steve Harris
c6071e24c5
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: b4846ce8a8
[formerly a4e4792bb5
] [formerly d3ad6095b7
] [formerly 5cdda77afb
[formerly d3ad6095b7
[formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]]]
Former-commit-id: 5cdda77afb
Former-commit-id: a5d7cad4cf9dcde7d77f5ce8ca8a3ccca2fdde58 [formerly 6aa18f74f6
]
Former-commit-id: 9845ef53f9
2012-03-30 09:50:48 -05:00
Max Schenkelberg
458f5970aa
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 50765e8a34
[formerly 6e5964df9d
[formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]]]
Former-commit-id: 50765e8a34
Former-commit-id: 87c83af55da8aec24c975aa2f80b06b4449fa969 [formerly cf440b3884
]
Former-commit-id: 8f08fab0a7
2012-03-14 09:49:32 -05:00
Max Schenkelberg
52c7dec2e8
Issue #358 Committing NPP core rendering improvements merged with Thin
...
Client core improvements
Former-commit-id: fe1811c167
[formerly e2cd95d3f4
] [formerly ae47d9683e
] [formerly 48b6d45f00
[formerly ae47d9683e
[formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]]]
Former-commit-id: 48b6d45f00
Former-commit-id: 22d12e35f7b0f5789a9dd62c8684fad371d63859 [formerly 3212cc6ebb
]
Former-commit-id: 0554abdde0
2012-03-01 16:59:40 -06:00
Nate Jensen
88d65bde01
Integrating Richard's changes with 12.2.1
...
Change-Id: I774e69f166dbc48c7cb31d066cb8bf5dd626520c
Former-commit-id: 43538daf06
[formerly a22448c3d5
] [formerly 2515d56c9f
] [formerly c5ba181cd8
[formerly 2515d56c9f
[formerly 50680111c00b8d2bec9f2479a0cc22380ef6ecfe]]]
Former-commit-id: c5ba181cd8
Former-commit-id: 347bc2c5bd372e1a2607ac2c2f9145fdcbaf53d5 [formerly 699e417731
]
Former-commit-id: 414785ee0e
2012-02-28 09:42:47 -06:00
Nate Jensen
87691e4627
Integrating Richard's changes with 12.2.1
...
Change-Id: I1831502d72bed7b804287bb7c3e4ea501514ada4
Former-commit-id: 8106ba956f
[formerly 94ae63b740
] [formerly d18a15535a
] [formerly afe3c5db9c
[formerly d18a15535a
[formerly 729a478cf151a4d61bb31adba4193c3fc33717a1]]]
Former-commit-id: afe3c5db9c
Former-commit-id: 046f91bda3cc120bf473a4bc36c00fa19e038a47 [formerly 74b6e7b389
]
Former-commit-id: a65f8d8242
2012-02-28 09:37:45 -06:00
Steve Harris
2dbdc945bf
Merge branch 'ss_sync' into 9-Wes2Bridge
...
Conflicts:
.gitignore
ncep/gov.noaa.nws.ncep.common.dataplugin.h5scd/src/gov/noaa/nws/ncep/common/dataplugin/h5scd/H5ScdRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.h5uair/src/gov/noaa/nws/ncep/common/dataplugin/h5uair/H5UairRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
deleted h5 files
using ss_sync version of java files
Former-commit-id: 6d01784115
[formerly 24059a5b4e
] [formerly 9b67525e95
] [formerly e5b56c99ab
[formerly 9b67525e95
[formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]]]
Former-commit-id: e5b56c99ab
Former-commit-id: 6a444fc4fae979713c005a8d9737369a6bcbce84 [formerly 40d7357165
]
Former-commit-id: 73a337bc31
2012-02-27 15:58:49 -06:00
Nate Jensen
2db5dbe305
Merge "Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder." into 4-Thin_Client
...
Former-commit-id: b07575c5b3
[formerly a914aa38c8
] [formerly e3e44707a4
] [formerly fef3fcb60c
[formerly e3e44707a4
[formerly fd448c2a996aef215802dc501b68d28747f66414]]]
Former-commit-id: fef3fcb60c
Former-commit-id: 834f82bd59e01c6c99532d9991840fdacffe244d [formerly d03ff9824e
]
Former-commit-id: e0e2a82d83
2012-02-23 11:50:39 -06:00
Ben Steffensmeier
d1b9b4bc84
Issue #176 update merged ncep plot classes to use new plot interface.
...
Change-Id: I345a970aa0d292fcd05ba4c19e77536e03057f72
Former-commit-id: 41ca3213a4
[formerly 0b0047e29d
] [formerly 703d59a968
] [formerly 03d9230879
[formerly 703d59a968
[formerly 2e22a794183e4be8758997b9e76f896917a761db]]]
Former-commit-id: 03d9230879
Former-commit-id: 892ee6361f74622da1f7045e0847bcce6026e627 [formerly 6db9a03560
]
Former-commit-id: f048713c31
2012-02-23 11:23:01 -06:00
Ben Steffensmeier
3f86d825d5
Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder.
...
Change-Id: I343e4e61d5f96938e84709392c32f6d94b244b17
Former-commit-id: 127dde9454
[formerly a2db6975c9
] [formerly 4dedc8b30d
] [formerly 73a08e9d4e
[formerly 4dedc8b30d
[formerly 951c8c2a77c8f58a04a576148ac583ccdcc21e02]]]
Former-commit-id: 73a08e9d4e
Former-commit-id: 57785c3dff7f653eb1377659f11622f20ae35a74 [formerly d5d8697d9f
]
Former-commit-id: d937284ab2
2012-02-23 10:49:56 -06:00
Steve Harris
391451e14b
Revert PlotResource2.java to ss_sync version for merge into 4-Thin_Client
...
Former-commit-id: 909a19606c
[formerly a5f8708b6a
] [formerly db065fcd50
] [formerly e94b322dc3
[formerly db065fcd50
[formerly 8a1ef8c6f0e3cdd8b4eb581218d499bc8fc19aeb]]]
Former-commit-id: e94b322dc3
Former-commit-id: e5d89cf4f3149ec572a32c84f492bd3f9f2178c4 [formerly 78ea2de6d3
]
Former-commit-id: 97184f1dc4
2012-02-23 10:16:02 -06:00
Steve Harris
2d02f819be
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: 5a96582f16
[formerly 92084b3f20
] [formerly d0bbbfefcc
] [formerly 7a10ca9766
[formerly d0bbbfefcc
[formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]]
Former-commit-id: 7a10ca9766
Former-commit-id: 6fb9d83319d58ea511061243437d2805a4c4ae7b [formerly 3d511fe719
]
Former-commit-id: 92b7072b82
2012-02-23 10:06:18 -06:00
Bryan Kowal
134afd329c
Issue #34 - recompiled the nsharp dll with the latest ncep code.
...
Former-commit-id: 573356d574
[formerly 2ce7c520b3
] [formerly c8dba08a9d
] [formerly 4888756560
[formerly c8dba08a9d
[formerly d3affc909e299af8826d16bc02754fc61754e287]]]
Former-commit-id: 4888756560
Former-commit-id: 5a1a83e71fb5f2c49f093b157a87cfb844467487 [formerly 71fe94b322
]
Former-commit-id: e4da2bcb9c
2012-02-16 12:51:24 -06:00
Ben Steffensmeier
34c03d78d0
Issue #235 Added ability to capture multiple frames to NSharp
...
Change-Id: Ib6ab3acff6d9357679f4116493c1d3a97b57c2cc
Former-commit-id: 8a5a87c2b1
[formerly 08e8343d98
] [formerly 5cdcd5a261
] [formerly 6bfd8ccfee
[formerly 5cdcd5a261
[formerly 447253e7cd0ea5ab64c020a4fe0822ffc3a01d3f]]]
Former-commit-id: 6bfd8ccfee
Former-commit-id: b17c805c928548abe79f8ce56d670d4b8f032bbf [formerly 512e0f1bd5
]
Former-commit-id: 9d442083a1
2012-02-09 10:54:02 -06:00
Ben Steffensmeier
c704c716f6
Issue #237 revert Silver Spring changes to nsharp activator which break windows. Fix grib decoder to handle grib files with lo1 on the dateline.
...
Change-Id: I4991e7f02c8cdcfd608c3c6d987f4d0ea8593f40
Former-commit-id: 2960e33fbd
[formerly 1e0bd549a4
] [formerly 324b358c44
] [formerly 851046ccf3
[formerly 324b358c44
[formerly 2b0f9f149c4dc2031cb9178538899eb3f9f5de23]]]
Former-commit-id: 851046ccf3
Former-commit-id: 232439ebed901aaa529649061733fcb56372d5a1 [formerly 56c1b70d03
]
Former-commit-id: 6da56f59fc
2012-02-06 16:55:48 -06:00
Ben Steffensmeier
460820bac9
Issue #230 fix scaling problems with printing to high dpi printers
...
Change-Id: I64e609d3b01a839d3b8927eedfd85f81ffc0301f
Former-commit-id: 15afb5b8bd
[formerly 89b327974a
] [formerly d35d365b7f
] [formerly f78fa301a8
[formerly d35d365b7f
[formerly 22418489fd697c94b2350d79e7701c8399842e2e]]]
Former-commit-id: f78fa301a8
Former-commit-id: 968bdeb040264a08ad8cd18803cb98f7c769e7e9 [formerly 55689025ff
]
Former-commit-id: 25adbef6ab
2012-02-03 12:49:59 -06:00
Ben Steffensmeier
174dd81c57
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: 539ebd56d3
[formerly 6194dc8210
] [formerly 9cc983549d
] [formerly 9254b762ff
[formerly 9cc983549d
[formerly 94d4feb2973ed201d369a21126b3443606041179]]]
Former-commit-id: 9254b762ff
Former-commit-id: 2274967c42d2f8b4145457a05f022995e7ac081d [formerly 484a0f64f8
]
Former-commit-id: 75f49627c8
2012-01-30 17:04:47 -06:00
Ben Steffensmeier
13f6e4f868
Issue #185 change LevelFactory to throw exceptions when there is no network connection so that everything can be reinitialized when the connection is restored..
...
Change-Id: Id5c82e7d01e7f229bc99366b1339bc38333ffa5a
Former-commit-id: 700cb47baa
[formerly 3c673896a0
] [formerly b3463d27fc
] [formerly 0d75fbf942
[formerly b3463d27fc
[formerly 1b2496a6db33fc65efecfdffb380d8b4e07ec590]]]
Former-commit-id: 0d75fbf942
Former-commit-id: 3e19b92cbce5cee988b6ee87c18925f5342d0749 [formerly c22f135dbc
]
Former-commit-id: 8b1cdd8db1
2012-01-30 16:39:57 -06:00
David Gillingham
f2b58b2f16
Issue #20 : Merge all changes from previous SVN repo to GIT.
...
Former-commit-id: 91ecb60c1f
[formerly b31f40ec9d
] [formerly 845e6c19af
] [formerly b056e18757
[formerly 845e6c19af
[formerly 926a2a6a5af5b3514c29097deb0fc24b093643a2]]]
Former-commit-id: b056e18757
Former-commit-id: 589441ef8a8b0e931380208ea6dea9adff2ba461 [formerly 87b15de88b
]
Former-commit-id: ea7a55ad8d
2012-01-26 17:38:43 -06:00
Nate Jensen
b0c285c305
Issue #181 fix ncep
...
Change-Id: If0e2947c33523ada50036212666867a7c5138c17
Former-commit-id: 6418e0edda
[formerly f3875948e8
] [formerly ca923b9475
] [formerly 15e0a5e68d
[formerly ca923b9475
[formerly 8d7433be62e5b815d012b330c31fe069db16b5b4]]]
Former-commit-id: 15e0a5e68d
Former-commit-id: e0dbbff654bb803f9a78bd56c5fbd86943f2b93e [formerly 29be9b82bd
]
Former-commit-id: 637a516ae5
2012-01-26 17:28:06 -06:00
Nate Jensen
b5b699baec
Issue #181 fix empty src dirs
...
Change-Id: If03015cf64f5791b4f5b340cc6aba4514a6a6d43
Former-commit-id: dfa1c4bbfe
[formerly 3c2701dd43
] [formerly 6fabe216d8
] [formerly 638f900d41
[formerly 6fabe216d8
[formerly 25ad3a67efb293afc2bf3ef9442ff2fc296bef18]]]
Former-commit-id: 638f900d41
Former-commit-id: 1d33d2975072dd99272e54765d2bc2a604cf19c5 [formerly 18540298b4
]
Former-commit-id: 710bcd1d8d
2012-01-26 15:42:55 -06:00
Roger Ferrel
901d493ecf
Issue #181
...
Added files to index.
Former-commit-id: 7324dcd368
[formerly e3d3629375
] [formerly cf1383a412
] [formerly beae8e7e59
[formerly cf1383a412
[formerly 874ae116e412c39b73dc3cc74ee3f3a3b02d82f7]]]
Former-commit-id: beae8e7e59
Former-commit-id: c8669b5ab7910607c5f11760fd75aaf1865a062e [formerly e1fc0b48c1
]
Former-commit-id: 49dfa99cc5
2012-01-26 15:05:25 -06:00
Roger Ferrel
84fc2cf17c
Issue #181
...
new files not indexed
Former-commit-id: 5fe3d78cb2
[formerly 732004d9cd
] [formerly 472e788dba
] [formerly 69f8daedff
[formerly 472e788dba
[formerly 6e2032f9290e77e8e597ae4256ffe7ad8142407b]]]
Former-commit-id: 69f8daedff
Former-commit-id: ef41863ce82e3fa3eeb978a1d320f1286ca06bae [formerly c6f2b90560
]
Former-commit-id: 2be2e8478f
2012-01-26 14:37:19 -06:00
Roger Ferrel
38f1182c6e
Issue #181
...
Changes from January ncep_cave
Former-commit-id: aa10b2f656
[formerly ae0981ac0f
] [formerly 7427aeaf29
] [formerly fa42f2dc60
[formerly 7427aeaf29
[formerly 6a878c3c5f400c53d39d7920c0619362aaafb946]]]
Former-commit-id: fa42f2dc60
Former-commit-id: f688e047f0ccf0adc31f824c5e1224b8d1c1598b [formerly 376f6868b6
]
Former-commit-id: 9475b22c54
2012-01-26 09:26:07 -06:00
Nate Jensen
1240be3682
Issue #181 fix ncep mistake
...
Change-Id: Ic86240830412ab530dae6a8d0003149c8eb034f8
Former-commit-id: 705d66f303
[formerly 24f90ed13d
] [formerly 8299f30726
] [formerly 94aab854ae
[formerly 8299f30726
[formerly f4e8cf7df44f7935dbce427b8f977d609572fa25]]]
Former-commit-id: 94aab854ae
Former-commit-id: fcffc9963ff5dc9f15d9fa745bc9304aeff79693 [formerly f12bd97443
]
Former-commit-id: 6b4ab6c0e6
2012-01-24 15:01:13 -06:00
Nate Jensen
f8f70f6a4c
Issue #181 fixing edex feature and component deploys
...
Change-Id: Id7bad29c6914b13b3a6f47452f772999b696f48d
Former-commit-id: a8c1e39554
[formerly fae8fd5a6d
] [formerly 8e3730adbf
] [formerly 1dabb12dce
[formerly 8e3730adbf
[formerly 0c82def5c753aab240848aac8dc906a161461ac3]]]
Former-commit-id: 1dabb12dce
Former-commit-id: 293fd5a235bdb1e4c85b58d55c98c802941e8fe6 [formerly 9c4ad58867
]
Former-commit-id: 802607c79f
2012-01-24 12:15:01 -06:00
Nate Jensen
bf2e1850f3
Issue #181 integrating ncep edex code
...
Change-Id: Iaf11559e4cdb4f846d02283c5d2038474c0118e3
Former-commit-id: daa0663af0
[formerly 6366bc35cb
] [formerly fe52a35f7a
] [formerly 33756de9c8
[formerly fe52a35f7a
[formerly 3aa13bd49e23ef963127f7efbc91054c06808f1c]]]
Former-commit-id: 33756de9c8
Former-commit-id: 2cdd1911db9699c1da43ed376abd9ca94f036c25 [formerly 3b7a082f41
]
Former-commit-id: 7301ad5c66
2012-01-24 09:59:50 -06:00
Nate Jensen
c1ca48ab19
Issue #181 integrating ncep edex code
...
Change-Id: I7f3fd64d1e21d5a82b29b404bb90a62bfa6f79bf
Former-commit-id: adb8188f98
[formerly 873469f771
] [formerly f96e6a822b
] [formerly a015cc136b
[formerly f96e6a822b
[formerly 71d87e07ef1d5ce2509fddce9170870a5950ba7b]]]
Former-commit-id: a015cc136b
Former-commit-id: bf42c95476b1354c34e606131e248046867b8dff [formerly e951995736
]
Former-commit-id: ba529c4a12
2012-01-24 09:49:27 -06:00
Bryan Kowal
4c4fc64253
Issue #202 - make deploy-install compatible with git; updated classpaths and component-deploy.xml.
...
Former-commit-id: 28957b7118
[formerly 971bf802ac
] [formerly 2142afe3f1
] [formerly 2b5ee4b940
[formerly 2142afe3f1
[formerly 296d2915b17f0086d93e200d4780663bff34edbb]]]
Former-commit-id: 2b5ee4b940
Former-commit-id: e24d39003e4489633c8f3c358cda877ba7831b9e [formerly 2a7b92ec91
]
Former-commit-id: a1dbdff475
2012-01-20 11:37:38 -06:00
Matt Nash
fa4cd88c90
Moving 12.1.1 into ss_sync
...
Former-commit-id: d8da2252c3
[formerly 580e2938d7
] [formerly 66be3bec40
] [formerly c83e5ff474
[formerly 66be3bec40
[formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 21d2361f00
[formerly 1faae42484
]
Former-commit-id: 82300ccdcf
2012-01-19 11:53:12 -06:00
root
9bb8decbcf
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 133dc97f67
[formerly a02aeb236c
] [formerly 9f19e3f712
] [formerly 06a8b51d6d
[formerly 9f19e3f712
[formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 377dcd10b9
[formerly 3360eb6c5f
]
Former-commit-id: 8e80217e59
2012-01-06 08:55:05 -06:00