Steve Harris
598fdb5d07
Merge branch 'ss_builds' (12.9.1-5) into development_on_ss_builds
...
Conflicts:
cave/com.raytheon.viz.ui/schema/editorMenuAddition.exsd
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/ContributedEditorMenuAction.java
edexOsgi/build.edex/edex/allElements.xml
edexOsgi/build.edex/edex/customAssembly.xml
edexOsgi/build.edex/esb/lib/lib_illusion/x86_64/libpython.so
edexOsgi/build.edex/esb/lib/native/linux64/libjep.so
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.guess
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.sub
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/depcomp
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/install-sh
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/ltmain.sh
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/missing
nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/mkinstalldirs
nativeLib/rary.cots.jasper/jasper-1.900.1/configure
rpms/awips2.core/Installer.python/nativeLib/i386/grib2.so
rpms/awips2.core/Installer.python/nativeLib/i386/gridslice.so
rpms/awips2.core/Installer.python/nativeLib/i386/libjasper.so.1.0.0
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1.0.0
rpms/awips2.edex/deploy.builder/build.sh
rpms/build/i386/build.sh
tools/scripts/commit-msg
tools/scripts/git-u-setup
tools/scripts/uamend
tools/scripts/ucommit
tools/scripts/upull
tools/scripts/upush
tools/scripts/ustat
Former-commit-id: 57c1be9f5a
[formerly 084ac9fbd4
] [formerly d38f8b80f0
] [formerly 57c1be9f5a
[formerly 084ac9fbd4
] [formerly d38f8b80f0
] [formerly 44a7cb75e7
[formerly d38f8b80f0
[formerly 6d33469c48d659279c02e5e9489b67b00576381a]]]]
Former-commit-id: 44a7cb75e7
Former-commit-id: a6797a478a
[formerly b335416e06
] [formerly 531735b4428be30c033b6b463b0342df571ead88 [formerly 77369f78a6
]]
Former-commit-id: 7d1b3c075694ece999044bcdceef8462a2a837fe [formerly 445d1a6a0d
]
Former-commit-id: 85533bdd24
2012-08-21 16:17:58 -05:00
Steve Harris
98059f9ef1
12.9.1-5 baseline
...
Former-commit-id: 77cbd6c1e5
[formerly a1d931fd44
] [formerly 61f269f54c
] [formerly 77cbd6c1e5
[formerly a1d931fd44
] [formerly 61f269f54c
] [formerly f2fac39428
[formerly 61f269f54c
[formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]]
Former-commit-id: f2fac39428
Former-commit-id: d9faed979f
[formerly 7fb0b17bd5
] [formerly 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb
]]
Former-commit-id: 84e9e52a92ae5e740b0daf680a98316f7435f7f7 [formerly 9b5c2094ed
]
Former-commit-id: 2d928d328e
2012-08-21 15:27:03 -05:00
Roger Ferrel
1adadb6e6d
Issue #875 Modification based on reviewers comments.
...
Issue #875 Implement Drag and Drop and converted point files to JAXB.
Change-Id: I3056794e1c77a02117998ac3f2d242c3ede3392b
Former-commit-id: a4987d9d8e
[formerly f7c56e0a73
] [formerly ca52d45911
] [formerly a4987d9d8e
[formerly f7c56e0a73
] [formerly ca52d45911
] [formerly 23a67f458a
[formerly ca52d45911
[formerly ea356c6c0ff3962542aad451a7a1ec65a5921628]]]]
Former-commit-id: 23a67f458a
Former-commit-id: 8bf9c837bb
[formerly c0f3f26eac
] [formerly cde0c4c81702c1a1d3d4bd95d80532e046717eed [formerly 544ea1ff53
]]
Former-commit-id: 3130d1cd8f7f5f39423deb8732ab113bfcd057b7 [formerly 85109fae11
]
Former-commit-id: fa712888d0
2012-08-21 11:56:50 -05:00
Max Schenkelberg
4eb5624fb4
Issue #28 Finished True Color Dialog and resource to allow overriding and persisting in bundle custom ranges set from the dialog.
...
Change-Id: Ia2629964d8c31d18ec469b0f5030efb9fd87445e
Former-commit-id: 6e575aa450
[formerly e404398ea6
] [formerly f381871fc4
] [formerly 6e575aa450
[formerly e404398ea6
] [formerly f381871fc4
] [formerly 6e1059f8be
[formerly f381871fc4
[formerly a34c116fbbad86f758882461dd96da9c6ab14cdd]]]]
Former-commit-id: 6e1059f8be
Former-commit-id: c3f6bc5225
[formerly 919000d0dd
] [formerly 064f75dfd8ee176652d6449f808d0b3ac5a57c6f [formerly ed033f8657
]]
Former-commit-id: 48e614807613f3c9a6adbd16f694a48c87911e13 [formerly 587ad5d2e4
]
Former-commit-id: fec3be6b57
2012-08-21 11:36:35 -05:00
Nate Jensen
e606897d0b
Merge "Issue #28 Cleaned up True Color code and removed old MultiChannel code. Adding capping index back to indexing.glsl and added no data value to ColorMapParameters that should be used for finding no data values in shader and in java. True color dialog was written but not hooked in yet as need to still think about single resource tied to multiple channels and serializing changes." into development
...
Former-commit-id: 3413c389cc
[formerly e29017c389
] [formerly 87c70d25e8
] [formerly 3413c389cc
[formerly e29017c389
] [formerly 87c70d25e8
] [formerly 1efe57fd02
[formerly 87c70d25e8
[formerly 3c0e8a73dc372214352fab8ac91e2b68f11f78f2]]]]
Former-commit-id: 1efe57fd02
Former-commit-id: 920b051a5b
[formerly 9c9f9a4989
] [formerly 2736a0139278a031106188c5c08456c5726df424 [formerly 521fc26db3
]]
Former-commit-id: eecb02de5a629f8abeb0c1a70e7d77cebb18757c [formerly 9141879a98
]
Former-commit-id: b5203491bb
2012-08-21 11:02:22 -05:00
Steve Harris
7aa51ef55a
Merge "Issue #989 - Adding markings to jasper" into development
...
Former-commit-id: a8cd465f23
[formerly 9165608ba0
] [formerly 0693643152
] [formerly a8cd465f23
[formerly 9165608ba0
] [formerly 0693643152
] [formerly c2b21a4251
[formerly 0693643152
[formerly becc2dc6e147ae6f7caeaa872b8d9948b47dab1a]]]]
Former-commit-id: c2b21a4251
Former-commit-id: 6a62dd4e04
[formerly 94e981ae8b
] [formerly 55653476b3998024bf1ad56471ef5dfaf42a09f6 [formerly fc77903de7
]]
Former-commit-id: 642d49d5a5743f4cde299530aba5f2faafbfdb6a [formerly 9a2724e8f6
]
Former-commit-id: 6dd00fb59d
2012-08-20 16:29:50 -05:00
Steve Harris
37d482bf23
Issue #989 - Adding markings to jasper
...
Former-commit-id: 63c4a840ad
[formerly 5ce7935576
] [formerly ccc150c980
] [formerly 63c4a840ad
[formerly 5ce7935576
] [formerly ccc150c980
] [formerly 9e8f59f31d
[formerly ccc150c980
[formerly 306b93cb3b73ae963b5900c8200d29a659689a74]]]]
Former-commit-id: 9e8f59f31d
Former-commit-id: a432d3a698
[formerly a7266b63fc
] [formerly d2f6f22e548d976113736d69ce571161ca4a89d9 [formerly 15462e7a38
]]
Former-commit-id: 8736b2e18c714aaf0d542d6477bab386c400437e [formerly 65b74111f1
]
Former-commit-id: 1f8e7a08f0
2012-08-20 16:26:51 -05:00
Max Schenkelberg
950e2bff73
Issue #28 Cleaned up True Color code and removed old MultiChannel code. Adding capping index back to indexing.glsl and added no data value to ColorMapParameters that should be used for finding no data values in shader and in java. True color dialog was written but not hooked in yet as need to still think about single resource tied to multiple channels and serializing changes.
...
Change-Id: I20bff443fe4c9b9330c0a66779218227c48df014
Former-commit-id: 79d98841a0
[formerly fc06265360
] [formerly b69d2cad1c
] [formerly 79d98841a0
[formerly fc06265360
] [formerly b69d2cad1c
] [formerly 1b406ecfca
[formerly b69d2cad1c
[formerly 564b38b30562a371cf0345de572b32ea8f53e82e]]]]
Former-commit-id: 1b406ecfca
Former-commit-id: 56496dc03e
[formerly 47cefd1513
] [formerly 71e7ec51b8b8299ebc4b78fb5367003fc83ce4f5 [formerly aa9df46a1d
]]
Former-commit-id: 408d45a6b996130822ce865675f4446c9ea19f79 [formerly 362d34bee0
]
Former-commit-id: dcbab7d58f
2012-08-20 14:47:14 -05:00
Ben Steffensmeier
25e6e3adba
Issue #666 fix collaboration message compose problems with ncp keybindings
...
Former-commit-id: 977d5587cb
[formerly 25b00010e1
] [formerly 3f0b2e474c
] [formerly 977d5587cb
[formerly 25b00010e1
] [formerly 3f0b2e474c
] [formerly 8e971abbd8
[formerly 3f0b2e474c
[formerly ec779e0252ae7efd7228b7a0e1eea83b05b10c9b]]]]
Former-commit-id: 8e971abbd8
Former-commit-id: 89255891cc
[formerly f6e7d795f9
] [formerly a03fb3fc1578ffe96414fa4161300406218521d7 [formerly 2c5cfe6d98
]]
Former-commit-id: e64790314b952168035c3cd21dd3de3e53fbe357 [formerly d9f68af5ad
]
Former-commit-id: 322d74aab7
2012-08-17 16:16:20 -05:00
Ron Anderson
fd53117c14
Issue #436 Made hazardDict an OrderedDict so order of entries is preserved.
...
Modifed include path so procedures/smartTools are found before utilities of the same name so
existing site MakeHazardConfig.py files in procedures will be found before the base file in utilities.
Added code to default new localEffects dicts to empty so existing MakeHazardConfig.py files can be used.
Change-Id: I4a59d930f8b93bf76c28f3dec3881fbccc077eff
Former-commit-id: 0a6de388dd
[formerly 16231374f8
] [formerly d7a818fd1d
] [formerly 0a6de388dd
[formerly 16231374f8
] [formerly d7a818fd1d
] [formerly 7662d249ab
[formerly d7a818fd1d
[formerly 18f0efe7a8d9f2c31786fc449403f720b554b95d]]]]
Former-commit-id: 7662d249ab
Former-commit-id: 21b48541c3
[formerly 6e3674f9fc
] [formerly eadb27af146fe75ce647766fdd43f9aa8948307f [formerly d3693827a1
]]
Former-commit-id: cc064445b1277a5893829a9d2679defa8d74bab9 [formerly 1b655b0826
]
Former-commit-id: f69d7b9c64
2012-08-17 12:41:49 -05:00
Ron Anderson
c1d0cbae01
Issue #436 merging elevation base changes into branch off of development baseline.
...
Former-commit-id: c71ee18e6e
[formerly 93c632c1ff
] [formerly 1321db6a99
] [formerly c71ee18e6e
[formerly 93c632c1ff
] [formerly 1321db6a99
] [formerly 819b9c8e56
[formerly 1321db6a99
[formerly 9287cf98369abb8a674fd5bab99439d055218a05]]]]
Former-commit-id: 819b9c8e56
Former-commit-id: 0a32c7c683
[formerly e5952c1c99
] [formerly 5cae0d5653a03ef5095386e62d4e0139bdd634e9 [formerly 6eafdda705
]]
Former-commit-id: e27e7df534ee0ecbb93248c7bad66447e0b16b5e [formerly f7b9190b51
]
Former-commit-id: b78c280ac8
2012-08-17 12:20:08 -05:00
Bryan Kowal
c836458e84
Remove the usage of the old method to build the edex ost rpm.
...
Former-commit-id: 31ec3cbee0
[formerly d5c16eb8ce
] [formerly 44328f1702
] [formerly 31ec3cbee0
[formerly d5c16eb8ce
] [formerly 44328f1702
] [formerly 01e7976a52
[formerly 44328f1702
[formerly 6fb431fe7f0204e8acc1e8263800c41aa5974bd9]]]]
Former-commit-id: 01e7976a52
Former-commit-id: 3e500e71a6
[formerly f81ba4737c
] [formerly f928d8f3a6488da251855ae1cb97a15af51db335 [formerly 69a16eb369
]]
Former-commit-id: 5cba2e23bd383fa1e73e130f34545fcf8c145d4c [formerly 1078d7b553
]
Former-commit-id: 29e1bc9993
2012-08-16 14:27:11 -05:00
Steve Harris
48947cc945
Fix resolution of MultiPointResource.java during AWIPS2 DR and baseline merge
...
Former-commit-id: 1bcd43a447
[formerly 735ed2ecd9
] [formerly fa77df807d
] [formerly 1bcd43a447
[formerly 735ed2ecd9
] [formerly fa77df807d
] [formerly 596d19466b
[formerly fa77df807d
[formerly 55326667ca13a37c7802849484949382e65a6329]]]]
Former-commit-id: 596d19466b
Former-commit-id: 4d2094072e
[formerly b0b8a13e60
] [formerly 2447699b9373672878bdc3d1b593c32f627a3309 [formerly 20fda57d37
]]
Former-commit-id: 0d408d1b5d8d6a0e00b9bcad92b5b644cd644f59 [formerly 9e75c7e5f1
]
Former-commit-id: 8413f8d96c
2012-08-16 10:27:51 -05:00
root
d0f911274c
Merge branch 'development_on_ss_builds' of 147.18.136.113:/home/slharris/repos/AWIPS2_baseline into development_on_ss_builds
...
Former-commit-id: e2b7a1679b
[formerly ac8888ae10
] [formerly 342bda7e5f
] [formerly e2b7a1679b
[formerly ac8888ae10
] [formerly 342bda7e5f
] [formerly 6eec24180e
[formerly 342bda7e5f
[formerly 2368421395496141fdc6467fd165babc282b65ac]]]]
Former-commit-id: 6eec24180e
Former-commit-id: c7a8b1e7fd
[formerly f0cb647101
] [formerly 688200e149897d55c1b90b9f2d6fb48f7cfa67a2 [formerly b3217ad886
]]
Former-commit-id: eb42969b62682f808230b579e5f3d75f037e2892 [formerly d1f2ac6698
]
Former-commit-id: a689deb547
2012-08-15 22:29:38 +00:00
root
7b6fb2ec7f
Merge branch 'reconcile' into development_on_ss_builds
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
Former-commit-id: b6e17e9b02
[formerly d170ae704b
] [formerly b93989daaf
] [formerly b6e17e9b02
[formerly d170ae704b
] [formerly b93989daaf
] [formerly ba40e18fb2
[formerly b93989daaf
[formerly 6e4d168bf9ea0c252d0923e4e2595d9c4df06289]]]]
Former-commit-id: ba40e18fb2
Former-commit-id: c8d09a5973
[formerly fd69b031d2
] [formerly b304e3656660b7049f012ff5306eb9b118135fb1 [formerly 3e9d1fa430
]]
Former-commit-id: 2d2cd5211b32f326f99a886ca98f22774f097460 [formerly 64c3ccb4a4
]
Former-commit-id: 84a8231c49
2012-08-15 22:29:07 +00:00
root
73466bae44
Merge 12.9.1-4 into development_on_ss_builds
...
Former-commit-id: bb7b5341dd
[formerly 0987fc6b3d
] [formerly cb46f57879
] [formerly bb7b5341dd
[formerly 0987fc6b3d
] [formerly cb46f57879
] [formerly 5a453ee984
[formerly cb46f57879
[formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]]
Former-commit-id: 5a453ee984
Former-commit-id: 791f3f5b85
[formerly 537dbadf64
] [formerly 9fa79e8d9e9e82e29b8bae3cd42dbb3e0f9f0f26 [formerly 8a66b2f209
]]
Former-commit-id: 167e4e289205b778c1de6873be7610daf3a39f5f [formerly 1792158ef8
]
Former-commit-id: 0eb9520e15
2012-08-15 22:15:20 +00:00
Ben Steffensmeier
16582906da
Issue #1065 fix contexts to deactivate when unrecognized views activate.
...
Former-commit-id: e65418717f
[formerly e8524301b5
] [formerly 6d9d0a406f
] [formerly e65418717f
[formerly e8524301b5
] [formerly 6d9d0a406f
] [formerly 4203807a77
[formerly 6d9d0a406f
[formerly 5046660b52594a165d4a8749ac12c236d5ec027d]]]]
Former-commit-id: 4203807a77
Former-commit-id: a50be67e0e
[formerly d7597d8cf7
] [formerly 0f7510411fcfebd4307421621a6b66de713609a0 [formerly 8a170234b8
]]
Former-commit-id: 66a1a85df2f4afc8d3aba14a9291d086df04411b [formerly 62979089d3
]
Former-commit-id: 2256ec871d
2012-08-15 16:36:05 -05:00
Benjamin Phillippe
ff6c5dc660
Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
...
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3
Former-commit-id: ec41ec59ee
[formerly dd8ed9eca0
] [formerly 72c63e1a6f
] [formerly ec41ec59ee
[formerly dd8ed9eca0
] [formerly 72c63e1a6f
] [formerly 7bad34f906
[formerly 72c63e1a6f
[formerly b30ec7ab0f96f1155e2c13587a1b4f179ce3da51]]]]
Former-commit-id: 7bad34f906
Former-commit-id: ebdadf4b89
[formerly 11bf8bb4c7
] [formerly c02cc2e93c8e648fd97f9f7d42aacefcb2dffcb0 [formerly 91493ee0b9
]]
Former-commit-id: 27079c626ffeaf0adc7ac87aaf5ceaa302211c16 [formerly e23523ad80
]
Former-commit-id: bd2023ec70
2012-08-15 16:22:39 -05:00
Nate Jensen
b7cd17640a
Merge "Issue #1033 do not load grib data on tileset creation but instead load allow it to load async." into development_on_ss_builds
...
Former-commit-id: a94964d940
[formerly b94597d03c
] [formerly 9c1597b554
] [formerly a94964d940
[formerly b94597d03c
] [formerly 9c1597b554
] [formerly 6897b1d480
[formerly 9c1597b554
[formerly 631ffe5bcec2a03934ac2063352b11aa6ab04ff7]]]]
Former-commit-id: 6897b1d480
Former-commit-id: 0321bf5fe3
[formerly 3b31bc0500
] [formerly 03020103f952139717e6611a3b60d333734a6753 [formerly b7bc962da4
]]
Former-commit-id: 8299877b3a8416a8dcc76a45f85321ce495f76dd [formerly ca08f538e8
]
Former-commit-id: b0eb5c1493
2012-08-15 16:18:36 -05:00
Ben Steffensmeier
ba78c72f6e
Issue #1033 do not load grib data on tileset creation but instead load allow it to load async.
...
Former-commit-id: 8dffbba06e
[formerly 9c41e73ee5
] [formerly cb99170685
] [formerly 8dffbba06e
[formerly 9c41e73ee5
] [formerly cb99170685
] [formerly b194a17abc
[formerly cb99170685
[formerly 97d786afadf136f75ffd6a440d35b628e144b888]]]]
Former-commit-id: b194a17abc
Former-commit-id: 2c1640fde4
[formerly 98728915f8
] [formerly 2ef9a5e297cead370e230dc243b7a36dec6a00bc [formerly 74acf329c4
]]
Former-commit-id: e147955fac3e590b13ad6c4eea7c7fdd49d0a069 [formerly 48a5389b2f
]
Former-commit-id: e64c4d343f
2012-08-15 15:25:46 -05:00
Steve Harris
867586657b
12.9.1-4 baseline
...
Former-commit-id: 71b024e3a1
[formerly 36c108e960
] [formerly dcda3a2290
] [formerly 71b024e3a1
[formerly 36c108e960
] [formerly dcda3a2290
] [formerly 33b95fb96d
[formerly dcda3a2290
[formerly df38541c9df38c634626ae214f288b606004a768]]]]
Former-commit-id: 33b95fb96d
Former-commit-id: 80655bf0a3
[formerly d7d60cc623
] [formerly a0362f7c21fdffcde34416e960bbba970227a95e [formerly 9990bf909b
]]
Former-commit-id: e06a87e5baa81edcd3ffe2ce62e1eb2416c1ee57 [formerly de9b64b501
]
Former-commit-id: 7e1d1f6e08
2012-08-15 15:19:10 -05:00
Steve Harris
d7acb65c06
12.9.1-3 baseline
...
Former-commit-id: 8083b81729
[formerly c11f7d396e
] [formerly 36d80b1f60
] [formerly 8083b81729
[formerly c11f7d396e
] [formerly 36d80b1f60
] [formerly 84bbf2573e
[formerly 36d80b1f60
[formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]]]]
Former-commit-id: 84bbf2573e
Former-commit-id: 988563a4b6
[formerly a535b51eba
] [formerly 04e06d54a9ad687da3d26555122e216b3426fb97 [formerly edbbacfa8a
]]
Former-commit-id: 60681d51155fd0d8fea0ced04f4dc5174712adca [formerly 8c5c5ad6eb
]
Former-commit-id: 03bb51ed0e
2012-08-15 14:26:10 -05:00
Steve Harris
8c620ce4dd
12.9.1-2 baseline
...
Former-commit-id: ecba93c959
[formerly 27871051e3
] [formerly d1d877d319
] [formerly ecba93c959
[formerly 27871051e3
] [formerly d1d877d319
] [formerly a198b3a807
[formerly d1d877d319
[formerly 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2]]]]
Former-commit-id: a198b3a807
Former-commit-id: 8690f264b6
[formerly de4c812834
] [formerly db9021d4da0353e03ade3f0d5a5eae88fce61247 [formerly 448ed038c2
]]
Former-commit-id: 007434bc5f036c2f1f728feff774f4546fd4a8a5 [formerly ed416f241e
]
Former-commit-id: adf346e7d3
2012-08-15 14:12:24 -05:00
Jonathan Sanchez
c1d52bb83b
Issue #915 Set the user data.
...
Former-commit-id: 55ac7d7684
[formerly f37a75f265
] [formerly 865136f6ef
] [formerly 55ac7d7684
[formerly f37a75f265
] [formerly 865136f6ef
] [formerly 03ed8ee0b0
[formerly 865136f6ef
[formerly d0e0b6160cc0969353555bd7282829a3440c9ef6]]]]
Former-commit-id: 03ed8ee0b0
Former-commit-id: b0036d9ad7
[formerly f1749f4fcc
] [formerly aede2757d06a4b4752402af488f523f9e9e0e79e [formerly e584d728f0
]]
Former-commit-id: 158f1995d650b2e6c15cad816c980ce6972d5eb8 [formerly 38bb2743e5
]
Former-commit-id: 49c757f958
2012-08-15 14:05:50 -05:00
Steve Harris
31353e2296
12.9.1-1 baseline
...
Former-commit-id: b9fb1c89d4
[formerly 8309193ce9
] [formerly 31ae7ea218
] [formerly b9fb1c89d4
[formerly 8309193ce9
] [formerly 31ae7ea218
] [formerly 79ce6cfd97
[formerly 31ae7ea218
[formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: d3023f15ac
[formerly aed7a644df
] [formerly b452006db8c662d7b75e89f5dcc158103aa65a9b [formerly 0c5d9e2416
]]
Former-commit-id: b1b11fe00755e632d56330d48d6e1eee387eeef8 [formerly 63bcadf121
]
Former-commit-id: 16d7d955fc
2012-08-15 13:59:00 -05:00
Steve Harris
106e18e326
Merge branch 'development' into Enhanced_points
...
Former-commit-id: 9a5ad2fdae
[formerly e372481f81
] [formerly 346d775f57
] [formerly 9a5ad2fdae
[formerly e372481f81
] [formerly 346d775f57
] [formerly f7f97d9f54
[formerly 346d775f57
[formerly 25026a4d9955b76039bf25861380cadebff19665]]]]
Former-commit-id: f7f97d9f54
Former-commit-id: 25585ca8d7
[formerly 73e357c39d
] [formerly f736245d042a572679a95e4b5cdd7ce4dcb5ef0f [formerly 031b655ab5
]]
Former-commit-id: 281b3f6641525153bf05935567c97d0e68556ff4 [formerly 14923a89e9
]
Former-commit-id: 5fc58b8e12
2012-08-15 13:35:47 -05:00
Nate Jensen
b1480daa29
Merge "Issue #1018 disable many toolbar and menu items when the current editor is not a display pane container" into development
...
Former-commit-id: a14db247fb
[formerly d70d78d664
] [formerly 2cb82b7170
] [formerly a14db247fb
[formerly d70d78d664
] [formerly 2cb82b7170
] [formerly 91e0ba8c23
[formerly 2cb82b7170
[formerly d252760b0e39002e53a5fce809b38521ca2351aa]]]]
Former-commit-id: 91e0ba8c23
Former-commit-id: d834aad044
[formerly 1da09f201e
] [formerly 00bff8ae22a58ce9c1926f3f681e442f45f7f40f [formerly 5b26d1e93e
]]
Former-commit-id: fb18988c1b9b1007d6781d9cd5e04849a3d5733d [formerly ebad112688
]
Former-commit-id: 826b645296
2012-08-14 16:52:40 -05:00
Ron Anderson
6b25274569
Issue #1052 Fixed GridLocaton.gridCell to return Point instead of Coordinate.
...
Change-Id: I1bbf11738ec0595d42d88423bb9b6ef9d42468e2
Former-commit-id: 9b35518fe5
[formerly bac68cc1de
] [formerly 17f636c2a2
] [formerly 9b35518fe5
[formerly bac68cc1de
] [formerly 17f636c2a2
] [formerly 81abb2c60b
[formerly 17f636c2a2
[formerly 373ac200fcd1c9a39244a2775d95c7b891334632]]]]
Former-commit-id: 81abb2c60b
Former-commit-id: daab9b6cfc
[formerly c8b0719d48
] [formerly f95802be5b445fb5325a67b2aad6ff7c3512608e [formerly 7cde30681b
]]
Former-commit-id: d0f735c6f0ba4872953d0a07c685f8e0a1475261 [formerly 3d0d4e9b09
]
Former-commit-id: 746e006e89
2012-08-14 16:27:11 -05:00
Steve Harris
6c76725af2
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: 39dbd45d38
[formerly 27fa10e133
] [formerly e3927a11c7
] [formerly 39dbd45d38
[formerly 27fa10e133
] [formerly e3927a11c7
] [formerly e530637aa3
[formerly e3927a11c7
[formerly 43d4642bc39a053d40fce9b6aff1d11f3d313dd7]]]]
Former-commit-id: e530637aa3
Former-commit-id: 7c49cb3c64
[formerly 118113bd60
] [formerly c68cbcb1c5cec8f3069be35211a81cf8d1e570ec [formerly 1687889756
]]
Former-commit-id: 1404988d60ce6f11cccb2b6365981d4cba5881d0 [formerly 03ebee99f8
]
Former-commit-id: f6ec677a1b
2012-08-14 16:26:00 -05:00
Ben Steffensmeier
695a8cf271
Issue #947 revert changes to dataTime format
...
Former-commit-id: 4c45df4e3f
[formerly 54b538bb07
] [formerly 50cb7383a6
] [formerly 4c45df4e3f
[formerly 54b538bb07
] [formerly 50cb7383a6
] [formerly 70ba8d82db
[formerly 50cb7383a6
[formerly 53a441f310e35d80ceb0ff28c156bf15ba1b5893]]]]
Former-commit-id: 70ba8d82db
Former-commit-id: 3d83dd0e1f
[formerly 36455cfbed
] [formerly dcd339cd56dee05048a4cc65e0aad47a394b2aa1 [formerly 77b7c4c517
]]
Former-commit-id: 1dc0661919f3d208087d6a8b1c809944896dff9c [formerly 242cc34efe
]
Former-commit-id: 4a9e7d5e3d
2012-08-14 16:20:36 -05:00
Ron Anderson
58e3f96915
Issue #1052 Fixed GridLocaton.gridCell to return Point instead of Coordinate.
...
Change-Id: I1bbf11738ec0595d42d88423bb9b6ef9d42468e2
Former-commit-id: 0328f2f50a
[formerly 5c80f582b3
] [formerly 71d74b1dcf
] [formerly 0328f2f50a
[formerly 5c80f582b3
] [formerly 71d74b1dcf
] [formerly 985167892d
[formerly 71d74b1dcf
[formerly 564b72997c59a665398c8687d6bafdb54c469881]]]]
Former-commit-id: 985167892d
Former-commit-id: 77bfb8a2dd
[formerly c90619a3bc
] [formerly 4241981581eb1d69e70fae848a376e84169e96cf [formerly 9bf0166f13
]]
Former-commit-id: 4a62b310663cf12792dba877978047a1f360353b [formerly 13d7576686
]
Former-commit-id: d47eda2d66
2012-08-14 16:20:23 -05:00
Nate Jensen
91d6c58f3d
Merge "Issue #947 revert changes to dataTime format" into development_on_ss_builds
...
Former-commit-id: 98c132222b
[formerly 9657ce7e32
] [formerly 571e16bd23
] [formerly 98c132222b
[formerly 9657ce7e32
] [formerly 571e16bd23
] [formerly 80f1766f9a
[formerly 571e16bd23
[formerly 22a06b47664b0f7b7592022345cc7e3ead147036]]]]
Former-commit-id: 80f1766f9a
Former-commit-id: 7dfe07291e
[formerly 45d5fa0366
] [formerly ce6e73388738585c32c632e84c06a69be0168b9f [formerly b6e459615b
]]
Former-commit-id: 468b8d3408a2ff5240e1fe431a45b472ad0793bd [formerly 7961babdb2
]
Former-commit-id: 7bdb5e26ec
2012-08-14 16:15:55 -05:00
Ben Steffensmeier
6fde348925
Issue #1058 fix reprojection of wind vectors
...
Former-commit-id: 066f40e606
[formerly 28aae9f11f
] [formerly ba9d0b25b5
] [formerly 066f40e606
[formerly 28aae9f11f
] [formerly ba9d0b25b5
] [formerly 9c727d2e33
[formerly ba9d0b25b5
[formerly 8fdc9841f9033720aa0ceb6389e7b1403d75a2d5]]]]
Former-commit-id: 9c727d2e33
Former-commit-id: a5cfc06b72
[formerly 2ac8180928
] [formerly b1facb8903e0530023ae07a2f768b579a015d22a [formerly e65832b2bf
]]
Former-commit-id: a6b709bd7a57e95c972d162ccabc847c0e8c3e45 [formerly 5112b6ce69
]
Former-commit-id: 0181083df2
2012-08-14 16:15:19 -05:00
David Gillingham
b96a1185e2
Issue #1055 : Fix coop precip breakage from Wes2Bridge db changes.
...
Change-Id: Idbbbf7622483c426efc715f9e8eb185be6d47bad
Former-commit-id: ac55928e60
[formerly e541c86f1b
] [formerly f40fc68c28
] [formerly ac55928e60
[formerly e541c86f1b
] [formerly f40fc68c28
] [formerly 79a77a38a4
[formerly f40fc68c28
[formerly 03f9de1860008cd1a2b4b60576802a67a8a447fa]]]]
Former-commit-id: 79a77a38a4
Former-commit-id: b5836fc932
[formerly 5ce4e54db9
] [formerly 7a0c83fef36fc378f400ab4642e90671334cc46c [formerly dd80a94061
]]
Former-commit-id: 877f4f1c58cbc014c55e0a2f9b0c88a6745bb61f [formerly 18c572c983
]
Former-commit-id: 67586ea006
2012-08-14 16:15:10 -05:00
Ben Steffensmeier
e85f540bba
Issue #947 revert changes to dataTime format
...
Former-commit-id: 85bba2f435
[formerly fd2bf26119
] [formerly ce689ad5fa
] [formerly 85bba2f435
[formerly fd2bf26119
] [formerly ce689ad5fa
] [formerly 434193b34b
[formerly ce689ad5fa
[formerly 5c560da8d485f2ca2b6ca24925480aa61fb994de]]]]
Former-commit-id: 434193b34b
Former-commit-id: 037ecbd293
[formerly c14674c64f
] [formerly 804eb32ad6a8cd0f132940c420498966a58cd373 [formerly 15977fdba2
]]
Former-commit-id: fa4901700b74b5bbe73242ef69052ec82d0cb342 [formerly f50c979293
]
Former-commit-id: 7950a24c07
2012-08-14 16:12:02 -05:00
Ben Steffensmeier
f48f5021a0
Issue #1018 change product browser to handle no editor conditions better.
...
Change-Id: I3235ebb6d50eee26c75d31ce91e2a01c2d49b300
Former-commit-id: 9e86aaaac1
[formerly 6267bdb915
] [formerly 4d20aa0e82
] [formerly 9e86aaaac1
[formerly 6267bdb915
] [formerly 4d20aa0e82
] [formerly 7559065a1d
[formerly 4d20aa0e82
[formerly 7cb30aa5c00eea5b95b6c4b39653fabeaccdd872]]]]
Former-commit-id: 7559065a1d
Former-commit-id: a2f13c62f3
[formerly 48963ebc07
] [formerly 365ed47ee4920f09cafc960c0319f4341a4bb4e2 [formerly 850203f715
]]
Former-commit-id: 99e28859da86d246aecce306fa7269e604acdeea [formerly 7f5bd99b0c
]
Former-commit-id: 5c560e5a56
2012-08-14 15:23:34 -05:00
Lee Venable
c38501a934
Merge "Issue #1055 : Fix coop precip breakage from Wes2Bridge db changes." into development_on_ss_builds
...
Former-commit-id: 5c02dabb9d
[formerly fe9a85cefb
] [formerly 457d099cca
] [formerly 5c02dabb9d
[formerly fe9a85cefb
] [formerly 457d099cca
] [formerly 2c2a3f4aec
[formerly 457d099cca
[formerly cf7be4b4a2a49f365258f1ac6262b64e86e705e4]]]]
Former-commit-id: 2c2a3f4aec
Former-commit-id: db3711bd9a
[formerly b42d389cb2
] [formerly dde5f0cc18d13fc3ea7c28937cf3133c8b1b76c5 [formerly a3651c5813
]]
Former-commit-id: 302cb06f8f026434bbf043f46fe10e0e395bf82b [formerly 5f180a03cc
]
Former-commit-id: 3187523b41
2012-08-14 14:26:10 -05:00
Ben Steffensmeier
c07defa133
Issue #1058 fix reprojection of wind vectors
...
Former-commit-id: eee0d925ec
[formerly 283781ba03
] [formerly c25c08c8e7
] [formerly eee0d925ec
[formerly 283781ba03
] [formerly c25c08c8e7
] [formerly 09c412d754
[formerly c25c08c8e7
[formerly 315965383123120bffe1faa1d63fdfb7b633bc97]]]]
Former-commit-id: 09c412d754
Former-commit-id: 1a351fbb0c
[formerly 6207cd7310
] [formerly fbb7642d733d90a42019f35984b47984ce3bdc89 [formerly ea551d3866
]]
Former-commit-id: 02644f637ce3f4823b2d7bc8f7b4293d8cdf08b1 [formerly e0561a1a35
]
Former-commit-id: dfd6d73cc2
2012-08-14 13:44:21 -05:00
David Gillingham
2073aaa06a
Issue #1055 : Fix coop precip breakage from Wes2Bridge db changes.
...
Change-Id: Idbbbf7622483c426efc715f9e8eb185be6d47bad
Former-commit-id: a795b2fbca
[formerly 06e789e986
] [formerly b587c1ea4f
] [formerly a795b2fbca
[formerly 06e789e986
] [formerly b587c1ea4f
] [formerly f2795370d1
[formerly b587c1ea4f
[formerly da6811db78e3fcf57acc25e417ec8319c1dceecf]]]]
Former-commit-id: f2795370d1
Former-commit-id: a9c5ee80a2
[formerly 35ac266c34
] [formerly a8a492c16a701283d691fc37d11077cd2527f3c8 [formerly e51d931a5a
]]
Former-commit-id: 73cf61b80c0285ecc9922603f27090403b99148f [formerly 2ba2b982a0
]
Former-commit-id: 767fdf56a1
2012-08-14 13:36:51 -05:00
Ben Steffensmeier
7a076b4a0b
Issue #1018 disable many toolbar and menu items when the current editor is not a display pane container
...
Former-commit-id: 2c64112a4c
[formerly 474fe44037
] [formerly a4c46c7f55
] [formerly 2c64112a4c
[formerly 474fe44037
] [formerly a4c46c7f55
] [formerly 0857d971b5
[formerly a4c46c7f55
[formerly 7ae4af9778cfa58fc755041479aadec5e6ad90b0]]]]
Former-commit-id: 0857d971b5
Former-commit-id: 47059f915b
[formerly 08021bcfc2
] [formerly 65c0e971652eab1efeba6ce2a63fccbf32b0da33 [formerly a02bb2c092
]]
Former-commit-id: bc354bf6e6f8705f771409a71703c7dbefc1f8f2 [formerly a17bae6f40
]
Former-commit-id: d6c42b28bf
2012-08-14 10:25:38 -05:00
Max Schenkelberg
de0b465ed8
Issue #28 Implemented generic true color resource with new extension. Wrote new, more efficient, accurate, and scalable TileSet rendering/managing code to replace AbstractTileSet which VIIRS uses since it took over 10s to load a single frame of data with AbstractTileSet and around 20-30s to load a single true color frame of VIIRS. Put true color code in separate projects to encapsulate functionality. Resources need not depend on these projects, they just have to set the ImagingProvider in their ImagingCapability and true color resource can be loaded through a bundle file.
...
Change-Id: I624edb115b02611470e2e434e27759c45600111c
Former-commit-id: 5c4ba85189
[formerly d6522f8e3a
] [formerly 93e8619fa5
] [formerly 5c4ba85189
[formerly d6522f8e3a
] [formerly 93e8619fa5
] [formerly 09b0db0a13
[formerly 93e8619fa5
[formerly 7d75620c07c992ab74a8305a69ed87817f8f0639]]]]
Former-commit-id: 09b0db0a13
Former-commit-id: 84e54dbb2a
[formerly 107efcaee3
] [formerly 2ae9659aef573b9f509312fe7c176e5105ef0760 [formerly 784c43ab7c
]]
Former-commit-id: 59e7bf476ae030aaebacd8f558cbeb93ba2064bb [formerly 79f15e475e
]
Former-commit-id: 3d43480508
2012-08-13 12:20:05 -05:00
Ben Steffensmeier
56bf35ee8e
Issue #1004 change plots to synchronize with dispose instead of joining since join allows paint to happen
...
Change-Id: I6011a5fedc155ab8d515d3c6eb5d368f582c59bd
Former-commit-id: 9aa0da6f76
[formerly 6f178a9150
] [formerly 603a9c90e4
] [formerly 9aa0da6f76
[formerly 6f178a9150
] [formerly 603a9c90e4
] [formerly 559efb19fb
[formerly 603a9c90e4
[formerly aece671b35405e1f278439c9a1a8230dad5cf4c2]]]]
Former-commit-id: 559efb19fb
Former-commit-id: 3df0e4d6e8
[formerly d52dd42ab2
] [formerly cd531c27c5b206f5bdac1fdd9f11e0273f8cfa3b [formerly 3f258a2bf8
]]
Former-commit-id: 6653fa0fc57d2bdd9428d3ee07def4a1a61d7562 [formerly fa8ea385d9
]
Former-commit-id: f87969cbee
2012-08-13 09:54:22 -05:00
Ben Steffensmeier
a9e7f1dd50
Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings.
...
Former-commit-id: 4ac95d6f30
[formerly 573cc270e8
] [formerly c6a121962f
] [formerly 4ac95d6f30
[formerly 573cc270e8
] [formerly c6a121962f
] [formerly 1e527f83f0
[formerly c6a121962f
[formerly 06c2c85159598ca803c663de97caed4b6841c135]]]]
Former-commit-id: 1e527f83f0
Former-commit-id: 400324692e
[formerly 0af9fd4fe2
] [formerly d4bea7465963586a2e6cb6e3b67004eb860aeafa [formerly c9ff69014b
]]
Former-commit-id: 9760348284e869f7ce63f8292ef14ca27119eb3c [formerly dc8d05c1be
]
Former-commit-id: 32287c896b
2012-08-09 17:53:19 -05:00
Ben Steffensmeier
0cafabafcc
Issue #947 fix parsing of DataTime.
...
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04
Former-commit-id: 702f11b85d
[formerly 8d118c392a
] [formerly 525c0b21a9
] [formerly 702f11b85d
[formerly 8d118c392a
] [formerly 525c0b21a9
] [formerly b53fe917bc
[formerly 525c0b21a9
[formerly 045952304218c867d8fe89df9828f70632df2d00]]]]
Former-commit-id: b53fe917bc
Former-commit-id: cf4e07b55c
[formerly 54b3078ad1
] [formerly 8ba260212ec345bbb5385de011be3084fda82b42 [formerly 4ed3d04e64
]]
Former-commit-id: 93765dc13e7fdad57232cba5c21dd2146eae6b7f [formerly fafea907c7
]
Former-commit-id: 62aafd3542
2012-08-09 17:50:23 -05:00
Ben Steffensmeier
af237b1a7d
Issue #1004 make dispose/shutdown of plot jobs more permenant by joining.
...
Former-commit-id: c2732bff32
[formerly 3f92e385a6
] [formerly 3abfef55cc
] [formerly c2732bff32
[formerly 3f92e385a6
] [formerly 3abfef55cc
] [formerly c1bacb33b1
[formerly 3abfef55cc
[formerly 6cb8e45b4f3a78abcfeee982306684eef025fd3d]]]]
Former-commit-id: c1bacb33b1
Former-commit-id: 445232b6d5
[formerly 0e48e6e4fd
] [formerly ae7e4d38b5d51780ccb3e30c473ea1697431b7a0 [formerly f711cfdae2
]]
Former-commit-id: 6d381c8b3bb7e9912f0f829e27d998751f0b3b6d [formerly 30702ea3c6
]
Former-commit-id: de38003e6c
2012-08-09 17:45:19 -05:00
Nate Jensen
69a5fa29c0
Merge "Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings." into development_on_ss_builds
...
Former-commit-id: 80b312f764
[formerly 32cc46ec4e
] [formerly eeaa2c798f
] [formerly 80b312f764
[formerly 32cc46ec4e
] [formerly eeaa2c798f
] [formerly 4211a8deac
[formerly eeaa2c798f
[formerly 70f2bcb38c03eee2d389774f92a4676b0d4cae43]]]]
Former-commit-id: 4211a8deac
Former-commit-id: 47e3a26d29
[formerly c0fa1e8cf2
] [formerly c6c095ba54831e57f26b23a2fa36bd907bb06747 [formerly 2cc3c63ba7
]]
Former-commit-id: fd3a4df97e9d71bfd55e39e6b0be2627914c7271 [formerly 0df3ab80eb
]
Former-commit-id: 5e82400554
2012-08-09 17:18:38 -05:00
Ben Steffensmeier
e1f186077f
Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings.
...
Former-commit-id: 16187575d7
[formerly 64caa963b1
] [formerly 066a5af2a6
] [formerly 16187575d7
[formerly 64caa963b1
] [formerly 066a5af2a6
] [formerly ad1415948f
[formerly 066a5af2a6
[formerly 51acdac79ebfa11abb5d69707a0a7b059e1a2e57]]]]
Former-commit-id: ad1415948f
Former-commit-id: 66f4ccc09b
[formerly e03eb5f5c9
] [formerly b76d791052722d8c2dddfa92d72e7c08b447c653 [formerly 65c33256d9
]]
Former-commit-id: a082627e7f5bc5e6972b2264f7e0275f1e0df5e7 [formerly 70f8f93f81
]
Former-commit-id: aa740ef6a8
2012-08-09 17:16:38 -05:00
Jonathan Sanchez
239f5e8d8c
Issue #883 Sorted warning records and prevented altered entries to be in
...
the same frame as new entries.
Former-commit-id: 457cbcdf95
[formerly 4f2d6630c1
] [formerly 6507a97665
] [formerly 457cbcdf95
[formerly 4f2d6630c1
] [formerly 6507a97665
] [formerly fa7795d17f
[formerly 6507a97665
[formerly 5c8c0783c8e054792ac38b4487188495dd0b0319]]]]
Former-commit-id: fa7795d17f
Former-commit-id: 46b7a35134
[formerly 3952dfc7ac
] [formerly faff7eb8279d6805bdc05f6ec705924a3bd4c05e [formerly 7ad6329fe0
]]
Former-commit-id: b4ce220d65ccf5d18e018934612b0ed2721272a4 [formerly 8a006c6093
]
Former-commit-id: 1986477214
2012-08-09 08:26:21 -05:00
Nate Jensen
6b53686be9
Merge "Issue #947 fix parsing of DataTime. Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04" into development_on_ss_builds
...
Former-commit-id: 3aeaced4dc
[formerly 8cd83e1571
] [formerly a88d7bcedc
] [formerly 3aeaced4dc
[formerly 8cd83e1571
] [formerly a88d7bcedc
] [formerly fbbf74eb50
[formerly a88d7bcedc
[formerly b7cac9d262bd99e74a51d903042fb7ad79eddfa8]]]]
Former-commit-id: fbbf74eb50
Former-commit-id: 4235ad69c1
[formerly e2462c0cc3
] [formerly c2a90fec0f6904b81f0f00d073e9861b9dc1c1ef [formerly 1214c05b72
]]
Former-commit-id: 6949e7061d5e4ae1f90360a2a26702fb38bef2e6 [formerly 135239eaee
]
Former-commit-id: b36d8c3f03
2012-08-08 16:10:13 -05:00
Ben Steffensmeier
527c5cac9f
Issue #947 fix parsing of DataTime.
...
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04
Former-commit-id: ee8a4896bd
[formerly cac790ac5a
] [formerly 97ba96759c
] [formerly ee8a4896bd
[formerly cac790ac5a
] [formerly 97ba96759c
] [formerly 5da238c8b9
[formerly 97ba96759c
[formerly 30ebbadbbffce0c3b1a236d36be5f3013124e7cd]]]]
Former-commit-id: 5da238c8b9
Former-commit-id: a35bdcb526
[formerly 8cdf1f8d1c
] [formerly 664f9aa2a161dd26a76c59a3bc493a05cfa127d3 [formerly b6cc71bf75
]]
Former-commit-id: 3b8c6f781ed6d2098e46f442d0d8043316b740e0 [formerly 726e934763
]
Former-commit-id: 873a7d64b6
2012-08-08 14:41:33 -05:00