Richard Peter
56089894f2
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: 9b12d9ddaf
[formerly cd51f3fa87
] [formerly a65804787550135ce5e8efc80b04f65f82ceff22 [formerly 3575d6586f
]] [formerly 21ae3b5fcd
[formerly 3575d6586f
[formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: 9377474013cb8e8722b3a32e83523c417b87fcd0 [formerly a7ec0bcf66
]
Former-commit-id: d65b11d404
2014-04-11 16:23:09 -05:00
Everett Kladstrup
29ce7781c9
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: eab1358602
[formerly 8b19b3601a
] [formerly 06d6961c0f
] [formerly 0699041518
[formerly 06d6961c0f
[formerly ad4a8cfbbc6de72810492c8f1de9701d381b6019]]]
Former-commit-id: 0699041518
Former-commit-id: eb5b00071037510aefc04c8c20411cc18c44abb0 [formerly 260d0beddc
]
Former-commit-id: 86bf2b5ea0
2014-04-09 09:31:12 -05:00
Mike Duff
5dd6bad115
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: 43f7e3307a
[formerly d5c3ddcef8
] [formerly be9cf109b1
] [formerly 5f1f931c64
[formerly be9cf109b1
[formerly ee88ab32961525d74a227cccec615c0610dc9525]]]
Former-commit-id: 5f1f931c64
Former-commit-id: e1dad5245b047c7e36a1a34a412afe2bccff0886 [formerly da5a3bf858
]
Former-commit-id: c518a6710b
2014-03-31 11:35:06 -05:00
Loubna.Bousaidi
0a5dd21ea9
ASM #380 - Hydro--TimeSeries:error thrown when click Table button
...
Change-Id: Ifca1581cbcf48346082a6afb976a927a3d878b09
Former-commit-id: 3a29602f9d
[formerly 27447d7b76
] [formerly 123007b18d
] [formerly ce2bea0a04
[formerly 123007b18d
[formerly d2161a0fdd0bad7f8266a8b30659021edecaa549]]]
Former-commit-id: ce2bea0a04
Former-commit-id: de3471a825bb008a8c6b4d7deb2d610059ce27a7 [formerly 6f7b1b6ca8
]
Former-commit-id: b5cb73fd5a
2014-03-11 18:58:26 +00:00
brian.dyke
ac37e2ea2e
merge 14.2.1-3 into asm-14.2.2
...
Former-commit-id: becf6322c6
[formerly 4a62e83835
] [formerly 2294c81a57
] [formerly f10f6d4e8a
[formerly 2294c81a57
[formerly a116be206fc8a24dd12610db37db6f26c65a19b0]]]
Former-commit-id: f10f6d4e8a
Former-commit-id: 83bf7b38976fc3a19f898b0fe2c8e7790a8d7629 [formerly e9e2eb3be0
]
Former-commit-id: 621464ac0d
2014-01-27 15:27:49 -05:00
Ben Steffensmeier
b7cdcc757c
Issue #2312 Add ability to export gif and image export dialog.
...
Change-Id: I10aaeba20a4acc7888cd566107ffff3e6a4fad05
Former-commit-id: 7a8c934c5c
[formerly b70faf1f7d
] [formerly fc1c56f9cb
] [formerly 4ad4b4a859
[formerly fc1c56f9cb
[formerly e2159c422ca93aa76c6ba7a30a09234e8f9da4ce]]]
Former-commit-id: 4ad4b4a859
Former-commit-id: e898590f6488b3cb1f76a669ff09fbe8f3b22604 [formerly 8b2e5a06bc
]
Former-commit-id: cd295e4172
2014-01-21 18:09:13 -06:00
Steve Naples
20d5c316ec
Issue #237
...
Change-Id: Iab0716c7e09739cbb4a525111eb34ecc0594a388
Former-commit-id: b0ab548349
[formerly f60d81202c
] [formerly c2667bd719
] [formerly 62dfc1f0b2
[formerly c2667bd719
[formerly 3f252c7aa8fc5598f3f74c376c713150793868e5]]]
Former-commit-id: 62dfc1f0b2
Former-commit-id: 4af266f8c1d3a3f722e2b89bab828a72957ab576 [formerly 687511035a
]
Former-commit-id: ee525c5525
2014-01-14 16:38:44 +00:00
Ben Steffensmeier
2400380daf
Issue #2491 Fix alertviz and java 6 compatibility.
...
Former-commit-id: ef2a281d45
[formerly 0c66089721
] [formerly 27165cea30
] [formerly 44a6f05986
[formerly 27165cea30
[formerly 2baf2fdd778b55b76be37503935510b057c5eb0e]]]
Former-commit-id: 44a6f05986
Former-commit-id: 82a83e55a2fa0b6a003492ed127ecae2ee7df8d2 [formerly 1f33a1997e
]
Former-commit-id: 0e3cf8b47f
2013-10-28 10:14:08 -05:00
Ben Steffensmeier
e03a1c1202
Issue #2491 Remove uneeded ISerializableObject files.
...
Former-commit-id: 230309c25f
[formerly f34bfc1e5b
] [formerly c14cc609a8
] [formerly cac1f07cbb
[formerly c14cc609a8
[formerly fd4cc4fde9507cd9abbf394ea5823a8f315c7d55]]]
Former-commit-id: cac1f07cbb
Former-commit-id: cbb9e5689b5ecaf7c5b0202dbf3d51fae0c0dda9 [formerly a06bdc56d6
]
Former-commit-id: ce9653ab15
2013-10-25 15:31:39 -05:00
Nate Jensen
4454f61a27
Issue #2361 remove ISerializableObject for hydro colors
...
Change-Id: Icc4a1e2ebff06ff389e95563406176663000ad7c
Former-commit-id: 54a13cef30
[formerly 472c2693c4
] [formerly 0fe5979eac
] [formerly 83fafc638b
[formerly 0fe5979eac
[formerly f23474913e08b34d1eb82e2106549f57fd36538c]]]
Former-commit-id: 83fafc638b
Former-commit-id: 67c022fe0bf860e2b4d22e1b1209c2a4000de21f [formerly 7fb250b184
]
Former-commit-id: 91ddf05a6b
2013-10-10 10:57:59 -05:00
Lee Venable
6ff07c7b35
Issue #2349 - Fixed font memory leaks
...
Former-commit-id: 09d6775293
[formerly 6b171d20db
] [formerly 02651018f2
] [formerly 0816c3e7c7
[formerly 02651018f2
[formerly e81149f65d944f9898509a6ff03b063662a88882]]]
Former-commit-id: 0816c3e7c7
Former-commit-id: e6eb7819d473fc53e3a7b8a7113b217c41123699 [formerly 1db5b00c76
]
Former-commit-id: 0636263f5b
2013-09-09 16:54:49 -05:00
Max Schenkelberg
70c91ed24b
Issue #2277 Switched DataCubeContainer calls to not use ScriptCreator
...
Amend: Added comments as requested
Change-Id: Ib787d43638f20babfc7f89ce2eac958e31d21c3c
Former-commit-id: 3509baaa74
[formerly 8a500677d3
] [formerly b633f9987a
] [formerly 2d1db7d0e2
[formerly b633f9987a
[formerly efb402d2835f715143cddffeec2bd7c20d0a65f6]]]
Former-commit-id: 2d1db7d0e2
Former-commit-id: c6fb597995ca49d9e40c0fe52f6d3e660affe671 [formerly 61e6dd1316
]
Former-commit-id: 1bdef4ddd3
2013-09-09 10:10:11 -05:00
Lee Venable
396da17cf2
Issue #2342 - fixed color memory leak and NPE
...
Change-Id: I34c6bf75f3901f7304ef392a4549f51f599752ff
Former-commit-id: 0305f4cbdf
[formerly 52667faab5
] [formerly b71b2c4208
] [formerly 508757bce6
[formerly b71b2c4208
[formerly 68411a30159f8251937f78d77f561c20a4822e48]]]
Former-commit-id: 508757bce6
Former-commit-id: 8a6f734572567c092e60533c8a3f93168485c8c6 [formerly 74d23f7948
]
Former-commit-id: 9f3666fbbe
2013-09-06 14:03:14 -05:00
Roger Ferrel
acea3a7a54
Issue #2088 Changes for non-blocking PrintTextReportDlg and TextReportDlg.
...
Change-Id: I0f999c8334aefb3f2d0e27d91bdea419a96d65e6
Former-commit-id: d9d74ca4bf
[formerly 1dbcb165df
] [formerly 6f6da35020
] [formerly edb32da7ce
[formerly 6f6da35020
[formerly 648aa82a0d6b10a92a44df55eb278b6cc4c9bc1b]]]
Former-commit-id: edb32da7ce
Former-commit-id: 15150632c51a17b283884abaa77f3b8c3c32d393 [formerly 79f72c3195
]
Former-commit-id: 656e94d8f8
2013-07-16 14:03:20 -05:00
Roger Ferrel
5ee2faff34
Issue #2088 changes for non-blocking RatingCurveDlg, FindReplaceDlg and TextEditorDlg.
...
Change-Id: I8d651254e862a45c1dad33c0d4991b29f1611828
Former-commit-id: 659a8f37ed
[formerly 5884bb5692
] [formerly d620283c3b
] [formerly 3eacead9bb
[formerly d620283c3b
[formerly d71b87606a93f744984f45aec8887dbc0052bb4e]]]
Former-commit-id: 3eacead9bb
Former-commit-id: a018799df11c533f6ed97b64c91dc8cf9e42b7ea [formerly c556150c27
]
Former-commit-id: 19ef062429
2013-07-16 10:28:32 -05:00
Roger Ferrel
60c5878266
Issue #2088 Changes for non-blocking DataSourcesDlg, ImpactStatementDlg and LowWaterStatementDlg.
...
Change-Id: Ib6b6a6b6a2b0c433c30ac31beb6858e4c7a0c768
Former-commit-id: 3249e81303
[formerly c90a989bd6
] [formerly 0ba32179e6
] [formerly e8d21c5d91
[formerly 0ba32179e6
[formerly cf769302b9a9b2055f42969dfe781d7aa9c2286b]]]
Former-commit-id: e8d21c5d91
Former-commit-id: dacd9f6b5f98fed8c941edf4b269ac595dec085c [formerly ccd83dab88
]
Former-commit-id: 5ca4909f17
2013-07-15 14:26:35 -05:00
Roger Ferrel
58fa2a4029
Issue #2088 Changes for non-blocking CrestHistoryDlg.
...
Change-Id: Iebb031464ab25d1212b1748789f79051528d0c3a
Former-commit-id: 59451c11ad
[formerly 77390e1f78
] [formerly b394c8fa41
] [formerly 68bc54c334
[formerly b394c8fa41
[formerly fc0cd12d87493527c6a7ddaddd70b77182a7390f]]]
Former-commit-id: 68bc54c334
Former-commit-id: 7ed16a72c79d83b8328dd47e7385fa774ffd122c [formerly e73bfc1a54
]
Former-commit-id: f4bafbf4d3
2013-07-15 07:56:14 -05:00
Roger Ferrel
2447f8c5c8
Issue #2088 Changes for non-blocking ContactsDlg.
...
Change-Id: I8e9bd796b6b811cbcbd4159d7b209733fffa23df
Former-commit-id: 3231633fb5
[formerly 11625b6eb3
] [formerly 9800f069e9
] [formerly 88e0eeb81c
[formerly 9800f069e9
[formerly 82e4a0edf2dbe2d2eca430b42adb50f8ec4e8125]]]
Former-commit-id: 88e0eeb81c
Former-commit-id: 9a47b039c83c5069185d5f85810abd6143d5b5a2 [formerly 69d3ccecf4
]
Former-commit-id: 52ce08d4f7
2013-07-11 13:02:13 -05:00
Roger Ferrel
dc01673b13
Issue #2088 Non-blocking ColorScaleMgrDlg and ColorChooserDlg.
...
Change-Id: I6f14726a466780e0dbab13d8b64fa2c55acf55d0
Former-commit-id: bcfe29ffeb
[formerly e73559b871
] [formerly 467fa72069001a5153490e0fb5522fbf84e14f24 [formerly d5e66e410d
]] [formerly f3bdbde9d3
[formerly d5e66e410d
[formerly 108c5a4957b6d3ab50eacd5792122f7cd2ff3cba]]]
Former-commit-id: f3bdbde9d3
Former-commit-id: 2c591fb8750544921169d97733aea020a1760e66 [formerly 696885dc4b
]
Former-commit-id: 44724d9487
2013-07-09 11:13:43 -05:00
Steve Harris
43b7a9b410
13.5.1-1 baseline
...
Former-commit-id: 5d99df9969
[formerly 6384018950
] [formerly 998961612c
] [formerly fe872355a7
[formerly 998961612c
[formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]
Former-commit-id: fe872355a7
Former-commit-id: 7fa801e313a1348e6bb00da11f43928fdf179b69 [formerly 30ba1d634e
]
Former-commit-id: 0aab285b8a
2013-06-10 15:17:17 -04:00
Roger Ferrel
67e4e40ada
Issue #1790 Changes for non-blocking dialogs DescriptionDlg, FloodCategoryDlg, FloodDamageDlg, GageHistoryDlg, HydroGenConfigDlg, LowWaterDlg, NwrTransmitterDlg, PreferencesDlg, PublicationsDlg and QcAlertAlarmLimitsDlg.
...
Change-Id: Ic4a3ccb3e13344244415786591accbffda0d0e96
Former-commit-id: 7bb8189127
[formerly 1af1e9e61a
] [formerly 75c1470c3a
] [formerly 2dafedfed2
[formerly 75c1470c3a
[formerly b9d5321cdeaeb9b37783e96b76321ddb90c0d6dd]]]
Former-commit-id: 2dafedfed2
Former-commit-id: ee26ccec332b7bf02995b1fa50cc61721ea41820 [formerly 399a54cc4b
]
Former-commit-id: 0018cad990
2013-04-23 11:42:14 -05:00
Roger Ferrel
f153fbf391
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: 2d0155e16d
[formerly 2bcc5e655c
] [formerly c761fd0938
] [formerly ec275df412
[formerly c761fd0938
[formerly 23bf9839c60aa33d7bf43492b72acbeedcf518b9]]]
Former-commit-id: ec275df412
Former-commit-id: dcda98a8ea83fdec4a81db28fcf173d7fc865497 [formerly ceb9d10fdc
]
Former-commit-id: 5406b16e40
2013-04-19 13:42:46 -05:00
Steve Harris
bb30a41300
13.3.1-12 baseline
...
Former-commit-id: 6f374b35d0
[formerly be96282207
] [formerly 0be473728a
] [formerly aaac0b51e5
[formerly 0be473728a
[formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]]
Former-commit-id: aaac0b51e5
Former-commit-id: 4cfa5d11d7d7059b88534daa18142d24f3a6f481 [formerly bc439aee4f
]
Former-commit-id: f80f98cee2
2013-03-25 13:27:13 -05:00
Steve Harris
027eda5dce
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: b64fbe549a
[formerly 28ef804e1b
] [formerly b8f0635ad6
] [formerly 7fcf9f1cb2
[formerly b8f0635ad6
[formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]]
Former-commit-id: 7fcf9f1cb2
Former-commit-id: 43739ee91e600eb0ff17b60915bab97a42d2b3aa [formerly 900b9aadde
]
Former-commit-id: 2a26783ba7
2013-03-18 16:52:00 -05:00
Steve Harris
0e9919f6be
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: 3e69490ab2
[formerly 27c418812f
] [formerly 1a999fee5a
] [formerly c18b96dc4c
[formerly 1a999fee5a
[formerly 5927ff20543395733d9302eba2e6772315730a80]]]
Former-commit-id: c18b96dc4c
Former-commit-id: e2239b3a3593dcd59bcf723bcb944913f4da1785 [formerly 245afb28c8
]
Former-commit-id: ea27f9cd17
2013-03-18 16:43:22 -05:00
Steve Harris
2fd4ac9397
13.3.1-8 baseline
...
Former-commit-id: dd30a5f940
[formerly bc9df0a8f9
] [formerly f97d78994b
] [formerly c15b3ffe20
[formerly f97d78994b
[formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]]
Former-commit-id: c15b3ffe20
Former-commit-id: 6578eddad397d44d5b9e9908233734077c464b81 [formerly 5f492500ea
]
Former-commit-id: 81a3f29afc
2013-03-18 15:43:32 -05:00
Roger Ferrel
cec76b08bf
Issue #1790 Changes for non-blocking TabularDisplayDlg.
...
Change-Id: I38505da2d1c5a79e7b45579893845cc356a59a5d
Former-commit-id: a19092d5c2
[formerly 818b856f97
] [formerly c43b7777e1
] [formerly ebe57f1cbc
[formerly c43b7777e1
[formerly 0466f5cf6c8114ff4b834869dab09ef567e8b192]]]
Former-commit-id: ebe57f1cbc
Former-commit-id: a4411b7fa0720ced4d24e4567246f0516fe411f4 [formerly ff944b4768
]
Former-commit-id: 46428ed944
2013-03-14 15:38:08 -05:00
Ben Steffensmeier
4936191404
Issue #1532 Delete uf.common.image and clean up the mess it left behind.
...
Former-commit-id: 8e2333d0d7
[formerly d27d30c2db
] [formerly f46686a6e2
] [formerly 2ca86633d6
[formerly f46686a6e2
[formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]]]
Former-commit-id: 2ca86633d6
Former-commit-id: fa7abe8431fbbdea60e6504cd61a867956d20856 [formerly 5068b18c6a
]
Former-commit-id: 334af0001b
2013-02-28 17:00:56 -06:00
Steve Harris
7e48d3e684
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: abdc733151
[formerly 64744fdb19
] [formerly a0573644c4
] [formerly 2641d578e2
[formerly a0573644c4
[formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]
Former-commit-id: 2641d578e2
Former-commit-id: 4a25bf4d6d77c9356aa1e74660e835a98a31e78b [formerly 33dd2589f1
]
Former-commit-id: 4f155a183a
2013-02-21 15:41:39 -06:00
Steve Harris
db712e1fcf
13.3.1-1 baseline
...
Former-commit-id: e0406d3183
[formerly 8ae397085e
] [formerly 71e8990021
] [formerly d2a654625f
[formerly 71e8990021
[formerly 34684c71436ce4c395ea523eb34ded6792476816]]]
Former-commit-id: d2a654625f
Former-commit-id: 42269f8019656ea35c9d11244f51d5ae9ac18ac0 [formerly 46d28be4a4
]
Former-commit-id: e4435815c9
2013-02-20 16:19:40 -06:00
Ben Steffensmeier
4140260659
Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default.
...
Change-Id: I48738965df0da9052f810dfc1f312ed032693390
Former-commit-id: bd6e0f8462
[formerly 1940a92596
] [formerly aa4c7526ff
] [formerly 8c0e9d3d9e
[formerly aa4c7526ff
[formerly ccf08fbd82aac8b1ae1d4f42b455ec7c3f995970]]]
Former-commit-id: 8c0e9d3d9e
Former-commit-id: badd785e8aa7a433093d24b4c4bf0d45450daf4a [formerly 455aa4628f
]
Former-commit-id: 086f6aabe9
2013-02-14 15:34:25 -06:00
Roger Ferrel
2321480a4f
Issue #1578 Changes for non-blocking DataTashCanDlg and clean up to data managers.
...
Review changes 2.
Change-Id: I4d697ccc5a2e5ab63dfef3e52e88d039adfcdaa0
Former-commit-id: 247d0550b9
[formerly b0d1575727
] [formerly b2dc220bcd
] [formerly dd85695eb9
[formerly b2dc220bcd
[formerly 7d2e157d20a009a2192b35f95252bdad895a91c5]]]
Former-commit-id: dd85695eb9
Former-commit-id: 33710c8bdfd40b76a059c9d4ddd43fe1ccada227 [formerly 0731398ac7
]
Former-commit-id: b04dee98c7
2013-02-07 09:12:24 -06:00
Steve Harris
ce726fadc7
13.2.1-2 baseline
...
Former-commit-id: a4fa438a41
[formerly 33bc5fd816
] [formerly 83e9157df7
] [formerly 328c6dccad
[formerly 83e9157df7
[formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]
Former-commit-id: 328c6dccad
Former-commit-id: f30d6bb5c391ebffda9767fba913019b2cd7d050 [formerly 47cc08ac79
]
Former-commit-id: d9be4dce21
2013-01-23 11:18:44 -05:00
Steve Harris
1d1791b3b4
13.2.1-1 baseline
...
Former-commit-id: 11b05eedeb
[formerly 48d1aa7732
] [formerly 9771dfae6b
] [formerly c63f9bcae0
[formerly 9771dfae6b
[formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]]
Former-commit-id: c63f9bcae0
Former-commit-id: b971e3aabeeb8f14462f7ad6502dafe876153e63 [formerly f6670806bf
]
Former-commit-id: 8ed6a53113
2013-01-23 11:13:03 -05:00
Max Schenkelberg
4e507c57f6
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: 77c2ae6ad1
[formerly e5cd1901a5
] [formerly ff72ce0b0c
] [formerly db3e7bab99
[formerly ff72ce0b0c
[formerly ab74da7808aa343983f532ee076820c7e63fdded]]]
Former-commit-id: db3e7bab99
Former-commit-id: 36ba7490bc83dc4ce324f378bdf66b8020044b22 [formerly c246f56568
]
Former-commit-id: fac8769336
2013-01-15 14:41:19 -06:00
Richard Peter
d880361e06
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: 6e42fa32d3
[formerly a966546e31
] [formerly 20520c8f0152154419357d990f91f1ce998a888a [formerly 3fb7d96ec1
]] [formerly 1dbb34523b
[formerly 3fb7d96ec1
[formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]]
Former-commit-id: 1dbb34523b
Former-commit-id: 85a5d2a8fdf64c0ba9efe9815c5ef9cb8f27eb62 [formerly 345dfd2ca9
]
Former-commit-id: 79ef100838
2013-01-14 18:07:17 -06:00
Steve Harris
3d35fd52d5
13.2.1-1 baseline
...
Former-commit-id: 8dd688c878
[formerly 5dfe4d10f1
] [formerly e62172c8c7
] [formerly 81849e3cbb
[formerly e62172c8c7
[formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]]
Former-commit-id: 81849e3cbb
Former-commit-id: c835df6c612355b23abcc04a384d5b398d1c5ec6 [formerly 8713dfc5ca
]
Former-commit-id: e34695538d
2013-01-14 18:42:21 -05:00
Richard Peter
177a54d19a
Issue #1408 : Merge 13.1.2-6 into development
...
Former-commit-id: 95f0508c29
[formerly d0a6ba23e5
] [formerly 029ebaa63a
] [formerly 328be6ac2b
[formerly 029ebaa63a
[formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]]
Former-commit-id: 328be6ac2b
Former-commit-id: e62c56e99c7920d8884c0d3271ccfd750504bf46 [formerly 6a5a0d7d09
]
Former-commit-id: 80bf1d7a28
2013-01-09 17:55:05 -06:00
Steve Harris
fe763963e9
13.1.2-6 baseline
...
Former-commit-id: 1d4d25b49b
[formerly efd3392abe
] [formerly 8e5f9e0e6c
] [formerly 59969775ad
[formerly 8e5f9e0e6c
[formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]
Former-commit-id: 59969775ad
Former-commit-id: fa884fbcd584330564fea44a1538e11036e753a8 [formerly dbcae57f57
]
Former-commit-id: 82a1ed77a4
2013-01-06 14:55:11 -06:00
Steve Harris
82cdde8491
13.1.2-2 baseline
...
Former-commit-id: e8f4a2f031
[formerly 51208e5515
] [formerly c0c1d56f3a
] [formerly 4ba416aeb3
[formerly c0c1d56f3a
[formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553
]
Former-commit-id: cd4185ef5c
2013-01-06 14:32:24 -06:00
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
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
Steve Harris
98670f1cc2
Merge branch 'ss_builds' (12.12.1-3) into development
...
Former-commit-id: 1ee8938748
[formerly 8fc896f7d4
] [formerly 448dd1c35f
] [formerly 00f3d51546
[formerly 448dd1c35f
[formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]]
Former-commit-id: 00f3d51546
Former-commit-id: 2de30d78d62b41d67562abff25e91b45ac8ab8fc [formerly c8cac52915
]
Former-commit-id: 21ecd53719
2012-11-13 17:28:50 -06:00
Steve Harris
5365b72401
12.12.1-2 baseline
...
Former-commit-id: 7192b19284
[formerly ed809a02db
] [formerly a8560580f8
] [formerly 6868eb9b23
[formerly a8560580f8
[formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]]
Former-commit-id: 6868eb9b23
Former-commit-id: 454cf3b19a973251055686ba6bcf2017dd870e1d [formerly df89fe9bed
]
Former-commit-id: 111e7607cf
2012-11-13 17:14:24 -06:00
Ben Steffensmeier
24de750932
merge Unified_Grid with ss_builds to 12.11.1-7
...
Former-commit-id: 1a215cb42a
[formerly 4f503d3a1e
] [formerly 6a9ff88b33
] [formerly c2934ae7a5
[formerly 6a9ff88b33
[formerly ab80625b5c573d8ab1350b4c251414ea036ef016]]]
Former-commit-id: c2934ae7a5
Former-commit-id: de67db55a641384b09da8b5dffaf5f786198848b [formerly a77d2097f8
]
Former-commit-id: 9b8f2bcdbd
2012-10-25 12:22:11 -05:00
Steve Harris
7fcbb49a3e
12.11.1-3 baseline
...
Former-commit-id: a65c057df5
[formerly 196afa0e5f
] [formerly 2d0c424713
] [formerly 5d796f775c
[formerly 2d0c424713
[formerly 33ddeff32d02d6302c7e9e61a3b5d8cbf0440b86]]]
Former-commit-id: 5d796f775c
Former-commit-id: 0e268084394b033a5de6dba694d14423a1da3040 [formerly 5723fb0031
]
Former-commit-id: 725b2f8ba5
2012-10-15 16:30:31 -05:00
Ben Steffensmeier
97c23508d7
Merge branch 'ss_builds' into Unified_Grid
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpcGuideNDFD.xml
Former-commit-id: a67ce9586c
[formerly de3769129c
] [formerly 8b7256b1ae
] [formerly 266a2f317f
[formerly 8b7256b1ae
[formerly f5ae7bbd116ddc19b4fd6c8518089fa11b78ec90]]]
Former-commit-id: 266a2f317f
Former-commit-id: aad7acdf220a9ba94d6a280496d0b78f3466b6be [formerly fed5a35af3
]
Former-commit-id: fde1e73d58
2012-10-12 12:45:50 -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
f976af446f
Issue #189 convert hydro and hydrocommon to grid.
...
Former-commit-id: a5c60f0f13
[formerly 3e0da6d171
] [formerly 8d150d404c
] [formerly 3e93e8980b
[formerly 8d150d404c
[formerly a84fcbd045c24c16b30df4328aaf3bbbb30efd17]]]
Former-commit-id: 3e93e8980b
Former-commit-id: 9c843ec0f10baa33a6447d47f517d98afd981744 [formerly 734922cb44
]
Former-commit-id: 3a1ba7bd87
2012-10-01 14:05:40 -05:00
Ben Steffensmeier
6af74b843c
Issue #189 checkin of gridcoverage plugin and switch existing grib to use new plugin
...
Change-Id: I060f13ce68e7947e54d62d25d90ebdad2666bece
Former-commit-id: 9eecab65c0
[formerly 4fe2127bfb
] [formerly bd8eb7fc15
] [formerly 05849f634d
[formerly bd8eb7fc15
[formerly 8f164a7b948e462b14caf6576de2b898a9a4e880]]]
Former-commit-id: 05849f634d
Former-commit-id: 28ed264c21455f309a74a270145d56d9aa7064df [formerly b547d9dd8f
]
Former-commit-id: 6b058ace34
2012-09-18 15:19:05 -05:00