Commit graph

91 commits

Author SHA1 Message Date
Dave Hladky
42a12fa7a5 Issue #15 Re-wrote SimDate integration for menus, alert observers after
merge headache.

Former-commit-id: 5b7ecea866 [formerly 647b7ac154dbdaf945231b231f491bbca86d2a24]
Former-commit-id: 1b7473572f
2012-04-30 13:43:34 -05:00
Richard Peter
c33a392a8c Issue #538: Fix Serialization Annotations and Serialization Issues
Change-Id: I436997106438ab283e987cb7e3055fcee009b608

Former-commit-id: b11df888d3 [formerly 3aadbc778d9bb22dc9c0b4b93bbbaa70c3fa07d0]
Former-commit-id: 349adaeedd
2012-04-27 12:08:29 -05:00
Steve Harris
418489e726 12.4.1-10 baseline
Former-commit-id: 01457fbbde [formerly 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a]
Former-commit-id: 704b75e1a1
2012-04-24 15:38:29 -05:00
Steve Harris
6d585942fe 12.4.1-7 baseline
Former-commit-id: cca73b3c62 [formerly 3524730cc38b5420e7529b5a75d62313695e64d6]
Former-commit-id: 90ae4bbb36
2012-04-24 15:24:39 -05:00
Steve Harris
63f11892e8 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 5e1b9319941eed516a08a135a2049c14bad77863]
Former-commit-id: 4d7572a632
2012-04-19 11:11:02 -05:00
Steve Harris
750b7543dd 12.4.1-4 baseline
Former-commit-id: 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]
Former-commit-id: 67a5a68300
2012-04-18 15:18:16 -05:00
Max Schenkelberg
490c75f684 Issue #239 Refactored Collaboration rendering so it looks up renderes by
extension point so radar renderer can be injected by a radar
collaboration project

Former-commit-id: 7d2a7d987d [formerly 79f4d46bf18fc03c79df0c80c8dde025fe954f0c]
Former-commit-id: 9b018ea151
2012-04-16 17:29:59 -05:00
Steve Harris
c90ce9d54e Merge branch 'ss_sync' (OB12.3.1) into 9-Wes2Bridge
Conflicts:
	edexOsgi/build.edex/esb/data/utility/edex_static/base/python/ObsRequest.py
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java

Former-commit-id: fee53dea94 [formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]
Former-commit-id: ed26e06df2
2012-04-10 12:50:03 -05:00
Bryan Kowal
21ff4bf657 Merge branch '9-Wes2Bridge' of ssh://lightning:29418/thunder into 9-Wes2Bridge
Former-commit-id: dcc3c7bb59 [formerly f0c0e0692dae0ee53a43b714be9dfb6df0f4c7a6]
Former-commit-id: f1e81b1a95
2012-04-09 09:19:02 -05:00
David Gillingham
5193184abf Issue #435: Prevent NullPointerExceptions from being thrown when
serializing AirepRecords and NcAirepRecords.

Issue #435: Address peer review comments on previous change.

Change-Id: I7af20fd0d0d12c819c8df8aaba12318dcba574ac

Former-commit-id: e0e57577ff [formerly d2e45df86fb0dbbe234c55cdb0cfc9cb31b71c43]
Former-commit-id: 87142f9f4e
2012-04-05 15:49:23 -05:00
Bryan Kowal
3e039dc79f Issue #18 - fix port conflicts that prevented multiple instances of edex request from starting; fix a problem that prevented the selected http port in setup.env from propogating throughout the edex instances.
Former-commit-id: 2ed20e107d [formerly 6b206773eff05abf20ecc87b27e96c47b67ba600]
Former-commit-id: e792b2a16f
2012-04-04 18:29:13 -05:00
Steve Harris
a4e4792bb5 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 879a2e0a4a31999bf4d624ff59e77bbd68195458]
Former-commit-id: d3ad6095b7
2012-03-30 09:50:48 -05:00
Max Schenkelberg
8fb7eccb73 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 7e4abe637edacca71e1e1c98d99521cd33415fb0]
Former-commit-id: 6e5964df9d
2012-03-14 09:49:32 -05:00
Max Schenkelberg
e2cd95d3f4 Issue #358 Committing NPP core rendering improvements merged with Thin
Client core improvements

Former-commit-id: 48b6d45f00 [formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]
Former-commit-id: ae47d9683e
2012-03-01 16:59:40 -06:00
Nate Jensen
a22448c3d5 Integrating Richard's changes with 12.2.1
Change-Id: I774e69f166dbc48c7cb31d066cb8bf5dd626520c

Former-commit-id: c5ba181cd8 [formerly 50680111c00b8d2bec9f2479a0cc22380ef6ecfe]
Former-commit-id: 2515d56c9f
2012-02-28 09:42:47 -06:00
Nate Jensen
94ae63b740 Integrating Richard's changes with 12.2.1
Change-Id: I1831502d72bed7b804287bb7c3e4ea501514ada4

Former-commit-id: afe3c5db9c [formerly 729a478cf151a4d61bb31adba4193c3fc33717a1]
Former-commit-id: d18a15535a
2012-02-28 09:37:45 -06:00
Steve Harris
24059a5b4e 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: e5b56c99ab [formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]
Former-commit-id: 9b67525e95
2012-02-27 15:58:49 -06:00
Nate Jensen
a914aa38c8 Merge "Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder." into 4-Thin_Client
Former-commit-id: fef3fcb60c [formerly fd448c2a996aef215802dc501b68d28747f66414]
Former-commit-id: e3e44707a4
2012-02-23 11:50:39 -06:00
Ben Steffensmeier
0b0047e29d Issue #176 update merged ncep plot classes to use new plot interface.
Change-Id: I345a970aa0d292fcd05ba4c19e77536e03057f72

Former-commit-id: 03d9230879 [formerly 2e22a794183e4be8758997b9e76f896917a761db]
Former-commit-id: 703d59a968
2012-02-23 11:23:01 -06:00
Ben Steffensmeier
a2db6975c9 Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder.
Change-Id: I343e4e61d5f96938e84709392c32f6d94b244b17

Former-commit-id: 73a08e9d4e [formerly 951c8c2a77c8f58a04a576148ac583ccdcc21e02]
Former-commit-id: 4dedc8b30d
2012-02-23 10:49:56 -06:00
Steve Harris
a5f8708b6a Revert PlotResource2.java to ss_sync version for merge into 4-Thin_Client
Former-commit-id: e94b322dc3 [formerly 8a1ef8c6f0e3cdd8b4eb581218d499bc8fc19aeb]
Former-commit-id: db065fcd50
2012-02-23 10:16:02 -06:00
Steve Harris
92084b3f20 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 5528a1374781f3a4d55702ae1f0c34efcf1e3865]
Former-commit-id: d0bbbfefcc
2012-02-23 10:06:18 -06:00
Bryan Kowal
2ce7c520b3 Issue #34 - recompiled the nsharp dll with the latest ncep code.
Former-commit-id: 4888756560 [formerly d3affc909e299af8826d16bc02754fc61754e287]
Former-commit-id: c8dba08a9d
2012-02-16 12:51:24 -06:00
Ben Steffensmeier
08e8343d98 Issue #235 Added ability to capture multiple frames to NSharp
Change-Id: Ib6ab3acff6d9357679f4116493c1d3a97b57c2cc

Former-commit-id: 6bfd8ccfee [formerly 447253e7cd0ea5ab64c020a4fe0822ffc3a01d3f]
Former-commit-id: 5cdcd5a261
2012-02-09 10:54:02 -06:00
Ben Steffensmeier
1e0bd549a4 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: 851046ccf3 [formerly 2b0f9f149c4dc2031cb9178538899eb3f9f5de23]
Former-commit-id: 324b358c44
2012-02-06 16:55:48 -06:00
Ben Steffensmeier
89b327974a Issue #230 fix scaling problems with printing to high dpi printers
Change-Id: I64e609d3b01a839d3b8927eedfd85f81ffc0301f

Former-commit-id: f78fa301a8 [formerly 22418489fd697c94b2350d79e7701c8399842e2e]
Former-commit-id: d35d365b7f
2012-02-03 12:49:59 -06:00
Ben Steffensmeier
6194dc8210 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: 9254b762ff [formerly 94d4feb2973ed201d369a21126b3443606041179]
Former-commit-id: 9cc983549d
2012-01-30 17:04:47 -06:00
Ben Steffensmeier
3c673896a0 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: 0d75fbf942 [formerly 1b2496a6db33fc65efecfdffb380d8b4e07ec590]
Former-commit-id: b3463d27fc
2012-01-30 16:39:57 -06:00
David Gillingham
b31f40ec9d Issue #20: Merge all changes from previous SVN repo to GIT.
Former-commit-id: b056e18757 [formerly 926a2a6a5af5b3514c29097deb0fc24b093643a2]
Former-commit-id: 845e6c19af
2012-01-26 17:38:43 -06:00
Nate Jensen
f3875948e8 Issue #181 fix ncep
Change-Id: If0e2947c33523ada50036212666867a7c5138c17

Former-commit-id: 15e0a5e68d [formerly 8d7433be62e5b815d012b330c31fe069db16b5b4]
Former-commit-id: ca923b9475
2012-01-26 17:28:06 -06:00
Nate Jensen
3c2701dd43 Issue #181 fix empty src dirs
Change-Id: If03015cf64f5791b4f5b340cc6aba4514a6a6d43

Former-commit-id: 638f900d41 [formerly 25ad3a67efb293afc2bf3ef9442ff2fc296bef18]
Former-commit-id: 6fabe216d8
2012-01-26 15:42:55 -06:00
Roger Ferrel
e3d3629375 Issue #181
Added files to index.


Former-commit-id: beae8e7e59 [formerly 874ae116e412c39b73dc3cc74ee3f3a3b02d82f7]
Former-commit-id: cf1383a412
2012-01-26 15:05:25 -06:00
Roger Ferrel
732004d9cd Issue #181
new files not indexed


Former-commit-id: 69f8daedff [formerly 6e2032f9290e77e8e597ae4256ffe7ad8142407b]
Former-commit-id: 472e788dba
2012-01-26 14:37:19 -06:00
Roger Ferrel
ae0981ac0f Issue #181
Changes from January ncep_cave

Former-commit-id: fa42f2dc60 [formerly 6a878c3c5f400c53d39d7920c0619362aaafb946]
Former-commit-id: 7427aeaf29
2012-01-26 09:26:07 -06:00
Nate Jensen
24f90ed13d Issue #181 fix ncep mistake
Change-Id: Ic86240830412ab530dae6a8d0003149c8eb034f8

Former-commit-id: 94aab854ae [formerly f4e8cf7df44f7935dbce427b8f977d609572fa25]
Former-commit-id: 8299f30726
2012-01-24 15:01:13 -06:00
Nate Jensen
fae8fd5a6d Issue #181 fixing edex feature and component deploys
Change-Id: Id7bad29c6914b13b3a6f47452f772999b696f48d

Former-commit-id: 1dabb12dce [formerly 0c82def5c753aab240848aac8dc906a161461ac3]
Former-commit-id: 8e3730adbf
2012-01-24 12:15:01 -06:00
Nate Jensen
6366bc35cb Issue #181 integrating ncep edex code
Change-Id: Iaf11559e4cdb4f846d02283c5d2038474c0118e3

Former-commit-id: 33756de9c8 [formerly 3aa13bd49e23ef963127f7efbc91054c06808f1c]
Former-commit-id: fe52a35f7a
2012-01-24 09:59:50 -06:00
Nate Jensen
873469f771 Issue #181 integrating ncep edex code
Change-Id: I7f3fd64d1e21d5a82b29b404bb90a62bfa6f79bf

Former-commit-id: a015cc136b [formerly 71d87e07ef1d5ce2509fddce9170870a5950ba7b]
Former-commit-id: f96e6a822b
2012-01-24 09:49:27 -06:00
Bryan Kowal
971bf802ac Issue #202 - make deploy-install compatible with git; updated classpaths and component-deploy.xml.
Former-commit-id: 2b5ee4b940 [formerly 296d2915b17f0086d93e200d4780663bff34edbb]
Former-commit-id: 2142afe3f1
2012-01-20 11:37:38 -06:00
Matt Nash
580e2938d7 Moving 12.1.1 into ss_sync
Former-commit-id: c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]
Former-commit-id: 66be3bec40
2012-01-19 11:53:12 -06:00
root
a02aeb236c Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]
Former-commit-id: 9f19e3f712
2012-01-06 08:55:05 -06:00