Commit graph

2504 commits

Author SHA1 Message Date
Richard Peter
ef7ba1f1ee Merge "Issue #2545 - Get bandwidth graph data by network" into development
Former-commit-id: d0b50eee3c [formerly d0b50eee3c [formerly a31695805478d27e072d069d5d3b369001c1d80d]]
Former-commit-id: 6fde307f0a
Former-commit-id: 9f4dfc9051
2013-12-05 14:54:46 -06:00
Mike Duff
d3c5ee0468 Issue #2545 - Get bandwidth graph data by network
Change-Id: I4de455a4da43f180ff37eb72370addec77a29314

Former-commit-id: 4796f43495 [formerly 4796f43495 [formerly 9102f16c8a6409e92ded498b82a6a4e6a531f2c0]]
Former-commit-id: 0c452e2434
Former-commit-id: 7f2ddb1360
2013-12-05 13:35:31 -06:00
Nate Jensen
bd4e9158f0 Merge "Issue #2537 Use PointDataAccessFactory for multiple point data types. Change-Id: I655091f116cde662933ed96d926372a14a435dfc" into development
Former-commit-id: c47f6546dd [formerly c47f6546dd [formerly 648e5bff2e85d00cf5bcee923f2a137aa76117fc]]
Former-commit-id: ae0bd2a86f
Former-commit-id: 7163e28d35
2013-12-05 12:59:58 -06:00
Richard Peter
fd93b7d85e Merge branch 'omaha_14.1.1' (14.1.1-11) into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
	edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/IFPWE.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
	msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs

Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a

Former-commit-id: 0c4ae068ad [formerly 0c4ae068ad [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: da027298d4
2013-12-05 12:12:27 -06:00
Ben Steffensmeier
956e8b04f2 Issue #2537 Use PointDataAccessFactory for multiple point data types.
Change-Id: I655091f116cde662933ed96d926372a14a435dfc

Former-commit-id: f682e66e9b [formerly f682e66e9b [formerly 91a3fdbc8bd98603a1cda218729d5542dac809ef]]
Former-commit-id: 46a466497c
Former-commit-id: ad9fee446d
2013-12-05 10:54:28 -06:00
Lee Venable
195162014d Merge "Issue #2592 - Fixed SWT checkbox issue with colored background/foreground." into omaha_14.1.1
Former-commit-id: 4f1b663b37 [formerly 4f1b663b37 [formerly 1d8f18b5e8a7e932008b8a8baf347f55fcf83e07]]
Former-commit-id: b7be687903
Former-commit-id: 3a3333e4ec
2013-12-05 08:30:28 -06:00
Lee Venable
ef61348fb8 Issue #2592 - Fixed SWT checkbox issue with colored background/foreground.
Change-Id: I94e9c691ca68c0d22e27ba107d99b8397f1d942b

Former-commit-id: 266d4884da [formerly 266d4884da [formerly a1624e9bcf8677d6edd76a68122aa07690383b34]]
Former-commit-id: a385ec612c
Former-commit-id: d433717c8c
2013-12-05 08:25:46 -06:00
Ron Anderson
89e87a1683 Issue #2331 Fixed Topo retrieval for smartTools/procedures
Change-Id: Iab9d5216f278836f3b8b2245330fdb2b254a5ae3

Former-commit-id: b5906249cc [formerly b5906249cc [formerly a7a201ec657a333f6e6f5c3c1d12a3d1f9b50a4c]]
Former-commit-id: 20eeb2796e
Former-commit-id: 103fed386f
2013-12-04 17:10:48 -06:00
Steve Harris
234ca267ed 14.1.1-12 baseline
Former-commit-id: b24d9c80b0 [formerly b24d9c80b0 [formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]]
Former-commit-id: a3ec45a99f
Former-commit-id: 14421048af
2013-12-04 16:47:59 -05:00
Ron Anderson
1988e86bbd Issue #2490 Fixed error handling in HazardsTable.py
Change-Id: Icfe1698e59b4b8976f488df209588f4350c58db2

Former-commit-id: 7459d65134 [formerly 7459d65134 [formerly 0526d24a2b70680c850f54cbbfd5c2ef5bdf21ef]]
Former-commit-id: c9cb2bdb6a
Former-commit-id: 75d2dd7a29
2013-12-04 15:29:28 -06:00
Nate Jensen
35abe8c3af Merge "Issue #2600 Fix typo in DataStoreCache." into development
Former-commit-id: 020c4de47d [formerly 020c4de47d [formerly 860ac1873dffff0ea221bde1f898aa93ad25859f]]
Former-commit-id: 0ead2a03ea
Former-commit-id: 78629260d9
2013-12-04 11:54:11 -06:00
Dave Hladky
3cf23e1e4d Issue #2607 Fixed Nullpointer
Former-commit-id: 25ce37d2d8 [formerly 25ce37d2d8 [formerly 6968c9f0a13880fe60e90a84b67a597753cbb175]]
Former-commit-id: 25f745bc12
Former-commit-id: b0f12b6613
2013-12-04 11:36:23 -06:00
Ben Steffensmeier
cb6d8f6070 Issue #2600 Fix typo in DataStoreCache.
Former-commit-id: 3c8962fb96 [formerly 3c8962fb96 [formerly 5f20550b08b2299c7bb7a4769b13c4c9e50c90dd]]
Former-commit-id: 0b4eaac59e
Former-commit-id: d1b4fdd9c8
2013-12-04 11:22:47 -06:00
Nate Jensen
b58a9fbed7 Merge "Issue #2576 Increased the font size of EMER." into development
Former-commit-id: cc53373478 [formerly cc53373478 [formerly 947196e8ac4bb82536102bb56413d94589569599]]
Former-commit-id: c29836abd7
Former-commit-id: bad9e2ab44
2013-12-03 17:44:55 -06:00
Richard Peter
b0e694483f Merge branch 'development_on_RHEL5' (GOES-R) into development
Conflicts:
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatBlendedResource.java
	nativeLib/edexBridge/edexBridge.cpp
	rpms/build/i386/build.sh
	rpms/build/x86_64/build.sh

Former-commit-id: f5f75ec629 [formerly f5f75ec629 [formerly 039d9ecb587338801cdab9cad11b06890517d6a4]]
Former-commit-id: e82e1137f9
Former-commit-id: 94994868fa
2013-12-03 16:25:31 -06:00
Jonathan Sanchez
e0b5d6f75d Issue #2576 Increased the font size of EMER.
Change-Id: Ic6994ce60611b2af76bdee153daffe328e556ef1

Former-commit-id: 88f7b75df4 [formerly 88f7b75df4 [formerly 15cdd4c1fdb336416a4cc320731d5ecbbb0db6f6]]
Former-commit-id: eeb3b0173b
Former-commit-id: dc4b8ec40f
2013-12-03 13:00:47 -06:00
Nate Jensen
57d1764c46 Merge "Issue #2573 safer and faster progressive disclosure" into development
Former-commit-id: ece38c85c0 [formerly ece38c85c0 [formerly 2be1427cdcd61d47a5463f6e4e85910200fda931]]
Former-commit-id: 2daf0f2691
Former-commit-id: a5cf904e1f
2013-12-03 09:41:02 -06:00
Nate Jensen
ecd87941e6 Issue #2573 safer and faster progressive disclosure
Change-Id: If568c0958f7e6133ce03fe5c4a17e6d865d431fd

Former-commit-id: 622cc1b223 [formerly 622cc1b223 [formerly 36621eb21598f3730d0aa88973932e877367fecf]]
Former-commit-id: 90d6b5bd74
Former-commit-id: e40c71acd1
2013-12-02 17:28:09 -06:00
Steve Harris
2e47683d4a Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: 65d5f13864 [formerly 65d5f13864 [formerly 361e9942cf804578fb3e873229c1cd6fd6689fdf]]
Former-commit-id: b98eb9ffa4
Former-commit-id: 6539b80ded
2013-12-02 16:17:38 -06:00
Steve Harris
f88a635a58 14.1.1-11 baseline
Former-commit-id: 70a6f1936e [formerly 70a6f1936e [formerly c32b2b2037c84cc074e7dc5a5a13b93223640d7d]]
Former-commit-id: 71ae71c850
Former-commit-id: 5526a8999d
2013-12-02 17:10:10 -05:00
Slav Korolev
20793f8784 Issue #2387. Added system status refresh.
Former-commit-id: 1be43bc76c [formerly 1be43bc76c [formerly f3530467b1845a488fa0996ee7100a2dc145394a]]
Former-commit-id: f7f00b77d0
Former-commit-id: 5e225387fd
2013-12-02 16:14:45 -05:00
Ben Steffensmeier
8c386a2aac Issue #2537 point data code cleanup.
Former-commit-id: a4e3a4a03b [formerly a4e3a4a03b [formerly 8809ac9faa7669e7a0817b9b1c15c322b05e06a2]]
Former-commit-id: 7889c14b35
Former-commit-id: 62ca7b1df6
2013-11-26 15:16:54 -06:00
Ben Steffensmeier
a3f5fcabf6 Issue #2492 Got mosaicing to happen in mosaic image units, satellite provides data units for images
Change-Id: I5a244397aa6172e406df1d0f4619dd53373584e0

Former-commit-id: 927801985a [formerly 927801985a [formerly 029c03379ffa8317fa0afe8b2f69cbe1ac3c3fd1]]
Former-commit-id: 3696896b49
Former-commit-id: 70ca78c7b5
2013-11-25 11:31:57 -06:00
Richard Peter
91fcef9d3f Merge "Issue #2532 Fix grid displays of grids larger than the world." into development
Former-commit-id: b26e562845 [formerly b26e562845 [formerly f2df036fd63196cd8e7f29cbb80944099c2db92a]]
Former-commit-id: be7c2ef08e
Former-commit-id: c51cc4bf17
2013-11-22 12:38:05 -06:00
Nate Jensen
54c2d1e420 Merge "Issue #2361 fix style manager's jaxb context" into development
Former-commit-id: 9de7c7f434 [formerly 9de7c7f434 [formerly 0b018d8cd8f9738eb11897f07a83a5e370dcbcac]]
Former-commit-id: 49ce4d4be3
Former-commit-id: 6ab6de4419
2013-11-22 10:08:13 -06:00
Nate Jensen
b6748206e5 Issue #2361 fix style manager's jaxb context
Change-Id: I273c2361739e7860bd92a8c86d8f806b677f1f68

Former-commit-id: 16329ab06b [formerly 16329ab06b [formerly 2fddfc61fb8de88a67deb5b66a570ca548628ab3]]
Former-commit-id: 328991e577
Former-commit-id: ebc3efdf80
2013-11-22 09:15:24 -06:00
Dave Hladky
54af53ffb4 Issue #2554 added explicit threading to WFS, ability to send GZIP requests, fixed maxfeatures, fixed adhoc display
Former-commit-id: 04c7e2cffc [formerly 04c7e2cffc [formerly e79ff905cbe3330dbe22b6663753e1d5e6dbe7bd]]
Former-commit-id: a9a3973319
Former-commit-id: ebd6d5cbe1
2013-11-21 14:46:47 -06:00
Nate Jensen
a5469c1d9e Merge "Issue #2033 fix plots working with multiple plotModels dirs contributed by different plugins" into development
Former-commit-id: ddb0eaf0ff [formerly ddb0eaf0ff [formerly 8f5078ce2a5369c62073a70b1772c2d0c96317fa]]
Former-commit-id: d851e6fc97
Former-commit-id: f60948fc36
2013-11-21 10:12:11 -06:00
Nate Jensen
19b467c208 Issue #2033 fix plots working with multiple plotModels dirs contributed
by different plugins

Change-Id: I2d1ff75c62395ead5154398002610401faa4388d

Former-commit-id: 9371c63c41 [formerly 9371c63c41 [formerly 0ed68f5ec6b2b2f3413f7de5f9c7b15291afb85c]]
Former-commit-id: 2b6799712d
Former-commit-id: 3e88de72dc
2013-11-20 17:33:53 -06:00
Ron Anderson
a731f80011 Issue #2488 Change to use DejaVu fonts
Change-Id: I82f4b93f340bca0e6dfa4f9c14a9890644c9f224

Former-commit-id: d72119409e [formerly d72119409e [formerly 396cd96c02521a33c65fa9e447275307c2d6168c]]
Former-commit-id: 633137d8c0
Former-commit-id: f6b9e69738
2013-11-20 13:43:25 -06:00
Ben Steffensmeier
1bc4453a8d Issue #2532 Fix grid displays of grids larger than the world.
Former-commit-id: d3ed1ba356 [formerly d3ed1ba356 [formerly e607da0bb204d61cbc998595f52406605c1953e0]]
Former-commit-id: 41753c40b5
Former-commit-id: 07743c4369
2013-11-20 11:11:03 -06:00
Brian Clements
2e4dc2000e Issue #2393 removed pypies interpolation
updated datastore interface
updated pypies python code
updated python generated from java classes
moved in-java interpolation code from sat dao to utility classes
changed ncep mcidas dao to use in-java interpolation
changed VIIRS dao to use common interpolation code


Former-commit-id: fe58826a1e [formerly fe58826a1e [formerly 6f9ad823de5d0b30ae7c8206b4a4fdf1e3a2b22b]]
Former-commit-id: 0f40ae2b99
Former-commit-id: b762864f88
2013-11-20 08:40:12 -06:00
Steve Harris
36d788890a 14.1.1-10 baseline
Former-commit-id: ca0f65bd9a [formerly ca0f65bd9a [formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]]
Former-commit-id: 9248695a1f
Former-commit-id: ef6e0b0304
2013-11-19 16:40:25 -05:00
Lee Venable
d3b12f6973 Merge "Issue #1531 - Made bandwidth utilization graph resizable." into development
Former-commit-id: f8f0a0e41e [formerly f8f0a0e41e [formerly 6d5026a25af31f0ae8c29d1036d9358366550f75]]
Former-commit-id: d42c36f365
Former-commit-id: da5cfb3d8e
2013-11-19 15:12:38 -06:00
Nate Jensen
ac93e07973 Merge "Issue #2361 don't initialize derived parameters on shutdown" into development
Former-commit-id: c6d6b07e3f [formerly c6d6b07e3f [formerly 4ae0820b630f25bda177572ffe77fbea52b4fd82]]
Former-commit-id: a610825ef9
Former-commit-id: 04de350ae7
2013-11-19 14:11:01 -06:00
Nate Jensen
cf87d1c335 Issue #2361 don't initialize derived parameters on shutdown
Change-Id: I0f735d9843d87aaef593cf6df8c9fdad03cd9583

Former-commit-id: c90a7d7b3c [formerly c90a7d7b3c [formerly 13cc948c57d52261c700157f8e86b6e6c75b4fe1]]
Former-commit-id: 5aee685557
Former-commit-id: e9adf706ba
2013-11-19 12:59:10 -06:00
Mike Duff
fcc96787c3 Issue #1531 - Made bandwidth utilization graph resizable.
Change-Id: I31752b94cd4a53aa08270e75a6adb8a70199b475

Former-commit-id: ed73a7e55a [formerly ed73a7e55a [formerly d6de10ca2c0609899bdb1f4c5f3de22a62d58998]]
Former-commit-id: 71093a685e
Former-commit-id: 437df90354
2013-11-19 12:51:06 -06:00
Mike Duff
d254f954c4 Issue #2458 - Fixed product browser for DD so only active subs from local site are displayed
Change-Id: I271a325fc0720070716d3d51ac606350d952b7e2

Former-commit-id: c908647259 [formerly c908647259 [formerly cacc7a8560c589b24ea98191f152c31479c5631e]]
Former-commit-id: 665d9e7651
Former-commit-id: 5afa90b967
2013-11-19 08:55:27 -06:00
Nate Jensen
a5abd4dad0 Merge "Issue #2543 fix gl buffer formating problems Change-Id: I305dfb7eadcf69b47d56e3f937abd8c2aa0edfdc" into development
Former-commit-id: edf51dffc9 [formerly edf51dffc9 [formerly b6420738e49d37840789c88089ecc8bab1103284]]
Former-commit-id: 3d51d80170
Former-commit-id: f07f543cd3
2013-11-18 12:50:38 -06:00
Nate Jensen
b6fe32de06 Merge "Issue #2544 Fix recycling issues with Satellite resources." into development
Former-commit-id: 0dbe79344a [formerly 0dbe79344a [formerly 3a4eb4f997dd19469e88cff0f873bf7647793b2d]]
Former-commit-id: 827b7f5a93
Former-commit-id: 6900d4e47f
2013-11-18 12:50:19 -06:00
Ben Steffensmeier
9bd35b793d Issue #2543 fix gl buffer formating problems
Change-Id: I305dfb7eadcf69b47d56e3f937abd8c2aa0edfdc

Former-commit-id: 105e3e359a [formerly 105e3e359a [formerly fe32d4ed93b583f0363b39edeb5b715bbe465dd8]]
Former-commit-id: e7a068e595
Former-commit-id: e605758e57
2013-11-18 11:51:51 -06:00
Ben Steffensmeier
55f26e277f Issue #2544 Fix recycling issues with Satellite resources.
Former-commit-id: e392185d78 [formerly e392185d78 [formerly 166957a22c3447fa2407b13362eece24943675c9]]
Former-commit-id: 9ff1751f4e
Former-commit-id: 1875f56695
2013-11-18 11:44:56 -06:00
Nate Jensen
951c1ff2f3 Merge "Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE startup" into development
Former-commit-id: 4f47800cae [formerly 4f47800cae [formerly c27baf85e0eaf7f6dd6f2d36d19243ae37dc0dac]]
Former-commit-id: 0146ae59df
Former-commit-id: a238ba2ba3
2013-11-18 11:39:12 -06:00
Steve Harris
c26818afe6 Merge branch 'omaha_14.1.1' (14.1.1-9) into development
Conflicts:
	cots/org.jep.linux32/libjep.so
	cots/org.jep.linux64/libjep.so
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
      (took all the omaha_14.1.1 versions)

Former-commit-id: 0a36987a01 [formerly 0a36987a01 [formerly 42b0235982d6d03e6e14057a1072842fcadc4b85]]
Former-commit-id: 6d9efac6ef
Former-commit-id: 869b505f80
2013-11-15 13:15:25 -06:00
Steve Harris
ea382798b5 14.1.1-9 baseline
Former-commit-id: f8f995b697 [formerly f8f995b697 [formerly 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5]]
Former-commit-id: 5a0a40e67c
Former-commit-id: 8c136f202d
2013-11-15 12:47:49 -05:00
Nate Jensen
f2c777ff48 Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE
startup

Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700

Former-commit-id: dd99aa3f47 [formerly dd99aa3f47 [formerly 264b7c80cbd0559c175aef0a99d8f8407b6af7d0]]
Former-commit-id: 78b01f61c4
Former-commit-id: d96cdbe761
2013-11-14 17:41:24 -06:00
Mike Duff
0f2626f79f Issue #2548 - fix malformed comment
Change-Id: I365f5311fe28e0cbbf0dd94dcc88fd723f4f4034

Former-commit-id: 414cb1cf68 [formerly 414cb1cf68 [formerly 52462f299735aacee3db09faa6db9f28ba91f552]]
Former-commit-id: 95fda38cc5
Former-commit-id: 7be43c4a52
2013-11-14 17:30:55 -06:00
Richard Peter
38d2c6564a Merge "Issue #2548 - Add a subscription type slot for uniqueness." into development
Former-commit-id: 14b1e924a1 [formerly 14b1e924a1 [formerly dba301df2f593baa951c14b684e7ce4794e32019]]
Former-commit-id: 0bb5e2a61e
Former-commit-id: 1a7dd7723b
2013-11-14 17:21:48 -06:00
Brian Clements
e7c355df52 Issue #2361 fixed ncwf hibernate pickup
the new way of finding hibernate classes requires project names to match package names
fixed ncwf to have matching package and project names


Former-commit-id: cacdf313c5 [formerly cacdf313c5 [formerly 4924917e28275d9bb8bb21feceb6016ce2c91c40]]
Former-commit-id: 00490c2db2
Former-commit-id: ab24330f23
2013-11-14 17:12:02 -06:00
Mike Duff
5fdf101af6 Issue #2548 - Add a subscription type slot for uniqueness.
Change-Id: I5cf04bde4a345606af72bf2091e423dd6aa555aa

Former-commit-id: 47011a70db [formerly 47011a70db [formerly 1ad7f83443c33f8b73d2ad8a9b2f574fd37db9e2]]
Former-commit-id: 47a0477587
Former-commit-id: b929b7aa02
2013-11-14 17:07:54 -06:00