提交 dbd3a64f 编写于 作者: S sushuang

Add slient and OCD-tweak.

上级 8800c728
import * as zrUtil from 'zrender/src/core/util';
import {retrieve, defaults, extend, each} from 'zrender/src/core/util';
import * as formatUtil from '../../util/format';
import * as graphic from '../../util/graphic';
import Model from '../../model/Model';
import {isRadianAroundZero, remRadian} from '../../util/number';
import {createSymbol} from '../../util/symbol';
import * as matrixUtil from 'zrender/src/core/matrix';
import * as vec2 from 'zrender/src/core/vector';
import {applyTransform as v2ApplyTransform} from 'zrender/src/core/vector';
var v2ApplyTransform = vec2.applyTransform;
var retrieve = zrUtil.retrieve;
var PI = Math.PI;
......@@ -73,7 +71,7 @@ var AxisBuilder = function (axisModel, opt) {
this.axisModel = axisModel;
// Default value
zrUtil.defaults(
defaults(
opt,
{
labelOffset: 0,
......@@ -145,7 +143,7 @@ var builders = {
v2ApplyTransform(pt2, pt2, matrix);
}
var lineStyle = zrUtil.extend(
var lineStyle = extend(
{
lineCap: 'round'
},
......@@ -186,37 +184,28 @@ var builders = {
var symbolWidth = arrowSize[0];
var symbolHeight = arrowSize[1];
// Start arrow
if (arrows[0] !== 'none' && arrows[0] != null) {
var symbol = createSymbol(
arrows[0],
-symbolWidth / 2,
-symbolHeight / 2,
symbolWidth,
symbolHeight,
lineStyle.stroke,
true
);
symbol.attr('rotation', opt.rotation + Math.PI / 2);
symbol.attr('position', pt1);
this.group.add(symbol);
}
// End arrow
if (arrows[1] !== 'none' && arrows[1] != null) {
var symbol = createSymbol(
arrows[1],
-symbolWidth / 2,
-symbolHeight / 2,
symbolWidth,
symbolHeight,
lineStyle.stroke,
true
);
symbol.attr('rotation', opt.rotation - Math.PI / 2);
symbol.attr('position', pt2);
this.group.add(symbol);
}
each([
[opt.rotation + Math.PI / 2, pt1],
[opt.rotation - Math.PI / 2, pt2]
], function (item, index) {
if (arrows[index] !== 'none' && arrows[index] != null) {
var symbol = createSymbol(
arrows[index],
-symbolWidth / 2,
-symbolHeight / 2,
symbolWidth,
symbolHeight,
lineStyle.stroke,
true
);
symbol.attr({
rotation: item[0],
position: item[1],
silent: true
});
this.group.add(symbol);
}
}, this);
}
},
......@@ -330,7 +319,7 @@ var builders = {
silent: isSilent(axisModel),
z2: 1,
tooltip: (tooltipOpt && tooltipOpt.show)
? zrUtil.extend({
? extend({
content: name,
formatter: function () {
return name;
......@@ -635,7 +624,7 @@ function buildAxisTick(axisBuilder, axisModel, opt) {
x2: pt2[0],
y2: pt2[1]
},
style: zrUtil.defaults(
style: defaults(
lineStyleModel.getLineStyle(),
{
stroke: axisModel.get('axisLine.lineStyle.color')
......@@ -679,7 +668,7 @@ function buildAxisLabel(axisBuilder, axisModel, opt) {
var showMinLabel = axisModel.get('axisLabel.showMinLabel');
var showMaxLabel = axisModel.get('axisLabel.showMaxLabel');
zrUtil.each(ticks, function (tickVal, index) {
each(ticks, function (tickVal, index) {
if (ifIgnoreOnTick(
axis, index, opt.labelInterval, ticks.length,
showMinLabel, showMaxLabel
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册