Skip to content

Commit cac1afa

Browse files
committed
bioradar update radar type
1 parent 7e448b5 commit cac1afa

File tree

2 files changed

+20
-10
lines changed

2 files changed

+20
-10
lines changed

BioRadar/src/script/graphic/radarChart.js

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ function RadarChart(id, data, options, name) {
8888

8989
let colorLength = cfg.arrColor.length-1;
9090
var dif = 1 / (cfg.levels-2);
91-
var right = 1 + dif;
91+
// cfg.arrThresholds = [-dif]; // 3/18/2020
92+
cfg.arrThresholds = [-4/cfg.w]; // 3/18/2020
9293
cfg.arrThresholds = [-dif];
9394
for (var i=0;i<colorLength-1;i++)
9495
cfg.arrThresholds.push(i*dif);
@@ -112,7 +113,8 @@ function RadarChart(id, data, options, name) {
112113
}
113114
let deltaAng = Math.PI/10;
114115
// Re-adjust angles
115-
minValue = range[0]-dif*(range[1]-range[0]);
116+
minValue = range[0] - (range[1]-range[0])*4/cfg.w;
117+
// minValue = range[0]-dif*(range[1]-range[0]); // 3/18/2020
116118
maxValue = range[1]+dif*(range[1]-range[0]);
117119

118120
let radius = Math.min(cfg.w / 2, cfg.h / 2); //Radius of the outermost circle
@@ -255,19 +257,22 @@ function RadarChart(id, data, options, name) {
255257
});
256258
//Draw the background circles
257259
var levels = axisGrid.selectAll(".levels.gridCircle")
258-
.data(d3.range(1, (cfg.levels + 1)).reverse());
260+
// .data(d3.range(1, (cfg.levels + 1)).reverse());
261+
.data(d3.range(1, (cfg.levels)).reverse());
259262
levels.exit().remove();
260263
levels.enter()
261264
.append("circle")
262265
.attr("class", "levels gridCircle")
263266
.merge(levels)
264267
.attr("r", function (d, i) {
265-
return radius / cfg.levels * d;
268+
// return radius / cfg.levels * d;
269+
return rScale(d/(cfg.levels-2));
266270
})
267271
.style("fill", "#CDCDCD")
268272
.style("stroke", function (d) {
269273
if (cfg.ringColor===undefined) {
270-
var v = (maxValue - minValue) * d / cfg.levels + minValue;
274+
// var v = (maxValue - minValue) * d / cfg.levels + minValue;
275+
var v = d/(cfg.levels-2);
271276
return colorTemperature(v);
272277
}
273278
return cfg.ringColor;

BioRadar/src/script/graphic/radarChart_v1.js

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ function RadarChart(id, data, options, name) {
9292
let colorLength = cfg.arrColor.length-1;
9393
var dif = 1 / (cfg.levels-2);
9494
var right = 1 + dif;
95-
cfg.arrThresholds = [-dif];
95+
// cfg.arrThresholds = [-dif]; // 3/18/2020
96+
cfg.arrThresholds = [-4/cfg.w]; // 3/18/2020
9697
for (var i=0;i<colorLength-1;i++)
9798
cfg.arrThresholds.push(i*dif);
9899
cfg.arrThresholds.push(right);
@@ -115,7 +116,8 @@ function RadarChart(id, data, options, name) {
115116
}
116117
let deltaAng = Math.PI/10;
117118
// Re-adjust angles
118-
minValue = range[0]-dif*(range[1]-range[0]);
119+
minValue = range[0] - (range[1]-range[0])*4/cfg.w;
120+
// minValue = range[0]-dif*(range[1]-range[0]); // 3/18/2020
119121
maxValue = range[1]+dif*(range[1]-range[0]);
120122

121123
let radius = Math.min(cfg.w / 2, cfg.h / 2); //Radius of the outermost circle
@@ -257,14 +259,16 @@ function RadarChart(id, data, options, name) {
257259
});
258260
//Draw the background circles
259261
var levels = axisGrid.selectAll(".levels.gridCircle")
260-
.data(d3.range(1, (cfg.levels + 1)).reverse());
262+
// .data(d3.range(1, (cfg.levels + 1)).reverse());
263+
.data(d3.range(1, (cfg.levels)).reverse());
261264
levels.exit().remove();
262265
levels.enter()
263266
.append("circle")
264267
.attr("class", "levels gridCircle")
265268
.merge(levels)
266269
.attr("r", function (d, i) {
267-
return radius / cfg.levels * d;
270+
// return radius / cfg.levels * d;
271+
return rScale(d/(cfg.levels-2));
268272
})
269273
.style("fill", "#CDCDCD")
270274
.style("stroke", function (d) {
@@ -275,7 +279,8 @@ function RadarChart(id, data, options, name) {
275279
return cfg.ringColor;
276280
})
277281
.style("stroke-width",d=>{
278-
var v = (maxValue - minValue) * d / cfg.levels + minValue;
282+
// var v = (maxValue - minValue) * d / cfg.levels + minValue;
283+
var v = d/(cfg.levels-2);
279284
return cfg.ringStroke_width(v)===undefined?0.3:cfg.ringStroke_width(v)
280285
})
281286
.style("stroke-opacity", 1)

0 commit comments

Comments
 (0)