Commit graph

18 commits

Author SHA1 Message Date
Steve Harris
a0573644c4 Merge branch 'development' into omaha_13.3.1
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java

Former-commit-id: e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c
2013-02-21 15:41:39 -06:00
Steve Harris
71e8990021 13.3.1-1 baseline
Former-commit-id: 34684c71436ce4c395ea523eb34ded6792476816
2013-02-20 16:19:40 -06:00
Ben Steffensmeier
1393f3e3cf Issue #1614 Refactor data access framework to use single request.
Change-Id: Id3ed7afcf79dfb2ddeca1d9c2b632f90cc44d798

Former-commit-id: 5a9ae7df15633492b0d9fb648876cfb2bb2946b6
2013-02-15 11:39:56 -06:00
Ben Steffensmeier
ab319bd3a8 Issue #1614 allow locationNames for grid data access
Change-Id: I5d88708909b8f76ebdf6fac64a330854781ffae2

Former-commit-id: 7fe101c9fdb9266cd7c16a6c0a7281b9f9836cc4
2013-02-14 10:07:01 -06:00
Ben Steffensmeier
52337a2e6e Issue #1521 add extra validation and checks to grid factory
Change-Id: If7903f96bad2d21e9e9eaea86fa5ccc9b9374c9c

Former-commit-id: 3023799852acfb932f2afcb0c4ed1cf764add776
2013-01-29 17:37:39 -06:00
Ben Steffensmeier
a19b51cf2e Issue #1521 create grid data access factory and refactor satellite to share common functionality.
Change-Id: I54de0b41b60ccd058124eb79e6f032cb2ea9a3cf

Former-commit-id: 2133adac87eaa53977c26700ef656c304e81ee1b
2013-01-23 11:39:52 -06:00
Steve Harris
83e9157df7 13.2.1-2 baseline
Former-commit-id: bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf
2013-01-23 11:18:44 -05:00
Bryan Kowal
e2a12845d3 Issue #1469 - pypies will now read the hdf5 root directory from configuration. Relative paths can now be passed to pypies. Rebased to fix merge conflict.
Change-Id: I38873e478729a3644db7ce2813e9bd6c15d9bdf3

Former-commit-id: ed2e78738b391bcb9a40ddde7b7a6acf7ccd1b30
2013-01-15 14:56:01 -06:00
Steve Harris
c0c1d56f3a 13.1.2-2 baseline
Former-commit-id: 221d0aaf0e19a054387134e72a76a278159bf4d0
2013-01-06 14:32:24 -06:00
Ben Steffensmeier
9bccb6ac7c Issue #189 grid retrieval api.
Change-Id: Ice9432ab703420c8d441860de085a8d34a2610c8

Former-commit-id: e0b91523c54227ef15588f5dd672b2450a9dd8ac
2012-11-20 11:32:29 -06:00
Ben Steffensmeier
2c8f3f09ac Issue #189 changes to mappings and ncep merge from code review
Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47

Former-commit-id: 9ed60c53dd17891f81e5c01c3b86933c8aff2ba4
2012-11-14 12:22:53 -06:00
Ben Steffensmeier
535c73051d Issue #1108 initial implementation of mappings
Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d

Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF

Former-commit-id: 8db340a796df354059f3d4142db92dfd5fa527f5
2012-11-08 14:45:36 -06:00
David Gillingham
0f13b5d0b1 Issue #1310: Fix automated tropical testing support code after Data Delivery and Unified Grid
baseline merges.

Change-Id: Ia134ecd68c1468b281e7dca6e56f5cbc20047583

Former-commit-id: 0c3a35f339819afc5ed79202c95215ed90890df8
2012-11-02 15:21:30 -05:00
Dustin Johnson
98d7beae50 Issue #1302 Merge branch '5-Data_Delivery' into development
Conflicts:
    edexOsgi/build.edex/deploy-common/external-rules.xml
    edexOsgi/build.edex/deploy-common/plugin-methods.xml
    edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
    edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
    edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
    edexOsgi/build.edex/build.xml
    edexOsgi/build.edex/esb/conf/modes.xml
    edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
    edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
    edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java

Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0

Former-commit-id: 89583d97c8823818f87dc1a234078d85ba7bea4a
2012-11-01 13:36:06 -05:00
Ben Steffensmeier
6a9ff88b33 merge Unified_Grid with ss_builds to 12.11.1-7
Former-commit-id: ab80625b5c573d8ab1350b4c251414ea036ef016
2012-10-25 12:22:11 -05:00
Ben Steffensmeier
52f7d6d6fa Issue #189 updates to grid from code review comments
Former-commit-id: 25d6e51d9e748a6e05c93fdff0b641731360bfee
2012-10-10 16:32:38 -05:00
Ben Steffensmeier
9632663c0a Issue #189 convert viz/d2d displays from grib to grid.
Former-commit-id: 003825d9634299773ad96843cc82d56ded8a1391
2012-09-24 14:05:22 -05:00
Ben Steffensmeier
ccc2ae2108 Issue #189 checkin of grid dataplugin
Change-Id: I49b57915d90e6f5b347960046fa4c97a27a93375

Former-commit-id: 0b026f5d9d5d86d464cb0ec2b411a59666939276
2012-09-18 15:19:07 -05:00