Commit graph

5340 commits

Author SHA1 Message Date
Steve Harris
1e989b1639 Omaha #3085 - Removed ufcore and ufcore-foss plugins
Former-commit-id: 8fae55b404 [formerly 03e7d5d06f] [formerly a89621797d] [formerly 491b768204 [formerly a89621797d [formerly 5dacfcc17cf99c604c0d4d2669c0aab962eca3ca]]]
Former-commit-id: 491b768204
Former-commit-id: 85fa8d3f761f8d88d8e3d58caaba110e85d03595 [formerly 23e542e36b]
Former-commit-id: 558686f2fd
2014-04-28 09:59:23 -05:00
Richard Peter
d5149f4409 Merge "Issue #2947 Minor satellite and derived parameter improvements." into development
Former-commit-id: 84bb4e5e32 [formerly 97fb03df02] [formerly 91e941f60a] [formerly 9ef8347f23 [formerly 91e941f60a [formerly 5bd4eed36c6d7c69b8fb70c6c7e021cbdd5d3b52]]]
Former-commit-id: 9ef8347f23
Former-commit-id: 0189c0a9c6497ecc36bfd9e74f6935af94b96c99 [formerly ffd74e6787]
Former-commit-id: a4eba6e6df
2014-04-11 19:33:31 -05:00
Ben Steffensmeier
a224105467 Issue #2947 Minor satellite and derived parameter improvements.
Former-commit-id: 4004fe2d18 [formerly 2d66e58671] [formerly dd794a3c12] [formerly 428f3a2d8b [formerly dd794a3c12 [formerly d5fe527ff45e02cbbba3a92f2031d500db879839]]]
Former-commit-id: 428f3a2d8b
Former-commit-id: 8166890980b160e863adea23a121042b57a2fc64 [formerly 6c92b645f0]
Former-commit-id: b120feab6f
2014-04-11 17:37:59 -05:00
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
Richard Peter
ed571fbebd Merge "Issue #2864 - Change how saved subset files are stored." into development
Former-commit-id: ce74b40f0b [formerly 69c6217ae9] [formerly 8a682a5e23] [formerly 695878c6aa [formerly 8a682a5e23 [formerly 05fed9ffbd4c61601d6a42b2ef3dadefde7e1a3c]]]
Former-commit-id: 695878c6aa
Former-commit-id: b517923cac7561c9a58df72238f27a0df00b52df [formerly 0fa4180959]
Former-commit-id: b4cc44faa0
2014-04-11 09:41:31 -05:00
Richard Peter
5242f17146 Merge "Issue #2905 modified ucar BUFR library to fix bug" into development
Former-commit-id: cfca7941da [formerly e235baf81d] [formerly 4681ba4a76] [formerly 8e33f38232 [formerly 4681ba4a76 [formerly 84fd4953a8aaf0ada4dbb96e3fea911b43247bc7]]]
Former-commit-id: 8e33f38232
Former-commit-id: 8545b6f9e7e00e6e2ee70a56973fc337e2cc1215 [formerly 032c8b17bd]
Former-commit-id: f3125d1a87
2014-04-11 09:40:36 -05:00
Ron Anderson
9353f224c9 Merge "Issue #2730 remove extracted numpy directories and files" into development
Former-commit-id: 6d205dd367 [formerly b768cea758] [formerly 6d55f4a7c7] [formerly de12c875f2 [formerly 6d55f4a7c7 [formerly 9c4b8db9c034dcf4ce2eb1302fca38ae6a909874]]]
Former-commit-id: de12c875f2
Former-commit-id: 5f53e78eb8b1b03ec7fafdcf5ced68a29b314bf6 [formerly 632a1e4592]
Former-commit-id: 19638b6d43
2014-04-11 08:46:17 -05:00
Mike Duff
6e9e743fdc Issue #2864 - Change how saved subset files are stored.
Change-Id: I57c68196a633a55a6f9c1548eff7ad449fadb88c

Former-commit-id: 3404a4beb4 [formerly a58f279b54] [formerly 82cf444d6f] [formerly 890faf2d73 [formerly 82cf444d6f [formerly 3052e5f92f4150fa82bfd93f512bb1670f926ec1]]]
Former-commit-id: 890faf2d73
Former-commit-id: ddc580d7996e5dbb65fac9aa71fcaadccf9ac671 [formerly 6d8bead4a7]
Former-commit-id: dc2a5b0c6f
2014-04-11 08:27:42 -05:00
Everett Kladstrup
c0091199ed Issue #2725 remove wxmath from edex.common.core
Former-commit-id: 108cddd62b [formerly 8e726ad379] [formerly c2d27d11f2] [formerly 25414de245 [formerly c2d27d11f2 [formerly 84b372c36f8f0ef707f124e06fe32eb2b41d8b0f]]]
Former-commit-id: 25414de245
Former-commit-id: 4bee026f12d62e5e43d37fb320316387da4dd66d [formerly fed45e26d8]
Former-commit-id: f40a46aef0
2014-04-10 17:42:07 -05:00
Nate Jensen
1de04d9b2b Merge "Issue #2937 Connect to the venue after the feed view is available." into development
Former-commit-id: 86acc1b95b [formerly c7593d61c4] [formerly 5fc6942fab] [formerly b3b9dbff67 [formerly 5fc6942fab [formerly 11985e2127b29ee4e67288579c273d1ac75cc902]]]
Former-commit-id: b3b9dbff67
Former-commit-id: e0d198c9c923c84f5c7f01b7be3395913cd0db68 [formerly 4a395ff2bc]
Former-commit-id: 7f32159599
2014-04-10 16:59:17 -05:00
Brian Clements
0d6e705419 Issue #2905 modified ucar BUFR library to fix bug
Former-commit-id: 8d0e4c9d46 [formerly 00c0403ec5] [formerly 184c2c3d77] [formerly 640391682f [formerly 184c2c3d77 [formerly d340cd72b224dedec1839bfdc75873faa8140ea9]]]
Former-commit-id: 640391682f
Former-commit-id: d2287f421bea0c0183fba812fb28dff27239b80c [formerly 0d8909db10]
Former-commit-id: 81f93a1929
2014-04-10 16:43:10 -05:00
Nate Jensen
f107b14359 Merge "Issue #2725 Moving derivparam plugins to the lowest applicable features" into development
Former-commit-id: b9ced036ed [formerly 2fc2442dc4] [formerly e1dbbe718b] [formerly 59d51c7d0b [formerly e1dbbe718b [formerly 653d2d2ef03b8f2b7a5c214d8e9b7b6284fe6b7b]]]
Former-commit-id: 59d51c7d0b
Former-commit-id: ded4f350ef7af1f1aa725f565644d7bbbaf2e6ae [formerly 51400be34f]
Former-commit-id: 4898952f4f
2014-04-10 16:36:26 -05:00
Everett Kladstrup
1c2141ee39 Issue #2725 Moving derivparam plugins to the lowest applicable features
Former-commit-id: c22e8323d1 [formerly 7fd3d7ce3d] [formerly b074c88957] [formerly ed0c157e33 [formerly b074c88957 [formerly 4397d0c6018858ab967110884cfdb7771c08e199]]]
Former-commit-id: ed0c157e33
Former-commit-id: 46e6bb43ef503376f26cf3a43ffbac64653319d2 [formerly b9f67d3bae]
Former-commit-id: 70a383f68d
2014-04-10 16:00:22 -05:00
Richard Peter
f59ce85fd6 Merge "Issue #2906 removed accidental manifest entry for bufr obs" into development
Former-commit-id: 777b89dbff [formerly 868d32cbbc] [formerly 2b28e47e44] [formerly b2962db1f0 [formerly 2b28e47e44 [formerly 6aad1ccde2c4a0b50e6f11cca6690b039a393568]]]
Former-commit-id: b2962db1f0
Former-commit-id: ba8513114ecb5f195da2a776dd4b9b37a6fead74 [formerly 2955520b41]
Former-commit-id: 8185a9120c
2014-04-10 15:54:34 -05:00
Brian Clements
4872fa7dca Issue #2906 removed accidental manifest entry for bufr obs
Former-commit-id: 86f1619d05 [formerly c4bbcc0688] [formerly f2d2cab0fc] [formerly e8708eb44d [formerly f2d2cab0fc [formerly 76eb62c08d300e5c47321b9ecbfe65814bcf2960]]]
Former-commit-id: e8708eb44d
Former-commit-id: 34c8d74ea4711e00f5646e74aacd2140daa2c3b9 [formerly ca43897d73]
Former-commit-id: b83dc2f4e9
2014-04-10 15:31:53 -05:00
Nate Jensen
98c385b874 Merge "Issue #2725 Put derivparam plugins in viz and edex separately" into development
Former-commit-id: 5b8a8effbb [formerly ecafc30027] [formerly ffc903d5c4] [formerly 7f8478ee0b [formerly ffc903d5c4 [formerly 7e57057056f7bf092336a915a2bfec652be268eb]]]
Former-commit-id: 7f8478ee0b
Former-commit-id: c39ac682b0aeebc03ee34cdfc9582d5e9223dec3 [formerly 11fd8d8055]
Former-commit-id: 17bf6198d9
2014-04-10 15:12:24 -05:00
Nate Jensen
444f846278 Merge "Issue #2906 added synop bufr obs decoder" into development
Former-commit-id: 0e44560636 [formerly 2df73a6601] [formerly 75b5f5b658] [formerly 439dc71571 [formerly 75b5f5b658 [formerly d214a46f19a939eec5d23d0c9029b1e85eaad447]]]
Former-commit-id: 439dc71571
Former-commit-id: 409268b2113f7a5a46304f6cf85517c66a4dddcb [formerly 8788d46064]
Former-commit-id: 91c478cb8f
2014-04-10 15:09:39 -05:00
Brad Gonzales
6ededf82a4 Issue #2730 remove extracted numpy directories and files
Change-Id: Ib1f47007c8820e89f75dadc25682aff7f356e99d

Former-commit-id: 55b91d551c [formerly 99d4fc15ef] [formerly 0e7f4d714d] [formerly 9b73789b20 [formerly 0e7f4d714d [formerly 329f95c875e55790821801fb0f7d70c26adc54f2]]]
Former-commit-id: 9b73789b20
Former-commit-id: 5f22b9a11f91d1d470b9215f57e388e740245150 [formerly edd15f2da6]
Former-commit-id: d529943e99
2014-04-10 15:04:50 -05:00
Everett Kladstrup
2bdc415769 Issue #2725 Put derivparam plugins in viz and edex separately
Former-commit-id: e543570a07 [formerly 90244ad7ec] [formerly d76aaed2f0] [formerly 1a8a05cd0e [formerly d76aaed2f0 [formerly b349f878ffe5fb8fd231cc9286cce6542f0ed88e]]]
Former-commit-id: 1a8a05cd0e
Former-commit-id: a7438ce6930c1b0cfa77ca4e1ab2e52ab9d87305 [formerly db413dc65f]
Former-commit-id: fa9ee97662
2014-04-10 14:08:42 -05:00
Brad Gonzales
ccc4bc5a27 Issue #2937 Connect to the venue after the feed view is available.
Change-Id: I6e560014308e6d17c8d7af525ded82d2399fa936

Former-commit-id: 0380e02c77 [formerly 5fcec27765] [formerly cc0fd1e9af] [formerly ea03096031 [formerly cc0fd1e9af [formerly 7b0e689a06eeee9f7c39dd79642fcde8e329c990]]]
Former-commit-id: ea03096031
Former-commit-id: 4877a895772c022be238b72f3f06a1ed801f3390 [formerly 3b25edad9a]
Former-commit-id: e41f9defa4
2014-04-10 14:01:53 -05:00
Nate Jensen
b36e4b7b65 Merge "Issue #1803 fix redbook sharing in collaboration" into development
Former-commit-id: 30dbefd6c3 [formerly 74a7189143] [formerly e88519c5e3] [formerly 666b271528 [formerly e88519c5e3 [formerly 296b4dee5e8907296c45b8372b5dffe28a2b9f4c]]]
Former-commit-id: 666b271528
Former-commit-id: e4c7b26770ed84f07c5a54f42347655f7d948564 [formerly 573981b0d5]
Former-commit-id: 5d17f07d25
2014-04-10 13:50:55 -05:00
Brian Clements
a48840eb73 Issue #2906 added synop bufr obs decoder
fixed units in sfcobs point data description
made getDescription() and static constants public in point data transform
fixed typo in udunits alias file
created new decoder for synop bufr obs
added decoder and dependencies to features


Former-commit-id: 421153a246 [formerly 1e2ad93e65] [formerly 663337e661] [formerly 972d18cd3b [formerly 663337e661 [formerly b35756921a0ba5ff240b80f92322da90345c6eaf]]]
Former-commit-id: 972d18cd3b
Former-commit-id: 52d5858d08d8147e77a97edea09d17aa7a29cd08 [formerly a072496474]
Former-commit-id: e34f218002
2014-04-10 12:08:27 -05:00
David Gillingham
969dccd366 Issue #3004: Move ClearPracticeVTECTableRequest and its handler from gfe to activetable plugin.
Change-Id: I46b1d79f1b6602254febff5d7c3d8f655a22bf2d

Former-commit-id: 41393ac5a1 [formerly 1c7e650e6a] [formerly c8a6dc8769] [formerly da31ab2042 [formerly c8a6dc8769 [formerly 6c5e65e538e145d31c84d2f81f7b41202ae41ad0]]]
Former-commit-id: da31ab2042
Former-commit-id: cb9962190ec6d166cbb1fc49f2bf0444ee77d9c4 [formerly 72229cfb94]
Former-commit-id: 0385a4395e
2014-04-10 11:24:40 -05:00
Nate Jensen
678fdc5e2e Issue #1803 fix redbook sharing in collaboration
Change-Id: I7e5d887d8dd46fec02966d9ea4723252d7cda31e

Former-commit-id: b591e66736 [formerly 4cccdac37e] [formerly 1efb9a2a4d] [formerly 4a826332e9 [formerly 1efb9a2a4d [formerly fdf384ea4cedebbf06c5e4861a5a7cdcc72533b4]]]
Former-commit-id: 4a826332e9
Former-commit-id: aa1362605787dece16aa34229e2c361a80278f2b [formerly a191b473e2]
Former-commit-id: 2750a173dc
2014-04-10 10:50:33 -05:00
Nate Jensen
0137516622 Merge "Issue #2694 Improve error handling" into development
Former-commit-id: 0ff3ad4f05 [formerly 288aa9b52c] [formerly e327184bdc] [formerly 9357bdfb0e [formerly e327184bdc [formerly a8707e3914a48b27d428340240eaa3eff48832f7]]]
Former-commit-id: 9357bdfb0e
Former-commit-id: 53e8e082e02b254f2a246e4a78524dfcee827a0f [formerly 3151a36ead]
Former-commit-id: 64f44d5e6c
2014-04-10 10:23:22 -05:00
Ron Anderson
1ad7403502 Issue #2694 Improve error handling
Change-Id: I576cd4950d73fd6ce82f982dbc165e18ecb240f3

Former-commit-id: 64a9b021d6 [formerly 11f7c48504] [formerly e66c93553d] [formerly 70faf6e7aa [formerly e66c93553d [formerly b9307d47ad5dabfd9664197025b675e0103e57ad]]]
Former-commit-id: 70faf6e7aa
Former-commit-id: 45f84345bfe6b816fa4a0b7f84b575feabcc697c [formerly 6891dab959]
Former-commit-id: 563e343ca6
2014-04-10 10:11:22 -05:00
Brad Gonzales
ce28c5b32a Issue #2937 Consolidated LogEntry to string and from string conversions in utility
methods.  Made LogEntry immutable.  Error handling updates processing LogEntries
read from the log and when processing room updates.

Amend: Create new DateFormatter for the the DetailedFeedLogPlugin purge thread.
       Added patterns and pipe constant to LogEntry.

Change-Id: I0d4963a54f5cf9fe236fef46fdd41f6c6822a0db

Former-commit-id: 19f4b1b64a [formerly fe95275a34] [formerly 056dbdbdff] [formerly d50f39e98d [formerly 056dbdbdff [formerly 38594a026e343bcf9db7d55816ae29fa77716f05]]]
Former-commit-id: d50f39e98d
Former-commit-id: fdd1fbec562ec709c2e1ddc6bf77a84a8df0074a [formerly 178e4fe8bb]
Former-commit-id: 7472fb8084
2014-04-09 18:47:09 -05:00
Richard Peter
cfe3c6a7af Merge "Issue #2862 The DatabaseArchiver and ArhivePurger now have write cluster locks." into development
Former-commit-id: 4e4a4a955b [formerly 8925673f3c] [formerly 394a41738f] [formerly 8b98ee101c [formerly 394a41738f [formerly cfbbae53d8466f647a7258047604bb10c9fef682]]]
Former-commit-id: 8b98ee101c
Former-commit-id: d7aced76be64291849b374dda327ee3a084f3600 [formerly dfd19e7904]
Former-commit-id: 923b6887dc
2014-04-09 16:42:31 -05:00
Nate Jensen
22724017f5 Merge "Issue #2907 fix redbook decoding of month" into development
Former-commit-id: b1dfcd4c63 [formerly a7776cf961] [formerly 3aa8d0bfea] [formerly 01834f722a [formerly 3aa8d0bfea [formerly e8054a6cba060649a2bbe31ce4f2d8c704150ecf]]]
Former-commit-id: 01834f722a
Former-commit-id: dbef326ddea1bc9331d7019a1f20c7f9c1eafd4e [formerly dac775ed4e]
Former-commit-id: 889db28e82
2014-04-09 16:10:45 -05:00
Nate Jensen
8af38ce197 Issue #2907 fix redbook decoding of month
Change-Id: Ieccea813452ba5708f039ea8aad0fd6f83c16f9a

Former-commit-id: 3f08f9e032 [formerly 8b9e22751a] [formerly 411779ce6f] [formerly 5905ff0dcf [formerly 411779ce6f [formerly 74340639a9522668ea6b2113771d5828919c7f02]]]
Former-commit-id: 5905ff0dcf
Former-commit-id: 2d6f9c59e93904ff7331c795337cf06ccc2fbf3f [formerly 0630c1bc0c]
Former-commit-id: 08f3535a49
2014-04-09 16:07:56 -05:00
Nate Jensen
1822ef2a7e Merge "Issue #2725 Add new project to alertviz feature" into development
Former-commit-id: d784482c45 [formerly 56b820ab97] [formerly ec40cb3dfc] [formerly eaf1382178 [formerly ec40cb3dfc [formerly 9cacee78da76f5da13b0a78a3e0a347a647050cf]]]
Former-commit-id: eaf1382178
Former-commit-id: 86328e4c52cd162460d6569d863534fac351186a [formerly 952586230a]
Former-commit-id: a0e2342126
2014-04-09 16:07:25 -05:00
Everett Kladstrup
2c4f13742b Issue #2725 Add new project to alertviz feature
Former-commit-id: e4be485bf7 [formerly 963ce8716e] [formerly e4633811fc] [formerly 02b47e4d5a [formerly e4633811fc [formerly 804dae43dd8f5cfc90fb7f17c7549b5151f63c7e]]]
Former-commit-id: 02b47e4d5a
Former-commit-id: feed7806f268e67eb9fd6dedff48a2ee5e474222 [formerly 55638c0916]
Former-commit-id: c2a96ba985
2014-04-09 16:01:57 -05:00
Nate Jensen
d39ebe23fe Merge "Issue #2950 Fix GL errors when mosaicing or using ginormous colormaps." into development
Former-commit-id: 3a88116cb1 [formerly ad961bb84d] [formerly 0dd55f63ba] [formerly 88d0e400fb [formerly 0dd55f63ba [formerly 4d91a4fedbba2164f1e11a2fbaea8e0b1dbe6340]]]
Former-commit-id: 88d0e400fb
Former-commit-id: 3475ac1a7fc2f3432054d40ed5ff81e416e0c344 [formerly a2c4c63852]
Former-commit-id: dfac2a42c2
2014-04-09 14:07:09 -05:00
Everett Kladstrup
dfbf285867 Issue #2725 Remove datacube plugin from viz.core feature
Former-commit-id: ffdcf503ca [formerly b670fa67f6] [formerly 50346d5aec] [formerly ef21ea5c1f [formerly 50346d5aec [formerly 1c72a291c9623f3930ca71da67e87ef884c81a94]]]
Former-commit-id: ef21ea5c1f
Former-commit-id: 2969dd971742c263227ae7f907962d513b487eaf [formerly 9faba2afbf]
Former-commit-id: fd9bd8282a
2014-04-09 13:59:11 -05:00
Roger Ferrel
e6938244b4 Issue #2862 The DatabaseArchiver and ArhivePurger now have write cluster locks.
Change-Id: I067b6037d5b044229f2c1e5acdd7ec5f7a372908

Former-commit-id: 76883956dd [formerly 032ee7ef77] [formerly 226b1be015] [formerly c86d738d5b [formerly 226b1be015 [formerly 09e4f116a482f2a197c01cdec3609e10e1d2285d]]]
Former-commit-id: c86d738d5b
Former-commit-id: 553d6ed782fb095faff61739f4995edf91a39016 [formerly 0d85ae72e0]
Former-commit-id: eec1d22987
2014-04-09 13:57:55 -05:00
Everett Kladstrup
9248f426c8 Issue #2725 Add new plugin to uf.viz.base feature
Former-commit-id: 11e432a9a5 [formerly 91673b18b0] [formerly 8d918404d5] [formerly 28364c8618 [formerly 8d918404d5 [formerly 828a32f1753a40613bb0351281458bee1d45cba6]]]
Former-commit-id: 28364c8618
Former-commit-id: b46b79c0e0435ebeaaed5f2f37fbfa85e03a4d6f [formerly 378193b61f]
Former-commit-id: d968a60023
2014-04-09 13:43:09 -05:00
Steve Harris
ea6d8ae184 Merge branch 'master_14.2.2' (14.2.2-3) into omaha_14.2.2
Former-commit-id: 72d410e74a [formerly 842e355cc7] [formerly ae196946b9] [formerly 2ea3d45ecc [formerly ae196946b9 [formerly 0b9acf9e28c1048bd3b98af7c04e6953c8425e81]]]
Former-commit-id: 2ea3d45ecc
Former-commit-id: 8e513f10ddbee68e5bba5df62ddbfb95a58225de [formerly 2efe4d5c6f]
Former-commit-id: cf3bc163b6
2014-04-09 13:24:52 -05:00
Ben Steffensmeier
73083d370e Issue #2950 Fix GL errors when mosaicing or using ginormous colormaps.
Former-commit-id: e74539a3e3 [formerly 9c5eb936d3] [formerly 5328415054] [formerly daff2b9d9d [formerly 5328415054 [formerly 67302674101992ae5416f342f92acab9233a113d]]]
Former-commit-id: daff2b9d9d
Former-commit-id: f590a0574524916e7a70b9bcfcc701a011f106d2 [formerly f5271a94d6]
Former-commit-id: 88f5dbe81d
2014-04-09 13:19:21 -05:00
Richard Peter
5fd5d98f2f Merge "Issue #2725 Post "derived parameter move" changes" into development
Former-commit-id: 44b93e4838 [formerly bf4617bc39] [formerly 2fd5aa86c893ed8ce4ea6decf9e5208236e8025e [formerly c6dd5bee41]] [formerly c1dde5cb3a [formerly c6dd5bee41 [formerly 635ea082393013a6967f177c419204197c9741f2]]]
Former-commit-id: c1dde5cb3a
Former-commit-id: a38cd0faf22d09b2b5d25515bb7c697eecfaf19e [formerly 4084c12c27]
Former-commit-id: caa3b3c51f
2014-04-09 11:37:09 -05:00
Nate Jensen
344f074849 Merge "Issue #2785 - Throw error when CollaborationConnection needs connection and it doesn't exist" into development
Former-commit-id: af412382b6 [formerly 187a895056] [formerly b58bb8500c] [formerly 2c2e324401 [formerly b58bb8500c [formerly c66a85a125bb590abad607eb751b0baf9c07a3ba]]]
Former-commit-id: 2c2e324401
Former-commit-id: 94cbd5ff0ac104e99e8caffdaf43085926994028 [formerly 8999051f04]
Former-commit-id: f574c535f5
2014-04-09 11:22:07 -05:00
Nate Jensen
4281ca0951 Merge "Issue #2950 Add option to interpolate image colors." into development
Former-commit-id: 5aa9e39af6 [formerly 0da28c9c7a] [formerly 1f2809ced0] [formerly d729cc70af [formerly 1f2809ced0 [formerly 1db00446a00b6cd268b169871eadd1bef407e268]]]
Former-commit-id: d729cc70af
Former-commit-id: 4e3e0a1ac7417f8887477ecc5573ff6370319711 [formerly c460736793]
Former-commit-id: 6f36916c31
2014-04-09 11:20:59 -05:00
Everett Kladstrup
4c979bd398 Issue #2725 Post "derived parameter move" changes
* move derived parameter definitions to base localization level
* remove java 7 exception constructor from inventory plugin
* move python function adapter to derivparam.python plugin


Former-commit-id: e222fc706e [formerly 0e88702cea] [formerly 16b4c9253e] [formerly 41b154802c [formerly 16b4c9253e [formerly c54110914a3a64a2ea7c22093327c9e0d84689b2]]]
Former-commit-id: 41b154802c
Former-commit-id: bbcf6ba629d8e4a1649178671bcae72d11e64f57 [formerly f6bf1f43bd]
Former-commit-id: 2ace82f815
2014-04-09 11:20:14 -05:00
Nate Jensen
7c7b5851a7 Merge "Issue #2950 Support dynamic color counts for color map editing." into development
Former-commit-id: 992a00b18c [formerly 6989999e95] [formerly 5129002e91] [formerly 5bad21f3e6 [formerly 5129002e91 [formerly b196bf0463ea59d55dec4e70373ca731152123f9]]]
Former-commit-id: 5bad21f3e6
Former-commit-id: 80e6eaeae66bf6576685319ea3e0cf04186e38c2 [formerly 92f0182d3f]
Former-commit-id: 58516f3a9f
2014-04-09 11:20:04 -05:00
Mike Duff
612ee41f8d Issue #2785 - Throw error when CollaborationConnection needs connection and it doesn't exist
Change-Id: I2f2234da42e9210b574f7489fc37da0a63bf2133

Former-commit-id: 981306d474 [formerly 5e39f5a61c] [formerly 23474c5ead] [formerly eafa177f4b [formerly 23474c5ead [formerly a1f94a19ba7f0bff7bbf76fa24ff6ace9019d0f1]]]
Former-commit-id: eafa177f4b
Former-commit-id: 6b9f38ad83f0cd349b068977532f23df7c700056 [formerly ee80debc36]
Former-commit-id: 1363155c34
2014-04-09 10:17:22 -05:00
Richard Peter
8ee15aba37 Merge "Issue #2725 Move derived parameters logic to common" into development
Former-commit-id: b86321616b [formerly 16e1018dd9] [formerly 9f0be4335806f82323adcb70ad62f21922700611 [formerly ea4d09c674]] [formerly ed25b71ff1 [formerly ea4d09c674 [formerly d97da3eb67c00a8d5bf1af0fae453fa9c96aacc4]]]
Former-commit-id: ed25b71ff1
Former-commit-id: 4968784e25043d1fa4fe8bf73e2308272466e2d1 [formerly ce7e0f9a31]
Former-commit-id: a32e066d95
2014-04-09 09:33:56 -05:00
Nate Jensen
165ad12513 Merge "Issue #2920 Fix serialization of DrawStringEvent." into development
Former-commit-id: c8ed059461 [formerly 6aa42816ec] [formerly abee6815ad] [formerly 143c3e1801 [formerly abee6815ad [formerly 663db14c5fa57c1d9ccd9c3d6ef82862d330a4b4]]]
Former-commit-id: 143c3e1801
Former-commit-id: ad20b8d2488e9d35df5bb49d9b58237c03c3af22 [formerly 0ea487feec]
Former-commit-id: 9899b9ecab
2014-04-09 09:32:39 -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
Ben Steffensmeier
02596282ca Issue #2920 Fix serialization of DrawStringEvent.
Former-commit-id: b921f6bb4e [formerly d09b87736a] [formerly 0abf71f719] [formerly d43e5abf29 [formerly 0abf71f719 [formerly d88bdcccb805896e32766373bc07185364741d4e]]]
Former-commit-id: d43e5abf29
Former-commit-id: 1eb3a1fd0725f2b68c866f6793a038c710d184f7 [formerly 6327c3a673]
Former-commit-id: 41e508b0da
2014-04-09 09:21:45 -05:00
Nate Jensen
d252a00965 Merge "Issue #2785 - Change connection order of events Fixed classpath Change-Id: I15296306ee105a54379a370da7d53c7e46dc34bb" into development
Former-commit-id: 323e6beb3e [formerly 44f93acd4d] [formerly 847481950c] [formerly ea3a8e29c3 [formerly 847481950c [formerly 2f4d6ca7b78e40d11a3dbfd66969681ddd2135fd]]]
Former-commit-id: ea3a8e29c3
Former-commit-id: 2d66ea60e65694f8edb4f2b29eaafcecb6c33f34 [formerly e99ad67ada]
Former-commit-id: 7a9f211997
2014-04-09 08:50:45 -05:00
Ben Steffensmeier
4c72a79253 Issue #2950 Support dynamic color counts for color map editing.
Former-commit-id: c23ef56706 [formerly 9d7504e2c3] [formerly c5a48642eb] [formerly c805a5fed7 [formerly c5a48642eb [formerly 85528bf2bbdbbaacc9631b76ef710e9fd0210110]]]
Former-commit-id: c805a5fed7
Former-commit-id: be88286e2cfc17a580f9a83f0f911cee38d4ed27 [formerly 16446101a4]
Former-commit-id: cf3456c6cd
2014-04-08 15:27:57 -05:00