Commit graph

2079 commits

Author SHA1 Message Date
Max Schenkelberg
b085fddff2 Issue #1500 Sped up warngen text creation by calculating hatched polygon and area in Job when polygon or area changes, initializing velocity for template running when warngen starts, only requesting full warning records when they are requested for use from CurrentWarnings, and only requesting partial ActivateTableRecords for determining active watch info.
Change-Id: Ia120f2d20b99e4d152554727597b22af762413ac

Former-commit-id: f73d55e920 [formerly bb68c95589] [formerly f73d55e920 [formerly bb68c95589] [formerly fdc5759b53 [formerly 26af6badfffd930b8051af8e33ff6897d6c87073]]]
Former-commit-id: fdc5759b53
Former-commit-id: f186c355ac [formerly 014eaa1666]
Former-commit-id: e736a5d5b7
2013-02-06 17:21:13 -06:00
Ben Steffensmeier
d655a54154 Issue #1586 add color to area validation.
Former-commit-id: 80f8dc50f9 [formerly f073984ce6] [formerly 80f8dc50f9 [formerly f073984ce6] [formerly 8a233105bc [formerly 452ba74bb84a2531b617675c4ee80ef4b008cd34]]]
Former-commit-id: 8a233105bc
Former-commit-id: 45b75823ac [formerly 6a8bd463a6]
Former-commit-id: 4b5ad7c8fb
2013-02-06 13:43:27 -06:00
Roger Ferrel
3e5e303037 Issue #1578 Code clean up for non-blocking dialogs.
Changes from code review.

Change-Id: I9f95dd07736f96af8cb1116030a9fb778fe4b047

Former-commit-id: 5e2b33206c [formerly 581b04f8f7] [formerly 5e2b33206c [formerly 581b04f8f7] [formerly db818dfd35 [formerly e3c21436e1186e467daf071bb723a2c31d6d3579]]]
Former-commit-id: db818dfd35
Former-commit-id: fc8537fb12 [formerly 1029538171]
Former-commit-id: 22bc10663c
2013-02-06 13:42:57 -06:00
Bryan Kowal
5fae563f88 Issue #1555 - improve Geometry loop
Change-Id: I124b0f41f2acd9dd2a5b4ec16c24d8bcfc64c417

Former-commit-id: 9ee71bc226 [formerly f5c3e20b3a] [formerly 9ee71bc226 [formerly f5c3e20b3a] [formerly cdafa71827 [formerly a8c222a7bb60ccdd0a431c8781488efc641a26c5]]]
Former-commit-id: cdafa71827
Former-commit-id: fc84326815 [formerly 9b572f0eb4]
Former-commit-id: 65b87267d6
2013-02-06 12:32:40 -06:00
Bryan Kowal
eaccf2d09a Issue #1555 - initial generic geometry resource
- refactored viz data access resources
- updated hydro factory based on existing hydro code
- geometric lines and polygons are now both rendered using wireframe shapes and the same logic
- relocated the data used to render the geometries to the resource
- points are created instead of circles for geometric points
- do not store legend text as a static variable in the abstract data access resource
- addressed peer review comments

Change-Id: Ic7792aede9e24445af541f01631886645a8cf1f0

Former-commit-id: 442a2f8fa4 [formerly a86d2b5769] [formerly 442a2f8fa4 [formerly a86d2b5769] [formerly 1732e6b4ea [formerly 04179bd343c3ec976c601e2856a3949e4515b472]]]
Former-commit-id: 1732e6b4ea
Former-commit-id: 9c7d8ca3d3 [formerly c8a6b08394]
Former-commit-id: 3b2342193f
2013-02-06 12:03:40 -06:00
Steve Harris
a11c8dff6d Merge branch '13.2.1_delivery' into development
Former-commit-id: da43a7a8ca [formerly 4bc8e9ab5c] [formerly da43a7a8ca [formerly 4bc8e9ab5c] [formerly 5ee47e098d [formerly 30e1ae8f245a60c780fcc79f54795ece0b28088f]]]
Former-commit-id: 5ee47e098d
Former-commit-id: b119d66cda [formerly 3ad515e28f]
Former-commit-id: d73efe8e86
2013-02-06 11:12:01 -06:00
Steve Harris
f997ecea38 Merge branch 'ss_builds' (13.2.1-5) into 13.2.1_delivery
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java

Former-commit-id: 14f23d4227 [formerly a16ac7819c] [formerly 14f23d4227 [formerly a16ac7819c] [formerly 6c6b53679b [formerly 873c1773504d6dd9421b92f6193c32e477e4533c]]]
Former-commit-id: 6c6b53679b
Former-commit-id: 48a0ffda4d [formerly 28ddc9bad8]
Former-commit-id: f028c16f79
2013-02-06 11:08:53 -06:00
Steve Harris
f36867a520 13.2.1-5 baseline
Former-commit-id: a6b3cde1ff [formerly 232734091d] [formerly a6b3cde1ff [formerly 232734091d] [formerly 146fcc6da8 [formerly c56f1fdc3e2419c5dd6bebbbb1e0e688bd5e0092]]]
Former-commit-id: 146fcc6da8
Former-commit-id: 7497a15e22 [formerly 1c602ec3a7]
Former-commit-id: bb0759d5ad
2013-02-06 11:02:32 -06:00
Nate Jensen
5004f1a551 Merge "Issue #1553 initial implementation of radar factory Change-Id: I86375a74f96159a9ed32d20ffd38168d9308c574" into development
Former-commit-id: 3f2aa931db [formerly ad4d5d6816] [formerly 3f2aa931db [formerly ad4d5d6816] [formerly 86c14f8275 [formerly a2c55643fe41a58029089aec2689a4678e7f8f6d]]]
Former-commit-id: 86c14f8275
Former-commit-id: 36810f3daa [formerly 7304e763d6]
Former-commit-id: dbc0a5137b
2013-02-05 17:37:29 -06:00
Lee Venable
5ac2876ddd Merge "Issue #1578 Changes for non-blocking CaveHydroSWTDialog, singleton TimeseriesDlg and removal of TimeSeriesconfigAction." into development
Former-commit-id: b6c943fe47 [formerly ab300ca0d5] [formerly b6c943fe47 [formerly ab300ca0d5] [formerly 8f5f26a058 [formerly 97bd7f31af2db7dd483d4fe4d7da271d2fe3a915]]]
Former-commit-id: 8f5f26a058
Former-commit-id: 9b9072902f [formerly 2264a66c09]
Former-commit-id: 470b10ddc7
2013-02-05 16:39:14 -06:00
Lee Venable
f82afa483c Merge "Issue #1550 - Add ability for MPE to preload maps on perspective open." into development
Former-commit-id: 6e7f552972 [formerly 42941bb2be] [formerly 6e7f552972 [formerly 42941bb2be] [formerly cc34190c18 [formerly 07a61258f12fe6cf793467af271d060882953adc]]]
Former-commit-id: cc34190c18
Former-commit-id: 3444c01cfa [formerly 0dd325ed88]
Former-commit-id: b807d9085e
2013-02-05 16:22:30 -06:00
Roger Ferrel
c4c24e2753 Issue #1578 Changes for non-blocking CaveHydroSWTDialog, singleton TimeseriesDlg and removal of TimeSeriesconfigAction.
Change-Id: Ie249af9dcb2b84db686bca5c0936c2157d40c507

Former-commit-id: a558cbc03a [formerly eaa3834f6b] [formerly a558cbc03a [formerly eaa3834f6b] [formerly dc965dc82a [formerly 413491362e25a08b7e43f86987cc059f794a674b]]]
Former-commit-id: dc965dc82a
Former-commit-id: 30a1f42557 [formerly d9d53340bb]
Former-commit-id: 24ff19dae7
2013-02-05 16:13:08 -06:00
Mike Duff
320c4c7683 Issue #1580 - Fix spring config
Former-commit-id: 3f3554a559 [formerly 6b51c66923] [formerly 3f3554a559 [formerly 6b51c66923] [formerly 65deb06061 [formerly 020c39ec162e786ebb8b5a9a2feac7ae415e5036]]]
Former-commit-id: 65deb06061
Former-commit-id: 1fc97f07fe [formerly 62e25af348]
Former-commit-id: cc384772b7
2013-02-05 15:49:22 -06:00
Mike Duff
28e854de25 Issue #1580 - Refactor events framework so EventBus is available from CAVE or EDEX.
Change-Id: If8d9c18108ca244b044b1ddc5a80e9e5de623c7a

Former-commit-id: 06ddb6cce7 [formerly 1b1d00f8a9] [formerly 06ddb6cce7 [formerly 1b1d00f8a9] [formerly 36909dd6c0 [formerly 1d3f9e0d5b32f96fc4eff47f040d5eb159a38d3c]]]
Former-commit-id: 36909dd6c0
Former-commit-id: cd52a94032 [formerly 4400265394]
Former-commit-id: 0cb979038b
2013-02-05 15:13:51 -06:00
Dustin Johnson
53c04aac63 Merge "Issue #1543 Add ability to save/read dods files back to net.dods" into development
Former-commit-id: 7b2adf535e [formerly df987e6204] [formerly 7b2adf535e [formerly df987e6204] [formerly 0ceb35c131 [formerly 062ed14d60a8b3d29650ce78fa449f69f40d413b]]]
Former-commit-id: 0ceb35c131
Former-commit-id: 81d0423913 [formerly d08a9b3b13]
Former-commit-id: f50dd729f5
2013-02-05 14:36:31 -06:00
Dustin Johnson
01bfa884e5 Merge "Issue #1543 Break apart the retrieval process to support SBN capabilities. Made interfaces for various aspects of retrieval that are Spring injectable. Created an initial SBN retrieval task that will watch the /awips2/crawl directory, for proof of concept." into development
Former-commit-id: 9da65d97bc [formerly 39cfcf40a8] [formerly 9da65d97bc [formerly 39cfcf40a8] [formerly 6f95400d1c [formerly b6c403f6c8e22397d1df178ffddc9b8951f7e683]]]
Former-commit-id: 6f95400d1c
Former-commit-id: 4fecb5f6a7 [formerly 2f900fb18f]
Former-commit-id: 0552073c4b
2013-02-05 14:36:12 -06:00
Greg Armendariz
2fd99367c5 Merge "Issue #1577 - deploy-install and AWIPS II ant task updates" into development
Former-commit-id: fc246471f1 [formerly 85d3f17617] [formerly fc246471f1 [formerly 85d3f17617] [formerly 5bcdb25925 [formerly 3e0d46e342a60f245b1519e1741469d9269ab079]]]
Former-commit-id: 5bcdb25925
Former-commit-id: 927046da46 [formerly 9223f40f3f]
Former-commit-id: 19c227a6b8
2013-02-05 14:07:45 -06:00
Dustin Johnson
547362b6bb Issue #1543 Add ability to save/read dods files back to net.dods
Change-Id: Icca189f4c3716d4045798d88a6e6ce7d27d46fcf

Former-commit-id: efe1bcc4b5 [formerly cd381cb819] [formerly efe1bcc4b5 [formerly cd381cb819] [formerly febe492056 [formerly d93464273e905ecbb834d7aeaccf477b42e495a3]]]
Former-commit-id: febe492056
Former-commit-id: c81cb3d60b [formerly fffbb32775]
Former-commit-id: 999f3cbcd5
2013-02-05 14:07:30 -06:00
Bryan Kowal
2afa604676 Issue #1577 - deploy-install and AWIPS II ant task updates
- includegen will now fail if a plugin is included in two or more features
- includegen will no longer prepend component-deploy.xml to the plugins in the list that it generates
- removed a plugin from the ncep feature that was also in the cots feature
- the includegen failure will cause deploy-install to fail
- peer review comments; excluding significant re-factoring

Change-Id: I2e317b1ef0764da3ddd9cd6ef10555ca4bf8bd3f

Former-commit-id: 81da18f851 [formerly 7815b651bb] [formerly 81da18f851 [formerly 7815b651bb] [formerly 5fea87f1dd [formerly 7659fb8044f3f4715c9ea7c875eda36b7c5dd136]]]
Former-commit-id: 5fea87f1dd
Former-commit-id: efe288c82c [formerly 99994d3151]
Former-commit-id: 2fafc6a34b
2013-02-05 13:25:15 -06:00
Nate Jensen
32bd4081c5 Merge "Issue #1567 refactor updates of plots for efficiency/clarity" into development
Former-commit-id: 317e225992 [formerly 532bec2967] [formerly 317e225992 [formerly 532bec2967] [formerly 0a64da0b72 [formerly e41fb23e150d4c447823593016a698dabcb8fae5]]]
Former-commit-id: 0a64da0b72
Former-commit-id: 956b1c57db [formerly d6de86b57b]
Former-commit-id: 80b1d80da9
2013-02-05 13:21:21 -06:00
Dave Hladky
d8ce48e79d Issue #1478 FFMP cache file read/writes overloading NAS, more efficiency
Change-Id: Ib5f49d9c1551b72a3620629437386d52c12b0ecf

Former-commit-id: 7b49430e34 [formerly c0712160d7] [formerly 7b49430e34 [formerly c0712160d7] [formerly 7af5aab08a [formerly 9c7d813ee094864e0a7da60d54dee5424c50efba]]]
Former-commit-id: 7af5aab08a
Former-commit-id: b134741e4c [formerly f6bd4ea0fa]
Former-commit-id: 69477ec246
2013-02-05 12:23:56 -06:00
Nate Jensen
353f7f513d Issue #1567 refactor updates of plots for efficiency/clarity
Change-Id: Id3d52ef2eb671138c078bc721c690867ba3dada3

Former-commit-id: 48a503e3dd [formerly b9b730aac5] [formerly 48a503e3dd [formerly b9b730aac5] [formerly 2a3f3e6a40 [formerly b2788eb6bbc807d6fecc8e097e15dfbcb3ff8105]]]
Former-commit-id: 2a3f3e6a40
Former-commit-id: 029aa60957 [formerly a56d672039]
Former-commit-id: fce50aaf62
2013-02-05 11:07:21 -06:00
Richard Peter
7fbd24e723 Merge "Issue #1576 - updated qpid 0.18 rpms" into development
Former-commit-id: bb317b1acf [formerly 221a6e1ca1] [formerly bb317b1acf [formerly 221a6e1ca1] [formerly b774fadb60 [formerly 16b20a7f05e0a16ef02881a950bd541f7b4a4a1e]]]
Former-commit-id: b774fadb60
Former-commit-id: 2e02b222f2 [formerly fa4dd004f9]
Former-commit-id: b4192e72c8
2013-02-05 09:25:55 -06:00
Richard Peter
916d24b076 Merge "Issue #1517 Added SPC Prob menu changes." into development
Former-commit-id: e4894a01fd [formerly 74b3cc23ff] [formerly e4894a01fd [formerly 74b3cc23ff] [formerly 4170ba9558 [formerly 153173d6f07aaf135be6e5422c893942deef5371]]]
Former-commit-id: 4170ba9558
Former-commit-id: 501e305a66 [formerly a0807f8ecb]
Former-commit-id: a64802277e
2013-02-05 09:23:20 -06:00
Steve Harris
f8420bc7e1 13.2.1-5 baseline
Former-commit-id: d6a9d68c10 [formerly a11ab8f26e] [formerly d6a9d68c10 [formerly a11ab8f26e] [formerly d26a488ee4 [formerly d117c677ade20193836680bc7905ba7bbf9c67b2]]]
Former-commit-id: d26a488ee4
Former-commit-id: 72ca459f76 [formerly 4a745c9483]
Former-commit-id: 62edcd29eb
2013-02-04 16:31:26 -06:00
Steve Harris
fdf67e8292 13.2.1-5 baseline
Former-commit-id: 1a74d2f0c5 [formerly b4014794de] [formerly 1a74d2f0c5 [formerly b4014794de] [formerly f99f99e2f5 [formerly 7a6958217f8b67edac937a23cb1c2ae8a89cedce]]]
Former-commit-id: f99f99e2f5
Former-commit-id: 39cb931bc9 [formerly 418d8ca0d8]
Former-commit-id: 256b596d88
2013-02-04 16:36:29 -05:00
Steve Harris
8c01240531 Merge branch '13.2.1_delivery' into development
Former-commit-id: 9595fefb4b [formerly d997d99f05] [formerly 9595fefb4b [formerly d997d99f05] [formerly f380667b34 [formerly 815e8b741b173044f8f20f537674d685b50ed6af]]]
Former-commit-id: f380667b34
Former-commit-id: 24ff063657 [formerly 930f1f13c0]
Former-commit-id: 8470638469
2013-02-04 15:26:44 -06:00
Bryan Kowal
0a74b80f23 Issue #1553 - remove duplicated "image" plugin
Change-Id: Ia0328efb3f45dc233118b7ef209e53b1f4ae1f5e

Former-commit-id: af697a65d1 [formerly 1b7e268feb] [formerly af697a65d1 [formerly 1b7e268feb] [formerly dd6abb0ba1 [formerly a16493410bddeca8982140a3a41922d46ee479b4]]]
Former-commit-id: dd6abb0ba1
Former-commit-id: 32012b9f64 [formerly 7bb3bef057]
Former-commit-id: 45f67cda75
2013-02-04 13:07:35 -06:00
Bryan Kowal
c92b997909 Issue #1576 - updated qpid 0.18 rpms
- the broker-plugins/management-jmx module is now built
- the broker-plugins-management-jmx plugins and the common-management plugins are now included in the rpms

Change-Id: I273772b2fb8f339a55cc3e523f90ca3b2398b222

Former-commit-id: 145cd06eae [formerly 1678618015] [formerly 145cd06eae [formerly 1678618015] [formerly 09523f1e84 [formerly c43c4268ba13e5758dfb4c504d57dead5ae89d63]]]
Former-commit-id: 09523f1e84
Former-commit-id: fe70d57c36 [formerly 513bda11bc]
Former-commit-id: 88d5830873
2013-02-04 12:31:23 -06:00
Nate Jensen
7bbb39b569 Issue #1553 fix build
Change-Id: Ia716b2bd6ecd3c8e045ad91c4c3ca063690b91c3

Former-commit-id: f044441759 [formerly ea6dec5db8] [formerly f044441759 [formerly ea6dec5db8] [formerly dd854cdb85 [formerly d46cda9c95a94572fa2e6c89ed4298a55cf76e15]]]
Former-commit-id: dd854cdb85
Former-commit-id: 53bf879c83 [formerly d15a57427e]
Former-commit-id: 77a1ecc998
2013-02-04 09:34:40 -06:00
Dustin Johnson
55f7212a0e Issue #1543 Break apart the retrieval process to support SBN capabilities.
Made interfaces for various aspects of retrieval that are Spring injectable.
Created an initial SBN retrieval task that will watch the /awips2/crawl directory, for proof of concept.

Amend:
  Check whether debug is enabled prior to debug message.
  Move log of request xml inside null check.

Change-Id: I5e3fe835f028cb93c98abce9735d3d59cfc663dc

Former-commit-id: cf063000ca [formerly 3b20efeb7d] [formerly cf063000ca [formerly 3b20efeb7d] [formerly 1a17e4a0f5 [formerly 120296239cfa021507b4ce9bc3f7333509b1dfb9]]]
Former-commit-id: 1a17e4a0f5
Former-commit-id: 2940a059d1 [formerly b5f69e21d8]
Former-commit-id: bef0f2eca1
2013-02-04 09:00:33 -06:00
Brad Gonzales
7253bbf20e Issue #1517 Added SPC Prob menu changes.
Amend: Moved derived parameter files to cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/
       Moved Spc.ppy to edexOsgi/build.edex/esb/data/utility/edex_static/base/smartinit/
       Updated units in spcGuideNDFD.xml.
       Removed local configuration menu items and tags.
       Updated pqact.conf.template SPC entry.
       Update SPC.py with levels.

Change-Id: I0f7a148d5e122b26c125bfee110019d5f577bdc1

Former-commit-id: 35cc853c74 [formerly f459554e33] [formerly 35cc853c74 [formerly f459554e33] [formerly 5bc6dd5498 [formerly a84415dcfc5dd1d330ef8022f496b2e2ee45c54d]]]
Former-commit-id: 5bc6dd5498
Former-commit-id: 8fc5c18ebd [formerly f3ef309293]
Former-commit-id: adbfa7ced1
2013-02-04 08:52:33 -06:00
Ben Steffensmeier
34cd58356e Issue #1553 initial implementation of radar factory
Change-Id: I86375a74f96159a9ed32d20ffd38168d9308c574

Former-commit-id: efc647e6ba [formerly ed60f1a696] [formerly efc647e6ba [formerly ed60f1a696] [formerly 0eb24c11e2 [formerly 1db5404b22544dbc8954825121217c0ffce95fa0]]]
Former-commit-id: 0eb24c11e2
Former-commit-id: 8cbde9ef7d [formerly 681b30b3d8]
Former-commit-id: 1d7df3e6c1
2013-02-01 16:29:13 -06:00
Nate Jensen
9837ce9241 Merge "Issue #1553 move radar units into common plugin for use in data access factory Change-Id: I32d01625bcbc6555b402048ebb34cee21f0b855f" into development
Former-commit-id: d7677be8a4 [formerly f77a1dc85c] [formerly d7677be8a4 [formerly f77a1dc85c] [formerly e1166c246c [formerly 358b990e43d0f5952ee3c33521778541bd1b7c04]]]
Former-commit-id: e1166c246c
Former-commit-id: d996064b91 [formerly 3ab7c693de]
Former-commit-id: 029b031536
2013-02-01 15:01:24 -06:00
Ben Steffensmeier
491d2c3e63 Issue #1575 apply persisted colormap attributes to grid resources
Former-commit-id: f8b9b2c987 [formerly 07d053bb3c] [formerly f8b9b2c987 [formerly 07d053bb3c] [formerly 1884c77278 [formerly 4bb77ee1763890a355a0ac5eefb8c14c12e13780]]]
Former-commit-id: 1884c77278
Former-commit-id: 16be5e1ab5 [formerly a2a95a17aa]
Former-commit-id: bda67a7d70
2013-02-01 12:45:39 -06:00
Roger Ferrel
3f8b7c2274 Issue #1496 Place finally on Jobs to always clean up properly.
Change-Id: I7923482fae1dff2f467605655582f96768146008

Former-commit-id: 87ea06dfa3 [formerly fa84461ac9] [formerly 87ea06dfa3 [formerly fa84461ac9] [formerly fe0761d2de [formerly c25a296b3362159230f1020b9800cc0b75d83b61]]]
Former-commit-id: fe0761d2de
Former-commit-id: 5328956362 [formerly 37f6ac440f]
Former-commit-id: f4adecb7c0
2013-02-01 10:28:06 -06:00
Ben Steffensmeier
04e0c7ca48 Issue #1553 fix RenderableTileSet for round projections.
Former-commit-id: f3aa9d3ba4 [formerly 1e6d6ac799] [formerly f3aa9d3ba4 [formerly 1e6d6ac799] [formerly f31215a999 [formerly 8bd997f193b4a8cc75fc6609b321b29f2524c08b]]]
Former-commit-id: f31215a999
Former-commit-id: 90070b40d2 [formerly 8c3deb1a93]
Former-commit-id: 77463bf7fa
2013-01-31 17:17:30 -06:00
Ben Steffensmeier
2334bfef69 Issue #1553 move radar units into common plugin for use in data access factory
Change-Id: I32d01625bcbc6555b402048ebb34cee21f0b855f

Former-commit-id: e9d3c547ff [formerly 057654103d] [formerly e9d3c547ff [formerly 057654103d] [formerly 54d91281a6 [formerly c9faa8b98ce3687667363841f5955d8aebab6b1e]]]
Former-commit-id: 54d91281a6
Former-commit-id: df823559eb [formerly 8442c27bc6]
Former-commit-id: bbdd86c866
2013-01-31 17:15:11 -06:00
Steve Harris
e32a6d6364 Merge branch '13.2.1_delivery' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into 13.2.1_delivery
Former-commit-id: e173b1caf7 [formerly 2117c3905f] [formerly e173b1caf7 [formerly 2117c3905f] [formerly 5966741649 [formerly 3008b5145d81fd940bed26cf96bfeaa42505e830]]]
Former-commit-id: 5966741649
Former-commit-id: c5dce3cc06 [formerly 8a2ee0ce90]
Former-commit-id: bacc980b63
2013-01-31 16:20:45 -06:00
Roger Ferrel
c608b96ce4 Issue #1568 Changed spell checkers shell.
Change-Id: If7fe987b46204d9edf89a0a0c461a4444320d265

Former-commit-id: 83f077a426 [formerly e3c047c96d] [formerly 83f077a426 [formerly e3c047c96d] [formerly fd04707b7d [formerly 5444ec7e59a1499114b2d138e90f2c888aaf6e6c]]]
Former-commit-id: fd04707b7d
Former-commit-id: 6495252989 [formerly 9183e40c5f]
Former-commit-id: bdf6be59cc
2013-01-31 16:08:54 -06:00
Jonathan Sanchez
0f441e63c7 Issue #1557 Added allowDuplicates XML element to point source configuration.
Change-Id: I20a05413ef93c4b1268a5b9d3d5541375a47523b

Former-commit-id: b2870a012e [formerly da1061baa6] [formerly b2870a012e [formerly da1061baa6] [formerly f72968824a [formerly 945b2e64b971fc31691d550e6c629f43db9a9c99]]]
Former-commit-id: f72968824a
Former-commit-id: ed42a6d939 [formerly 53eddc3ec8]
Former-commit-id: aec55e410f
2013-01-31 16:01:04 -06:00
Nate Jensen
8f195e0a7e Merge "Issue #1564 correct mosaic ordered shader shader." into development
Former-commit-id: 6aecbaef5b [formerly dcc3c43454] [formerly 6aecbaef5b [formerly dcc3c43454] [formerly 4f7b9dee8b [formerly 7ad29b0c523ec431d91f2a0340f4fc635564493d]]]
Former-commit-id: 4f7b9dee8b
Former-commit-id: 3e7349e404 [formerly 6154c18856]
Former-commit-id: 8858e72966
2013-01-31 15:57:55 -06:00
Lee Venable
57443eb443 Merge "Issue #1557 Added allowDuplicates XML element to point source configuration. Change-Id: I20a05413ef93c4b1268a5b9d3d5541375a47523b" into development
Former-commit-id: bc4b462c69 [formerly 3cc2665f41] [formerly bc4b462c69 [formerly 3cc2665f41] [formerly f2e7f7ff1b [formerly a7e3ea831a4cbd3e5ab04f3288b8eac8f74f70f3]]]
Former-commit-id: f2e7f7ff1b
Former-commit-id: f192004c51 [formerly 16bc40cec8]
Former-commit-id: f5919fdf64
2013-01-31 15:54:05 -06:00
Nate Jensen
7b3f056fa9 Merge "Issue #1558 Fixed RotatePanelsHandler so it functions correctly when rotating from 4-1 panel" into development
Former-commit-id: 3daf6649dd [formerly a4255d89ae] [formerly 3daf6649dd [formerly a4255d89ae] [formerly 84a25b2c19 [formerly 429d48bfcc56a96b4ef4d0a2c498cf51d661973d]]]
Former-commit-id: 84a25b2c19
Former-commit-id: 74043613ed [formerly e2992d6344]
Former-commit-id: ff2d324817
2013-01-31 15:41:47 -06:00
Max Schenkelberg
23a67773f6 Issue #1558 Fixed RotatePanelsHandler so it functions correctly when rotating from 4-1 panel
Change-Id: I39f6d119360b6c43b2ba4667321e4119d312f721

Former-commit-id: d0c9157e2a [formerly ed4a9023da] [formerly d0c9157e2a [formerly ed4a9023da] [formerly 95d3706969 [formerly b5f53d6b332c8f4b24462d0d42ff1d07cb31830b]]]
Former-commit-id: 95d3706969
Former-commit-id: a1d92fa99f [formerly 0f9f51fb14]
Former-commit-id: 621f71977e
2013-01-31 15:34:46 -06:00
Ben Steffensmeier
c78627f525 Issue #1564 correct mosaic ordered shader shader.
Former-commit-id: 153b826ca9 [formerly ebae642c8a] [formerly 153b826ca9 [formerly ebae642c8a] [formerly 9bf9b1cc0d [formerly 514ae219a7e986ca420d28a0c480de4c4d31bbdb]]]
Former-commit-id: 9bf9b1cc0d
Former-commit-id: 723c4c87a7 [formerly c43bd1a5ab]
Former-commit-id: e57e54dbba
2013-01-31 15:26:16 -06:00
Nate Jensen
2ddb12e9ab Merge "Issue #1562 Made topo create colormap parameters off existing ones and moved to new tileset API" into development
Former-commit-id: 1928c8a329 [formerly 3f5e7f4eee] [formerly 1928c8a329 [formerly 3f5e7f4eee] [formerly fb122159c8 [formerly 2063a0d927451764f622e5fa08bff52bef124c14]]]
Former-commit-id: fb122159c8
Former-commit-id: 68d20efc52 [formerly 346ca8be1c]
Former-commit-id: e8860fd628
2013-01-31 15:25:49 -06:00
Bryan Kowal
fa38db1d45 Merge "Issue #1551 - adding maps to the Data Access Framework" into development
Former-commit-id: 776e7ab5c2 [formerly f585de398b] [formerly 776e7ab5c2 [formerly f585de398b] [formerly 73cf3ac730 [formerly d722b34158a74e922025804a2f0953226aae7a98]]]
Former-commit-id: 73cf3ac730
Former-commit-id: 6027369645 [formerly a65ccede20]
Former-commit-id: 59cbe4be3f
2013-01-31 15:24:30 -06:00
Jonathan Sanchez
db72c21e73 Issue #1557 Added allowDuplicates XML element to point source configuration.
Change-Id: I20a05413ef93c4b1268a5b9d3d5541375a47523b

Former-commit-id: c6a47fe8c9 [formerly 55b12dae25] [formerly c6a47fe8c9 [formerly 55b12dae25] [formerly ed0bce744e [formerly 9ba75c5a838b95ff09a64929c97492b97f4729f1]]]
Former-commit-id: ed0bce744e
Former-commit-id: 8d3188713b [formerly c8b8981804]
Former-commit-id: e3d4a66310
2013-01-31 15:11:17 -06:00
Benjamin Phillippe
c72a037691 Issue #1525 Data Discovery Browser Performance
Change-Id: I1b5405e52fa8462b562e8a56b2e544d96e9ad0f3

Former-commit-id: 25b05eada7 [formerly acb6889b1d] [formerly 25b05eada7 [formerly acb6889b1d] [formerly 9806387a8b [formerly 495a30e31a16f0c595c35555e4d804585dcb5a96]]]
Former-commit-id: 9806387a8b
Former-commit-id: d68bb6da0d [formerly db40c02bbf]
Former-commit-id: 182df430f4
2013-01-31 14:43:26 -06:00