|
@ -1230,6 +1230,32 @@ Graph3d.prototype._line = function(ctx, from, to, strokeStyle) { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Graph3d.prototype.drawAxisLabelX = function(ctx, point3d, text, armAngle, yMargin) { |
|
|
|
|
|
if (yMargin === undefined) { |
|
|
|
|
|
yMargin = 0; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
var point2d = this._convert3Dto2D(point3d); |
|
|
|
|
|
|
|
|
|
|
|
if (Math.cos(armAngle * 2) > 0) { |
|
|
|
|
|
ctx.textAlign = 'center'; |
|
|
|
|
|
ctx.textBaseline = 'top'; |
|
|
|
|
|
point2d.y += yMargin; |
|
|
|
|
|
} |
|
|
|
|
|
else if (Math.sin(armAngle * 2) < 0){ |
|
|
|
|
|
ctx.textAlign = 'right'; |
|
|
|
|
|
ctx.textBaseline = 'middle'; |
|
|
|
|
|
} |
|
|
|
|
|
else { |
|
|
|
|
|
ctx.textAlign = 'left'; |
|
|
|
|
|
ctx.textBaseline = 'middle'; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
ctx.fillStyle = this.axisColor; |
|
|
|
|
|
ctx.fillText(text, point2d.x, point2d.y); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* Redraw the axis |
|
|
* Redraw the axis |
|
|
*/ |
|
|
*/ |
|
@ -1276,23 +1302,10 @@ Graph3d.prototype._redrawAxis = function() { |
|
|
this._line(ctx, from, to, this.axisColor); |
|
|
this._line(ctx, from, to, this.axisColor); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
yText = (Math.cos(armAngle) > 0) ? this.yMin : this.yMax; |
|
|
|
|
|
text = this._convert3Dto2D(new Point3d(x, yText, this.zMin)); |
|
|
|
|
|
if (Math.cos(armAngle * 2) > 0) { |
|
|
|
|
|
ctx.textAlign = 'center'; |
|
|
|
|
|
ctx.textBaseline = 'top'; |
|
|
|
|
|
text.y += textMargin; |
|
|
|
|
|
} |
|
|
|
|
|
else if (Math.sin(armAngle * 2) < 0){ |
|
|
|
|
|
ctx.textAlign = 'right'; |
|
|
|
|
|
ctx.textBaseline = 'middle'; |
|
|
|
|
|
} |
|
|
|
|
|
else { |
|
|
|
|
|
ctx.textAlign = 'left'; |
|
|
|
|
|
ctx.textBaseline = 'middle'; |
|
|
|
|
|
} |
|
|
|
|
|
ctx.fillStyle = this.axisColor; |
|
|
|
|
|
ctx.fillText(' ' + this.xValueLabel(step.getCurrent()) + ' ', text.x, text.y); |
|
|
|
|
|
|
|
|
yText = (Math.cos(armAngle) > 0) ? this.yMin : this.yMax; |
|
|
|
|
|
var point3d = new Point3d(x, yText, this.zMin); |
|
|
|
|
|
var msg = ' ' + this.xValueLabel(x) + ' '; |
|
|
|
|
|
this.drawAxisLabelX(ctx, point3d, msg, armAngle, textMargin); |
|
|
|
|
|
|
|
|
step.next(); |
|
|
step.next(); |
|
|
} |
|
|
} |
|
@ -1396,23 +1409,10 @@ Graph3d.prototype._redrawAxis = function() { |
|
|
var xLabel = this.xLabel; |
|
|
var xLabel = this.xLabel; |
|
|
if (xLabel.length > 0) { |
|
|
if (xLabel.length > 0) { |
|
|
yOffset = 0.1 / this.scale.y; |
|
|
yOffset = 0.1 / this.scale.y; |
|
|
xText = (this.xMin + this.xMax) / 2; |
|
|
|
|
|
yText = (Math.cos(armAngle) > 0) ? this.yMin - yOffset: this.yMax + yOffset; |
|
|
|
|
|
text = this._convert3Dto2D(new Point3d(xText, yText, this.zMin)); |
|
|
|
|
|
if (Math.cos(armAngle * 2) > 0) { |
|
|
|
|
|
ctx.textAlign = 'center'; |
|
|
|
|
|
ctx.textBaseline = 'top'; |
|
|
|
|
|
} |
|
|
|
|
|
else if (Math.sin(armAngle * 2) < 0){ |
|
|
|
|
|
ctx.textAlign = 'right'; |
|
|
|
|
|
ctx.textBaseline = 'middle'; |
|
|
|
|
|
} |
|
|
|
|
|
else { |
|
|
|
|
|
ctx.textAlign = 'left'; |
|
|
|
|
|
ctx.textBaseline = 'middle'; |
|
|
|
|
|
} |
|
|
|
|
|
ctx.fillStyle = this.axisColor; |
|
|
|
|
|
ctx.fillText(xLabel, text.x, text.y); |
|
|
|
|
|
|
|
|
xText = (this.xMin + this.xMax) / 2; |
|
|
|
|
|
yText = (Math.cos(armAngle) > 0) ? this.yMin - yOffset: this.yMax + yOffset; |
|
|
|
|
|
text = new Point3d(xText, yText, this.zMin); |
|
|
|
|
|
this.drawAxisLabelX(ctx, text, xLabel, armAngle); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// draw y-label
|
|
|
// draw y-label
|
|
|