Richard Peter
|
ef2ff1d0f7
|
Merge branch 'omaha_14.2.1' (14.2.1-8) into development
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java
Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75
Former-commit-id: 79d3aa4e1a [formerly 7bd6a07913] [formerly 0e25ae35c1] [formerly 79d3aa4e1a [formerly 7bd6a07913] [formerly 0e25ae35c1] [formerly 1c150e6e8b [formerly 0e25ae35c1 [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: 1d6e9816e0 [formerly 50a1b270c5] [formerly 23c2e13876eeacd0c485ad3110006f8bd36a537c [formerly f13c86bc3e]]
Former-commit-id: 1916128dada6d785b45f3c66eda571278ddb03d7 [formerly 9b3f8f9649]
Former-commit-id: 5fab51d41b
|
2014-02-27 15:18:26 -06:00 |
|
Ron Anderson
|
c3b687b9a5
|
Merge branch 'master_14.1.1' into master_14.2.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
rpms/awips2.core/Installer.tools/component.spec
Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4
Former-commit-id: 410f956cff [formerly e7f2b6883d] [formerly 32bcf9d0d0] [formerly 410f956cff [formerly e7f2b6883d] [formerly 32bcf9d0d0] [formerly 14a082a4e9 [formerly 32bcf9d0d0 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]]]]
Former-commit-id: 14a082a4e9
Former-commit-id: 8779564e3a [formerly 0135771eec] [formerly daf9f7ed0c92599e36d2d85d87483ca351cda108 [formerly d4ba9eba94]]
Former-commit-id: 55baedb811a56a020df3ba68f97e40ee6307fb4c [formerly 68e03bf02f]
Former-commit-id: 8a7af092f2
|
2014-02-18 10:45:20 -06:00 |
|
Brian.Dyke
|
e0236cc20a
|
14.1.1-17 baseline
Former-commit-id: 4c6eb0c001 [formerly f3d34b0c38] [formerly 180d1356cd] [formerly 4c6eb0c001 [formerly f3d34b0c38] [formerly 180d1356cd] [formerly 23280af290 [formerly 180d1356cd [formerly 810229668fd7ff81b5c426161d496fc62e24b75c]]]]
Former-commit-id: 23280af290
Former-commit-id: 6e66bb7b6e [formerly f1cc9d6ee2] [formerly 50e190ed8cb3b89c055f33e543707eeb6346818a [formerly 947ec5fd96]]
Former-commit-id: b5864c63c56c26489ecbcefc3b1a67b8472182a1 [formerly 948fffa361]
Former-commit-id: b8f7317b9d
|
2014-02-04 12:33:46 -05:00 |
|
Max Schenkelberg
|
d6ee7afe4a
|
Issue #2620 Fixed viz base feature dependency issues.
Change-Id: Ia3db09b101f800d77d0d95932a7abb69fc110aec
Former-commit-id: 0084b5b4f1 [formerly be45102814] [formerly 9d846aa104] [formerly 0084b5b4f1 [formerly be45102814] [formerly 9d846aa104] [formerly 987d4b3a30 [formerly 9d846aa104 [formerly 520e22dd848cf6472232d60789e1f6938db7c776]]]]
Former-commit-id: 987d4b3a30
Former-commit-id: 774859fcb9 [formerly e86e477165] [formerly f76ae5c39c57683f77097753d76cab458fd9e037 [formerly eede01921e]]
Former-commit-id: db317e89829b4a77b51a6217c6048e6ba7e2f098 [formerly 5c2da4c3e3]
Former-commit-id: ede6c2fa1e
|
2013-12-09 15:14:01 -06:00 |
|
Bryan Kowal
|
6a0ddf11e4
|
Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
cave/build/static/common/cave/etc/bundles/StationPlot.xml
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
edexOsgi/build.edex/esb/data/utility/common_static/base/python/RollbackMasterInterface.py
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
nativeLib/ncep_grib2module/.cproject
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
Former-commit-id: 5164a7c0b1 [formerly 38464427d3] [formerly feaacd9356] [formerly 5164a7c0b1 [formerly 38464427d3] [formerly feaacd9356] [formerly c8d7a32e2e [formerly feaacd9356 [formerly bb2efa59ed211345e071829f47d41eba232baae9]]]]
Former-commit-id: c8d7a32e2e
Former-commit-id: d3062ea58f [formerly f02d4b7a0b] [formerly fc14f5a833bc96ed1a9a8b8cb4ac6b0c2897f30f [formerly d366e70934]]
Former-commit-id: a385091a8de68d44ac589d69363d2af9bd0275a7 [formerly eaaa3d022c]
Former-commit-id: f5bb76a01e
|
2013-10-31 15:34:46 -05:00 |
|
Steve Harris
|
cbf859daf6
|
14.1.1-4 baseline
Former-commit-id: cb3b53f205 [formerly 82dec19b6a] [formerly bd95bb6a4e] [formerly cb3b53f205 [formerly 82dec19b6a] [formerly bd95bb6a4e] [formerly 99e3707c5b [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]]
Former-commit-id: 99e3707c5b
Former-commit-id: 2039d101ef [formerly b60635cd70] [formerly 2d757fef6618aded3efb26a4e6771f03101fe824 [formerly 7590a56e0e]]
Former-commit-id: 973d527ee973fdb4fc285ca2d02f0a43a03bb0fa [formerly 98ae84da42]
Former-commit-id: da4589ec2b
|
2013-10-28 10:55:16 -04:00 |
|
Nate Jensen
|
fdfcd1ae84
|
Issue #2361 Added startup timing statements
Change-Id: I347b3e671ecd7c7c61b88e008e2d4c56d19e6108
Former-commit-id: 0d7d2257cc [formerly 3f107e931f] [formerly 323f594de4] [formerly 0d7d2257cc [formerly 3f107e931f] [formerly 323f594de4] [formerly d265f4ddf4 [formerly 323f594de4 [formerly 3f93aeeb8259600b1c6e0ff47641ff95337df605]]]]
Former-commit-id: d265f4ddf4
Former-commit-id: 84b16b89b5 [formerly 521c019757] [formerly 02d772fe8febbecc8657a8eacb5c61f6d3d41e3e [formerly d72a7f3c69]]
Former-commit-id: 5e12a372b6d817c05bc8593e1177b5c178c81b98 [formerly 4b2855e7cb]
Former-commit-id: ed1eb0adaa
|
2013-10-15 14:23:59 -05:00 |
|
Richard Peter
|
1d08e54d43
|
Merge branch 'omaha_13.5.1' (13.5.1-7) into development
Conflicts:
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesAction.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF
rpms/awips2.cave/deploy.builder/build.sh
Former-commit-id: 19dacc32c1 [formerly 401ed88e44] [formerly 15d1a6eab0] [formerly 19dacc32c1 [formerly 401ed88e44] [formerly 15d1a6eab0] [formerly c6386e306f [formerly 15d1a6eab0 [formerly 293586df88f53c2ddf6f7586bf71719298728022]]]]
Former-commit-id: c6386e306f
Former-commit-id: 4c53471f8e [formerly e7ec068c7e] [formerly e1fa5bd1d05a5aa1d607bb1e33e99826fc290d81 [formerly 12993d9539]]
Former-commit-id: 468a024f2957450aa44633c7888eb3aad2011b85 [formerly 85fc9c773b]
Former-commit-id: 2a9cfe51af
|
2013-07-22 09:40:18 -05:00 |
|
Steve Harris
|
adf2f89d57
|
13.5.1-7 baseline
Former-commit-id: 67299457b1 [formerly 630705aa3f] [formerly bf58a81b38] [formerly 67299457b1 [formerly 630705aa3f] [formerly bf58a81b38] [formerly 86ce1248c2 [formerly bf58a81b38 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]]]
Former-commit-id: 86ce1248c2
Former-commit-id: 0fe8173b7b [formerly cb50a0028d] [formerly 5aea78fbd5da8a55b6f4dc4542505312f878d73d [formerly f9c9aecba5]]
Former-commit-id: bc809e3e0a77e3fbc4971821c0a9d912bb8a28a4 [formerly eff4fb29dd]
Former-commit-id: 513c089375
|
2013-07-18 12:07:22 -04:00 |
|
Ben Steffensmeier
|
a469270e54
|
Issue #2158 Allow VizGlobalsManager to work without accessing UI thread.
Change-Id: I3cb8e97d68a76b371a93a52b1c4f7b860b0847c1
Former-commit-id: ccf4ec5c3d [formerly 0cbe0e996d] [formerly 872ad4dfa9] [formerly ccf4ec5c3d [formerly 0cbe0e996d] [formerly 872ad4dfa9] [formerly ffed387cce [formerly 872ad4dfa9 [formerly d3621cf3155841086cd24eecf4543bd70c890e41]]]]
Former-commit-id: ffed387cce
Former-commit-id: d12902e725 [formerly 0b336d418b] [formerly 0a629899d7899e902f1daebcfdead2043ab8a4f1 [formerly 9606262e7e]]
Former-commit-id: 07094cc973c3df36a824e8d0e5b836f971dc835f [formerly 0a48ee47f7]
Former-commit-id: 701859fefc
|
2013-07-16 11:04:08 -05:00 |
|
Steve Harris
|
97a4c59662
|
13.5.1-1 baseline
Former-commit-id: 5d99df9969 [formerly 6384018950] [formerly 998961612c] [formerly 5d99df9969 [formerly 6384018950] [formerly 998961612c] [formerly fe872355a7 [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]]
Former-commit-id: fe872355a7
Former-commit-id: 43b7a9b410 [formerly 0aab285b8a] [formerly 7fa801e313a1348e6bb00da11f43928fdf179b69 [formerly 30ba1d634e]]
Former-commit-id: 83a711e54bdd8cabc147e6ca5222939082f46f9c [formerly 146c5e8940]
Former-commit-id: 859965fc9d
|
2013-06-10 15:17:17 -04:00 |
|
Nate Jensen
|
ee18f936c4
|
Issue #1967 fix annoying warnings, remove unused preferences page
Change-Id: I9f7a5ef09f67165b4a3eca023f646f24efbe10e0
Former-commit-id: d479912981 [formerly bd8431b986] [formerly ed7b0fc8c5] [formerly d479912981 [formerly bd8431b986] [formerly ed7b0fc8c5] [formerly 3f85aeb00a [formerly ed7b0fc8c5 [formerly e3acc289aa835326bac7af9d10b7b5909c7c07f6]]]]
Former-commit-id: 3f85aeb00a
Former-commit-id: e94a5b5494 [formerly f7817d7c41] [formerly 755dd253bb4939ea763815cd0328c8e0a0f2daca [formerly 0b48f54f47]]
Former-commit-id: cffae6c820b21f70627ccef42419758b373339fc [formerly e7f6bee025]
Former-commit-id: 4469346bc5
|
2013-05-28 14:30:26 -05:00 |
|
Max Schenkelberg
|
46c630d325
|
Issue #1638 Made pypies slab reads work in more than 2-d data. Moved DecisionTree to common.dataquery. Merged changes into CAVEApplication.
Amend: Deleted old DecisionTree
Change-Id: Id51a32c42f5485a5261dd73f88f55a6fda3263c8
Former-commit-id: 76d2e27f3f [formerly 14dba9a749] [formerly ea2501abbb] [formerly 76d2e27f3f [formerly 14dba9a749] [formerly ea2501abbb] [formerly 40c76c2c82 [formerly ea2501abbb [formerly 4f76cfa7102f2b266bc94dbeb4ed6d2e4028c106]]]]
Former-commit-id: 40c76c2c82
Former-commit-id: 6a7461bfb5 [formerly 48a283f0f2] [formerly 99c9ac745d21ab21d542ae5c708afb7d811bd08d [formerly fc27ac4a30]]
Former-commit-id: 57ae24aafa8a42a2a4f1f8d3ad55d253af3a6af7 [formerly 1d3e653520]
Former-commit-id: 4a9f001831
|
2013-05-08 17:58:19 -05:00 |
|
Max Schenkelberg
|
efb0323e1a
|
Issue #1638 Made string rendering always look right despite extent proportions so it is never warped. Moved dataURI map creation to DataURIUtil. Fixed double dispose of controls in VizDisplayPane, also made resize non interface method.
Amend: Fixed menu mix up and making sure perspective bar is on by default
Change-Id: I0c19e5fbf0f0d29cdca0f63afb33ca964a145b94
Former-commit-id: 259982918f [formerly c8fcaf06d1] [formerly b91b706701] [formerly 259982918f [formerly c8fcaf06d1] [formerly b91b706701] [formerly 1d3c378dde [formerly b91b706701 [formerly 53e42aa3925399271cc3ad4ee964476ddffc8eb6]]]]
Former-commit-id: 1d3c378dde
Former-commit-id: dccb0d1350 [formerly 69abb31ee6] [formerly a2c21fee41cbb58a585e7280c1318378ee5b8959 [formerly e05c12e246]]
Former-commit-id: 16736e1f66b39f32dcbcce6e6c34d08e4600f773 [formerly 0e64c796b1]
Former-commit-id: 71b0056d37
|
2013-04-19 14:57:40 -05:00 |
|
Max Schenkelberg
|
10ee43ad97
|
Issue #1638 Added viz base feature as well as personalities cave project extracting out non-awips specific things in personalities awips project
Amend: Removed eclipse feature all together, added os and arch to fragments. Ensured unpack flag stayed same when changing features.
Change-Id: I78a2c5262ebdbe3ace3c180254b5f036011c0a65
Former-commit-id: 16cce70f9d [formerly 6ccef4d3c7] [formerly bd52681be3] [formerly 16cce70f9d [formerly 6ccef4d3c7] [formerly bd52681be3] [formerly 7513e5982b [formerly bd52681be3 [formerly dd4ddb8aacf82f7c69860b470c3f754a59f0c124]]]]
Former-commit-id: 7513e5982b
Former-commit-id: d0edd6a882 [formerly 1950aff01a] [formerly 0dd1d5c1eb848344c287d03fc5cb6b4556d376ab [formerly 57f34e9080]]
Former-commit-id: d0f63d287352e6fa8f52b87780f423ef41d87efa [formerly 2e5c1a7c32]
Former-commit-id: eb6a0d25d0
|
2013-04-17 11:42:46 -05:00 |
|