brian.dyke
b2e3c50ec0
Merge branch 'master_14.3.1-4' into asm_14.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
Former-commit-id: 9626317825011d121e4b9626317825011d121e4b58683ad04058683ad0402e105c1d5dbc4649765ab42011fc76
2014-05-19 09:45:37 -04:00
Qinglu.Lin
03f7862321
ASM #514 - Line of Storms functionality behaving oddly in WarnGen
...
Change-Id: I0bd2b9e4200b5acbb19a06caa45f18d36346de39
Former-commit-id: 5f0e0bda6918e92f03c15f0e0bda6918e92f03c1d8753a4145d8753a4145580d7e3ba78de2d2f7186ba15bd00c
2014-05-05 11:54:56 -04:00
Richard Peter
938e39a0fc
Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml
Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900
Former-commit-id: 67683dd89144b178246167683dd89144b178246132957285fc32957285fc6966b7924680d415387824a3fe1466
2014-04-28 16:27:40 -05:00
Brian.Dyke
f31d8cc8cf
Merge branch 'master_14.2.2' into master_14.3.1
...
Merge (14.2.2-5 into 14.3.1-1)
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java
Former-commit-id: f0b8ea5822fb1f5aa593f0b8ea5822fb1f5aa5933524838f9f3524838f9fbf3758efa3029f5753adc6d3fe6952
2014-04-25 11:06:11 -04:00
Lee Venable
d6e34a221f
Issue #3041 - added dispose check to runAsync call and cleaned up code.
...
Change-Id: I50e6ce1a214a884221fbc256a133e57e579862da
Former-commit-id: ac914e72e73c45a24efbac914e72e73c45a24efbdcb7e697e8dcb7e697e891d37d783c20764b1d97294d8ff917
2014-04-21 13:47:31 -05:00
Brian.Dyke
de500c093f
Merged 14.2.1 -17, -18 into 1422-3
...
Former-commit-id: 9df6fb2d4d12a482e1d79df6fb2d4d12a482e1d7b8829139a2b8829139a26f358189170ea7c51ad7a925ba6219
2014-04-17 14:42:35 -04: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: cd51f3fa873575d6586fcd51f3fa873575d6586f21ae3b5fcd21ae3b5fcdd65b11d404a7ec0bcf66b6482f2e54
2014-04-11 16:23:09 -05:00
Richard Peter
421b2716a4
Merge branch 'master_14.1.2' into master_14.2.1
...
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
Former-commit-id: 567609044395eba8dcf6567609044395eba8dcf6b15d288530b15d288530f1b85f696473aab15d85b667e0509f
2014-04-09 16:00:54 -05:00
Brian.Dyke
8ef50f023b
Merged 1354 -7 and -8 into 1412
...
Former-commit-id: e4136f79dd947194c998e4136f79dd947194c998929b736038929b736038d76d3a26cb5163a31a66462952ce65
2014-04-09 11:39:07 -04: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: 8b19b3601a06d6961c0f8b19b3601a06d6961c0f0699041518069904151886bf2b5ea0260d0beddcd96b56c91a
2014-04-09 09:31:12 -05:00
Brian.Dyke
39b5e7fe67
Merged 1354 -5 and -6 into 1412 based on 1411-25
...
Former-commit-id: 17477e7db16a28fcb15617477e7db16a28fcb156dd98c213c7dd98c213c747d90952119f37f61cf8be574897cc
2014-04-04 12:57:32 -04:00
David Friedman
8f8f55dd3c
Merge branch 'master_14.2.2' into asm_14.2.2
...
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.
Conflicts:
cave/build/static/linux/cave/cave.sh
cave/build/static/linux/cave/caveUtil.sh
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d
Former-commit-id: 32a7adbe4bfd900e38c232a7adbe4bfd900e38c2f146c7bcd0f146c7bcd01168a3eae5533d15c863dde12b4fc3
2014-03-27 19:17:03 +00:00
Max Schenkelberg
83103254e7
Issue #2804 Fixed clipping pane issues where clipped map borders would be visible due to other resources not resetting up the clipping pane when done.
...
Change-Id: If27cd7c8e11cdc6287303e6d5fc1f4990e300ada
Former-commit-id: 6edfb8965fdbcbd1b5606edfb8965fdbcbd1b5601854bbb4771854bbb477bff80c3ee96658c94e6e96bdc00728
2014-03-03 17:59:48 -06:00
Juliya Dynina
05ad2e4da5
Merge "ASM #114 " into asm_14.2.2
...
Former-commit-id: 3edd73f78c575ed3610d3edd73f78c575ed3610dc6253811e8c6253811e8f54454f8f1430b9a1aceeb96dc613f
2014-02-05 10:42:30 -05:00
David Friedman
e73e546582
ASM #110
...
Change-Id: I9df0f0491fa96ecb4c8f46125d987179f3aefc2f
Former-commit-id: d36cbb2ca9769086c0b7d36cbb2ca9769086c0b7e18c49ea72e18c49ea720ce67592ac052e12b7775a5c72df2f
2014-01-29 20:23:55 +00:00
Michael Gamazaychikov
01e92945cc
ASM #114
...
Change-Id: I6308422a99e66701852e3b6de6c89b756513ef02
Former-commit-id: 297d1cffc697f9c2ea92297d1cffc697f9c2ea928f90c0dee28f90c0dee20198607fe07d7cf7cfabe478ff7fdc
2014-01-29 10:58:18 -05:00
brian.dyke
ca9263003a
merge 14.2.1-3 into asm-14.2.2
...
Former-commit-id: 4a62e838352294c81a574a62e838352294c81a57f10f6d4e8af10f6d4e8a621464ac0de9e2eb3be0dcf5f25ed1
2014-01-27 15:27:49 -05:00
David Friedman
91e52302b0
Issue #114
...
Change-Id: I7fd218b0120fe8d8eb6ab535d6d07b40c6c0773d
Former-commit-id: 6c1b1f33ee01d657fd506c1b1f33ee01d657fd50fe50967163fe509671631eae25014b0975f982f26fadfec657
2013-12-20 20:33:18 +00:00
Ben Steffensmeier
7f38aac48c
Issue #2491 Remove uneeded ISerializableObject files.
...
Former-commit-id: f34bfc1e5bc14cc609a8f34bfc1e5bc14cc609a8cac1f07cbbcac1f07cbbce9653ab15a06bdc56d63955ac729f
2013-10-25 15:31:39 -05:00
Nate Jensen
8b62ea092a
Issue #2400 fix so active map editor is used if applicable
...
Change-Id: I642edc1bdc94eac871a07c26e900c2431f567ab1
Former-commit-id: 58c9aced4e8e9e49514958c9aced4e8e9e495149c1dd4b40fbc1dd4b40fb81f5ecb21a136ea71235726f38c27f
2013-09-30 11:47:26 -05:00
Nate Jensen
1c84ac6a75
Issue #2360 don't allow mouse actions on layer if layer is invisible
...
Change-Id: Id8e169d4af96902e72b2509d2f53e39ac6cc0a8a
Former-commit-id: 906e9ad7e908bd2c0241906e9ad7e908bd2c0241ce457b5be4ce457b5be4450f5d063d11c1fa94ae1150d848e4
2013-09-18 17:33:20 -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: 8a500677d3b633f9987a8a500677d3b633f9987a2d1db7d0e22d1db7d0e21bdef4ddd361e6dd131666d023227d
2013-09-09 10:10:11 -05:00
Ben Steffensmeier
e8ab7969a9
Issue #2310 Switch awipstools to load using bundles.
...
Change-Id: I9a24e6359bd43bfb7c8f84686348f532748503c4
Former-commit-id: ecf667fce9d75fdcb916ecf667fce9d75fdcb91687b647410687b647410619cc13d9bfa6661a883104f5cd8f2a
2013-09-04 16:05:09 -05:00
Ben Steffensmeier
25175b982c
Issue #2281 Fix shear click distance calculations.
...
Change-Id: I67980264723512a4167cf90cfc3adac2c9ba1d08
Former-commit-id: ed989ef777bf8dba768aed989ef777bf8dba768a057d7b9381057d7b93816da772b60f96d9c53cc99749a982dd
2013-08-29 13:20:56 -05:00
Richard Peter
42c78326f1
Merge branch 'omaha_13.5.1' (13.5.1-15) into development
...
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
edexOsgi/com.raytheon.edex.plugin.bufrua/res/pointdata/bufruadb.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java
Former-commit-id: 1f32ef9c7a5e5047cc4f1f32ef9c7a5e5047cc4f2a9276c7282a9276c728c0b0eef331db7c941f6f9cf5e247ab
2013-08-14 15:23:18 -05:00
Steve Harris
f4262380d6
13.5.1-14 baseline
...
Former-commit-id: b848317203d695e5debeb848317203d695e5debe80e5f7fbd480e5f7fbd49bd983e2fecd5b1e9e2f0f3ffc3892
2013-08-14 10:07:41 -04:00
Richard Peter
2a9cfe51af
Merge branch 'omaha_13.5.1' (13.5.1-7) into development
...
Conflicts:
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesAction.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF
rpms/awips2.cave/deploy.builder/build.sh
Former-commit-id: 401ed88e4415d1a6eab0401ed88e4415d1a6eab0c6386e306fc6386e306fe7ec068c7e12993d953985fc9c773b
2013-07-22 09:40:18 -05:00
Steve Harris
513c089375
13.5.1-7 baseline
...
Former-commit-id: 630705aa3fbf58a81b38630705aa3fbf58a81b3886ce1248c286ce1248c2cb50a0028df9c9aecba5eff4fb29dd
2013-07-18 12:07:22 -04:00
Nate Jensen
5a0dd6f037
Issue #2142 clean up dependencies and dead code
...
Change-Id: I30f94c9afb01cdd1b7bef98c6ba40f79c3acea59
Former-commit-id: c4bc1ef034a636846295c4bc1ef034a636846295f28420dac4f28420dac48b070975aa65dbc62b59428d0c73dc
2013-07-17 16:30:08 -05:00
Roger Ferrel
5d1d211890
Issue #2145 Verify movable ring coordinates prior to saving.
...
Change-Id: I4772e180d0af394985dbd1bdc65007a8c02feed0
Former-commit-id: f31f880a19f279672f6ff31f880a19f279672f6f26ffb4d88526ffb4d885cd63b071db9e195e546973fd01fa51
2013-07-09 14:05:35 -05:00
Roger Ferrel
87b937b6d9
Issue #2145 Added slection indicator and verificaton of lat, lon and radius.
...
Change-Id: I10492bdd2e74b5ea8fd9386528019665185ae584
Former-commit-id: a438c9ff2ac44c11279da438c9ff2ac44c11279d5224ab80f05224ab80f0b057f27a94895d0dc8232a40a92307
2013-07-05 13:33:53 -05:00
Roger Ferrel
9f8b831148
Issue #2145 Changes to RangeRingDialog so it doesn't double the movable range rings when a point is modified.
...
Change-Id: I229ce3e40769961c9c1b296c7c42d919a21cfd0b
Former-commit-id: ebb76daf14fab96d28f2ebb76daf14fab96d28f2752933c7fe752933c7fe477d8b03173c24739b720fb0ff7a5a
2013-07-02 17:27:22 -05:00
Steve Harris
50d4376af7
13.5.1-3 baseline
...
Former-commit-id: d8176d4a4c63803c1424d8176d4a4c63803c142472d22a30c972d22a30c9deebdb874a810388f00a1e939939b5
2013-06-24 09:29:43 -04:00
Steve Harris
859965fc9d
13.5.1-1 baseline
...
Former-commit-id: 6384018950998961612c6384018950998961612cfe872355a7fe872355a70aab285b8a30ba1d634e146c5e8940
2013-06-10 15:17:17 -04:00
Steve Harris
b41118326c
13.4.1-10 baseline
...
Former-commit-id: 68fe2134b89a403b361568fe2134b89a403b361592152778b992152778b97e04d8cd13b1fc4e625b322036ea82
2013-05-20 10:52:47 -04:00
Steve Harris
5e54a425fb
13.4.1-6 baseline
...
Former-commit-id: 6fcbb5ae6b83799776736fcbb5ae6b837997767316fe8cc5a216fe8cc5a25be793f2f9979700c3022e835dc591
2013-05-07 08:47:39 -04:00
Steve Harris
b2b9dac313
13.4.1-2 baseline
...
Former-commit-id: 9212be8b7452f0ae47589212be8b7452f0ae47585ebd58a0b35ebd58a0b36880107d3299bc8c8072c0481dcdf2
2013-04-24 17:22:10 -05:00
Steve Harris
722e428c74
13.4.1-1 baseline
...
Former-commit-id: f95e0ad10b2f517b7713f95e0ad10b2f517b771300332e630500332e63050e950655f14accbb80db4001e050e7
2013-04-24 17:15:55 -05:00
Steve Harris
953ffdab87
13.3.1-20 baseline
...
Former-commit-id: 07f7e6e2b425432cc38807f7e6e2b425432cc388446bec6f49446bec6f498535bceb4c4b7113138644cd8d47fb
2013-04-15 08:58:59 -05:00
Steve Harris
1c2dffd66d
13.3.1-8 baseline
...
Former-commit-id: bc9df0a8f9f97d78994bbc9df0a8f9f97d78994bc15b3ffe20c15b3ffe2081a3f29afc5f492500ea0c94cc97fb
2013-03-18 15:43:32 -05:00
Steve Harris
c28f3aeb02
13.3.1-6 baseline
...
Former-commit-id: 2e110bd1513a4c7931e12e110bd1513a4c7931e1566b677d09566b677d096fe4b169244ed21b702bc6f379f59a
2013-03-12 08:35:45 -05:00
Steve Harris
b7f180d9d3
13.1.2-6 baseline
...
Former-commit-id: efd3392abe8e5f9e0e6cefd3392abe8e5f9e0e6c59969775ad59969775ad82a1ed77a4dbcae57f5705bdc0ecd2
2013-01-06 14:55:11 -06:00
Steve Harris
f52ec0b0a0
13.1.2-2 baseline
...
Former-commit-id: 51208e5515c0c1d56f3a51208e5515c0c1d56f3a4ba416aeb34ba416aeb3cd4185ef5c941337c553b6fa9b4858
2013-01-06 14:32:24 -06:00
Steve Harris
af59663a99
12.12.1-1 baseline
...
Former-commit-id: c2839cc86de4bd20a515c2839cc86de4bd20a515e1498006c7e1498006c74f243de928214fcd3b63a5be98d6de
2012-11-07 12:41:20 -06:00
Steve Harris
35e34308c5
12.11.1-4 baseline
...
Former-commit-id: 98171b5de9d3497e47eb98171b5de9d3497e47eb6958b861f06958b861f02c82d9cb07cbbdb231ce560f0d9cc3
2012-10-16 13:27:07 -05:00
Steve Harris
2d928d328e
12.9.1-5 baseline
...
Former-commit-id: a1d931fd4461f269f54ca1d931fd4461f269f54cf2fac39428f2fac394287fb0b17bd572824561cb9b5c2094ed
2012-08-21 15:27:03 -05:00
Steve Harris
37f2b6e138
12.6.1-9 baseline
...
Former-commit-id: 7c064b68682c0ff851ca7c064b68682c0ff851ca27afa6034527afa60345dc50bc84434f7bb90bb0d5fa61041b
2012-07-10 07:53:49 -05:00
Steve Harris
74b66d9683
12.4.1-4 baseline
...
Former-commit-id: 750b7543dd67a5a68300750b7543dd67a5a683002a216f333c2a216f333ca2a6a18faea4e519f3cd8cd5974f4c
2012-04-18 15:18:16 -05:00
Matt Nash
bcc32c10bc
Moving 12.1.1 into ss_sync
...
Former-commit-id: 580e2938d766be3bec40580e2938d766be3bec40c83e5ff474c83e5ff47482300ccdcf1faae4248421d2361f00
2012-01-19 11:53:12 -06:00
root
e2ecdcfe33
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: a02aeb236c9f19e3f712a02aeb236c9f19e3f71206a8b51d6d06a8b51d6d8e80217e593360eb6c5f377dcd10b9
2012-01-06 08:55:05 -06:00
