Commit graph

123 commits

Author SHA1 Message Date
Max Schenkelberg
cf9e6ff3b2 Issue #1329 Committing some of the core classes touched for MPE time refactor. Made GL data mapping work properly with non float types. Made GriddedImageDisplay2 use new TileSetRenderable for processing and memory efficieny
Change-Id: Ib12a3a6bb1f20f1e8eeb6dbd170802cf79359cfb

Former-commit-id: 24938de2d2 [formerly be99f6c7ca] [formerly 3e128b266a] [formerly 5db71ca943 [formerly 3e128b266a [formerly eaeb75b4f2dd1c19f805c8cf4f4d010b455d99e8]]]
Former-commit-id: 5db71ca943
Former-commit-id: e215a3aeda7dede45a9e7e93feb2e2f2e9e6e34b [formerly b74d788909]
Former-commit-id: d43e0c1c25
2012-12-12 11:39:32 -06:00
Steve Harris
88f9070c93 Issue #1408 - Merge branch 'ss_builds' (12.12.1-12) (via branch 'mergetest') into development
Former-commit-id: e0e596120c [formerly d4686333a1] [formerly ab8b1ae64d] [formerly ce72ebb094 [formerly ab8b1ae64d [formerly 794a9a083b8340d322c915139968ba5a4fe2ee54]]]
Former-commit-id: ce72ebb094
Former-commit-id: 638be45c65cc1e7b65d1b4e332046932a30ff790 [formerly 113fdcb679]
Former-commit-id: 15849ae72a
2012-12-11 08:56:54 -06:00
Steve Harris
377804398b Merge branch 'ss_builds' (12.12.1-12) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java

Former-commit-id: d27c5237c3 [formerly 4d4771ee3a] [formerly 43ddfe98c4] [formerly f6988eefff [formerly 43ddfe98c4 [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]]
Former-commit-id: f6988eefff
Former-commit-id: e2ccbce82667d7cf9a91d423288dfe898f82ff00 [formerly 6287b32e7d]
Former-commit-id: f02c1ef71d
2012-12-11 08:45:53 -06:00
Nate Jensen
adad056c53 Issue #1396 fix thin client
Change-Id: I58dc3f40594697d8332cc372f45f30bb28927100

Former-commit-id: 52b55cdf65 [formerly 851f8977f3] [formerly 020b84e373] [formerly 03e6f7ee16 [formerly 020b84e373 [formerly 1afd50427bff0a11ebbf99eb3b29d2d8c3e02c44]]]
Former-commit-id: 03e6f7ee16
Former-commit-id: db935f8f15b87218882a4babaf96d3d58289cbba [formerly 496fa1ede9]
Former-commit-id: 7c0941e292
2012-12-07 11:59:13 -06:00
Ron Anderson
7c09ef9001 Issue #1395 Updated ShadeableCapability to specify opacity (alpha) to be used for shading
Change-Id: Ifeb87aa3dc83c34c4599f22bbb2ed540e82d6c06

Former-commit-id: 0c849c04d7 [formerly 45914e0a46] [formerly bb163074fa] [formerly b6fcd999f4 [formerly bb163074fa [formerly 596a5c305e2c7be6e76c8d623a2fd4d5a5ffb7f7]]]
Former-commit-id: b6fcd999f4
Former-commit-id: a37aae4d7e209290f67a1eb565eee632c0e19fd2 [formerly 70cca3900b]
Former-commit-id: c5b3111795
2012-12-06 17:02:56 -06:00
Ron Anderson
76141bfc05 Issue #1395 Modified LineStyle to contain a definition of the style so that GL and SWT can render them the same way
Change-Id: I9e9875c3d56870309d4c5420a541674fb8733a09

Former-commit-id: 03dff87b0d [formerly 330e913cb2] [formerly 5143e82d4a] [formerly 9398573f2f [formerly 5143e82d4a [formerly 6c2704dffcbadab19611464df580f781bb5ebefd]]]
Former-commit-id: 9398573f2f
Former-commit-id: d82c8ff0301aef55921e5f77656fa41a6963ce17 [formerly 10479a1909]
Former-commit-id: d42afa44dc
2012-12-06 15:38:04 -06:00
Dustin Johnson
46c2b31f91 Issue #1377 Break registry dependency on data delivery
Change-Id: I232f4d23497f37d5f4f9883048e9c3bda84551ea

Former-commit-id: eda8a2208f [formerly 6d1831b002] [formerly bba092f51e] [formerly 529238d010 [formerly bba092f51e [formerly f560beb5c66541859abd36cab855a7b6a8c8ded9]]]
Former-commit-id: 529238d010
Former-commit-id: a57882853f80c6e174dda103c8aec580f19821e6 [formerly 1b165c8e73]
Former-commit-id: 5953c5372f
2012-12-03 12:06:32 -06:00
Max Schenkelberg
1f8c88490a Issue #1328 Cleaned up time matching API for GFE use. Removed notion of time match basis from AbstractTimeMatcher and moved code using it into D2D specific plugins
Amend: Added back in TimeMatchBasisCapability.  Someday will need to figure out bundle migration since this unused class can never die

Change-Id: I3086daa43e553202565e2b88f455d4dd0bfc65f6

Former-commit-id: a113ecd2ea [formerly 56ae27e172] [formerly b648c5828e] [formerly ed77d56a84 [formerly b648c5828e [formerly fa693a9bb802af2491c70c14aa7ab33485fb4915]]]
Former-commit-id: ed77d56a84
Former-commit-id: 9fbbf5fdd49d3393d497c172fb165e221cdc3c0c [formerly b24440cc37]
Former-commit-id: f681c1304c
2012-11-29 10:29:36 -06:00
Nate Jensen
c5a27b653a Issue #1323 fix build issue
Change-Id: I5918a05535bc7e928214075784f615cf454d2972

Former-commit-id: f2ff0e89ca [formerly cbb77b884b] [formerly d76ab40583] [formerly f24fcc07cf [formerly d76ab40583 [formerly db083d70f18b771740f73ecb787c103b5264881d]]]
Former-commit-id: f24fcc07cf
Former-commit-id: 77af90edc781818f265653aebd82cbfac24f0a3f [formerly 10be056dcb]
Former-commit-id: 8a4544a632
2012-11-27 09:07:07 -06:00
Dustin Johnson
add45e6805 Issue #1322 Move router registry to edex.xml
Amend:
  Add requestRouterRegistry to viz Spring file.

Change-Id: Id2697aaca02662bd1bb9f759070b2cde8f1dd864

Former-commit-id: ea7537804c [formerly dd82a472e5] [formerly 13b1683458] [formerly a9d01486ed [formerly 13b1683458 [formerly dc3f0b465628d312f675b16d61c0456bf79edc7d]]]
Former-commit-id: a9d01486ed
Former-commit-id: c8e8f27647ef18ecfbb5e4b6ae6a9f36c8133dea [formerly 1bb69653af]
Former-commit-id: dd03bf9bd5
2012-11-19 13:21:03 -06:00
Dustin Johnson
9b9f41cb5a Issue #1322 Add server keyed routing
Amend:
  Remove ServiceLoader files for RequestRouter.
  Resolve peer review comments.

Change-Id: I249917931c2d7fd2d074203b6007cdf66952f04b

Former-commit-id: 22c930824c [formerly d1024d091c] [formerly 87148a8061] [formerly 8a6be78eb0 [formerly 87148a8061 [formerly d7010894ecd0d1702567d52260fdf6088468eb09]]]
Former-commit-id: 8a6be78eb0
Former-commit-id: 0e562f6e19c01c0c23b34e7e423696a3b7663f29 [formerly 1d5714b994]
Former-commit-id: a448369b44
2012-11-16 14:43:45 -06:00
Max Schenkelberg
d86550c239 Issue #1243 moved locking for getFile into adapter code for cave since that is the only time a file is actually downloaded and requires locking
Change-Id: I39920677769e1a885ac7b3f1003dd52ae1dc2737

Former-commit-id: a40abfda65 [formerly a472f5535b] [formerly 655f54b098] [formerly f540f65fd7 [formerly 655f54b098 [formerly 4648ab539b37a0608ab7ebab5080317bbf618504]]]
Former-commit-id: f540f65fd7
Former-commit-id: 6ed55cce2d899bb904eca4a9886c9f8d39f745d2 [formerly f1866b2e49]
Former-commit-id: db2fe0b5e8
2012-11-15 16:21:42 -06:00
Max Schenkelberg
91607fb03e Issue #1243 Made localization lock more intelligently to avoid files getting out of sync and causing errors.
Amend: Fixed LocalizationFileOutputStream so it has option to close and save file and made LocalizationFile.write so it is more clear as to
what it is doing. Made CloudHeightData and AdaptivePlotResourceData not create FileUpdateMessages.

Amend: Rebased

Change-Id: I5aff6402004f4b4d3040c8c71f5ee16dfeb33567

Former-commit-id: 61f0c0501b [formerly fe11e31bfb] [formerly dcde9e8951] [formerly 28e61c8285 [formerly dcde9e8951 [formerly 85a0b9bb03887b9ef50e67a1ae3a36afd24b3a58]]]
Former-commit-id: 28e61c8285
Former-commit-id: 5f777b3fc72c55ae811d6c28a223bff8a71b24e9 [formerly 2e20c3e799]
Former-commit-id: 5aa26e4f13
2012-11-14 16:19:37 -06:00
Max Schenkelberg
25f5a9b1aa Issue #1308 removed activemq references in spring file, made gfe common xml explicitly depend on time xml
Change-Id: I784b077d1ab2d929ddad1cb69fccc4a8c5e0729e

Former-commit-id: 1ed5f10230 [formerly 30c1802398] [formerly d1099addc6] [formerly 00822a4f39 [formerly d1099addc6 [formerly e696b81840b6c1f0a0df8a9f20b859f23bc5a3e7]]]
Former-commit-id: 00822a4f39
Former-commit-id: 5eaaf2b42110ba677fab87f22b62f6cd269072be [formerly c4e5092f94]
Former-commit-id: 4408af827f
2012-11-12 16:46:21 -06:00
Dustin Johnson
cd5faf58bf Issue #1302 Address peer review comments for 5-Data_Delivery/development merge
Amend:
  More peer review comments
  Restore PreferencesHandler

Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7

Former-commit-id: acd4cf94d8 [formerly efd3d3735a] [formerly 064ef82d1e] [formerly 1dbeb22893 [formerly 064ef82d1e [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]]
Former-commit-id: 1dbeb22893
Former-commit-id: 6b7958c5dca22552e39ad9f77a0bdd977908f9dc [formerly 4222b24d09]
Former-commit-id: 2d1e886cf3
2012-11-08 09:57:16 -06:00
Max Schenkelberg
f9e6347863 Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration.
Change-Id: If392126da6b7b27be20bbcb2423ab0e851307345

Former-commit-id: 94e64c9b0d [formerly f069f34a96] [formerly 11111d3a29cb179e3e47566262a8a2be05fd32e6 [formerly 2f90120248]] [formerly ca4177dd08 [formerly 2f90120248 [formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]]
Former-commit-id: ca4177dd08
Former-commit-id: 42f60026840ae4bf86371ebfd3e40ca565028c4b [formerly 747ab974e9]
Former-commit-id: 5a5bd522a1
2012-11-07 10:44:42 -06:00
Dustin Johnson
fe8a2a3b09 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: 7d0e4a6e75 [formerly 8e69107b5a] [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]]
Former-commit-id: 31d7d09c10
Former-commit-id: 465044dd2793505eba62cb46e6b3a8ac48623765 [formerly bcf575966b]
Former-commit-id: e7a0f96a9a
2012-11-01 13:36:06 -05:00
Steve Harris
6a81945d07 Fixing fields duplicated in merge of 12.11.1-4 baseline
Former-commit-id: 21136b0560 [formerly 18ec4b5933] [formerly 559540ffbbcbfef9a40622bca48b2ab297be7483 [formerly 34e7b3f4a3]] [formerly 8703ff00c7 [formerly 34e7b3f4a3 [formerly 477c64cbd4614e080d84fe1b0b5733274eeee838]]]
Former-commit-id: 8703ff00c7
Former-commit-id: a128d53471bbb82cdb98a297cb2308d5a1ee6417 [formerly dc5eba737d]
Former-commit-id: 31253e2949
2012-10-17 08:21:19 -05:00
Steve Harris
d88afce365 Merge branch 'ss_builds' (12.11.1-4) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/procedures/IAlterBundleContributor.java
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/AlterBundleDlg.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/CoordinateInputPanel.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointEditDialog.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointsMgrDialog.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/layer/PointsToolLayer.java
	cave/com.raytheon.uf.viz.radarapps.core/src/com/raytheon/uf/viz/radarapps/products/ui/BaseRadarProductUI.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ToolsAlterBundleContributor.java
	cave/com.raytheon.viz.gfe/help/EXAMPLElocalMaps.py
	cave/com.raytheon.viz.gfe/help/EXAMPLElocalMapsAdd.py
	cave/com.raytheon.viz.gfe/help/localMapsConfig.html
	cave/com.raytheon.viz.gfe/help/mapConfig.html
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/Maps.py
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/DbShapeSource.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/ShapeTable.py
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/util/WorldWrapCorrector.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
	rpms/common/yum/arch.x86/comps.xml

Former-commit-id: c19835d4be [formerly da7a11fe97] [formerly 4610ecc513] [formerly 751563e331 [formerly 4610ecc513 [formerly 07beab271f793ae79fcf9233f9d384702ead22a9]]]
Former-commit-id: 751563e331
Former-commit-id: 4390735c107d9ebc5c839213d322a92aad724790 [formerly 0c0c1144c6]
Former-commit-id: d0e91329b4
2012-10-16 15:48:14 -05:00
Steve Harris
c9b563338a 12.11.1-4 baseline
Former-commit-id: 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]
Former-commit-id: 6958b861f0
Former-commit-id: d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce]
Former-commit-id: 2c82d9cb07
2012-10-16 13:27:07 -05:00
Nate Jensen
446d7f5f13 Issue #1265 Enable configuration of compression on all current HttpClient traffic, but disabled by default
Change-Id: If87b57083015bcb4df0d8d302121fd3b981b1eae

Former-commit-id: 134d8a2e3b [formerly cbc2da0c06] [formerly f2cbf0c5c3] [formerly 8e4a7ec406 [formerly f2cbf0c5c3 [formerly 6d20dbb01981135ea49e1a883c3ba307bdcd8ff1]]]
Former-commit-id: 8e4a7ec406
Former-commit-id: c35558c0281157096518a8d9e3647aa801d78a21 [formerly 5bdf9d4d38]
Former-commit-id: 93143bbda0
2012-10-12 15:16:27 -05:00
Roger Ferrel
0653f130b8 Issue #1248 Changes to allow change listeners on Alter Bundles.
Changes from code review 2.

Change-Id: I8f8640a9c90c0191179c74570855a67370617a20

Former-commit-id: a001e54a85 [formerly 65a19e48b0] [formerly e7d27f4aab] [formerly 03070aded9 [formerly e7d27f4aab [formerly de530f99fcc7f68a1bd84ed399ff04eac63e7a58]]]
Former-commit-id: 03070aded9
Former-commit-id: 1db773c056a395caee481c1f3227dcbac2e92bae [formerly f4861554cd]
Former-commit-id: 09bb914dc0
2012-10-10 06:52:09 -05:00
Steve Harris
d6f07f7013 Merge branch 'ss_builds' (12.11.1-2) into development
Change-Id: I4d3416f5f91d7955dd8eb274cd536563862e2b73

Former-commit-id: a6c3e16c69 [formerly 7be572b27d] [formerly 634c6bd63f9ed7885295630247765c53b3e97028 [formerly 8c97afe03b]] [formerly 0895f22690 [formerly 8c97afe03b [formerly 1a255600a5e909dc4189e9c88d0735157a400a1d]]]
Former-commit-id: 0895f22690
Former-commit-id: 0ccc977e5162ad8a17c1a30f58a15fa4f27ad13b [formerly 8dae024430]
Former-commit-id: 48a80a23e4
2012-10-08 13:29:34 -05:00
Steve Harris
6e0b2c55d7 12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b

Former-commit-id: 04da0dbf50 [formerly 75901860c2] [formerly c12ee14e66] [formerly 1e02387ff1 [formerly c12ee14e66 [formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]]]
Former-commit-id: 1e02387ff1
Former-commit-id: 4b6477f6b0ceaafd125d3a6350ab34e5d7c81ad7 [formerly 42bf60b2fc]
Former-commit-id: 772c60efa4
2012-10-08 13:26:20 -05:00
Ben Steffensmeier
32ebb2c4c7 Issue #1151 move alert parsing into the resource data so that it can clear the time cache for derived alerts.
Change-Id: Iba5b641fbd6e8fa3657a7dd2311ae18cf63456f8

Former-commit-id: c3d732b9dd [formerly b4d7183cdd] [formerly 65b803caacde99b22587bcf672732ee089e5e25a [formerly 42ae490a50]] [formerly b6e124f830 [formerly 42ae490a50 [formerly 4f648f3ea23cd2d300bb92228e20d7f2678718fd]]]
Former-commit-id: b6e124f830
Former-commit-id: 7bcd6df46a77a7bee1474c158e30b4e4396a5765 [formerly 2cdb3553e9]
Former-commit-id: fdddbebddc
2012-10-05 14:28:35 -05:00
Steven Harris
9c67bbab77 12.11.1-1 baseline
Former-commit-id: ffe3641057 [formerly 0e86bfd1d3] [formerly 618aa3f316] [formerly feec28f274 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]
Former-commit-id: feec28f274
Former-commit-id: 5951ea0cd95d43633ba501132c7b65a55db27e09 [formerly 8843ffd022]
Former-commit-id: f5e63d5f93
2012-09-27 15:57:45 -05:00
Max Schenkelberg
2eaaa36856 Issue #1214 Made VizGlobalsManager check for null window before calling getPage() since getInstance() still returns succesfully when null window is passed in. Change TimeMatchingJob to be shutdown when core plugin stops and cancels existing jobs.
Amend: Removed println

Change-Id: I3559b13074eb025e9bf931685cda3e804037baff

Former-commit-id: 8a9ba0178b [formerly 51e565c6ff] [formerly 4b2467e639] [formerly edfd7fd22f [formerly 4b2467e639 [formerly fc617c1392d9585d2e91e371af74aad4b24acfbb]]]
Former-commit-id: edfd7fd22f
Former-commit-id: 6c26ac1dfaab3d2a090ad759e28fbd78f175087c [formerly 63c30eafc2]
Former-commit-id: f0376e0240
2012-09-24 15:39:18 -05:00
Steve Harris
61bb5bf595 Merge branch 'development' into Enhanced_points and Enhanced_points into development
Former-commit-id: 912cec518b [formerly c64e9b0ad9] [formerly 72ecefa9ee] [formerly fe92909f53 [formerly 72ecefa9ee [formerly 9f938d77412ff1d09a8314bb650ddef8eabf73fb]]]
Former-commit-id: fe92909f53
Former-commit-id: 0d6cc0b3ec0875f61bc7bd95203b177595d2ed5c [formerly b8d2ff47ca]
Former-commit-id: 91f26b6c0e
2012-09-17 14:58:23 -05:00
Bryan Kowal
0ab345e17f Issue #1181 - replace EnhancedPatternLayout with PatternLayout
Former-commit-id: cff13f2294 [formerly 9915d4c006] [formerly 77d12d0275] [formerly 3a037ffd49 [formerly 77d12d0275 [formerly 29b131727eb8b5b9c450a7f0fd9d1c2c073cc393]]]
Former-commit-id: 3a037ffd49
Former-commit-id: 87357daeaaf9ea2895f17d4854007267e21c00d1 [formerly f516e61f20]
Former-commit-id: 9dc8747553
2012-09-14 12:25:41 -05:00
Steve Harris
92bac7167a Merge branch 'development' into Enhanced_points
Former-commit-id: b84b354c01 [formerly 2e47ad78bc] [formerly 321e2191b1] [formerly 6146f56ce4 [formerly 321e2191b1 [formerly ee63462d73511ef55dc0d80b3e94ef08a37f3305]]]
Former-commit-id: 6146f56ce4
Former-commit-id: 1519ecf79b5f70bd2a5878e760356c231a28383c [formerly 9ca736f901]
Former-commit-id: bc86013d8f
2012-09-13 15:25:12 -05:00
Brad Gonzales
05314b8677 Issue #951 added Appender EnvConfigurableRollingFileAppender.
Change-Id: Icfab60803c647afad6aa30e516083e46b27be75b

Former-commit-id: b384c8372b [formerly 32df328434] [formerly 4b383c3274] [formerly d10cabc917 [formerly 4b383c3274 [formerly 4d103fe06c94b8d5067e44aaabfdac88347f9a96]]]
Former-commit-id: d10cabc917
Former-commit-id: 843e55a046283daa44610ca5e1825fc4341a5d8c [formerly 41dc92ba3a]
Former-commit-id: 2ea4005704
2012-09-13 07:50:56 -05:00
Steve Harris
0f90ce8b04 Merge branch 'development' into Enhanced_points
Former-commit-id: bb6fe85a47 [formerly 892598dc66] [formerly 1dd1305a5d] [formerly ada1066831 [formerly 1dd1305a5d [formerly 632a766ec44337156bab8df73aecdee8b7bc2853]]]
Former-commit-id: ada1066831
Former-commit-id: ad082c7958881e97fce6af73febade39a438deb1 [formerly d85659d9de]
Former-commit-id: e0ee6bbf96
2012-09-12 14:14:56 -05:00
Steve Harris
11421048fb 12.10.1-3 baseline (better than previous which was missing changeset 7d75620)
Former-commit-id: bbc20f4a68 [formerly 22dac5c82e] [formerly 077ced354e] [formerly fd5e214e72 [formerly 077ced354e [formerly af8ffe73c81cd980843f137800f9fbb453c9e2c0]]]
Former-commit-id: fd5e214e72
Former-commit-id: bdf8cbe13f96fe312d8ad014285d113e04c8d85a [formerly ba25027ea5]
Former-commit-id: 9f3bd0d4ec
2012-09-12 13:10:36 -05:00
Max Schenkelberg
1e81c703f1 Issue #1164 Revereted Friedman changes to time matcher over last 5 months. Fixed original issues for DRs 14699 and 15160 by getting rid of setTimeList on AbstractTimeMatcher and instead calling redoTimeMatching when a resource is added. Also made time matching happen in job when resource is removed.
Change-Id: I7f72f9782f0f28b25a202e48e5391d1ad34ce91d

Former-commit-id: 5e94274b98 [formerly a6cc869ada] [formerly 7294025e26] [formerly 2f8f1ce9b2 [formerly 7294025e26 [formerly 64194223bc30a629b32ca8aa5cefbcfdf8fd6776]]]
Former-commit-id: 2f8f1ce9b2
Former-commit-id: 879019359ad23ac206937c8d749c606eda7eac91 [formerly c26d21d908]
Former-commit-id: 52e812ec0e
2012-09-11 16:27:41 -05:00
Steve Harris
64699fa90b 12.10.1-3 baseline
Former-commit-id: 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 969e7e6dfd [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: fcb66f8bc7809d9eb8a7989d2e1acbdbe19fb78e [formerly 438d139fdd]
Former-commit-id: f376a4b4db
2012-09-11 16:00:38 -05:00
Max Schenkelberg
827ef7301b Issue #1138 Changed LocalizationFile.protectedFile from boolean to LocalizationLevel so the protected level is specified if the file is protected. That way the file browser knows what level the file can be copied or moved to. Made speed improvements to perspective when refreshing files and consolidated different ways of doing same thing. Made all localization actions check protected level when setting if enabled or not. Added tool tip to protected files to show they are protected in view.
Change-Id: Id6862f29f431dd79758e39282659a670fe3a1536

Former-commit-id: f7abe9ee39 [formerly 6d78afd423] [formerly 80439b309b] [formerly 84658dd03a [formerly 80439b309b [formerly 1d5b8912fe38bd21496c7b9f4ba385e27d7dedcd]]]
Former-commit-id: 84658dd03a
Former-commit-id: f9f8eef104b9eb8e02ca5321a8ca3396d4878105 [formerly 20f5d966db]
Former-commit-id: d2d74fac20
2012-09-10 10:45:37 -05:00
Max Schenkelberg
e7b2f69ff3 Issue #29 Changed how TileLevel calculate pixel density to make densities more consistent between granules on display. Changed TileSetRenderable level change threshold to smaller value so displays look less pixelated with new pixel density calculation. Fixed FileTreeView from throwing errors if two definitions with same name defined which came to light from NPP build
Change-Id: I66b556b74e1a856dace5447c4b9f090d026c493c

Former-commit-id: e06d1dabef [formerly a14d5d4c86] [formerly c183a0e614] [formerly 28d6308444 [formerly c183a0e614 [formerly a4dd750d4bbdaae4a548c9a296436cc783d2d71a]]]
Former-commit-id: 28d6308444
Former-commit-id: b4ace038bdcc2b915892986d414af1d5d5480636 [formerly 87bcbdb4cc]
Former-commit-id: 45d6b7bcb5
2012-09-05 11:51:38 -05:00
Steve Harris
20e088a957 Merge branch 'ss_builds' (12.10.1-1) into development
Former-commit-id: 319927240c [formerly 0e046d847a] [formerly bba4eb12d0] [formerly af106f1d29 [formerly bba4eb12d0 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]]]
Former-commit-id: af106f1d29
Former-commit-id: fa15b185c1fb287218beaf2772d775077049f22b [formerly 53e29f59e4]
Former-commit-id: f224e3e8ad
2012-09-04 12:11:03 -05:00
Steve Harris
9f4fa7bf83 12.10.1-1 baseline
Former-commit-id: 7248f8b762 [formerly 0abf64b77c] [formerly 195158c004] [formerly d708932029 [formerly 195158c004 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]
Former-commit-id: d708932029
Former-commit-id: eb876c43cf6e8b687c0e099c754e050f9cb32001 [formerly 7bd9c63dc7]
Former-commit-id: e720b8ed31
2012-09-04 12:07:27 -05:00
Steve Harris
ff1a0c911d Merge branch 'development' into Enhanced_points
Former-commit-id: feccb1205d [formerly fa7c31206b] [formerly 5feac55dbd] [formerly 32cf7fd764 [formerly 5feac55dbd [formerly 3aec6326bfce36758b93c7955ce3d0ee49e30cc3]]]
Former-commit-id: 32cf7fd764
Former-commit-id: 9a3bf8cf46dc47950600c368d21537bbdc91f65e [formerly 592ab923bb]
Former-commit-id: 5a8e58eda5
2012-08-30 15:43:06 -05:00
Steve Harris
fd6e8d5b63 Merge branch 'development_on_ss_builds' (with 12.9.1-5) into development
Conflicts:
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGribGridResource.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelDataRequestJob.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelGeneratorJob.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWarningResource.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java

Former-commit-id: 772c4359da [formerly 51eb89eb2a] [formerly 91e39617cb] [formerly a71dac6cad [formerly 91e39617cb [formerly b9db13cf5bff60511d815f92f0239a4313498265]]]
Former-commit-id: a71dac6cad
Former-commit-id: 1be860f8d952be20f92f7830faeba102244c82ba [formerly 87a602dfee]
Former-commit-id: dbcb28ce77
2012-08-27 09:53:55 -05:00
Max Schenkelberg
8fb5b29881 Issue #28 Changed ResourceList so it can be extended to allow duplicates. Removed deleted files from ISerializableObject files. Made TileSetRenderable properly issue refresh when images were still being requested. Made true color code work by only showing intersecting areas of all bands on screen. Made so shader files would be reread in if edited.
Change-Id: Ib2ce27522c59f25ce1cef65e6d7665e28963f081

Former-commit-id: 97759c7ce1 [formerly 1f84ddbddf] [formerly 75b2cdff47] [formerly c4812b7745 [formerly 75b2cdff47 [formerly 291edbc6bd69815e003179e9ce708b6fdad254ad]]]
Former-commit-id: c4812b7745
Former-commit-id: 991a8632682c94855dfb4abec915f0eae9146f28 [formerly 7f506ce81d]
Former-commit-id: 6f96fa5045
2012-08-23 17:37:12 -05:00
Steve Harris
d9faed979f 12.9.1-5 baseline
Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb]
Former-commit-id: 7fb0b17bd5
2012-08-21 15:27:03 -05:00
Max Schenkelberg
56496dc03e Issue #28 Cleaned up True Color code and removed old MultiChannel code. Adding capping index back to indexing.glsl and added no data value to ColorMapParameters that should be used for finding no data values in shader and in java. True color dialog was written but not hooked in yet as need to still think about single resource tied to multiple channels and serializing changes.
Change-Id: I20bff443fe4c9b9330c0a66779218227c48df014

Former-commit-id: 79d98841a0 [formerly fc06265360] [formerly b69d2cad1c] [formerly 1b406ecfca [formerly b69d2cad1c [formerly 564b38b30562a371cf0345de572b32ea8f53e82e]]]
Former-commit-id: 1b406ecfca
Former-commit-id: 71e7ec51b8b8299ebc4b78fb5367003fc83ce4f5 [formerly aa9df46a1d]
Former-commit-id: 47cefd1513
2012-08-20 14:47:14 -05:00
root
791f3f5b85 Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: bb7b5341dd [formerly 0987fc6b3d] [formerly cb46f57879] [formerly 5a453ee984 [formerly cb46f57879 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]
Former-commit-id: 5a453ee984
Former-commit-id: 9fa79e8d9e9e82e29b8bae3cd42dbb3e0f9f0f26 [formerly 8a66b2f209]
Former-commit-id: 537dbadf64
2012-08-15 22:15:20 +00:00
Steve Harris
d3023f15ac 12.9.1-1 baseline
Former-commit-id: b9fb1c89d4 [formerly 8309193ce9] [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: b452006db8c662d7b75e89f5dcc158103aa65a9b [formerly 0c5d9e2416]
Former-commit-id: aed7a644df
2012-08-15 13:59:00 -05:00
Steve Harris
25585ca8d7 Merge branch 'development' into Enhanced_points
Former-commit-id: 9a5ad2fdae [formerly e372481f81] [formerly 346d775f57] [formerly f7f97d9f54 [formerly 346d775f57 [formerly 25026a4d9955b76039bf25861380cadebff19665]]]
Former-commit-id: f7f97d9f54
Former-commit-id: f736245d042a572679a95e4b5cdd7ce4dcb5ef0f [formerly 031b655ab5]
Former-commit-id: 73e357c39d
2012-08-15 13:35:47 -05:00
Max Schenkelberg
84e54dbb2a Issue #28 Implemented generic true color resource with new extension. Wrote new, more efficient, accurate, and scalable TileSet rendering/managing code to replace AbstractTileSet which VIIRS uses since it took over 10s to load a single frame of data with AbstractTileSet and around 20-30s to load a single true color frame of VIIRS. Put true color code in separate projects to encapsulate functionality. Resources need not depend on these projects, they just have to set the ImagingProvider in their ImagingCapability and true color resource can be loaded through a bundle file.
Change-Id: I624edb115b02611470e2e434e27759c45600111c

Former-commit-id: 5c4ba85189 [formerly d6522f8e3a] [formerly 93e8619fa5] [formerly 09b0db0a13 [formerly 93e8619fa5 [formerly 7d75620c07c992ab74a8305a69ed87817f8f0639]]]
Former-commit-id: 09b0db0a13
Former-commit-id: 2ae9659aef573b9f509312fe7c176e5105ef0760 [formerly 784c43ab7c]
Former-commit-id: 107efcaee3
2012-08-13 12:20:05 -05:00
Roger Ferrel
f8e0bfb797 Issue #875 Markers and group added to Cave.
Amend: Removed python file

Amemd: Changes based on reviewer comments and additon of popup menus in the PontsMgrDlg.

Amend: deleted unwanted .project file

Amend: Removed comment out code and fix class descriptions

Amend: Changes based on reviewer comments.

Change-Id: I32c9dd754d1bfa06b470872b052b61e42adf11e8

Former-commit-id: f8d0512703 [formerly b3c357c964] [formerly 2e3fc4b400] [formerly f4ae8eb150 [formerly 2e3fc4b400 [formerly c8e5bf1a82979ebc2445acb88682e32ca8813f43]]]
Former-commit-id: f4ae8eb150
Former-commit-id: f9ea3b03486c9aff9f813d9e892a99cac8ea4ff8 [formerly ae41499ba2]
Former-commit-id: 69f22fe6bb
2012-08-08 13:35:47 -05:00
Steve Harris
330c7a877c Merge branch 'ss_builds' (12.8.1-5) into development_on_ss_builds
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/AbstractParmManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/VCModuleJobPool.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/GFEColorbarResource.java
	edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	rpms/awips2.64/Installer.h5py/component.spec
	rpms/awips2.64/Installer.python/component.spec
	rpms/awips2.64/Installer.python/src/lapack.patch1
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/python.site-packages/Installer.pupynere/component.spec

Former-commit-id: 0557c9a0c6 [formerly fb47934159] [formerly 6d77b94217] [formerly 51e38ca887 [formerly 6d77b94217 [formerly 1b17cebeb85f871d950bd02e27141b11d977c3ad]]]
Former-commit-id: 51e38ca887
Former-commit-id: 01cf1f328ecb5a3b2a058b016779fc32e6f68081 [formerly 3476fe755b]
Former-commit-id: d2291ba23f
2012-08-01 12:43:12 -05:00