Steve Harris
6aa18f74f6
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: d3ad6095b75cdda77afb
2012-03-30 09:50:48 -05:00
Steve Harris
ce3b74c605
12.3.1-10 baseline
...
Former-commit-id: 4068f5295f22bd792cd9
2012-03-30 08:38:33 -05:00
Steve Harris
6884520750
Merge branch 'sync_test' (VCModules) into ss_sync
...
Former-commit-id: 70357d90bca0abcf8120
2012-03-29 10:03:05 -05:00
Steve Harris
4b853c56c6
Merge branch '104-integration' into ss_sync; 4-Thin_Client and 10-Tech_Blocked (tear-off menus) -> ss_sync
...
Former-commit-id: 132d68acc654a1d9cdbc
2012-03-29 10:01:55 -05:00
Nate Jensen
2801c4fdfb
Issue #427 Share maps and editor
...
Change-Id: I6bd3148ec199c348ffd85d08322fdb8befa4096c
Former-commit-id: 615962f5dd0e214bcd7c
2012-03-22 09:39:59 -05:00
David Gillingham
5dac19bde9
Issue #20 : Don't throw an exception if overriding a lower-localization
...
level's configuration (like overriding BASE's default plugin
configuration).
Former-commit-id: 13af9170b1ed74b90589
2012-03-14 15:07:59 -05:00
Max Schenkelberg
cf440b3884
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: 6e5964df9d50765e8a34
2012-03-14 09:49:32 -05:00
David Gillingham
2b5588bd1e
Issue #417 : Refactor HPEDhrSrv to work from a 2-stage queueing process.
...
Former-commit-id: e13850a2b6d433b7d4d6
2012-03-13 12:31:38 -05:00
Steve Harris
7bdde9f690
Issue #16 - Recovering mpduff 9-Wes2Bridge code that fell out of a rebase while fixing a review set
...
Former-commit-id: 5bbf80a38410dc140747
2012-03-12 13:10:34 -05:00
Bryan Kowal
3b97383354
Issue #419 - a -Dgit={true|false} switch will be used to determine if deploy-install will deploy from a single directory source tree or a multiple directory source tree. Removed tmp files that should not be baselined.
...
Former-commit-id: 58bfa6298166e05f4c96
2012-03-12 11:43:34 -05:00
David Gillingham
1818e488c5
Issue #361 : Fine tune synchronization in GfeScriptExecutor to prevent
...
massive backups in access to GfeScript instance map.
Issue #361 : Further modifications to GfeScriptExecutor and GfeScript to improve synchronization-caused back-logs.
Change-Id: Ic33ef5e62d2bd1e19dd2cfedcfefe050cf7efe9e
Former-commit-id: 9a75c878293cfa029f4b
2012-03-06 16:24:58 -06:00
David Gillingham
8c0b121cbc
Issue #361 : Refactor IscDataRecRequest handler to execute iscDataRec
...
asynchronously.
Former-commit-id: ff231f33f41d69867594
2012-03-05 16:49:23 -06:00
Bryan Kowal
1fda54a89b
Issue #20 - additional new svn changes that have not been merged yet:
...
http://lightning.omaha.us.ray.com/redmine/projects/interim-svn-repository/repository/diff/trunk/edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java?rev=48&rev_to=1
Former-commit-id: bea56356fd00759729a4
2012-03-05 14:36:56 -06:00
Max Schenkelberg
e27d36432a
Issue #358 merged esb.camel project for plot update compatibility
...
Former-commit-id: 0cf00cb7f476e7a02f76
2012-03-02 13:26:44 -06:00
Max Schenkelberg
e4914cbe89
Issue #358 merged dataURI changes from thinclient in for plot
...
compatibility
Former-commit-id: f96ff962591f714b1a5b
2012-03-02 12:24:19 -06:00
Max Schenkelberg
3212cc6ebb
Issue #358 Committing NPP core rendering improvements merged with Thin
...
Client core improvements
Former-commit-id: ae47d9683e48b6d45f00
2012-03-01 16:59:40 -06:00
Steve Harris
db45babec8
Merge branch 'ss_sync' into sync_test
...
Former-commit-id: 951ecfe3dd787aed90f8
2012-03-01 14:01:16 -06:00
David Gillingham
953f8a6535
Issue #20 : Fix breakage to alertViz caused by changes to
...
FileUtil.join().
Former-commit-id: c6803ba4348a45f1f4c3
2012-03-01 11:19:22 -06:00
Ben Steffensmeier
84e6c9beb8
Issue #353 add logic to syncronize times for thin client data updates..
...
Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1
Former-commit-id: 5c303ed189c61e40c426
2012-02-29 15:49:47 -06:00
Steve Harris
40d7357165
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: 9b67525e95e5b56c99ab
2012-02-27 15:58:49 -06:00
David Gillingham
88dcd4d09d
Issue #346 : Fix disappearing ISC data from VCParms, fix threading issues in Scalar/Vector pickup value dialogs.
...
Change-Id: If465b8daf5ef04a76084500425ac3114a48ab908
Former-commit-id: 32b2c0698885998bc654
2012-02-23 13:23:59 -06:00
Steve Harris
3d511fe719
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: d0bbbfefcc7a10ca9766
2012-02-23 10:06:18 -06:00
Steve Harris
4450cf8963
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: c8aae9874154be9660f1
2012-02-22 11:14:43 -06:00
Steve Harris
aaead73ec5
Merge branch 14-NCEP into 'ss_sync'
...
Former-commit-id: 94c2ea985b9995d22e25
2012-02-22 10:12:49 -06:00
Steve Harris
4a93298877
Merge branch 'ss_sync' (OB12.1.2) into 9-Wes2Bridge
...
Conflicts:
.gitignore
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/IVcModuleArgument.java
deltaScripts/.pydevproject
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/ServerSpecificPersistablePluginDataObject.java
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IDataArchiver.java
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
Former-commit-id: b89ebc5e01496cc6a06b
2012-02-20 16:38:06 -06:00
Steve Harris
54b5b6baef
Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
...
Former-commit-id: 4b76d22f77cc66c8be24
2012-02-20 12:43:38 -06:00
Bryan Kowal
2ba23624b4
Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
...
Former-commit-id: 10a0ca252d682c10767d
2012-02-17 12:17:14 -06:00
Bryan Kowal
38ccaf882b
Issue #182 - the meteolib Activator will now return a properly formatted path to the meteolib dll when on a Windows workstation. The meteolib "cape function" will now acurrately report if it is out of memory.
...
Former-commit-id: 4276fc2fe89f1b7a613a
2012-02-17 11:09:13 -06:00
Steve Harris
65b22abd24
Manual merge of SS OB12.1.2-4 changes into ss_sync
...
Former-commit-id: 93f6535bd8b137302802
2012-02-17 10:55:02 -06:00
Steve Harris
db1e3b1215
Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP
...
Former-commit-id: 7356d655da1707b98721
2012-02-15 14:34:47 -06:00
Ben Steffensmeier
7914496c96
Issue #176 remove id from dataURI notifications
...
Change-Id: I418de45a0daf13c9656161cc4ef67b755052ea58
Former-commit-id: 100b4c4ba02995d2b29b
2012-02-14 12:59:42 -06:00
David Gillingham
9f416558fa
Issue #20 : Committing refactored archiver capability
...
Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf
Issue #20 : Address peer review comments from previous commit.
Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf
Former-commit-id: bb1ac9959b061966f243
2012-02-13 16:09:36 -06:00
Lee Venable
74cd5a6f0b
Merge changes I92d52e19,Ia6e18647 into 9-Wes2Bridge
...
* changes:
Issue #13 Corrected valid month check - from code review Change-Id: I92d52e191749313b846871c5d8cd7c2fdc3c73c3
Issue #13 - Modified/corrected handling of "ARCHIVE" time stamp
Former-commit-id: 9cc539f8a4db74c784d6
2012-02-08 09:06:55 -06:00
Lee Venable
ead1c644fd
Merge "Issue #14 - Modified SHEF decoder components to respect the ALLOW_ARCHIVE_DATA "flag"" into 9-Wes2Bridge
...
Former-commit-id: a97a61c74c225aadb85b
2012-02-08 09:06:46 -06:00
Mike Duff
846110bac4
Issue #16 - Added subdirectory to token value and fixed IndexOutOfBounds
...
error
Change-Id: Ie0d670487a1768a53001209be0499c3cf5e9d4c7
Former-commit-id: 60de2210f5d8d84fbe2e
2012-02-07 16:46:36 -06:00
Nate Jensen
47d4648cd5
Merge "Issue #176 fix PersistablePluginDataObject" into 4-Thin_Client
...
Former-commit-id: a25342a5c8e79aa3bfa1
2012-02-07 09:47:46 -06:00
Ben Steffensmeier
22809228d6
Issue #176 fix PersistablePluginDataObject
...
Change-Id: I29f37b0fceb180eb0950ff1e00c44eb94b05f82e
Former-commit-id: 20247d0d896d901d27ae
2012-02-07 09:42:07 -06:00
Ben Steffensmeier
56c1b70d03
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: 324b358c44851046ccf3
2012-02-06 16:55:48 -06:00
Ben Steffensmeier
7bcbf3e3bc
Issue #176 pull changes to insert and persist time from the WES2Bridge branch.
...
Change-Id: If82378f4d8ccf867a5078682893ce65591ea04b4
Former-commit-id: f016be988e73f6e9e322
2012-02-03 17:33:32 -06:00
Mike Duff
bc390cf9ba
Issue #16 - data/manual now uses subdirectories
...
Change-Id: Iaeb5946767d635da1fe129296745bfa3eea57631
Former-commit-id: 365a64ca27f32cb51813
2012-02-02 09:11:19 -06:00
Ben Steffensmeier
3d3f73118b
Issue #211 change point requests to correctly return null responses when there are no matching pdos.
...
Change-Id: I88e6ba5734aa55af76c3b417eea9336eef7bf08a
Former-commit-id: 0d9fa5ea6c83fbf80c98
2012-02-01 17:39:14 -06:00
James Korman
30d9e073fe
Issue #13 Corrected valid month check - from code review
...
Change-Id: I92d52e191749313b846871c5d8cd7c2fdc3c73c3
Former-commit-id: 5a5bb127129e7e3a4ef2
2012-01-31 16:18:48 -06:00
Nate Jensen
50e735ce0c
Issue #181 disable nctext-ingest
...
Change-Id: Ib376d7ebf435947898d5c84e8e31b83737760e3e
Former-commit-id: 1b32446288f3ba2258df
2012-01-31 09:45:27 -06:00
Ben Steffensmeier
c22f135dbc
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: b3463d27fc0d75fbf942
2012-01-30 16:39:57 -06:00
Nate Jensen
ab7f9e5a56
Issue #181 fix ncep edex rpms
...
Change-Id: Iaf7778d9b32e8136f74caf4ed37892149e8392cf
Former-commit-id: 0301af999e50c6816fa9
2012-01-30 15:56:50 -06:00
Ben Steffensmeier
f082727112
Issue #183 change grib data catalog to use bulk requests to retrieve all coverages at once.
...
Change-Id: I99f3dfc7900b57b074062155a4e7a65851f70170
Former-commit-id: 113722a596dfd869c1c1
2012-01-27 14:48:40 -06:00
Greg Armendariz
3c983de477
Merge "Issue #192 - updated deploy-install to remove tmp directory after deployment; removing all baselined tmp artifacts." into 9-Wes2Bridge
...
Former-commit-id: 906dad4b76c34ed58ff5
2012-01-27 08:54:21 -06:00
David Gillingham
87b15de88b
Issue #20 : Merge all changes from previous SVN repo to GIT.
...
Former-commit-id: 845e6c19afb056e18757
2012-01-26 17:38:43 -06:00
Bryan Kowal
1f254d0e0f
Issue #192 - updated deploy-install to remove tmp directory after deployment; removing all baselined tmp artifacts.
...
Former-commit-id: f0b31d25f671d08b6916
2012-01-26 17:38:17 -06:00
Bryan Kowal
6969c9b7ed
Issue #192 - updated deploy-install to remove tmp directory after deployment; removing all baselined tmp artifacts.
...
Former-commit-id: fac21248adf4f398089b
2012-01-26 17:33:36 -06:00
