xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6235 commits 31 branches 40 tags 3.8 GiB
Commit graph

71 commits

Author SHA1 Message Date
Steve Harris
7eabeb7ad6 Merge branch 'omaha_14.3.1' (14.3.1-8) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/whfslib/colorthreshold/GetColorValues.java
	edexOsgi/build.edex/edex/common.properties
	edexOsgi/build.edex/esb/conf/modes.xml
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so

Former-commit-id: 647cd97e29 [formerly 7fec0d039c] [formerly 647cd97e29 [formerly 7fec0d039c] [formerly 455eb8b39d [formerly 45250149681f057cf168f4d3cb27276279f62c05]]]
Former-commit-id: 455eb8b39d
Former-commit-id: 373c816e6a [formerly ec743199f1]
Former-commit-id: cbceb4ea62
 2014-06-02 11:21:46 -05:00
Brian.Dyke
9351315fd6 Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1 
VLab Issue #3454 - HPE dual-polarization upgrade

Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
	edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults

Former-commit-id: a0a879be7d [formerly a8737e18f0] [formerly a0a879be7d [formerly a8737e18f0] [formerly 3f1e12effc [formerly 9d7a819489480e119b65cb5643520818adeb1ebf]]]
Former-commit-id: 3f1e12effc
Former-commit-id: 3961c75ecd [formerly 66aacd6578]
Former-commit-id: a23d371522
 2014-05-30 10:46:25 -04:00
Nate Jensen
caf433d525 Omaha #3133 Removed dead hydro code and related dependencies 
Change-Id: I15daffddd4219541cac44b2d5930a69e1e864e6a

Former-commit-id: a984e7ac9a [formerly 514c9d3a0c] [formerly a984e7ac9a [formerly 514c9d3a0c] [formerly 67ac5fa242 [formerly 13d3dc45edab66106e9aa5a1149ca05e94d144c3]]]
Former-commit-id: 67ac5fa242
Former-commit-id: a25a8b69eb [formerly c2f78a6888]
Former-commit-id: 11899e65e2
 2014-05-27 18:23:38 -05:00
Chip Gobs
47068a7939 VLab Issue #3454 (OHD Dual-Pol enhancements for MPE and HPE/HPN (DCS #167,DCS #168) and PostAnalysis (DR #9784) ) 
Change-Id: Id96c25de545144d769309fef608c431d67d1bada

Former-commit-id: 4e4d00792d [formerly 65d2135ac2] [formerly 4e4d00792d [formerly 65d2135ac2] [formerly e42bef2a33 [formerly 1f43b57d7dffe0d1c4002ff9f1dd789a47b97734]]]
Former-commit-id: e42bef2a33
Former-commit-id: c075175e8e [formerly 593b36d722]
Former-commit-id: 1b7f762617
 2014-05-06 10:48:35 -04:00
Xuezhi.Wei
2bc8a6c5fd ASM #545 Hydrobase IngestFilter GUI fixes 
Change-Id: I368113a8ccb0356198a52a9d5c8a39247dce68e8

Former-commit-id: a647b1ddf3 [formerly c4fc2f169b] [formerly a647b1ddf3 [formerly c4fc2f169b] [formerly 071a1ae06a [formerly a8710a68e4aa28861c03c5d988bc36a553704c31]]]
Former-commit-id: 071a1ae06a
Former-commit-id: f31f39a875 [formerly 1ce32e2be1]
Former-commit-id: 57a6bcfca6
 2014-05-02 16:55:36 +00:00
Richard Peter
a22345ea6b Merge branch 'omaha_14.2.2' (14.2.2-3) into development 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Former-commit-id: cd51f3fa87 [formerly 3575d6586f] [formerly cd51f3fa87 [formerly 3575d6586f] [formerly 21ae3b5fcd [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: d65b11d404 [formerly a7ec0bcf66]
Former-commit-id: b6482f2e54
 2014-04-11 16:23:09 -05:00
Everett Kladstrup
7b2683532a Issue #2725 Move derived parameters logic to common 
* Make derived parameters not use VizException
* Move derived parameters packages from the viz hierarchy
  to the common hierarchy
* Move data cube classes that don't depend on derived parameters
  to thier own plugin
* Moved DataCubeContainer and supporting frontend classes from
  viz.core to viz.datacube


Former-commit-id: 8b19b3601a [formerly 06d6961c0f] [formerly 8b19b3601a [formerly 06d6961c0f] [formerly 0699041518 [formerly ad4a8cfbbc6de72810492c8f1de9701d381b6019]]]
Former-commit-id: 0699041518
Former-commit-id: 86bf2b5ea0 [formerly 260d0beddc]
Former-commit-id: d96b56c91a
 2014-04-09 09:31:12 -05:00
Mike Duff
b0a9b09f16 Issue #2689 - Add input values to log statement on LL to HRAP conversion failure. 
Fix error in HRAP overlay resource.

Change-Id: If6fcb23a839323e4541e8ff28c0d702bf3066273

Former-commit-id: d5c3ddcef8 [formerly be9cf109b1] [formerly d5c3ddcef8 [formerly be9cf109b1] [formerly 5f1f931c64 [formerly ee88ab32961525d74a227cccec615c0610dc9525]]]
Former-commit-id: 5f1f931c64
Former-commit-id: c518a6710b [formerly da5a3bf858]
Former-commit-id: a007cb795c
 2014-03-31 11:35:06 -05:00
Loubna.Bousaidi
1eb79ede56 ASM #380 - Hydro--TimeSeries:error thrown when click Table button 
Change-Id: Ifca1581cbcf48346082a6afb976a927a3d878b09

Former-commit-id: 27447d7b76 [formerly 123007b18d] [formerly 27447d7b76 [formerly 123007b18d] [formerly ce2bea0a04 [formerly d2161a0fdd0bad7f8266a8b30659021edecaa549]]]
Former-commit-id: ce2bea0a04
Former-commit-id: b5cb73fd5a [formerly 6f7b1b6ca8]
Former-commit-id: 7eb94c4651
 2014-03-11 18:58:26 +00:00
brian.dyke
ca9263003a merge 14.2.1-3 into asm-14.2.2 
Former-commit-id: 4a62e83835 [formerly 2294c81a57] [formerly 4a62e83835 [formerly 2294c81a57] [formerly f10f6d4e8a [formerly a116be206fc8a24dd12610db37db6f26c65a19b0]]]
Former-commit-id: f10f6d4e8a
Former-commit-id: 621464ac0d [formerly e9e2eb3be0]
Former-commit-id: dcf5f25ed1
 2014-01-27 15:27:49 -05:00
Ben Steffensmeier
9a87e95aac Issue #2312 Add ability to export gif and image export dialog. 
Change-Id: I10aaeba20a4acc7888cd566107ffff3e6a4fad05

Former-commit-id: b70faf1f7d [formerly fc1c56f9cb] [formerly b70faf1f7d [formerly fc1c56f9cb] [formerly 4ad4b4a859 [formerly e2159c422ca93aa76c6ba7a30a09234e8f9da4ce]]]
Former-commit-id: 4ad4b4a859
Former-commit-id: cd295e4172 [formerly 8b2e5a06bc]
Former-commit-id: 7d083a08c5
 2014-01-21 18:09:13 -06:00
Steve Naples
02b5235c9a Issue #237 
Change-Id: Iab0716c7e09739cbb4a525111eb34ecc0594a388

Former-commit-id: f60d81202c [formerly c2667bd719] [formerly f60d81202c [formerly c2667bd719] [formerly 62dfc1f0b2 [formerly 3f252c7aa8fc5598f3f74c376c713150793868e5]]]
Former-commit-id: 62dfc1f0b2
Former-commit-id: ee525c5525 [formerly 687511035a]
Former-commit-id: 9b13898698
 2014-01-14 16:38:44 +00:00
Ben Steffensmeier
47d3fb8249 Issue #2491 Fix alertviz and java 6 compatibility. 
Former-commit-id: 0c66089721 [formerly 27165cea30] [formerly 0c66089721 [formerly 27165cea30] [formerly 44a6f05986 [formerly 2baf2fdd778b55b76be37503935510b057c5eb0e]]]
Former-commit-id: 44a6f05986
Former-commit-id: 0e3cf8b47f [formerly 1f33a1997e]
Former-commit-id: 0c3bb6ef3e
 2013-10-28 10:14:08 -05:00
Ben Steffensmeier
7f38aac48c Issue #2491 Remove uneeded ISerializableObject files. 
Former-commit-id: f34bfc1e5b [formerly c14cc609a8] [formerly f34bfc1e5b [formerly c14cc609a8] [formerly cac1f07cbb [formerly fd4cc4fde9507cd9abbf394ea5823a8f315c7d55]]]
Former-commit-id: cac1f07cbb
Former-commit-id: ce9653ab15 [formerly a06bdc56d6]
Former-commit-id: 3955ac729f
 2013-10-25 15:31:39 -05:00
Nate Jensen
5d533a8026 Issue #2361 remove ISerializableObject for hydro colors 
Change-Id: Icc4a1e2ebff06ff389e95563406176663000ad7c

Former-commit-id: 472c2693c4 [formerly 0fe5979eac] [formerly 472c2693c4 [formerly 0fe5979eac] [formerly 83fafc638b [formerly f23474913e08b34d1eb82e2106549f57fd36538c]]]
Former-commit-id: 83fafc638b
Former-commit-id: 91ddf05a6b [formerly 7fb250b184]
Former-commit-id: 2e6998e999
 2013-10-10 10:57:59 -05:00
Lee Venable
c8091476fb Issue #2349 - Fixed font memory leaks 
Former-commit-id: 6b171d20db [formerly 02651018f2] [formerly 6b171d20db [formerly 02651018f2] [formerly 0816c3e7c7 [formerly e81149f65d944f9898509a6ff03b063662a88882]]]
Former-commit-id: 0816c3e7c7
Former-commit-id: 0636263f5b [formerly 1db5b00c76]
Former-commit-id: 89dafbbe63
 2013-09-09 16:54:49 -05:00
Max Schenkelberg
1a466db041 Issue #2277 Switched DataCubeContainer calls to not use ScriptCreator 
Amend: Added comments as requested

Change-Id: Ib787d43638f20babfc7f89ce2eac958e31d21c3c

Former-commit-id: 8a500677d3 [formerly b633f9987a] [formerly 8a500677d3 [formerly b633f9987a] [formerly 2d1db7d0e2 [formerly efb402d2835f715143cddffeec2bd7c20d0a65f6]]]
Former-commit-id: 2d1db7d0e2
Former-commit-id: 1bdef4ddd3 [formerly 61e6dd1316]
Former-commit-id: 66d023227d
 2013-09-09 10:10:11 -05:00
Lee Venable
587b808635 Issue #2342 - fixed color memory leak and NPE 
Change-Id: I34c6bf75f3901f7304ef392a4549f51f599752ff

Former-commit-id: 52667faab5 [formerly b71b2c4208] [formerly 52667faab5 [formerly b71b2c4208] [formerly 508757bce6 [formerly 68411a30159f8251937f78d77f561c20a4822e48]]]
Former-commit-id: 508757bce6
Former-commit-id: 9f3666fbbe [formerly 74d23f7948]
Former-commit-id: bf26f7d0fa
 2013-09-06 14:03:14 -05:00
Roger Ferrel
cbd87fe3e2 Issue #2088 Changes for non-blocking PrintTextReportDlg and TextReportDlg. 
Change-Id: I0f999c8334aefb3f2d0e27d91bdea419a96d65e6

Former-commit-id: 1dbcb165df [formerly 6f6da35020] [formerly 1dbcb165df [formerly 6f6da35020] [formerly edb32da7ce [formerly 648aa82a0d6b10a92a44df55eb278b6cc4c9bc1b]]]
Former-commit-id: edb32da7ce
Former-commit-id: 656e94d8f8 [formerly 79f72c3195]
Former-commit-id: 798c82f832
 2013-07-16 14:03:20 -05:00
Roger Ferrel
adec97370a Issue #2088 changes for non-blocking RatingCurveDlg, FindReplaceDlg and TextEditorDlg. 
Change-Id: I8d651254e862a45c1dad33c0d4991b29f1611828

Former-commit-id: 5884bb5692 [formerly d620283c3b] [formerly 5884bb5692 [formerly d620283c3b] [formerly 3eacead9bb [formerly d71b87606a93f744984f45aec8887dbc0052bb4e]]]
Former-commit-id: 3eacead9bb
Former-commit-id: 19ef062429 [formerly c556150c27]
Former-commit-id: a0b46a31ba
 2013-07-16 10:28:32 -05:00
Roger Ferrel
ad4b1aff48 Issue #2088 Changes for non-blocking DataSourcesDlg, ImpactStatementDlg and LowWaterStatementDlg. 
Change-Id: Ib6b6a6b6a2b0c433c30ac31beb6858e4c7a0c768

Former-commit-id: c90a989bd6 [formerly 0ba32179e6] [formerly c90a989bd6 [formerly 0ba32179e6] [formerly e8d21c5d91 [formerly cf769302b9a9b2055f42969dfe781d7aa9c2286b]]]
Former-commit-id: e8d21c5d91
Former-commit-id: 5ca4909f17 [formerly ccd83dab88]
Former-commit-id: 2b4393850d
 2013-07-15 14:26:35 -05:00
Roger Ferrel
0eaa7512c2 Issue #2088 Changes for non-blocking CrestHistoryDlg. 
Change-Id: Iebb031464ab25d1212b1748789f79051528d0c3a

Former-commit-id: 77390e1f78 [formerly b394c8fa41] [formerly 77390e1f78 [formerly b394c8fa41] [formerly 68bc54c334 [formerly fc0cd12d87493527c6a7ddaddd70b77182a7390f]]]
Former-commit-id: 68bc54c334
Former-commit-id: f4bafbf4d3 [formerly e73bfc1a54]
Former-commit-id: 4462cdf67f
 2013-07-15 07:56:14 -05:00
Roger Ferrel
3f8ac119d0 Issue #2088 Changes for non-blocking ContactsDlg. 
Change-Id: I8e9bd796b6b811cbcbd4159d7b209733fffa23df

Former-commit-id: 11625b6eb3 [formerly 9800f069e9] [formerly 11625b6eb3 [formerly 9800f069e9] [formerly 88e0eeb81c [formerly 82e4a0edf2dbe2d2eca430b42adb50f8ec4e8125]]]
Former-commit-id: 88e0eeb81c
Former-commit-id: 52ce08d4f7 [formerly 69d3ccecf4]
Former-commit-id: f0845257e0
 2013-07-11 13:02:13 -05:00
Roger Ferrel
9f1f91258f Issue #2088 Non-blocking ColorScaleMgrDlg and ColorChooserDlg. 
Change-Id: I6f14726a466780e0dbab13d8b64fa2c55acf55d0

Former-commit-id: e73559b871 [formerly d5e66e410d] [formerly e73559b871 [formerly d5e66e410d] [formerly f3bdbde9d3 [formerly 108c5a4957b6d3ab50eacd5792122f7cd2ff3cba]]]
Former-commit-id: f3bdbde9d3
Former-commit-id: 44724d9487 [formerly 696885dc4b]
Former-commit-id: b82c76157c
 2013-07-09 11:13:43 -05:00
Steve Harris
859965fc9d 13.5.1-1 baseline 
Former-commit-id: 6384018950 [formerly 998961612c] [formerly 6384018950 [formerly 998961612c] [formerly fe872355a7 [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]
Former-commit-id: fe872355a7
Former-commit-id: 0aab285b8a [formerly 30ba1d634e]
Former-commit-id: 146c5e8940
 2013-06-10 15:17:17 -04:00
Roger Ferrel
2b5d99a69e Issue #1790 Changes for non-blocking dialogs DescriptionDlg, FloodCategoryDlg, FloodDamageDlg, GageHistoryDlg, HydroGenConfigDlg, LowWaterDlg, NwrTransmitterDlg, PreferencesDlg, PublicationsDlg and QcAlertAlarmLimitsDlg. 
Change-Id: Ic4a3ccb3e13344244415786591accbffda0d0e96

Former-commit-id: 1af1e9e61a [formerly 75c1470c3a] [formerly 1af1e9e61a [formerly 75c1470c3a] [formerly 2dafedfed2 [formerly b9d5321cdeaeb9b37783e96b76321ddb90c0d6dd]]]
Former-commit-id: 2dafedfed2
Former-commit-id: 0018cad990 [formerly 399a54cc4b]
Former-commit-id: cf3f91c2ee
 2013-04-23 11:42:14 -05:00
Roger Ferrel
aee78e2ae3 Issue #1790 Changes for non-blocking dialogs CountyStateDlg, CountyZoneUgcDlg, DataAdjustFactorDlg, DataIngestFilterDlg, DataPurgeParamsDlg and DatumDlg; also changes to hydro data mangagers to remove ArrayList for method interfaces. 
Change-Id: Id5f56669045afd402bed893c13977641ef59835b

Former-commit-id: 2bcc5e655c [formerly c761fd0938] [formerly 2bcc5e655c [formerly c761fd0938] [formerly ec275df412 [formerly 23bf9839c60aa33d7bf43492b72acbeedcf518b9]]]
Former-commit-id: ec275df412
Former-commit-id: 5406b16e40 [formerly ceb9d10fdc]
Former-commit-id: 2ba89dc9f2
 2013-04-19 13:42:46 -05:00
Steve Harris
120fc26670 13.3.1-12 baseline 
Former-commit-id: be96282207 [formerly 0be473728a] [formerly be96282207 [formerly 0be473728a] [formerly aaac0b51e5 [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]]
Former-commit-id: aaac0b51e5
Former-commit-id: f80f98cee2 [formerly bc439aee4f]
Former-commit-id: f1d156779a
 2013-03-25 13:27:13 -05:00
Steve Harris
481cee4c74 Merge branch 'omaha_13.3.1' into development 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java

Former-commit-id: 28ef804e1b [formerly b8f0635ad6] [formerly 28ef804e1b [formerly b8f0635ad6] [formerly 7fcf9f1cb2 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]]
Former-commit-id: 7fcf9f1cb2
Former-commit-id: 2a26783ba7 [formerly 900b9aadde]
Former-commit-id: 22bb7ecd33
 2013-03-18 16:52:00 -05:00
Steve Harris
9d4d1baefe Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1 
Conflicts (just history comments):
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/userPython/procedures/TCMWindTool.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java


Former-commit-id: 27c418812f [formerly 1a999fee5a] [formerly 27c418812f [formerly 1a999fee5a] [formerly c18b96dc4c [formerly 5927ff20543395733d9302eba2e6772315730a80]]]
Former-commit-id: c18b96dc4c
Former-commit-id: ea27f9cd17 [formerly 245afb28c8]
Former-commit-id: fc6748cb3e
 2013-03-18 16:43:22 -05:00
Steve Harris
1c2dffd66d 13.3.1-8 baseline 
Former-commit-id: bc9df0a8f9 [formerly f97d78994b] [formerly bc9df0a8f9 [formerly f97d78994b] [formerly c15b3ffe20 [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]]
Former-commit-id: c15b3ffe20
Former-commit-id: 81a3f29afc [formerly 5f492500ea]
Former-commit-id: 0c94cc97fb
 2013-03-18 15:43:32 -05:00
Roger Ferrel
d8000c1526 Issue #1790 Changes for non-blocking TabularDisplayDlg. 
Change-Id: I38505da2d1c5a79e7b45579893845cc356a59a5d

Former-commit-id: 818b856f97 [formerly c43b7777e1] [formerly 818b856f97 [formerly c43b7777e1] [formerly ebe57f1cbc [formerly 0466f5cf6c8114ff4b834869dab09ef567e8b192]]]
Former-commit-id: ebe57f1cbc
Former-commit-id: 46428ed944 [formerly ff944b4768]
Former-commit-id: 1cada5eec3
 2013-03-14 15:38:08 -05:00
Ben Steffensmeier
866c873f71 Issue #1532 Delete uf.common.image and clean up the mess it left behind. 
Former-commit-id: d27d30c2db [formerly f46686a6e2] [formerly d27d30c2db [formerly f46686a6e2] [formerly 2ca86633d6 [formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]]]
Former-commit-id: 2ca86633d6
Former-commit-id: 334af0001b [formerly 5068b18c6a]
Former-commit-id: 0778375180
 2013-02-28 17:00:56 -06:00
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
c300faa186 Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default. 
Change-Id: I48738965df0da9052f810dfc1f312ed032693390

Former-commit-id: 1940a92596 [formerly aa4c7526ff] [formerly 1940a92596 [formerly aa4c7526ff] [formerly 8c0e9d3d9e [formerly ccf08fbd82aac8b1ae1d4f42b455ec7c3f995970]]]
Former-commit-id: 8c0e9d3d9e
Former-commit-id: 086f6aabe9 [formerly 455aa4628f]
Former-commit-id: 49b700da85
 2013-02-14 15:34:25 -06:00
Roger Ferrel
8c2defd927 Issue #1578 Changes for non-blocking DataTashCanDlg and clean up to data managers. 
Review changes 2.

Change-Id: I4d697ccc5a2e5ab63dfef3e52e88d039adfcdaa0

Former-commit-id: b0d1575727 [formerly b2dc220bcd] [formerly b0d1575727 [formerly b2dc220bcd] [formerly dd85695eb9 [formerly 7d2e157d20a009a2192b35f95252bdad895a91c5]]]
Former-commit-id: dd85695eb9
Former-commit-id: b04dee98c7 [formerly 0731398ac7]
Former-commit-id: 83fc1951f4
 2013-02-07 09:12:24 -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
Steve Harris
08bf724a6c 13.2.1-1 baseline 
Former-commit-id: 48d1aa7732 [formerly 9771dfae6b] [formerly 48d1aa7732 [formerly 9771dfae6b] [formerly c63f9bcae0 [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]]
Former-commit-id: c63f9bcae0
Former-commit-id: 8ed6a53113 [formerly f6670806bf]
Former-commit-id: 9146e727f9
 2013-01-23 11:13:03 -05:00
Max Schenkelberg
be1fb93c1b Issue #1457 Initial changes for MPE time refactor. Wrote custom resource that handles multiple times and tailored code to use resource instead of old XmrgResource which was not written to support multiple frames 
Amend: Cleaned up comments and some bugs in code after review

Amend: Rebased changes

Change-Id: I512b9bb30a08b9a1cfc5e8d9b5008ebc4f352c2d

Former-commit-id: e5cd1901a5 [formerly ff72ce0b0c] [formerly e5cd1901a5 [formerly ff72ce0b0c] [formerly db3e7bab99 [formerly ab74da7808aa343983f532ee076820c7e63fdded]]]
Former-commit-id: db3e7bab99
Former-commit-id: fac8769336 [formerly c246f56568]
Former-commit-id: 21dae56a1b
 2013-01-15 14:41:19 -06:00
Richard Peter
e838f2db25 Merge branch 'ss_builds' (13.2.1-1) into development 
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: a966546e31 [formerly 3fb7d96ec1] [formerly a966546e31 [formerly 3fb7d96ec1] [formerly 1dbb34523b [formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]]
Former-commit-id: 1dbb34523b
Former-commit-id: 79ef100838 [formerly 345dfd2ca9]
Former-commit-id: cd2014bf8d
 2013-01-14 18:07:17 -06:00
Steve Harris
b4556ea28f 13.2.1-1 baseline 
Former-commit-id: 5dfe4d10f1 [formerly e62172c8c7] [formerly 5dfe4d10f1 [formerly e62172c8c7] [formerly 81849e3cbb [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]]
Former-commit-id: 81849e3cbb
Former-commit-id: e34695538d [formerly 8713dfc5ca]
Former-commit-id: ebff2a6275
 2013-01-14 18:42:21 -05:00
Richard Peter
398b47967d Issue #1408: Merge 13.1.2-6 into development 
Former-commit-id: d0a6ba23e5 [formerly 029ebaa63a] [formerly d0a6ba23e5 [formerly 029ebaa63a] [formerly 328be6ac2b [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]]
Former-commit-id: 328be6ac2b
Former-commit-id: 80bf1d7a28 [formerly 6a5a0d7d09]
Former-commit-id: 709af3b25e
 2013-01-09 17:55:05 -06:00
Steve Harris
b7f180d9d3 13.1.2-6 baseline 
Former-commit-id: efd3392abe [formerly 8e5f9e0e6c] [formerly efd3392abe [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]
Former-commit-id: 59969775ad
Former-commit-id: 82a1ed77a4 [formerly dbcae57f57]
Former-commit-id: 05bdc0ecd2
 2013-01-06 14:55:11 -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
Max Schenkelberg
2030832669 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: be99f6c7ca [formerly 3e128b266a] [formerly be99f6c7ca [formerly 3e128b266a] [formerly 5db71ca943 [formerly eaeb75b4f2dd1c19f805c8cf4f4d010b455d99e8]]]
Former-commit-id: 5db71ca943
Former-commit-id: d43e0c1c25 [formerly b74d788909]
Former-commit-id: 206116ab66
 2012-12-12 11:39:32 -06:00
Max Schenkelberg
a7b239f9c1 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: 56ae27e172 [formerly b648c5828e] [formerly 56ae27e172 [formerly b648c5828e] [formerly ed77d56a84 [formerly fa693a9bb802af2491c70c14aa7ab33485fb4915]]]
Former-commit-id: ed77d56a84
Former-commit-id: f681c1304c [formerly b24440cc37]
Former-commit-id: b8b98a78c3
 2012-11-29 10:29:36 -06:00
Steve Harris
ae9d9985cd Merge branch 'ss_builds' (12.12.1-3) into development 
Former-commit-id: 8fc896f7d4 [formerly 448dd1c35f] [formerly 8fc896f7d4 [formerly 448dd1c35f] [formerly 00f3d51546 [formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]]
Former-commit-id: 00f3d51546
Former-commit-id: 21ecd53719 [formerly c8cac52915]
Former-commit-id: 59efd9a217
 2012-11-13 17:28:50 -06:00
Steve Harris
53d74c66e7 12.12.1-2 baseline 
Former-commit-id: ed809a02db [formerly a8560580f8] [formerly ed809a02db [formerly a8560580f8] [formerly 6868eb9b23 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]]
Former-commit-id: 6868eb9b23
Former-commit-id: 111e7607cf [formerly df89fe9bed]
Former-commit-id: 96a4a4f3f5
 2012-11-13 17:14:24 -06: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