Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
x649585723
incubator-echarts
提交
c0300ec5
I
incubator-echarts
项目概览
x649585723
/
incubator-echarts
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
incubator-echarts
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c0300ec5
编写于
11月 16, 2015
作者:
L
lang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
tweak, improve markLine
上级
840f9f78
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
74 addition
and
47 deletion
+74
-47
src/chart/pie/PieView.js
src/chart/pie/PieView.js
+5
-1
src/chart/pie/labelLayout.js
src/chart/pie/labelLayout.js
+41
-38
src/coord/Axis.js
src/coord/Axis.js
+0
-1
src/coord/cartesian/Axis2D.js
src/coord/cartesian/Axis2D.js
+11
-0
src/coord/cartesian/axisLabelInterval.js
src/coord/cartesian/axisLabelInterval.js
+1
-1
src/data/List.js
src/data/List.js
+10
-3
src/model/globalDefault.js
src/model/globalDefault.js
+1
-1
src/util/graphic.js
src/util/graphic.js
+5
-2
未找到文件。
src/chart/pie/PieView.js
浏览文件 @
c0300ec5
...
@@ -188,7 +188,11 @@ define(function (require) {
...
@@ -188,7 +188,11 @@ define(function (require) {
});
});
api
.
updateGraphicEl
(
labelLine
,
{
api
.
updateGraphicEl
(
labelLine
,
{
shape
:
{
shape
:
{
points
:
labelLayout
.
linePoints
points
:
labelLayout
.
linePoints
||
[
[
labelLayout
.
x
,
labelLayout
.
y
],
[
labelLayout
.
x
,
labelLayout
.
y
],
[
labelLayout
.
x
,
labelLayout
.
y
]
]
}
}
});
});
api
.
updateGraphicEl
(
labelText
,
{
api
.
updateGraphicEl
(
labelText
,
{
...
...
src/chart/pie/labelLayout.js
浏览文件 @
c0300ec5
...
@@ -38,42 +38,42 @@ define(function (require) {
...
@@ -38,42 +38,42 @@ define(function (require) {
}
}
}
}
function
changeX
(
list
,
isDownList
,
cx
,
cy
,
r
,
dir
)
{
//
function changeX(list, isDownList, cx, cy, r, dir) {
var
deltaX
;
//
var deltaX;
var
deltaY
;
//
var deltaY;
var
length
;
//
var length;
var
lastDeltaX
=
dir
>
0
//
var lastDeltaX = dir > 0
?
isDownList
// 右侧
//
? isDownList // 右侧
?
Number
.
MAX_VALUE
// 下
//
? Number.MAX_VALUE // 下
:
0
// 上
//
: 0 // 上
:
isDownList
// 左侧
//
: isDownList // 左侧
?
Number
.
MAX_VALUE
// 下
//
? Number.MAX_VALUE // 下
:
0
;
// 上
//
: 0; // 上
for
(
var
i
=
0
,
l
=
list
.
length
;
i
<
l
;
i
++
)
{
//
for (var i = 0, l = list.length; i < l; i++) {
deltaY
=
Math
.
abs
(
list
[
i
].
y
-
cy
);
//
deltaY = Math.abs(list[i].y - cy);
length
=
list
[
i
].
_radius
-
r
;
// length = list[i].length
;
deltaX
=
(
deltaY
<
r
+
length
)
//
deltaX = (deltaY < r + length)
?
Math
.
sqrt
(
//
? Math.sqrt(
(
r
+
length
+
20
)
*
(
r
+
length
+
20
)
//
(r + length + 20) * (r + length + 20)
-
Math
.
pow
(
list
[
i
].
y
-
cy
,
2
)
//
- Math.pow(list[i].y - cy, 2)
)
//
)
:
Math
.
abs
(
//
: Math.abs(
list
[
i
].
x
-
cx
//
list[i].x - cx
);
//
);
if
(
isDownList
&&
deltaX
>=
lastDeltaX
)
{
//
if (isDownList && deltaX >= lastDeltaX) {
// 右下,左下
//
// 右下,左下
deltaX
=
lastDeltaX
-
10
;
//
deltaX = lastDeltaX - 10;
}
//
}
if
(
!
isDownList
&&
deltaX
<=
lastDeltaX
)
{
//
if (!isDownList && deltaX <= lastDeltaX) {
// 右上,左上
//
// 右上,左上
deltaX
=
lastDeltaX
+
10
;
//
deltaX = lastDeltaX + 10;
}
//
}
list
[
i
].
x
=
cx
+
deltaX
*
dir
;
//
list[i].x = cx + deltaX * dir;
lastDeltaX
=
deltaX
;
//
lastDeltaX = deltaX;
}
//
}
}
//
}
var
lastY
=
0
;
var
lastY
=
0
;
var
delta
;
var
delta
;
...
@@ -98,8 +98,8 @@ define(function (require) {
...
@@ -98,8 +98,8 @@ define(function (require) {
upList
.
push
(
list
[
i
]);
upList
.
push
(
list
[
i
]);
}
}
}
}
changeX
(
downList
,
true
,
cx
,
cy
,
r
,
dir
);
//
changeX(downList, true, cx, cy, r, dir);
changeX
(
upList
,
false
,
cx
,
cy
,
r
,
dir
);
//
changeX(upList, false, cx, cy, r, dir);
}
}
function
avoidOverlap
(
labelLayoutList
,
cx
,
cy
,
r
,
viewWidth
,
viewHeight
)
{
function
avoidOverlap
(
labelLayoutList
,
cx
,
cy
,
r
,
viewWidth
,
viewHeight
)
{
...
@@ -126,6 +126,7 @@ define(function (require) {
...
@@ -126,6 +126,7 @@ define(function (require) {
else
{
else
{
linePoints
[
2
][
0
]
=
labelLayoutList
[
i
].
x
-
3
;
linePoints
[
2
][
0
]
=
labelLayoutList
[
i
].
x
-
3
;
}
}
linePoints
[
1
][
1
]
=
linePoints
[
2
][
1
]
=
labelLayoutList
[
i
].
y
;
}
}
}
}
}
}
...
@@ -204,6 +205,8 @@ define(function (require) {
...
@@ -204,6 +205,8 @@ define(function (require) {
x
:
textX
,
x
:
textX
,
y
:
textY
,
y
:
textY
,
height
:
textRect
.
height
,
height
:
textRect
.
height
,
length
:
labelLineLen
,
length2
:
labelLineLen2
,
linePoints
:
linePoints
,
linePoints
:
linePoints
,
textAlign
:
textAlign
,
textAlign
:
textAlign
,
textBaseline
:
textBaseline
,
textBaseline
:
textBaseline
,
...
...
src/coord/Axis.js
浏览文件 @
c0300ec5
...
@@ -122,7 +122,6 @@ define(function (require) {
...
@@ -122,7 +122,6 @@ define(function (require) {
*/
*/
dataToCoord
:
function
(
data
,
clamp
)
{
dataToCoord
:
function
(
data
,
clamp
)
{
data
=
this
.
scale
.
normalize
(
data
);
data
=
this
.
scale
.
normalize
(
data
);
var
extent
=
this
.
getExtent
();
var
extent
=
this
.
getExtent
();
if
(
this
.
onBand
)
{
if
(
this
.
onBand
)
{
fixExtentWithBands
(
extent
,
this
.
scale
.
count
());
fixExtentWithBands
(
extent
,
this
.
scale
.
count
());
...
...
src/coord/cartesian/Axis2D.js
浏览文件 @
c0300ec5
...
@@ -2,6 +2,7 @@ define(function (require) {
...
@@ -2,6 +2,7 @@ define(function (require) {
var
zrUtil
=
require
(
'
zrender/core/util
'
);
var
zrUtil
=
require
(
'
zrender/core/util
'
);
var
Axis
=
require
(
'
../Axis
'
);
var
Axis
=
require
(
'
../Axis
'
);
var
axisLabelInterval
=
require
(
'
./axisLabelInterval
'
);
/**
/**
* Extend axis 2d
* Extend axis 2d
...
@@ -54,6 +55,16 @@ define(function (require) {
...
@@ -54,6 +55,16 @@ define(function (require) {
isHorizontal
:
function
()
{
isHorizontal
:
function
()
{
var
position
=
this
.
position
;
var
position
=
this
.
position
;
return
position
===
'
top
'
||
position
===
'
bottom
'
;
return
position
===
'
top
'
||
position
===
'
bottom
'
;
},
/**
* @return {number}
*/
getLabelInterval
:
function
()
{
var
labelInterval
=
this
.
_labelInterval
;
if
(
!
labelInterval
)
{
labelInterval
=
this
.
_labelInterval
=
axisLabelInterval
(
this
);
}
return
labelInterval
;
}
}
};
};
zrUtil
.
inherits
(
Axis2D
,
Axis
);
zrUtil
.
inherits
(
Axis2D
,
Axis
);
...
...
src/coord/cartesian/axisLabelInterval.js
浏览文件 @
c0300ec5
...
@@ -54,5 +54,5 @@ define(function(require) {
...
@@ -54,5 +54,5 @@ define(function(require) {
}
}
return
autoLabelInterval
;
return
autoLabelInterval
;
}
}
;
});
});
\ No newline at end of file
src/data/List.js
浏览文件 @
c0300ec5
...
@@ -374,11 +374,15 @@ define(function (require) {
...
@@ -374,11 +374,15 @@ define(function (require) {
*/
*/
listProto
.
getDataExtent
=
function
(
dim
,
stack
)
{
listProto
.
getDataExtent
=
function
(
dim
,
stack
)
{
var
dimData
=
this
.
_storage
[
dim
];
var
dimData
=
this
.
_storage
[
dim
];
var
min
=
Infinity
;
var
dimExtent
=
(
this
.
_extent
||
(
this
.
_extent
=
{}))[
dim
];
var
max
=
-
Infinity
;
var
value
;
var
value
;
if
(
dimExtent
)
{
return
dimExtent
;
}
// var dimInfo = this._dimensionInfos[dim];
// var dimInfo = this._dimensionInfos[dim];
if
(
dimData
)
{
if
(
dimData
)
{
var
min
=
Infinity
;
var
max
=
-
Infinity
;
// var isOrdinal = dimInfo.type === 'ordinal';
// var isOrdinal = dimInfo.type === 'ordinal';
for
(
var
i
=
0
,
len
=
this
.
count
();
i
<
len
;
i
++
)
{
for
(
var
i
=
0
,
len
=
this
.
count
();
i
<
len
;
i
++
)
{
value
=
this
.
get
(
dim
,
i
,
stack
);
value
=
this
.
get
(
dim
,
i
,
stack
);
...
@@ -390,8 +394,11 @@ define(function (require) {
...
@@ -390,8 +394,11 @@ define(function (require) {
value
<
min
&&
(
min
=
value
);
value
<
min
&&
(
min
=
value
);
value
>
max
&&
(
max
=
value
);
value
>
max
&&
(
max
=
value
);
}
}
return
(
this
.
_extent
[
dim
]
=
[
min
,
max
]);
}
else
{
return
[
Infinity
,
-
Infinity
];
}
}
return
[
min
,
max
];
};
};
/**
/**
...
...
src/model/globalDefault.js
浏览文件 @
c0300ec5
...
@@ -23,7 +23,7 @@ define(function () {
...
@@ -23,7 +23,7 @@ define(function () {
// PENDING
// PENDING
fontFamily
:
platform
.
match
(
/^Win/
)
?
'
Microsoft YaHei
'
:
'
sans-serif
'
,
fontFamily
:
platform
.
match
(
/^Win/
)
?
'
Microsoft YaHei
'
:
'
sans-serif
'
,
// fontFamily: 'Arial, Verdana, sans-serif',
// fontFamily: 'Arial, Verdana, sans-serif',
fontSize
:
1
2
,
fontSize
:
1
4
,
fontStyle
:
'
normal
'
,
fontStyle
:
'
normal
'
,
fontWeight
:
'
normal
'
fontWeight
:
'
normal
'
},
},
...
...
src/util/graphic.js
浏览文件 @
c0300ec5
...
@@ -8,6 +8,7 @@ define(function(require) {
...
@@ -8,6 +8,7 @@ define(function(require) {
var
colorTool
=
require
(
'
zrender/tool/color
'
);
var
colorTool
=
require
(
'
zrender/tool/color
'
);
var
matrix
=
require
(
'
zrender/core/matrix
'
);
var
matrix
=
require
(
'
zrender/core/matrix
'
);
var
vector
=
require
(
'
zrender/core/vector
'
);
var
vector
=
require
(
'
zrender/core/vector
'
);
var
Gradient
=
require
(
'
zrender/graphic/Gradient
'
);
var
graphic
=
{};
var
graphic
=
{};
...
@@ -172,8 +173,10 @@ define(function(require) {
...
@@ -172,8 +173,10 @@ define(function(require) {
// Create hoverStyle on mouseover
// Create hoverStyle on mouseover
var
hoverStyle
=
el
.
__hoverStl
;
var
hoverStyle
=
el
.
__hoverStl
;
hoverStyle
.
fill
=
hoverStyle
.
fill
||
colorTool
.
lift
(
fill
,
-
0.1
);
hoverStyle
.
fill
=
hoverStyle
.
fill
hoverStyle
.
stroke
=
hoverStyle
.
stroke
||
colorTool
.
lift
(
stroke
,
-
0.1
);
||
(
fill
instanceof
Gradient
)
?
fill
:
colorTool
.
lift
(
fill
,
-
0.1
);
hoverStyle
.
stroke
=
hoverStyle
.
stroke
||
(
stroke
instanceof
Gradient
)
?
stroke
:
colorTool
.
lift
(
stroke
,
-
0.1
);
var
normalStyle
=
{};
var
normalStyle
=
{};
for
(
var
name
in
hoverStyle
)
{
for
(
var
name
in
hoverStyle
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录