You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by su...@apache.org on 2019/02/18 08:44:39 UTC
[incubator-echarts] branch fix/release-license updated: Fix the
third-party license.
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch fix/release-license
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
The following commit(s) were added to refs/heads/fix/release-license by this push:
new d95a8d3 Fix the third-party license.
d95a8d3 is described below
commit d95a8d3b9f8b33110969a96c52535952e5e91550
Author: sushuang <su...@gmail.com>
AuthorDate: Mon Feb 18 16:44:08 2019 +0800
Fix the third-party license.
---
src/chart/treemap/treemapLayout.js | 6 ++---
src/scale/Time.js | 18 +++++++++++----
src/util/number.js | 45 ++++++++++----------------------------
3 files changed, 29 insertions(+), 40 deletions(-)
diff --git a/src/chart/treemap/treemapLayout.js b/src/chart/treemap/treemapLayout.js
index 84c7c1e..4114fd6 100644
--- a/src/chart/treemap/treemapLayout.js
+++ b/src/chart/treemap/treemapLayout.js
@@ -20,8 +20,8 @@
/*
* A third-party license is included for some of the code in this file:
* The treemap layout implementation is originally copied from
-* the "d3.js" and made many modifications for this project.
-* See more details in the comment of the method "squarify" below.
+* "d3.js" and made many modifications for this project.
+* (See more details in the comment of the method "squarify" below.)
* The use of the source code of this file is also subject to the terms
* and consitions of the license of "d3.js" (BSD-3Clause, see
* <echarts/src/licenses/LICENSE-d3>).
@@ -158,7 +158,7 @@ export default {
* The implementation of this algorithm is originally copied from "d3.js"
* <https://github.com/d3/d3/blob/9cc9a875e636a1dcf36cc1e07bdf77e1ad6e2c74/src/layout/treemap.js>
* and made many modifications for this program.
- * So see the license statement at the head of this file.
+ * See the license statement at the head of this file.
*
* @protected
* @param {module:echarts/data/Tree~TreeNode} node
diff --git a/src/scale/Time.js b/src/scale/Time.js
index 13b21c4..c8a647b 100644
--- a/src/scale/Time.js
+++ b/src/scale/Time.js
@@ -18,11 +18,16 @@
*/
/*
-* The `scaleLevels` references to d3.js. The use of the source
-* code of this file is also subject to the terms and consitions
-* of its license (BSD-3Clause, see <echarts/src/licenses/LICENSE-d3>).
+* A third-party license is included for some of the code in this file:
+* The "scaleLevels" is originally copied from "d3.js" and made some
+* modifications for this project.
+* (See more details in the comment on the definition of "scaleLevels" below.)
+* The use of the source code of this file is also subject to the terms
+* and consitions of the license of "d3.js" (BSD-3Clause, see
+* <echarts/src/licenses/LICENSE-d3>).
*/
+
// [About UTC and local time zone]:
// In most cases, `number.parseDate` will treat input data string as local time
// (except time zone is specified in time string). And `format.formateTime` returns
@@ -171,7 +176,12 @@ zrUtil.each(['contain', 'normalize'], function (methodName) {
};
});
-// Steps from d3, see the license statement at the top of this file.
+/**
+ * This implementation is originally copied from "d3.js"
+ * <https://github.com/d3/d3/blob/b516d77fb8566b576088e73410437494717ada26/src/time/scale.js>
+ * and made some modifications for this program.
+ * See the license statement at the head of this file.
+ */
var scaleLevels = [
// Format interval
['hh:mm:ss', ONE_SECOND], // 1s
diff --git a/src/util/number.js b/src/util/number.js
index e9c1000..f271aa7 100644
--- a/src/util/number.js
+++ b/src/util/number.js
@@ -17,6 +17,15 @@
* under the License.
*/
+/*
+* A third-party license is included for some of the code in this file:
+* The method "quantile" copied from "d3.js".
+* (See more details in the comment of the method below.)
+* The use of the source code of this file is also subject to the terms
+* and consitions of the license of "d3.js" (BSD-3Clause, see
+* <echarts/src/licenses/LICENSE-d3>).
+*/
+
import * as zrUtil from 'zrender/src/core/util';
var RADIAN_EPSILON = 1e-4;
@@ -432,39 +441,9 @@ export function nice(val, round) {
}
/**
- * BSD 3-Clause
- *
- * Copyright (c) 2010-2015, Michael Bostock
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * * The name Michael Bostock may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL MICHAEL BOSTOCK BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/**
- * @see <https://github.com/mbostock/d3/blob/master/src/arrays/quantile.js>
- * @see <http://en.wikipedia.org/wiki/Quantile>
+ * This code is copied from "d3.js"
+ * <https://github.com/d3/d3/blob/9cc9a875e636a1dcf36cc1e07bdf77e1ad6e2c74/src/arrays/quantile.js>.
+ * See the license statement at the head of this file.
* @param {Array.<number>} ascArr
*/
export function quantile(ascArr, p) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org