Skip to content

Commit

Permalink
chord 支持 category, force样式配置 stroke(兼容) -> border
Browse files Browse the repository at this point in the history
  • Loading branch information
pissang committed Oct 30, 2014
1 parent f28626c commit 4dfd5d1
Show file tree
Hide file tree
Showing 10 changed files with 260 additions and 44 deletions.
2 changes: 1 addition & 1 deletion doc/example/chord3.html
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
{target: '多特蒙德', source: '胡梅尔斯', weight: 1},
{target: '多特蒙德', source: '魏登费勒', weight: 1},
{target: '多特蒙德', source: '杜尔姆', weight: 1},
{target: '多特蒙德', source: '格罗斯克罗伊茨', weight: 1},
{target: '多特蒙德', source: '格罗斯克罗伊茨', weight: 1}
]
}
]
Expand Down
32 changes: 17 additions & 15 deletions doc/example/chord4.html
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@
}
}
},
minRadius: 7,
maxRadius: 20,
// 使用 nodes links 表达和弦图
nodes: [
{name:'默特萨克'},
Expand All @@ -84,7 +86,7 @@
{name:'施魏因施泰格'},
{name:'拉姆'},
{name:'克罗斯'},
{name:'穆勒'},
{name:'穆勒', symbol: 'star'},
{name:'格策'},
{name:'胡梅尔斯'},
{name:'魏登费勒'},
Expand All @@ -95,20 +97,20 @@
{name:'多特蒙德'}
],
links: [
{source: '阿森纳', target: '默特萨克', weight: 0.9},
{source: '阿森纳', target: '厄齐尔', weight: 0.9},
{source: '阿森纳', target: '波多尔斯基', weight: 0.9},
{source: '拜仁慕尼黑', target: '诺伊尔', weight: 0.9},
{source: '拜仁慕尼黑', target: '博阿滕', weight: 0.9},
{source: '拜仁慕尼黑', target: '施魏因施泰格', weight: 0.9},
{source: '拜仁慕尼黑', target: '拉姆', weight: 0.9},
{source: '拜仁慕尼黑', target: '克罗斯', weight: 0.9},
{source: '拜仁慕尼黑', target: '穆勒', weight: 0.9},
{source: '拜仁慕尼黑', target: '格策', weight: 0.9},
{source: '多特蒙德', target: '胡梅尔斯', weight: 0.9},
{source: '多特蒙德', target: '魏登费勒', weight: 0.9},
{source: '多特蒙德', target: '杜尔姆', weight: 0.9},
{source: '多特蒙德', target: '格罗斯克罗伊茨', weight: 0.9},
{source: '阿森纳', target: '默特萨克', weight: 1},
{source: '阿森纳', target: '厄齐尔', weight: 1},
{source: '阿森纳', target: '波多尔斯基', weight: 1},
{source: '拜仁慕尼黑', target: '诺伊尔', weight: 1},
{source: '拜仁慕尼黑', target: '博阿滕', weight: 1},
{source: '拜仁慕尼黑', target: '施魏因施泰格', weight: 1},
{source: '拜仁慕尼黑', target: '拉姆', weight: 1},
{source: '拜仁慕尼黑', target: '克罗斯', weight: 1},
{source: '拜仁慕尼黑', target: '穆勒', weight: 1},
{source: '拜仁慕尼黑', target: '格策', weight: 1},
{source: '多特蒙德', target: '胡梅尔斯', weight: 1},
{source: '多特蒙德', target: '魏登费勒', weight: 1},
{source: '多特蒙德', target: '杜尔姆', weight: 1},
{source: '多特蒙德', target: '格罗斯克罗伊茨', weight: 1}
]
}
]
Expand Down
5 changes: 3 additions & 2 deletions doc/example/force.html
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@
},
nodeStyle : {
brushType : 'both',
strokeColor : 'rgba(255,215,0,0.4)',
lineWidth : 1
borderColor : 'rgba(255,215,0,0.4)',
borderWidth : 1
}
},
emphasis: {
Expand All @@ -110,6 +110,7 @@
linkSymbol: 'arrow',
steps: 10,
coolDown: 0.9,
preventOverlap: true,
nodes:[
{
category:0, name: '乔布斯', value : 10,
Expand Down
4 changes: 2 additions & 2 deletions doc/example/force1.html
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@
},
nodeStyle : {
brushType : 'both',
strokeColor : 'rgba(255,215,0,0.4)',
lineWidth : 1
borderColor : 'rgba(255,215,0,0.4)',
borderWidth : 1
}
},
emphasis: {
Expand Down
4 changes: 2 additions & 2 deletions doc/example/force2.html
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@
},
nodeStyle : {
brushType : 'both',
strokeColor : 'rgba(255,215,0,0.6)',
lineWidth : 1
borderColor : 'rgba(255,215,0,0.6)',
borderWidth : 1
}
}
},
Expand Down
149 changes: 149 additions & 0 deletions doc/example/webkit-dep2.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="ECharts">
<meta name="author" content="[email protected]">
<title>ECharts · Example</title>

<link rel="shortcut icon" href="../asset/ico/favicon.png">

<link href="http://maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet">
<link href="../asset/css/bootstrap.css" rel="stylesheet">
<link href="../asset/css/carousel.css" rel="stylesheet">
<link href="../asset/css/echartsHome.css" rel="stylesheet">
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->

<script src="../asset/js/esl/esl.js"></script>
<script src="../asset/js/codemirror.js"></script>
<script src="../asset/js/javascript.js"></script>

<link href="../asset/css/codemirror.css" rel="stylesheet">
<link href="../asset/css/monokai.css" rel="stylesheet">
<style type="text/css">
.CodeMirror {
height: 620px;
}
</style>
</head>

<body>
<!-- Fixed navbar -->
<div class="navbar navbar-default navbar-fixed-top" role="navigation" id="head"></div>


<div class="container-fluid">
<div class="row-fluid example">
<div id="sidebar-code" class="col-md-1">
<div class="well sidebar-nav">
<div class="nav-header"><a href="#" onclick="autoResize()" class="glyphicon glyphicon-resize-full" id ="icon-resize" ></a>option</div>
<textarea id="code" name="code">
option = {
title : {
text: 'webkit内核依赖',
subtext: '数据来自网络',
x:'right',
y:'bottom'
},
tooltip : {
trigger: 'item',
formatter : "{b}"
},
toolbox: {
show : true,
feature : {
restore : {show: true},
saveAsImage : {show: true}
}
},
legend : {
data : ['HTMLElement', 'WebGL', 'SVG', 'CSS', 'Other'],
orient : 'vertical',
x : 'left'
},
series : (function (){
// If data have been loaded
if (webkitDepData) {
//webkitDepData has been required and defined in webkit-dep.js
webkitDepData.type = 'chord';
webkitDepData.ribbonType = false;
for (var i = 0; i < webkitDepData.nodes.length; i++) {
webkitDepData.nodes[i].value = null;
}
for (var i = 0; i < webkitDepData.links.length; i++) {
webkitDepData.links[i].weight = 1;
}
webkitDepData.minRadius = 2;
webkitDepData.maxRadius = 10;
webkitDepData.itemStyle = {
normal: {
label: {
show: true,
rotate: true
},
chordStyle: {
opacity: 0.2
}
}
};
return [webkitDepData];
} else {
return [];
}
})()
};
</textarea>
</div><!--/.well -->
</div><!--/span-->
<div id="graphic" class="col-md-11">
<div id="main" class="main" style="height:600px;"></div>
<div>
<button type="button" class="btn btn-sm btn-success" onclick="refresh(true)">刷 新</button>
<span class="text-primary">切换主题</span>
<select id="theme-select"></select>

<span id='wrong-message' style="color:red"></span>
</div>
</div><!--/span-->
</div><!--/row-->

</div><!--/.fluid-container-->

<footer id="footer"></footer>
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="../asset/js/jquery.min.js"></script>
<script type="text/javascript" src="../asset/js/echartsHome.js"></script>
<script src="../asset/js/bootstrap.min.js"></script>
<script type="text/javascript">
var webkitDepData;
require(['webkit-dep'], function (wd) {
webkitDepData = wd;
//webkitDepData has been required and defined in webkit-dep.js
webkitDepData.minRadius = 5;
webkitDepData.maxRadius = 8;
webkitDepData.density = 1.1;
webkitDepData.attractiveness = 1.1;
webkitDepData.itemStyle = {
normal : {
linkStyle : {
opacity : 0.5
}
}
}
// Echarts have been loaded
if (typeof(echarts) !== 'undefined') {
refresh();
}
})
</script>
<script src="../asset/js/echartsExample.js"></script>
</body>
</html>
Loading

0 comments on commit 4dfd5d1

Please sign in to comment.