Commit graph

14 commits

Author SHA1 Message Date
Richard Peter
b6482f2e54 Merge branch 'omaha_14.2.2' (14.2.2-3) into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Former-commit-id: 3575d6586f [formerly 3575d6586f [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: a7ec0bcf66
2014-04-11 16:23:09 -05:00
Mike Duff
a007cb795c Issue #2689 - Add input values to log statement on LL to HRAP conversion failure.
Fix error in HRAP overlay resource.

Change-Id: If6fcb23a839323e4541e8ff28c0d702bf3066273

Former-commit-id: be9cf109b1 [formerly be9cf109b1 [formerly ee88ab32961525d74a227cccec615c0610dc9525]]
Former-commit-id: 5f1f931c64
Former-commit-id: da5a3bf858
2014-03-31 11:35:06 -05:00
steve.naples
72d6b1f1a5 ASM #338 Updated HRAPCoordinates to not parse whitespace
Change-Id: I353e8a07927f3e36aa8905506f63b0e50f2179a6

Former-commit-id: 309ff4e7f7 [formerly 309ff4e7f7 [formerly 220ef7b1195366834c9f85b828862f128dd3fea1]]
Former-commit-id: 75e8a907fe
Former-commit-id: 54cc3397ee
2014-03-18 15:40:13 +00:00
Ben Steffensmeier
4f01f96cf4 Issue #2673 Add ability to query only ref times to Data Access Layer.
Former-commit-id: 641d4acd15 [formerly 641d4acd15 [formerly 37c406a9945bfb6ccb99d2472b44d649f2ce18d0]]
Former-commit-id: 9fcb730858
Former-commit-id: 1d2d1e20f5
2014-03-03 17:44:11 -06:00
Max Schenkelberg
a47f187f4f Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties

Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa

Former-commit-id: 63421a4819 [formerly 63421a4819 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]
Former-commit-id: 50825200a1
Former-commit-id: 1610826d2e
2013-07-15 14:26:15 -05:00
Nate Jensen
4eb941dacb Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3

Former-commit-id: 99b4a21414 [formerly 99b4a21414 [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]
Former-commit-id: 3f3e0a788d
Former-commit-id: a1f314948f
2013-05-29 14:49:43 -05:00
Ben Steffensmeier
f868f66f76 Issue #1614 Refactor data access framework to use single request.
Change-Id: Id3ed7afcf79dfb2ddeca1d9c2b632f90cc44d798

Former-commit-id: 1393f3e3cf [formerly 1393f3e3cf [formerly 5a9ae7df15633492b0d9fb648876cfb2bb2946b6]]
Former-commit-id: 0933a5f596
Former-commit-id: f0f3c71d50
2013-02-15 11:39:56 -06:00
Bryan Kowal
3b2342193f Issue #1555 - initial generic geometry resource
- refactored viz data access resources
- updated hydro factory based on existing hydro code
- geometric lines and polygons are now both rendered using wireframe shapes and the same logic
- relocated the data used to render the geometries to the resource
- points are created instead of circles for geometric points
- do not store legend text as a static variable in the abstract data access resource
- addressed peer review comments

Change-Id: Ic7792aede9e24445af541f01631886645a8cf1f0

Former-commit-id: a86d2b5769 [formerly a86d2b5769 [formerly 04179bd343c3ec976c601e2856a3949e4515b472]]
Former-commit-id: 1732e6b4ea
Former-commit-id: c8a6b08394
2013-02-06 12:03:40 -06:00
Bryan Kowal
c4e18dd6e6 Issue #1551 - adding maps to the Data Access Framework
- initial commit of Maps Geometry Factory
- re-factored geometry factory code
- addressing peer review comments
- cast to Timestamp

Change-Id: Ie12177b5ae1a8d8d9151d061682730841cfcc807

Former-commit-id: 964b30d5f2 [formerly 964b30d5f2 [formerly 8155a2cc6dc16df4addf5b567c08890278dc48c3]]
Former-commit-id: 5d83f9f3d1
Former-commit-id: e86fda2a6f
2013-01-31 10:03:10 -06:00
Max Schenkelberg
21dae56a1b Issue #1457 Initial changes for MPE time refactor. Wrote custom resource that handles multiple times and tailored code to use resource instead of old XmrgResource which was not written to support multiple frames
Amend: Cleaned up comments and some bugs in code after review

Amend: Rebased changes

Change-Id: I512b9bb30a08b9a1cfc5e8d9b5008ebc4f352c2d

Former-commit-id: ff72ce0b0c [formerly ff72ce0b0c [formerly ab74da7808aa343983f532ee076820c7e63fdded]]
Former-commit-id: db3e7bab99
Former-commit-id: c246f56568
2013-01-15 14:41:19 -06:00
Nate Jensen
13dca3b784 Issue #1409 Initial implementation of hydro data access
Change-Id: I309694f9477384446658520794e19ca9493473fb

Former-commit-id: 817717fe0a [formerly 817717fe0a [formerly ae7ac8a8bfc51d1c7dc3493c8fc036a87772f323]]
Former-commit-id: 85658e7e1d
Former-commit-id: 3c2865bbd7
2012-12-12 11:20:42 -06:00
Steve Harris
8cd5974f4c 12.4.1-4 baseline
Former-commit-id: 67a5a68300 [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 2a216f333c
Former-commit-id: a4e519f3cd
2012-04-18 15:18:16 -05:00
Matt Nash
21d2361f00 Moving 12.1.1 into ss_sync
Former-commit-id: 66be3bec40 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: c83e5ff474
Former-commit-id: 1faae42484
2012-01-19 11:53:12 -06:00
root
377dcd10b9 Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 9f19e3f712 [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 3360eb6c5f
2012-01-06 08:55:05 -06:00