|
@ -1118,10 +1118,8 @@ Graph3d.prototype._redrawLegend = function() { |
|
|
var legendMin = isValueLegend ? this.valueMin : this.zMin; |
|
|
var legendMin = isValueLegend ? this.valueMin : this.zMin; |
|
|
var legendMax = isValueLegend ? this.valueMax : this.zMax; |
|
|
var legendMax = isValueLegend ? this.valueMax : this.zMax; |
|
|
var step = new StepNumber(legendMin, legendMax, (legendMax-legendMin)/5, true); |
|
|
var step = new StepNumber(legendMin, legendMax, (legendMax-legendMin)/5, true); |
|
|
step.start(); |
|
|
|
|
|
if (step.getCurrent() < legendMin) { |
|
|
|
|
|
step.next(); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
step.start(true); |
|
|
|
|
|
|
|
|
var y; |
|
|
var y; |
|
|
while (!step.end()) { |
|
|
while (!step.end()) { |
|
|
y = bottom - (step.getCurrent() - legendMin) / (legendMax - legendMin) * height; |
|
|
y = bottom - (step.getCurrent() - legendMin) / (legendMax - legendMin) * height; |
|
@ -1254,10 +1252,8 @@ Graph3d.prototype._redrawAxis = function() { |
|
|
ctx.lineWidth = 1; |
|
|
ctx.lineWidth = 1; |
|
|
prettyStep = (this.defaultXStep === undefined); |
|
|
prettyStep = (this.defaultXStep === undefined); |
|
|
step = new StepNumber(this.xMin, this.xMax, this.xStep, prettyStep); |
|
|
step = new StepNumber(this.xMin, this.xMax, this.xStep, prettyStep); |
|
|
step.start(); |
|
|
|
|
|
if (step.getCurrent() < this.xMin) { |
|
|
|
|
|
step.next(); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
step.start(true); |
|
|
|
|
|
|
|
|
while (!step.end()) { |
|
|
while (!step.end()) { |
|
|
var x = step.getCurrent(); |
|
|
var x = step.getCurrent(); |
|
|
|
|
|
|
|
@ -1301,10 +1297,8 @@ Graph3d.prototype._redrawAxis = function() { |
|
|
ctx.lineWidth = 1; |
|
|
ctx.lineWidth = 1; |
|
|
prettyStep = (this.defaultYStep === undefined); |
|
|
prettyStep = (this.defaultYStep === undefined); |
|
|
step = new StepNumber(this.yMin, this.yMax, this.yStep, prettyStep); |
|
|
step = new StepNumber(this.yMin, this.yMax, this.yStep, prettyStep); |
|
|
step.start(); |
|
|
|
|
|
if (step.getCurrent() < this.yMin) { |
|
|
|
|
|
step.next(); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
step.start(true); |
|
|
|
|
|
|
|
|
while (!step.end()) { |
|
|
while (!step.end()) { |
|
|
if (this.showGrid) { |
|
|
if (this.showGrid) { |
|
|
from = this._convert3Dto2D(new Point3d(this.xMin, step.getCurrent(), this.zMin)); |
|
|
from = this._convert3Dto2D(new Point3d(this.xMin, step.getCurrent(), this.zMin)); |
|
@ -1346,10 +1340,8 @@ Graph3d.prototype._redrawAxis = function() { |
|
|
ctx.lineWidth = 1; |
|
|
ctx.lineWidth = 1; |
|
|
prettyStep = (this.defaultZStep === undefined); |
|
|
prettyStep = (this.defaultZStep === undefined); |
|
|
step = new StepNumber(this.zMin, this.zMax, this.zStep, prettyStep); |
|
|
step = new StepNumber(this.zMin, this.zMax, this.zStep, prettyStep); |
|
|
step.start(); |
|
|
|
|
|
if (step.getCurrent() < this.zMin) { |
|
|
|
|
|
step.next(); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
step.start(true); |
|
|
|
|
|
|
|
|
xText = (Math.cos(armAngle ) > 0) ? this.xMin : this.xMax; |
|
|
xText = (Math.cos(armAngle ) > 0) ? this.xMin : this.xMax; |
|
|
yText = (Math.sin(armAngle ) < 0) ? this.yMin : this.yMax; |
|
|
yText = (Math.sin(armAngle ) < 0) ? this.yMin : this.yMax; |
|
|
while (!step.end()) { |
|
|
while (!step.end()) { |
|
|