Commit graph

18 commits

Author SHA1 Message Date
Steve Harris
b5d9e75b95 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: 64744fdb19 [formerly a0573644c4] [formerly 64744fdb19 [formerly a0573644c4] [formerly 2641d578e2 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]
Former-commit-id: 2641d578e2
Former-commit-id: 4f155a183a [formerly 33dd2589f1]
Former-commit-id: f3c3191a1c
2013-02-21 15:41:39 -06:00
Steve Harris
8c828dbd75 13.3.1-1 baseline
Former-commit-id: 8ae397085e [formerly 71e8990021] [formerly 8ae397085e [formerly 71e8990021] [formerly d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]
Former-commit-id: d2a654625f
Former-commit-id: e4435815c9 [formerly 46d28be4a4]
Former-commit-id: b3b56830b0
2013-02-20 16:19:40 -06:00
Ben Steffensmeier
e6fc131343 Issue #1614 Refactor data access framework to use single request.
Change-Id: Id3ed7afcf79dfb2ddeca1d9c2b632f90cc44d798

Former-commit-id: e771076275 [formerly 1393f3e3cf] [formerly e771076275 [formerly 1393f3e3cf] [formerly 0933a5f596 [formerly 5a9ae7df15633492b0d9fb648876cfb2bb2946b6]]]
Former-commit-id: 0933a5f596
Former-commit-id: 91bbdc3337 [formerly f0f3c71d50]
Former-commit-id: f868f66f76
2013-02-15 11:39:56 -06:00
Ben Steffensmeier
2bcf3749ce Issue #1614 allow locationNames for grid data access
Change-Id: I5d88708909b8f76ebdf6fac64a330854781ffae2

Former-commit-id: ef7addb005 [formerly ab319bd3a8] [formerly ef7addb005 [formerly ab319bd3a8] [formerly 9b4de367e3 [formerly 7fe101c9fdb9266cd7c16a6c0a7281b9f9836cc4]]]
Former-commit-id: 9b4de367e3
Former-commit-id: efaddb710c [formerly 0995024482]
Former-commit-id: aecc5a69e9
2013-02-14 10:07:01 -06:00
Ben Steffensmeier
31e9b542c1 Issue #1521 add extra validation and checks to grid factory
Change-Id: If7903f96bad2d21e9e9eaea86fa5ccc9b9374c9c

Former-commit-id: 9f5a0a1f58 [formerly 52337a2e6e] [formerly 9f5a0a1f58 [formerly 52337a2e6e] [formerly 437e6ae690 [formerly 3023799852acfb932f2afcb0c4ed1cf764add776]]]
Former-commit-id: 437e6ae690
Former-commit-id: dcb8a26ca2 [formerly 449dcb2df2]
Former-commit-id: c5ff5a6f61
2013-01-29 17:37:39 -06:00
Ben Steffensmeier
20a08fcc2c Issue #1521 create grid data access factory and refactor satellite to share common functionality.
Change-Id: I54de0b41b60ccd058124eb79e6f032cb2ea9a3cf

Former-commit-id: bd32a947c7 [formerly a19b51cf2e] [formerly bd32a947c7 [formerly a19b51cf2e] [formerly 3032dc2189 [formerly 2133adac87eaa53977c26700ef656c304e81ee1b]]]
Former-commit-id: 3032dc2189
Former-commit-id: e59bb3c914 [formerly 2e907f4a0e]
Former-commit-id: fc7b0393c5
2013-01-23 11:39:52 -06:00
Steve Harris
2779f5c6d9 13.2.1-2 baseline
Former-commit-id: 33bc5fd816 [formerly 83e9157df7] [formerly 33bc5fd816 [formerly 83e9157df7] [formerly 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]
Former-commit-id: 328c6dccad
Former-commit-id: d9be4dce21 [formerly 47cc08ac79]
Former-commit-id: 547c1dedd1
2013-01-23 11:18:44 -05:00
Bryan Kowal
89cc2bdf57 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: fba28ea69b [formerly e2a12845d3] [formerly fba28ea69b [formerly e2a12845d3] [formerly 4db9c6c321 [formerly ed2e78738b391bcb9a40ddde7b7a6acf7ccd1b30]]]
Former-commit-id: 4db9c6c321
Former-commit-id: 38480e46b1 [formerly c1330e8121]
Former-commit-id: 290167ac16
2013-01-15 14:56:01 -06:00
Steve Harris
f52ec0b0a0 13.1.2-2 baseline
Former-commit-id: 51208e5515 [formerly c0c1d56f3a] [formerly 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: cd4185ef5c [formerly 941337c553]
Former-commit-id: b6fa9b4858
2013-01-06 14:32:24 -06:00
Ben Steffensmeier
775ab284c8 Issue #189 grid retrieval api.
Change-Id: Ice9432ab703420c8d441860de085a8d34a2610c8

Former-commit-id: 93ac9ccaf2 [formerly 9bccb6ac7c] [formerly 93ac9ccaf2 [formerly 9bccb6ac7c] [formerly 56d375da86 [formerly e0b91523c54227ef15588f5dd672b2450a9dd8ac]]]
Former-commit-id: 56d375da86
Former-commit-id: 98cab0f2b3 [formerly dd1a3154e5]
Former-commit-id: 6f844cc7e2
2012-11-20 11:32:29 -06:00
Ben Steffensmeier
e57c669f2e Issue #189 changes to mappings and ncep merge from code review
Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47

Former-commit-id: 3d126b41e1 [formerly 2c8f3f09ac] [formerly 3d126b41e1 [formerly 2c8f3f09ac] [formerly 2d864c3b09 [formerly 9ed60c53dd17891f81e5c01c3b86933c8aff2ba4]]]
Former-commit-id: 2d864c3b09
Former-commit-id: 47759f025b [formerly 91254adfd6]
Former-commit-id: 84abe4fa4f
2012-11-14 12:22:53 -06:00
Ben Steffensmeier
2223e6ff64 Issue #1108 initial implementation of mappings
Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d

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

Former-commit-id: 20e618eb4f [formerly 535c73051d] [formerly 20e618eb4f [formerly 535c73051d] [formerly 693090cb36 [formerly 8db340a796df354059f3d4142db92dfd5fa527f5]]]
Former-commit-id: 693090cb36
Former-commit-id: 7c93db759c [formerly 884c82c4fe]
Former-commit-id: 74d1381180
2012-11-08 14:45:36 -06:00
David Gillingham
f4259113fb Issue #1310: Fix automated tropical testing support code after Data Delivery and Unified Grid
baseline merges.

Change-Id: Ia134ecd68c1468b281e7dca6e56f5cbc20047583

Former-commit-id: 251f41414a [formerly 0f13b5d0b1] [formerly 251f41414a [formerly 0f13b5d0b1] [formerly ec7a7c1373 [formerly 0c3a35f339819afc5ed79202c95215ed90890df8]]]
Former-commit-id: ec7a7c1373
Former-commit-id: a82f811659 [formerly f998d419d9]
Former-commit-id: fc56b970ff
2012-11-02 15:21:30 -05:00
Dustin Johnson
931d94d1de 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: 8e69107b5a [formerly 98d7beae50] [formerly 8e69107b5a [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]]
Former-commit-id: 31d7d09c10
Former-commit-id: e7a0f96a9a [formerly bcf575966b]
Former-commit-id: 4d9c945388
2012-11-01 13:36:06 -05:00
Ben Steffensmeier
86562637f0 merge Unified_Grid with ss_builds to 12.11.1-7
Former-commit-id: 4f503d3a1e [formerly 6a9ff88b33] [formerly 4f503d3a1e [formerly 6a9ff88b33] [formerly c2934ae7a5 [formerly ab80625b5c573d8ab1350b4c251414ea036ef016]]]
Former-commit-id: c2934ae7a5
Former-commit-id: 9b8f2bcdbd [formerly a77d2097f8]
Former-commit-id: dd5ab10b61
2012-10-25 12:22:11 -05:00
Ben Steffensmeier
0a31d3649d Issue #189 updates to grid from code review comments
Former-commit-id: 8a5aa9adc9 [formerly 52f7d6d6fa] [formerly 8a5aa9adc9 [formerly 52f7d6d6fa] [formerly aa08ec7929 [formerly 25d6e51d9e748a6e05c93fdff0b641731360bfee]]]
Former-commit-id: aa08ec7929
Former-commit-id: d6b85c32b5 [formerly 8ae8e40f25]
Former-commit-id: 9ba9377361
2012-10-10 16:32:38 -05:00
Ben Steffensmeier
231ab11d9a Issue #189 convert viz/d2d displays from grib to grid.
Former-commit-id: 8e5b20236d [formerly 9632663c0a] [formerly 8e5b20236d [formerly 9632663c0a] [formerly f918b6636f [formerly 003825d9634299773ad96843cc82d56ded8a1391]]]
Former-commit-id: f918b6636f
Former-commit-id: 9512238d6e [formerly 6c38e6abb2]
Former-commit-id: 769e28c28d
2012-09-24 14:05:22 -05:00
Ben Steffensmeier
57fa7661b6 Issue #189 checkin of grid dataplugin
Change-Id: I49b57915d90e6f5b347960046fa4c97a27a93375

Former-commit-id: 82b83f6e14 [formerly ccc2ae2108] [formerly 82b83f6e14 [formerly ccc2ae2108] [formerly 9512cca8ea [formerly 0b026f5d9d5d86d464cb0ec2b411a59666939276]]]
Former-commit-id: 9512cca8ea
Former-commit-id: 762915184c [formerly 30d970eb95]
Former-commit-id: 464547754e
2012-09-18 15:19:07 -05:00