Skip to content

Commit 2baa9ca

Browse files
committed
Draw grid lines for imaginary axis
1 parent 3a6a4ef commit 2baa9ca

File tree

1 file changed

+39
-37
lines changed

1 file changed

+39
-37
lines changed

src/plots/smith/smith.js

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -444,14 +444,15 @@ proto.updateRadialAxis = function(fullLayout, polarLayout) {
444444
// var valsClipped = Axes.clipEnds(ax, vals);
445445
var tickSign = Axes.getTickSigns(ax)[2];
446446

447-
Axes.drawTicks(gd, ax, {
448-
vals: vals,
449-
layer: layers['radial-axis'],
450-
path: Axes.makeTickPath(ax, 0, tickSign),
451-
transFn: transFn,
452-
crisp: false
453-
});
454-
447+
// Axes.drawTicks(gd, ax, {
448+
// vals: vals,
449+
// layer: layers['radial-axis'],
450+
// path: Axes.makeTickPath(ax, 0, tickSign),
451+
// transFn: transFn,
452+
// crisp: false
453+
// });
454+
455+
// circular grid lines
455456
Axes.drawGrid(gd, ax, {
456457
vals: [{x: 0.2 }, {x: 0.5 }, {x: 1.0 }, {x: 2.0 }, {x: 5.0 } ],
457458
layer: layers['radial-grid'],
@@ -460,13 +461,13 @@ proto.updateRadialAxis = function(fullLayout, polarLayout) {
460461
crisp: false
461462
});
462463

463-
Axes.drawLabels(gd, ax, {
464-
vals: vals,
465-
layer: layers['radial-axis'],
466-
transFn: transFn,
467-
// labelFns: Axes.makeLabelFns(ax, 0)
468-
labelFns: labelFns
469-
});
464+
// Axes.drawLabels(gd, ax, {
465+
// vals: vals,
466+
// layer: layers['radial-axis'],
467+
// transFn: transFn,
468+
// // labelFns: Axes.makeLabelFns(ax, 0)
469+
// labelFns: labelFns
470+
// });
470471
}
471472

472473
// stash 'actual' radial axis angle for drag handlers (in degrees)
@@ -691,14 +692,10 @@ proto.updateAngularAxis = function(fullLayout, polarLayout) {
691692
};
692693

693694
var gridPathFn = function(d) {
694-
var rad = t2g(d);
695-
var cosRad = Math.cos(rad);
696-
var sinRad = Math.sin(rad);
697-
return 'M' + [cx + innerRadius * cosRad, cy - innerRadius * sinRad] +
698-
'L' + [cx + radius * cosRad, cy - radius * sinRad];
695+
var value = d.x;
696+
var radius = _this.radius / d.x;
699697

700-
// var h = 2.0 / d.y;
701-
// var radius = h;
698+
return Lib.pathArc(Math.abs(radius), Math.PI / 2.0, 3.0 * Math.PI / 2.0, cx + _this.radius, cy - radius);
702699
};
703700

704701
var out = Axes.makeLabelFns(ax, 0);
@@ -767,29 +764,34 @@ proto.updateAngularAxis = function(fullLayout, polarLayout) {
767764
var tickSign = ax.ticks === 'inside' ? -1 : 1;
768765
var pad = (ax.linewidth || 1) / 2;
769766

770-
Axes.drawTicks(gd, ax, {
771-
vals: vals,
772-
layer: layers['angular-axis'],
773-
path: 'M' + (tickSign * pad) + ',0h' + (tickSign * ax.ticklen),
774-
transFn: transFn2,
775-
crisp: false
776-
});
767+
// Axes.drawTicks(gd, ax, {
768+
// vals: vals,
769+
// layer: layers['angular-axis'],
770+
// path: 'M' + (tickSign * pad) + ',0h' + (tickSign * ax.ticklen),
771+
// transFn: transFn2,
772+
// crisp: false
773+
// });
777774

778775
Axes.drawGrid(gd, ax, {
779-
vals: vals,
776+
// vals: vals,
777+
vals: [-5.0, -2.0, -1.0, -0.5, -0.2, 0.2, 0.5, 1.0, 2.0, 5.0].map(function (v) {
778+
return {
779+
x: v,
780+
};
781+
}),
780782
layer: layers['angular-grid'],
781783
path: gridPathFn,
782784
transFn: Lib.noop,
783785
crisp: false
784786
});
785787

786-
Axes.drawLabels(gd, ax, {
787-
vals: vals,
788-
layer: layers['angular-axis'],
789-
repositionOnUpdate: true,
790-
transFn: transFn,
791-
labelFns: labelFns
792-
});
788+
// Axes.drawLabels(gd, ax, {
789+
// vals: vals,
790+
// layer: layers['angular-axis'],
791+
// repositionOnUpdate: true,
792+
// transFn: transFn,
793+
// labelFns: labelFns
794+
// });
793795
}
794796

795797
// TODO maybe two arcs is better here?

0 commit comments

Comments
 (0)