Skip to content

Commit a6b2705

Browse files
TsunaouTsunaou
committed
增加了对于背景图，本地文件，logo，文件贡献的支持
1 parent 5935273 commit a6b2705

File tree

7 files changed

+35
-16
lines changed

7 files changed

+35
-16
lines changed

‎repoDB_Options.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ def get_ContributorNetworkMatrix(self, table_name):
129129
datas['x'] = hours
130130
datas['y'] = days
131131
datas['data'] = data
132+
datas['max'] = 10
132133

133134
if self.is_table_exist(table_name):
134135
names_raw = self.execute("select name from {}".format(table_name))
@@ -138,13 +139,17 @@ def get_ContributorNetworkMatrix(self, table_name):
138139
names.append(j)
139140
infos = self.get_col_and_datas(table_name)
140141
data = []
142+
max = 10
141143
for i in range(1, infos.__len__()):
142144
for j in range(1, infos[0].__len__()):
143145
data.append([i-1, j-1, infos[i][j]])
146+
if infos[i][j] > max:
147+
max = infos[i][j]
144148

145149
datas['x'] = names
146150
datas['y'] = names
147151
datas['data'] = data
152+
datas['max'] = max
148153
else:
149154
print("表", table_name, "不存在")
150155

@@ -183,6 +188,7 @@ def get_FileContributorMatrix(self, table_name):
183188
datas['x'] = hours
184189
datas['y'] = days
185190
datas['data'] = data
191+
datas['max'] = 10
186192

187193
if self.is_table_exist(table_name):
188194
names_raw = self.execute("select contributor from {}".format(table_name))
@@ -192,13 +198,17 @@ def get_FileContributorMatrix(self, table_name):
192198
names.append(j)
193199
infos = self.get_col_and_datas(table_name)
194200
data = []
201+
max = 10
195202
for i in range(1, infos.__len__()):
196203
for j in range(1, infos[0].__len__()):
197204
data.append([i - 1, j - 1, infos[i][j]])
205+
if infos[i][j] > max:
206+
max = infos[i][j]
198207

199208
datas['x'] = infos[0][1:]
200209
datas['y'] = names
201210
datas['data'] = data
211+
datas['max'] = max
202212
else:
203213
print("表", table_name, "不存在")
204214

‎static/images/codeCloud.jpg

18.7 KB
Loading

‎static/images/github.jpg

37.2 KB
Loading

‎static/images/gitlab.png

25.8 KB
Loading

‎templates/macros/macros_ContributorNetworkMatrix.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
// 指定图表的配置项和数据(注意要用tojson)
77
var hours = {{ contributor_network_matrix.x | tojson }};
88
var days = {{ contributor_network_matrix.y | tojson }};
9-
var data = {{ contributor_network_matrix.data | tojson}}
9+
var data = {{ contributor_network_matrix.data | tojson}};
10+
var max = {{ contributor_network_matrix.max }}
1011

11-
data = data.map(function (item) {
12+
data = data.map(function (item) {
1213
return [item[1], item[0], item[2] || '-'];
1314
});
1415

@@ -37,7 +38,7 @@
3738
},
3839
visualMap: {
3940
min: 0,
40-
max: 10,
41+
max: max,
4142
calculable: true,
4243
orient: 'horizontal',
4344
left: 'center',

‎templates/macros/macros_FileContributorMatrix.html

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
// 指定图表的配置项和数据(注意要用tojson)
77
var hours = {{ file_contributor_matrix.x | tojson }};
88
var days = {{ file_contributor_matrix.y | tojson }};
9-
var data = {{ file_contributor_matrix.data | tojson}}
9+
var data = {{ file_contributor_matrix.data | tojson}};
10+
var max = {{ file_contributor_matrix.max }}
1011

11-
data = data.map(function (item) {
12-
return [item[1], item[0], item[2] || '-'];
13-
});
12+
data = data.map(function (item) {
13+
return [item[1], item[0], item[2] || '-'];
14+
});
1415

1516
var option3 = {
1617
tooltip: {
@@ -37,7 +38,7 @@
3738
},
3839
visualMap: {
3940
min: 0,
40-
max: 10,
41+
max: max,
4142
calculable: true,
4243
orient: 'horizontal',
4344
left: 'center',

‎templates/repositories_basic.html

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,20 @@
1717
{% block scripts %}
1818
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
1919
<!-- Include all compiled plugins (below), or include individual files as needed -->
20-
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
21-
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js" integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4" crossorigin="anonymous"></script>
20+
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js"
21+
integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN"
22+
crossorigin="anonymous"></script>
23+
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js"
24+
integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4"
25+
crossorigin="anonymous"></script>
2226
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js"></script>
23-
{% endblock scripts%}
27+
{% endblock scripts %}
2428
{% endblock head %}
2529
</head>
2630

2731
<body style="background-image: url({{ url_for('static', filename='images/background.jpg') }})">
2832

29-
<div class="container" >
33+
<div class="container">
3034
<header class="blog-header py-3">
3135
<div class="row flex-nowrap justify-content-between align-items-center">
3236
<div class="col-4 pt-1">
@@ -50,13 +54,15 @@
5054
</header>
5155
<nav class="navbar navbar-expand-lg navbar-light bg-light">
5256
<a class="navbar-brand" href="{{ url_for('home') }}">Add Repository</a>
53-
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavAltMarkup" aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation">
57+
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavAltMarkup"
58+
aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation">
5459
<span class="navbar-toggler-icon"></span>
5560
</button>
5661
<div class="collapse navbar-collapse" id="navbarNavAltMarkup">
5762
<div class="navbar-nav">
5863
{% block nav %}
59-
<a class="nav-item nav-link active" href="{{ url_for('home') }}">首页<span class="sr-only">(current)</span></a>
64+
<a class="nav-item nav-link active" href="{{ url_for('home') }}">首页<span
65+
class="sr-only">(current)</span></a>
6066
<a class="nav-item nav-link" href="{{ url_for('sql_display') }}">数据库信息</a>
6167
<a class="nav-item nav-link" href="{{ url_for('quick_login') }}">快速登录</a>
6268
<a class="nav-item nav-link" href="{{ url_for('repositories') }}">我的仓库信息</a>
@@ -94,11 +100,12 @@ <h1 class="font-italic">Mining Core Contributors in Open-Source Projects</h1>
94100
</div>
95101
</main>
96102

97-
<footer class="blog-footer">
103+
<footer class="blog-footer container">
98104
{% block footer %}
99105
<small> &copy; 2019 <a href="https://github.com/Tsunaou" title="Written by Tsunaou">Young</a> /
100106
<a href="https://github.com/Tsunaou" title="Fork me on GitHub">GitHub</a> /
101-
<a href="https://github.com/OpenSrcRepoDataMining" title="Website-Design Course Works">OpenSrcRepoDataMining</a>
107+
<a href="https://github.com/OpenSrcRepoDataMining"
108+
title="Website-Design Course Works">OpenSrcRepoDataMining</a>
102109
</small>
103110
{% endblock %}
104111
</footer>

0 commit comments

Comments
 (0)