Skip to content

S
sdkjs
Commit fa9a047b authored by Sergey Luzyanin's avatar Sergey Luzyanin
Browse files
Options

xPos -> posX

parent baafd59e
Show whitespace changes
Inline Side-by-side
Showing with 91 additions and 91 deletions
common/Drawings/Format/ChartSpace.js
View file @ fa9a047b
...@@ -3663,7 +3663,7 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -3663,7 +3663,7 @@ CChartSpace.prototype.recalculateAxis = function()
arr_x_points[i] = rect.x + first_hor_label_half_width + hor_interval_width*(arr_x_val[i] - arr_x_val[0]); arr_x_points[i] = rect.x + first_hor_label_half_width + hor_interval_width*(arr_x_val[i] - arr_x_val[0]);
} }
y_ax.labels.x = rect.x + first_hor_label_half_width + hor_interval_width*(arr_x_val[arr_x_val.length-1] - arr_x_val[0]); y_ax.labels.x = rect.x + first_hor_label_half_width + hor_interval_width*(arr_x_val[arr_x_val.length-1] - arr_x_val[0]);
y_ax.xPos = rect.x + first_hor_label_half_width + (crosses-arr_x_val[0])*hor_interval_width; y_ax.posX = rect.x + first_hor_label_half_width + (crosses-arr_x_val[0])*hor_interval_width;
} }
else{ else{
hor_interval_width = checkFiniteNumber(rect.w/(arr_x_val[arr_x_val.length-1] - arr_x_val[0])); hor_interval_width = checkFiniteNumber(rect.w/(arr_x_val[arr_x_val.length-1] - arr_x_val[0]));
...@@ -3672,7 +3672,7 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -3672,7 +3672,7 @@ CChartSpace.prototype.recalculateAxis = function()
arr_x_points[i] = rect.x + hor_interval_width*(arr_x_val[i] - arr_x_val[0]); arr_x_points[i] = rect.x + hor_interval_width*(arr_x_val[i] - arr_x_val[0]);
} }
y_ax.labels.x = rect.x + hor_interval_width*(arr_x_val[arr_x_val.length-1] - arr_x_val[0]); y_ax.labels.x = rect.x + hor_interval_width*(arr_x_val[arr_x_val.length-1] - arr_x_val[0]);
y_ax.xPos = rect.x + (crosses-arr_x_val[0])*hor_interval_width; y_ax.posX = rect.x + (crosses-arr_x_val[0])*hor_interval_width;
} }
break; break;
} }
...@@ -3694,7 +3694,7 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -3694,7 +3694,7 @@ CChartSpace.prototype.recalculateAxis = function()
arr_x_points[i] = rect.x + left_gap + hor_interval_width*(arr_x_val[i] - arr_x_val[0]); arr_x_points[i] = rect.x + left_gap + hor_interval_width*(arr_x_val[i] - arr_x_val[0]);
} }
y_ax.labels.x = rect.x - y_ax.labels.extX; y_ax.labels.x = rect.x - y_ax.labels.extX;
y_ax.xPos = rect.x + (crosses-arr_x_val[0])*hor_interval_width; y_ax.posX = rect.x + (crosses-arr_x_val[0])*hor_interval_width;
} }
else{ else{
hor_interval_width = checkFiniteNumber(rect.w/(arr_x_val[arr_x_val.length-1] - arr_x_val[0])); hor_interval_width = checkFiniteNumber(rect.w/(arr_x_val[arr_x_val.length-1] - arr_x_val[0]));
...@@ -3703,7 +3703,7 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -3703,7 +3703,7 @@ CChartSpace.prototype.recalculateAxis = function()
arr_x_points[i] = rect.x + hor_interval_width*(arr_x_val[i] - arr_x_val[0]); arr_x_points[i] = rect.x + hor_interval_width*(arr_x_val[i] - arr_x_val[0]);
} }
y_ax.labels.x = rect.x - y_ax.labels.extX; y_ax.labels.x = rect.x - y_ax.labels.extX;
y_ax.xPos = rect.x + (crosses-arr_x_val[0])*hor_interval_width; y_ax.posX = rect.x + (crosses-arr_x_val[0])*hor_interval_width;
} }
break; break;
...@@ -3716,7 +3716,7 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -3716,7 +3716,7 @@ CChartSpace.prototype.recalculateAxis = function()
for (i = 0; i < arr_x_val.length; ++i) { for (i = 0; i < arr_x_val.length; ++i) {
arr_x_points[i] = rect.x + first_hor_label_half_width + hor_interval_width * (arr_x_val[i] - arr_x_val[0]); arr_x_points[i] = rect.x + first_hor_label_half_width + hor_interval_width * (arr_x_val[i] - arr_x_val[0]);
} }
y_ax.xPos = rect.x + first_hor_label_half_width + hor_interval_width * (crosses - arr_x_val[0]); y_ax.posX = rect.x + first_hor_label_half_width + hor_interval_width * (crosses - arr_x_val[0]);
} }
else{ else{
y_ax.labels = null; y_ax.labels = null;
...@@ -3724,7 +3724,7 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -3724,7 +3724,7 @@ CChartSpace.prototype.recalculateAxis = function()
for (i = 0; i < arr_x_val.length; ++i) { for (i = 0; i < arr_x_val.length; ++i) {
arr_x_points[i] = rect.x + first_hor_label_half_width + hor_interval_width * (arr_x_val[i] - arr_x_val[0]); arr_x_points[i] = rect.x + first_hor_label_half_width + hor_interval_width * (arr_x_val[i] - arr_x_val[0]);
} }
y_ax.xPos = rect.x + hor_interval_width * (crosses - arr_x_val[0]); y_ax.posX = rect.x + hor_interval_width * (crosses - arr_x_val[0]);
} }
break; break;
} }
...@@ -3744,7 +3744,7 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -3744,7 +3744,7 @@ CChartSpace.prototype.recalculateAxis = function()
if(!bWithoutLabels){ if(!bWithoutLabels){
y_ax.labels.x = rect.x + rect.w - right_gap; y_ax.labels.x = rect.x + rect.w - right_gap;
y_ax.xPos = rect.x + rect.w - right_gap; y_ax.posX = rect.x + rect.w - right_gap;
hor_interval_width = checkFiniteNumber((rect.w - right_gap - first_hor_label_half_width)/(arr_x_val[arr_x_val.length-1] - arr_x_val[0])); hor_interval_width = checkFiniteNumber((rect.w - right_gap - first_hor_label_half_width)/(arr_x_val[arr_x_val.length-1] - arr_x_val[0]));
for(i = 0; i < arr_x_val.length; ++i) for(i = 0; i < arr_x_val.length; ++i)
{ {
...@@ -3754,7 +3754,7 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -3754,7 +3754,7 @@ CChartSpace.prototype.recalculateAxis = function()
else{ else{
y_ax.labels.x = rect.x + rect.w; y_ax.labels.x = rect.x + rect.w;
y_ax.xPos = rect.x + rect.w; y_ax.posX = rect.x + rect.w;
hor_interval_width = checkFiniteNumber(rect.w/(arr_x_val[arr_x_val.length-1] - arr_x_val[0])); hor_interval_width = checkFiniteNumber(rect.w/(arr_x_val[arr_x_val.length-1] - arr_x_val[0]));
for(i = 0; i < arr_x_val.length; ++i) for(i = 0; i < arr_x_val.length; ++i)
{ {
...@@ -3770,19 +3770,19 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -3770,19 +3770,19 @@ CChartSpace.prototype.recalculateAxis = function()
if (!bNeedReflect && first_hor_label_half_width + (crosses - arr_x_val[0]) * hor_interval_width < y_ax.labels.extX) { if (!bNeedReflect && first_hor_label_half_width + (crosses - arr_x_val[0]) * hor_interval_width < y_ax.labels.extX) {
hor_interval_width = checkFiniteNumber((rect.w - y_ax.labels.extX - last_hor_label_half_width) / (arr_x_val[arr_x_val.length - 1] - crosses)); hor_interval_width = checkFiniteNumber((rect.w - y_ax.labels.extX - last_hor_label_half_width) / (arr_x_val[arr_x_val.length - 1] - crosses));
} }
y_ax.xPos = rect.x + rect.w - last_hor_label_half_width - (arr_x_val[arr_x_val.length - 1] - crosses) * hor_interval_width; y_ax.posX = rect.x + rect.w - last_hor_label_half_width - (arr_x_val[arr_x_val.length - 1] - crosses) * hor_interval_width;
for (i = 0; i < arr_x_val.length; ++i) { for (i = 0; i < arr_x_val.length; ++i) {
arr_x_points[i] = y_ax.xPos + (arr_x_val[i] - crosses) * hor_interval_width; arr_x_points[i] = y_ax.posX + (arr_x_val[i] - crosses) * hor_interval_width;
} }
y_ax.labels.x = y_ax.xPos - y_ax.labels.extX; y_ax.labels.x = y_ax.posX - y_ax.labels.extX;
} }
else{ else{
hor_interval_width = checkFiniteNumber(rect.w/ (arr_x_val[arr_x_val.length - 1] - arr_x_val[0])); hor_interval_width = checkFiniteNumber(rect.w/ (arr_x_val[arr_x_val.length - 1] - arr_x_val[0]));
y_ax.xPos = rect.x + rect.w - (arr_x_val[arr_x_val.length - 1] - crosses) * hor_interval_width; y_ax.posX = rect.x + rect.w - (arr_x_val[arr_x_val.length - 1] - crosses) * hor_interval_width;
for (i = 0; i < arr_x_val.length; ++i) { for (i = 0; i < arr_x_val.length; ++i) {
arr_x_points[i] = y_ax.xPos + (arr_x_val[i] - crosses) * hor_interval_width; arr_x_points[i] = y_ax.posX + (arr_x_val[i] - crosses) * hor_interval_width;
} }
y_ax.labels.x = y_ax.xPos - y_ax.labels.extX; y_ax.labels.x = y_ax.posX - y_ax.labels.extX;
} }
} }
break; break;
...@@ -3806,22 +3806,22 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -3806,22 +3806,22 @@ CChartSpace.prototype.recalculateAxis = function()
if(!bWithoutLabels){ if(!bWithoutLabels){
hor_interval_width = checkFiniteNumber((rect.w - left_gap - first_hor_label_half_width)/(arr_x_val[arr_x_val.length-1] - arr_x_val[0])); hor_interval_width = checkFiniteNumber((rect.w - left_gap - first_hor_label_half_width)/(arr_x_val[arr_x_val.length-1] - arr_x_val[0]));
y_ax.xPos = rect.x + rect.w - (crosses - arr_x_val[0])*hor_interval_width - first_hor_label_half_width; y_ax.posX = rect.x + rect.w - (crosses - arr_x_val[0])*hor_interval_width - first_hor_label_half_width;
for(i = 0; i < arr_x_val.length; ++i) for(i = 0; i < arr_x_val.length; ++i)
{ {
arr_x_points[i] = y_ax.xPos - (arr_x_val[i]-crosses)*hor_interval_width; arr_x_points[i] = y_ax.posX - (arr_x_val[i]-crosses)*hor_interval_width;
} }
y_ax.labels.x = y_ax.xPos - (arr_x_val[arr_x_val.length-1]-crosses)*hor_interval_width - y_ax.labels.extX; y_ax.labels.x = y_ax.posX - (arr_x_val[arr_x_val.length-1]-crosses)*hor_interval_width - y_ax.labels.extX;
} }
else{ else{
hor_interval_width = checkFiniteNumber(rect.w/(arr_x_val[arr_x_val.length-1] - arr_x_val[0])); hor_interval_width = checkFiniteNumber(rect.w/(arr_x_val[arr_x_val.length-1] - arr_x_val[0]));
y_ax.xPos = rect.x + rect.w - (crosses - arr_x_val[0])*hor_interval_width; y_ax.posX = rect.x + rect.w - (crosses - arr_x_val[0])*hor_interval_width;
for(i = 0; i < arr_x_val.length; ++i) for(i = 0; i < arr_x_val.length; ++i)
{ {
arr_x_points[i] = y_ax.xPos - (arr_x_val[i]-crosses)*hor_interval_width; arr_x_points[i] = y_ax.posX - (arr_x_val[i]-crosses)*hor_interval_width;
} }
y_ax.labels.x = y_ax.xPos - (arr_x_val[arr_x_val.length-1]-crosses)*hor_interval_width - y_ax.labels.extX; y_ax.labels.x = y_ax.posX - (arr_x_val[arr_x_val.length-1]-crosses)*hor_interval_width - y_ax.labels.extX;
} }
break; break;
} }
...@@ -3840,19 +3840,19 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -3840,19 +3840,19 @@ CChartSpace.prototype.recalculateAxis = function()
if(!bWithoutLabels){ if(!bWithoutLabels){
hor_interval_width = checkFiniteNumber((rect.w - right_gap - last_hor_label_half_width)/(arr_x_val[arr_x_val.length-1] - arr_x_val[0])); hor_interval_width = checkFiniteNumber((rect.w - right_gap - last_hor_label_half_width)/(arr_x_val[arr_x_val.length-1] - arr_x_val[0]));
y_ax.xPos = rect.x + rect.w - right_gap - (crosses - arr_x_val[0])*hor_interval_width; y_ax.posX = rect.x + rect.w - right_gap - (crosses - arr_x_val[0])*hor_interval_width;
for(i = 0; i < arr_x_val.length; ++i) for(i = 0; i < arr_x_val.length; ++i)
{ {
arr_x_points[i] = y_ax.xPos - (arr_x_val[i]-crosses)*hor_interval_width; arr_x_points[i] = y_ax.posX - (arr_x_val[i]-crosses)*hor_interval_width;
} }
y_ax.labels.x = rect.x + rect.w - right_gap; y_ax.labels.x = rect.x + rect.w - right_gap;
} }
else{ else{
hor_interval_width = checkFiniteNumber(rect.w/(arr_x_val[arr_x_val.length-1] - arr_x_val[0])); hor_interval_width = checkFiniteNumber(rect.w/(arr_x_val[arr_x_val.length-1] - arr_x_val[0]));
y_ax.xPos = rect.x + rect.w - (crosses - arr_x_val[0])*hor_interval_width; y_ax.posX = rect.x + rect.w - (crosses - arr_x_val[0])*hor_interval_width;
for(i = 0; i < arr_x_val.length; ++i) for(i = 0; i < arr_x_val.length; ++i)
{ {
arr_x_points[i] = y_ax.xPos - (arr_x_val[i]-crosses)*hor_interval_width; arr_x_points[i] = y_ax.posX - (arr_x_val[i]-crosses)*hor_interval_width;
} }
y_ax.labels.x = rect.x + rect.w; y_ax.labels.x = rect.x + rect.w;
} }
...@@ -3864,16 +3864,16 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -3864,16 +3864,16 @@ CChartSpace.prototype.recalculateAxis = function()
if(!bWithoutLabels) { if(!bWithoutLabels) {
hor_interval_width = checkFiniteNumber((rect.w - first_hor_label_half_width - last_hor_label_half_width) / (arr_x_val[arr_x_val.length - 1] - arr_x_val[0])); hor_interval_width = checkFiniteNumber((rect.w - first_hor_label_half_width - last_hor_label_half_width) / (arr_x_val[arr_x_val.length - 1] - arr_x_val[0]));
y_ax.xPos = rect.x + rect.w - first_hor_label_half_width - (crosses - arr_x_val[0]) * hor_interval_width; y_ax.posX = rect.x + rect.w - first_hor_label_half_width - (crosses - arr_x_val[0]) * hor_interval_width;
for (i = 0; i < arr_x_val.length; ++i) { for (i = 0; i < arr_x_val.length; ++i) {
arr_x_points[i] = y_ax.xPos - (arr_x_val[i] - crosses) * hor_interval_width; arr_x_points[i] = y_ax.posX - (arr_x_val[i] - crosses) * hor_interval_width;
} }
} }
else{ else{
hor_interval_width = checkFiniteNumber(rect.w / (arr_x_val[arr_x_val.length - 1] - arr_x_val[0])); hor_interval_width = checkFiniteNumber(rect.w / (arr_x_val[arr_x_val.length - 1] - arr_x_val[0]));
y_ax.xPos = rect.x + rect.w - (crosses - arr_x_val[0]) * hor_interval_width; y_ax.posX = rect.x + rect.w - (crosses - arr_x_val[0]) * hor_interval_width;
for (i = 0; i < arr_x_val.length; ++i) { for (i = 0; i < arr_x_val.length; ++i) {
arr_x_points[i] = y_ax.xPos - (arr_x_val[i] - crosses) * hor_interval_width; arr_x_points[i] = y_ax.posX - (arr_x_val[i] - crosses) * hor_interval_width;
} }
} }
break; break;
...@@ -3893,13 +3893,13 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -3893,13 +3893,13 @@ CChartSpace.prototype.recalculateAxis = function()
} }
if(!bWithoutLabels) { if(!bWithoutLabels) {
hor_interval_width = checkFiniteNumber((rect.w - left_gap - first_hor_label_half_width) / (arr_x_val[arr_x_val.length - 1] - arr_x_val[0])); hor_interval_width = checkFiniteNumber((rect.w - left_gap - first_hor_label_half_width) / (arr_x_val[arr_x_val.length - 1] - arr_x_val[0]));
y_ax.xPos = rect.x + rect.w - first_hor_label_half_width - (crosses - arr_x_val[0]) * hor_interval_width; y_ax.posX = rect.x + rect.w - first_hor_label_half_width - (crosses - arr_x_val[0]) * hor_interval_width;
y_ax.labels.x = y_ax.xPos - ((arr_x_val[arr_x_val.length - 1] - crosses) * hor_interval_width) - y_ax.labels.extX; y_ax.labels.x = y_ax.posX - ((arr_x_val[arr_x_val.length - 1] - crosses) * hor_interval_width) - y_ax.labels.extX;
} }
else{ else{
hor_interval_width = checkFiniteNumber(rect.w/ (arr_x_val[arr_x_val.length - 1] - arr_x_val[0])); hor_interval_width = checkFiniteNumber(rect.w/ (arr_x_val[arr_x_val.length - 1] - arr_x_val[0]));
y_ax.xPos = rect.x + rect.w - (crosses - arr_x_val[0]) * hor_interval_width; y_ax.posX = rect.x + rect.w - (crosses - arr_x_val[0]) * hor_interval_width;
y_ax.labels.x = y_ax.xPos - ((arr_x_val[arr_x_val.length - 1] - crosses) * hor_interval_width) - y_ax.labels.extX; y_ax.labels.x = y_ax.posX - ((arr_x_val[arr_x_val.length - 1] - crosses) * hor_interval_width) - y_ax.labels.extX;
} }
} }
else else
...@@ -3911,19 +3911,19 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -3911,19 +3911,19 @@ CChartSpace.prototype.recalculateAxis = function()
hor_interval_width = checkFiniteNumber((rect.w - y_ax.labels.extX - last_hor_label_half_width) / (arr_x_val[arr_x_val.length - 1] - crosses)); hor_interval_width = checkFiniteNumber((rect.w - y_ax.labels.extX - last_hor_label_half_width) / (arr_x_val[arr_x_val.length - 1] - crosses));
} }
left_align_labels = false; left_align_labels = false;
y_ax.xPos = rect.x + last_hor_label_half_width + hor_interval_width * (arr_x_val[arr_x_val.length - 1] - crosses); y_ax.posX = rect.x + last_hor_label_half_width + hor_interval_width * (arr_x_val[arr_x_val.length - 1] - crosses);
y_ax.labels.x = y_ax.xPos; y_ax.labels.x = y_ax.posX;
} }
else{ else{
hor_interval_width = checkFiniteNumber(rect.w / (arr_x_val[arr_x_val.length - 1] - arr_x_val[0])); hor_interval_width = checkFiniteNumber(rect.w / (arr_x_val[arr_x_val.length - 1] - arr_x_val[0]));
left_align_labels = false; left_align_labels = false;
y_ax.xPos = rect.x + hor_interval_width * (arr_x_val[arr_x_val.length - 1] - crosses); y_ax.posX = rect.x + hor_interval_width * (arr_x_val[arr_x_val.length - 1] - crosses);
y_ax.labels.x = y_ax.xPos; y_ax.labels.x = y_ax.posX;
} }
} }
for(i = 0; i < arr_x_val.length; ++i) for(i = 0; i < arr_x_val.length; ++i)
{ {
arr_x_points[i] = y_ax.xPos - (arr_x_val[i] - crosses)*hor_interval_width; arr_x_points[i] = y_ax.posX - (arr_x_val[i] - crosses)*hor_interval_width;
} }
break; break;
} }
...@@ -3995,7 +3995,7 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -3995,7 +3995,7 @@ CChartSpace.prototype.recalculateAxis = function()
{ {
arr_y_points[i] = bottom_start_point - (arr_val[i] - arr_val[0])*vert_interval_height; arr_y_points[i] = bottom_start_point - (arr_val[i] - arr_val[0])*vert_interval_height;
} }
x_ax.yPos = bottom_start_point - (crosses_x - arr_val[0])*vert_interval_height; x_ax.posY = bottom_start_point - (crosses_x - arr_val[0])*vert_interval_height;
} }
else{ else{
vert_interval_height = checkFiniteNumber(rect.h/(arr_val[arr_val.length-1] - arr_val[0])); vert_interval_height = checkFiniteNumber(rect.h/(arr_val[arr_val.length-1] - arr_val[0]));
...@@ -4006,7 +4006,7 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -4006,7 +4006,7 @@ CChartSpace.prototype.recalculateAxis = function()
{ {
arr_y_points[i] = rect.y + rect.h - (arr_val[i] - arr_val[0])*vert_interval_height; arr_y_points[i] = rect.y + rect.h - (arr_val[i] - arr_val[0])*vert_interval_height;
} }
x_ax.yPos = rect.y + rect.h - (crosses_x - arr_val[0])*vert_interval_height; x_ax.posY = rect.y + rect.h - (crosses_x - arr_val[0])*vert_interval_height;
} }
break; break;
} }
...@@ -4021,7 +4021,7 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -4021,7 +4021,7 @@ CChartSpace.prototype.recalculateAxis = function()
{ {
arr_y_points[i] = rect.y + rect.h - bottom_gap - (arr_val[i] - arr_val[0])*vert_interval_height; arr_y_points[i] = rect.y + rect.h - bottom_gap - (arr_val[i] - arr_val[0])*vert_interval_height;
} }
x_ax.yPos = rect.y + rect.h - bottom_gap - (crosses_x - arr_val[0])*vert_interval_height; x_ax.posY = rect.y + rect.h - bottom_gap - (crosses_x - arr_val[0])*vert_interval_height;
} }
else{ else{
x_ax.labels.y = rect.y + rect.h; x_ax.labels.y = rect.y + rect.h;
...@@ -4031,7 +4031,7 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -4031,7 +4031,7 @@ CChartSpace.prototype.recalculateAxis = function()
{ {
arr_y_points[i] = rect.y + rect.h - (arr_val[i] - arr_val[0])*vert_interval_height; arr_y_points[i] = rect.y + rect.h - (arr_val[i] - arr_val[0])*vert_interval_height;
} }
x_ax.yPos = rect.y + rect.h - (crosses_x - arr_val[0])*vert_interval_height; x_ax.posY = rect.y + rect.h - (crosses_x - arr_val[0])*vert_interval_height;
} }
break; break;
} }
...@@ -4044,7 +4044,7 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -4044,7 +4044,7 @@ CChartSpace.prototype.recalculateAxis = function()
{ {
arr_y_points[i] = rect.y + rect.h - first_vert_label_half_height - (arr_val[i] - arr_val[0])*vert_interval_height; arr_y_points[i] = rect.y + rect.h - first_vert_label_half_height - (arr_val[i] - arr_val[0])*vert_interval_height;
} }
x_ax.yPos = rect.y + rect.h - first_vert_label_half_height - (crosses_x - arr_val[0])*vert_interval_height; x_ax.posY = rect.y + rect.h - first_vert_label_half_height - (crosses_x - arr_val[0])*vert_interval_height;
} }
else{ else{
vert_interval_height = checkFiniteNumber(rect.h/(arr_val[arr_val.length-1] - arr_val[0])); vert_interval_height = checkFiniteNumber(rect.h/(arr_val[arr_val.length-1] - arr_val[0]));
...@@ -4052,7 +4052,7 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -4052,7 +4052,7 @@ CChartSpace.prototype.recalculateAxis = function()
{ {
arr_y_points[i] = rect.y + rect.h - (arr_val[i] - arr_val[0])*vert_interval_height; arr_y_points[i] = rect.y + rect.h - (arr_val[i] - arr_val[0])*vert_interval_height;
} }
x_ax.yPos = rect.y + rect.h - (crosses_x - arr_val[0])*vert_interval_height; x_ax.posY = rect.y + rect.h - (crosses_x - arr_val[0])*vert_interval_height;
} }
break; break;
} }
...@@ -4069,16 +4069,16 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -4069,16 +4069,16 @@ CChartSpace.prototype.recalculateAxis = function()
for (i = 0; i < arr_val.length; ++i) { for (i = 0; i < arr_val.length; ++i) {
arr_y_points[i] = rect.y + rect.h - first_vert_label_half_height - (arr_val[i] - arr_val[0]) * vert_interval_height; arr_y_points[i] = rect.y + rect.h - first_vert_label_half_height - (arr_val[i] - arr_val[0]) * vert_interval_height;
} }
x_ax.yPos = rect.y + rect.h - first_vert_label_half_height - (arr_val[arr_val.length - 1] - arr_val[0]) * vert_interval_height; x_ax.posY = rect.y + rect.h - first_vert_label_half_height - (arr_val[arr_val.length - 1] - arr_val[0]) * vert_interval_height;
x_ax.labels.y = x_ax.yPos - x_ax.labels.extY; x_ax.labels.y = x_ax.posY - x_ax.labels.extY;
} }
else{ else{
vert_interval_height = checkFiniteNumber(rect.h / (arr_val[arr_val.length - 1] - arr_val[0])); vert_interval_height = checkFiniteNumber(rect.h / (arr_val[arr_val.length - 1] - arr_val[0]));
for (i = 0; i < arr_val.length; ++i) { for (i = 0; i < arr_val.length; ++i) {
arr_y_points[i] = rect.y + rect.h - (arr_val[i] - arr_val[0]) * vert_interval_height; arr_y_points[i] = rect.y + rect.h - (arr_val[i] - arr_val[0]) * vert_interval_height;
} }
x_ax.yPos = rect.y + rect.h - (arr_val[arr_val.length - 1] - arr_val[0]) * vert_interval_height; x_ax.posY = rect.y + rect.h - (arr_val[arr_val.length - 1] - arr_val[0]) * vert_interval_height;
x_ax.labels.y = x_ax.yPos - x_ax.labels.extY; x_ax.labels.y = x_ax.posY - x_ax.labels.extY;
} }
} }
else else
...@@ -4089,20 +4089,20 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -4089,20 +4089,20 @@ CChartSpace.prototype.recalculateAxis = function()
vert_interval_height = checkFiniteNumber((rect.h - x_ax.labels.extY - last_vert_label_half_height) / (arr_val[arr_val.length - 1] - crosses_x)); vert_interval_height = checkFiniteNumber((rect.h - x_ax.labels.extY - last_vert_label_half_height) / (arr_val[arr_val.length - 1] - crosses_x));
} }
x_ax.yPos = rect.y + last_vert_label_half_height + (arr_val[arr_val.length - 1] - crosses_x) * vert_interval_height; x_ax.posY = rect.y + last_vert_label_half_height + (arr_val[arr_val.length - 1] - crosses_x) * vert_interval_height;
x_ax.labels.y = x_ax.yPos; x_ax.labels.y = x_ax.posY;
for (i = 0; i < arr_val.length; ++i) { for (i = 0; i < arr_val.length; ++i) {
arr_y_points[i] = x_ax.yPos - (arr_val[i] - crosses_x) * vert_interval_height; arr_y_points[i] = x_ax.posY - (arr_val[i] - crosses_x) * vert_interval_height;
} }
} }
else{ else{
vert_interval_height = checkFiniteNumber(rect.h / (arr_val[arr_val.length - 1] - arr_val[0])); vert_interval_height = checkFiniteNumber(rect.h / (arr_val[arr_val.length - 1] - arr_val[0]));
x_ax.yPos = rect.y + (arr_val[arr_val.length - 1] - crosses_x) * vert_interval_height; x_ax.posY = rect.y + (arr_val[arr_val.length - 1] - crosses_x) * vert_interval_height;
x_ax.labels.y = x_ax.yPos; x_ax.labels.y = x_ax.posY;
for (i = 0; i < arr_val.length; ++i) { for (i = 0; i < arr_val.length; ++i) {
arr_y_points[i] = x_ax.yPos - (arr_val[i] - crosses_x) * vert_interval_height; arr_y_points[i] = x_ax.posY - (arr_val[i] - crosses_x) * vert_interval_height;
} }
} }
} }
...@@ -4119,19 +4119,19 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -4119,19 +4119,19 @@ CChartSpace.prototype.recalculateAxis = function()
bottom_gap = Math.max(last_vert_label_half_height, x_ax.labels.extY); bottom_gap = Math.max(last_vert_label_half_height, x_ax.labels.extY);
if(!bWithoutLabels) { if(!bWithoutLabels) {
vert_interval_height = checkFiniteNumber((rect.h - bottom_gap - first_vert_label_half_height) / (arr_val[arr_val.length - 1] - arr_val[0])); vert_interval_height = checkFiniteNumber((rect.h - bottom_gap - first_vert_label_half_height) / (arr_val[arr_val.length - 1] - arr_val[0]));
x_ax.yPos = rect.y + first_vert_label_half_height + (crosses_x - arr_val[0]) * vert_interval_height; x_ax.posY = rect.y + first_vert_label_half_height + (crosses_x - arr_val[0]) * vert_interval_height;
for (i = 0; i < arr_val.length; ++i) { for (i = 0; i < arr_val.length; ++i) {
arr_y_points[i] = x_ax.yPos + vert_interval_height * (arr_val[i] - crosses_x); arr_y_points[i] = x_ax.posY + vert_interval_height * (arr_val[i] - crosses_x);
} }
x_ax.labels.y = x_ax.yPos + vert_interval_height * (arr_val[arr_val.length - 1] - crosses_x); x_ax.labels.y = x_ax.posY + vert_interval_height * (arr_val[arr_val.length - 1] - crosses_x);
} }
else{ else{
vert_interval_height = checkFiniteNumber(rect.h / (arr_val[arr_val.length - 1] - arr_val[0])); vert_interval_height = checkFiniteNumber(rect.h / (arr_val[arr_val.length - 1] - arr_val[0]));
x_ax.yPos = rect.y + (crosses_x - arr_val[0]) * vert_interval_height; x_ax.posY = rect.y + (crosses_x - arr_val[0]) * vert_interval_height;
for (i = 0; i < arr_val.length; ++i) { for (i = 0; i < arr_val.length; ++i) {
arr_y_points[i] = x_ax.yPos + vert_interval_height * (arr_val[i] - crosses_x); arr_y_points[i] = x_ax.posY + vert_interval_height * (arr_val[i] - crosses_x);
} }
x_ax.labels.y = x_ax.yPos + vert_interval_height * (arr_val[arr_val.length - 1] - crosses_x); x_ax.labels.y = x_ax.posY + vert_interval_height * (arr_val[arr_val.length - 1] - crosses_x);
} }
break; break;
} }
...@@ -4142,7 +4142,7 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -4142,7 +4142,7 @@ CChartSpace.prototype.recalculateAxis = function()
bottom_align_labels = false; bottom_align_labels = false;
if(!bWithoutLabels) { if(!bWithoutLabels) {
vert_interval_height = checkFiniteNumber((rect.h - top_height - last_vert_label_half_height) / (arr_val[arr_val.length - 1] - arr_val[0])); vert_interval_height = checkFiniteNumber((rect.h - top_height - last_vert_label_half_height) / (arr_val[arr_val.length - 1] - arr_val[0]));
x_ax.yPos = rect.y + top_height + (crosses_x - arr_val[0]) * vert_interval_height; x_ax.posY = rect.y + top_height + (crosses_x - arr_val[0]) * vert_interval_height;
for (i = 0; i < arr_val.length; ++i) { for (i = 0; i < arr_val.length; ++i) {
arr_y_points[i] = rect.y + top_height + vert_interval_height * (arr_val[i] - arr_val[0]); arr_y_points[i] = rect.y + top_height + vert_interval_height * (arr_val[i] - arr_val[0]);
} }
...@@ -4150,7 +4150,7 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -4150,7 +4150,7 @@ CChartSpace.prototype.recalculateAxis = function()
} }
else{ else{
vert_interval_height = checkFiniteNumber(rect.h / (arr_val[arr_val.length - 1] - arr_val[0])); vert_interval_height = checkFiniteNumber(rect.h / (arr_val[arr_val.length - 1] - arr_val[0]));
x_ax.yPos = rect.y + (crosses_x - arr_val[0]) * vert_interval_height; x_ax.posY = rect.y + (crosses_x - arr_val[0]) * vert_interval_height;
for (i = 0; i < arr_val.length; ++i) { for (i = 0; i < arr_val.length; ++i) {
arr_y_points[i] = rect.y + vert_interval_height * (arr_val[i] - arr_val[0]); arr_y_points[i] = rect.y + vert_interval_height * (arr_val[i] - arr_val[0]);
} }
...@@ -4163,7 +4163,7 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -4163,7 +4163,7 @@ CChartSpace.prototype.recalculateAxis = function()
x_ax.labels = null; x_ax.labels = null;
if(!bWithoutLabels){ if(!bWithoutLabels){
vert_interval_height = checkFiniteNumber((rect.h - first_vert_label_half_height - last_vert_label_half_height)/(arr_val[arr_val.length-1] - arr_val[0])); vert_interval_height = checkFiniteNumber((rect.h - first_vert_label_half_height - last_vert_label_half_height)/(arr_val[arr_val.length-1] - arr_val[0]));
x_ax.yPos = rect.y + first_vert_label_half_height + (crosses_x-arr_val[0])*vert_interval_height; x_ax.posY = rect.y + first_vert_label_half_height + (crosses_x-arr_val[0])*vert_interval_height;
for(i = 0; i < arr_val.length;++i) for(i = 0; i < arr_val.length;++i)
{ {
arr_y_points[i] = rect.y + first_vert_label_half_height + vert_interval_height*(arr_val[i] - arr_val[0]); arr_y_points[i] = rect.y + first_vert_label_half_height + vert_interval_height*(arr_val[i] - arr_val[0]);
...@@ -4171,7 +4171,7 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -4171,7 +4171,7 @@ CChartSpace.prototype.recalculateAxis = function()
} }
else{ else{
vert_interval_height = checkFiniteNumber(rect.h/(arr_val[arr_val.length-1] - arr_val[0])); vert_interval_height = checkFiniteNumber(rect.h/(arr_val[arr_val.length-1] - arr_val[0]));
x_ax.yPos = rect.y + (crosses_x-arr_val[0])*vert_interval_height; x_ax.posY = rect.y + (crosses_x-arr_val[0])*vert_interval_height;
for(i = 0; i < arr_val.length;++i) for(i = 0; i < arr_val.length;++i)
{ {
arr_y_points[i] = rect.y + vert_interval_height*(arr_val[i] - arr_val[0]); arr_y_points[i] = rect.y + vert_interval_height*(arr_val[i] - arr_val[0]);
...@@ -4188,7 +4188,7 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -4188,7 +4188,7 @@ CChartSpace.prototype.recalculateAxis = function()
if(!bWithoutLabels) { if(!bWithoutLabels) {
vert_interval_height = checkFiniteNumber((rect.h - bottom_gap - first_vert_label_half_height) / (arr_val[arr_val.length - 1] - arr_val[0])); vert_interval_height = checkFiniteNumber((rect.h - bottom_gap - first_vert_label_half_height) / (arr_val[arr_val.length - 1] - arr_val[0]));
x_ax.yPos = rect.y + first_vert_label_half_height + (crosses_x - arr_val[0]) * vert_interval_height; x_ax.posY = rect.y + first_vert_label_half_height + (crosses_x - arr_val[0]) * vert_interval_height;
for (i = 0; i < arr_val.length; ++i) { for (i = 0; i < arr_val.length; ++i) {
arr_y_points[i] = rect.y + first_vert_label_half_height + vert_interval_height * (arr_val[i] - arr_val[0]); arr_y_points[i] = rect.y + first_vert_label_half_height + vert_interval_height * (arr_val[i] - arr_val[0]);
} }
...@@ -4196,7 +4196,7 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -4196,7 +4196,7 @@ CChartSpace.prototype.recalculateAxis = function()
} }
else{ else{
vert_interval_height = checkFiniteNumber(rect.h / (arr_val[arr_val.length - 1] - arr_val[0])); vert_interval_height = checkFiniteNumber(rect.h / (arr_val[arr_val.length - 1] - arr_val[0]));
x_ax.yPos = rect.y + (crosses_x - arr_val[0]) * vert_interval_height; x_ax.posY = rect.y + (crosses_x - arr_val[0]) * vert_interval_height;
for (i = 0; i < arr_val.length; ++i) { for (i = 0; i < arr_val.length; ++i) {
arr_y_points[i] = rect.y + vert_interval_height * (arr_val[i] - arr_val[0]); arr_y_points[i] = rect.y + vert_interval_height * (arr_val[i] - arr_val[0]);
} }
...@@ -4211,23 +4211,23 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -4211,23 +4211,23 @@ CChartSpace.prototype.recalculateAxis = function()
vert_interval_height = checkFiniteNumber((rect.h - last_vert_label_half_height - first_vert_label_half_height) / (arr_val[arr_val.length - 1] - arr_val[0])); vert_interval_height = checkFiniteNumber((rect.h - last_vert_label_half_height - first_vert_label_half_height) / (arr_val[arr_val.length - 1] - arr_val[0]));
if (first_vert_label_half_height + (crosses_x - arr_val[0]) * vert_interval_height < x_ax.labels.extY) { if (first_vert_label_half_height + (crosses_x - arr_val[0]) * vert_interval_height < x_ax.labels.extY) {
x_ax.yPos = rect.y + x_ax.labels.extY; x_ax.posY = rect.y + x_ax.labels.extY;
vert_interval_height = checkFiniteNumber((rect.h - x_ax.labels.extY - last_vert_label_half_height) / (arr_val[arr_val.length - 1] - crosses_x)); vert_interval_height = checkFiniteNumber((rect.h - x_ax.labels.extY - last_vert_label_half_height) / (arr_val[arr_val.length - 1] - crosses_x));
} }
else { else {
x_ax.yPos = rect.y + rect.h - vert_interval_height * (arr_val[arr_val.length - 1] - crosses_x) - last_vert_label_half_height; x_ax.posY = rect.y + rect.h - vert_interval_height * (arr_val[arr_val.length - 1] - crosses_x) - last_vert_label_half_height;
} }
x_ax.labels.y = x_ax.yPos - x_ax.labels.extY; x_ax.labels.y = x_ax.posY - x_ax.labels.extY;
for (i = 0; i < arr_val.length; ++i) { for (i = 0; i < arr_val.length; ++i) {
arr_y_points[i] = x_ax.yPos + vert_interval_height * (arr_val[i] - crosses_x); arr_y_points[i] = x_ax.posY + vert_interval_height * (arr_val[i] - crosses_x);
} }
} }
else{ else{
vert_interval_height = checkFiniteNumber(rect.h / (arr_val[arr_val.length - 1] - arr_val[0])); vert_interval_height = checkFiniteNumber(rect.h / (arr_val[arr_val.length - 1] - arr_val[0]));
x_ax.yPos = rect.y + rect.h - vert_interval_height * (arr_val[arr_val.length - 1] - crosses_x); x_ax.posY = rect.y + rect.h - vert_interval_height * (arr_val[arr_val.length - 1] - crosses_x);
x_ax.labels.y = x_ax.yPos - x_ax.labels.extY; x_ax.labels.y = x_ax.posY - x_ax.labels.extY;
for (i = 0; i < arr_val.length; ++i) { for (i = 0; i < arr_val.length; ++i) {
arr_y_points[i] = x_ax.yPos + vert_interval_height * (arr_val[i] - crosses_x); arr_y_points[i] = x_ax.posY + vert_interval_height * (arr_val[i] - crosses_x);
} }
} }
} }
...@@ -5688,7 +5688,7 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -5688,7 +5688,7 @@ CChartSpace.prototype.recalculateAxis = function()
if(!bWithoutLabels){ if(!bWithoutLabels){
top_val_axis_gap = Math.max(first_val_axis_label_half_height, cat_ax_ext_y); top_val_axis_gap = Math.max(first_val_axis_label_half_height, cat_ax_ext_y);
unit_height = checkFiniteNumber((rect.h - top_val_axis_gap - last_val_axis_label_half_height)/(arr_val[arr_val.length-1] - arr_val[0])); unit_height = checkFiniteNumber((rect.h - top_val_axis_gap - last_val_axis_label_half_height)/(arr_val[arr_val.length-1] - arr_val[0]));
cat_ax.yPos = rect.y + rect.h - last_val_axis_label_half_height - (arr_val[arr_val.length-1] - crosses_val_ax)*unit_height; cat_ax.posY = rect.y + rect.h - last_val_axis_label_half_height - (arr_val[arr_val.length-1] - crosses_val_ax)*unit_height;
for(i = 0; i < arr_val.length; ++i) for(i = 0; i < arr_val.length; ++i)
...@@ -5698,7 +5698,7 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -5698,7 +5698,7 @@ CChartSpace.prototype.recalculateAxis = function()
} }
else{ else{
unit_height = checkFiniteNumber(rect.h/(arr_val[arr_val.length-1] - arr_val[0])); unit_height = checkFiniteNumber(rect.h/(arr_val[arr_val.length-1] - arr_val[0]));
cat_ax.yPos = rect.y + rect.h - (arr_val[arr_val.length-1] - crosses_val_ax)*unit_height; cat_ax.posY = rect.y + rect.h - (arr_val[arr_val.length-1] - crosses_val_ax)*unit_height;
for(i = 0; i < arr_val.length; ++i) for(i = 0; i < arr_val.length; ++i)
...@@ -5720,7 +5720,7 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -5720,7 +5720,7 @@ CChartSpace.prototype.recalculateAxis = function()
} }
if(bCorrectedCat){ if(bCorrectedCat){
unit_height = checkFiniteNumber(rect.h/(arr_val[arr_val.length-1] - arr_val[0])); unit_height = checkFiniteNumber(rect.h/(arr_val[arr_val.length-1] - arr_val[0]));
cat_ax.yPos = rect.y + rect.h - (arr_val[arr_val.length-1] - crosses_val_ax)*unit_height; cat_ax.posY = rect.y + rect.h - (arr_val[arr_val.length-1] - crosses_val_ax)*unit_height;
for(i = 0; i < arr_val.length; ++i) for(i = 0; i < arr_val.length; ++i)
arr_val_labels_points[i] = cat_ax.posY + (arr_val[i] - crosses_val_ax)*unit_height; arr_val_labels_points[i] = cat_ax.posY + (arr_val[i] - crosses_val_ax)*unit_height;
...@@ -5737,7 +5737,7 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -5737,7 +5737,7 @@ CChartSpace.prototype.recalculateAxis = function()
if(!bWithoutLabels){ if(!bWithoutLabels){
bottom_val_axis_gap = Math.max(cat_ax_ext_y, last_val_axis_label_half_height); bottom_val_axis_gap = Math.max(cat_ax_ext_y, last_val_axis_label_half_height);
unit_height = checkFiniteNumber((rect.h - bottom_val_axis_gap - first_val_axis_label_half_height)/(arr_val[arr_val.length-1] - arr_val[0])); unit_height = checkFiniteNumber((rect.h - bottom_val_axis_gap - first_val_axis_label_half_height)/(arr_val[arr_val.length-1] - arr_val[0]));
cat_ax.yPos = rect.y + first_val_axis_label_half_height + (crosses_val_ax - arr_val[0])*unit_height; cat_ax.posY = rect.y + first_val_axis_label_half_height + (crosses_val_ax - arr_val[0])*unit_height;
for(i = 0; i < arr_val.length; ++i) for(i = 0; i < arr_val.length; ++i)
arr_val_labels_points[i] = cat_ax.posY + (arr_val[i] - crosses_val_ax)*unit_height; arr_val_labels_points[i] = cat_ax.posY + (arr_val[i] - crosses_val_ax)*unit_height;
if(cat_ax.labels) if(cat_ax.labels)
...@@ -5746,7 +5746,7 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -5746,7 +5746,7 @@ CChartSpace.prototype.recalculateAxis = function()
else{ else{
unit_height = checkFiniteNumber(rect.h/(arr_val[arr_val.length-1] - arr_val[0])); unit_height = checkFiniteNumber(rect.h/(arr_val[arr_val.length-1] - arr_val[0]));
cat_ax.yPos = rect.y + (crosses_val_ax - arr_val[0])*unit_height; cat_ax.posY = rect.y + (crosses_val_ax - arr_val[0])*unit_height;
for(i = 0; i < arr_val.length; ++i) for(i = 0; i < arr_val.length; ++i)
arr_val_labels_points[i] = cat_ax.posY + (arr_val[i] - crosses_val_ax)*unit_height; arr_val_labels_points[i] = cat_ax.posY + (arr_val[i] - crosses_val_ax)*unit_height;
if(cat_ax.labels){ if(cat_ax.labels){
...@@ -5765,7 +5765,7 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -5765,7 +5765,7 @@ CChartSpace.prototype.recalculateAxis = function()
} }
if(bCorrectedCat){ if(bCorrectedCat){
unit_height = checkFiniteNumber(rect.h/(arr_val[arr_val.length-1] - arr_val[0])); unit_height = checkFiniteNumber(rect.h/(arr_val[arr_val.length-1] - arr_val[0]));
cat_ax.yPos = rect.y + (crosses_val_ax - arr_val[0])*unit_height; cat_ax.posY = rect.y + (crosses_val_ax - arr_val[0])*unit_height;
for(i = 0; i < arr_val.length; ++i) for(i = 0; i < arr_val.length; ++i)
arr_val_labels_points[i] = cat_ax.posY + (arr_val[i] - crosses_val_ax)*unit_height; arr_val_labels_points[i] = cat_ax.posY + (arr_val[i] - crosses_val_ax)*unit_height;
cat_ax.labels.y = rect.y + rect.h; cat_ax.labels.y = rect.y + rect.h;
...@@ -6743,9 +6743,9 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -6743,9 +6743,9 @@ CChartSpace.prototype.recalculateAxis = function()
left_gap = Math.max(0, last_val_lbl_half_width); left_gap = Math.max(0, last_val_lbl_half_width);
} }
unit_width = checkFiniteNumber((rect.w - left_gap - first_val_lbl_half_width)/(arr_val[arr_val.length - 1] - arr_val[0])); unit_width = checkFiniteNumber((rect.w - left_gap - first_val_lbl_half_width)/(arr_val[arr_val.length - 1] - arr_val[0]));
cat_ax.xPos = rect.x + rect.w - first_val_lbl_half_width - (crosses_val_ax - arr_val[0])*unit_width; cat_ax.posX = rect.x + rect.w - first_val_lbl_half_width - (crosses_val_ax - arr_val[0])*unit_width;
if(cat_ax.labels) if(cat_ax.labels)
cat_ax.labels.x = cat_ax.xPos - cat_ax.labels.extX; cat_ax.labels.x = cat_ax.posX - cat_ax.labels.extX;
} }
else else
{ {
...@@ -6754,12 +6754,12 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -6754,12 +6754,12 @@ CChartSpace.prototype.recalculateAxis = function()
{ {
unit_width = checkFiniteNumber((rect.w - cat_ax_ext_x - last_val_lbl_half_width)/(arr_val[arr_val.length - 1] - arr_val[0])); unit_width = checkFiniteNumber((rect.w - cat_ax_ext_x - last_val_lbl_half_width)/(arr_val[arr_val.length - 1] - arr_val[0]));
} }
cat_ax.xPos = rect.x + last_val_lbl_half_width + (arr_val[arr_val.length-1] - crosses_val_ax)*unit_width; cat_ax.posX = rect.x + last_val_lbl_half_width + (arr_val[arr_val.length-1] - crosses_val_ax)*unit_width;
if(cat_ax.labels) if(cat_ax.labels)
cat_ax.labels.x = cat_ax.xPos; cat_ax.labels.x = cat_ax.posX;
} }
for(i = 0; i < arr_val.length; ++i) for(i = 0; i < arr_val.length; ++i)
arr_val_labels_points[i] = cat_ax.xPos - (arr_val[i] - crosses_val_ax)*unit_width; arr_val_labels_points[i] = cat_ax.posX - (arr_val[i] - crosses_val_ax)*unit_width;
} }
else if(hor_labels_pos === c_oAscTickLabelsPos.TICK_LABEL_POSITION_LOW) else if(hor_labels_pos === c_oAscTickLabelsPos.TICK_LABEL_POSITION_LOW)
{ {
...@@ -6774,11 +6774,11 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -6774,11 +6774,11 @@ CChartSpace.prototype.recalculateAxis = function()
} }
unit_width = checkFiniteNumber((rect.w - last_val_lbl_half_width - right_gap)/(arr_val[arr_val.length-1] - arr_val[0])); unit_width = checkFiniteNumber((rect.w - last_val_lbl_half_width - right_gap)/(arr_val[arr_val.length-1] - arr_val[0]));
cat_ax.xPos = rect.x + last_val_lbl_half_width + (arr_val[arr_val.length-1] - crosses_val_ax)*crosses_val_ax; cat_ax.posX = rect.x + last_val_lbl_half_width + (arr_val[arr_val.length-1] - crosses_val_ax)*crosses_val_ax;
if(cat_ax.labels) if(cat_ax.labels)
cat_ax.labels.x = cat_ax.xPos - (arr_val[0] - crosses_val_ax)*unit_width; cat_ax.labels.x = cat_ax.posX - (arr_val[0] - crosses_val_ax)*unit_width;
for(i = 0; i < arr_val.length; ++i) for(i = 0; i < arr_val.length; ++i)
arr_val_labels_points[i] = cat_ax.xPos - (arr_val[i] - crosses_val_ax)*unit_width; arr_val_labels_points[i] = cat_ax.posX - (arr_val[i] - crosses_val_ax)*unit_width;
} }
else if(hor_labels_pos === c_oAscTickLabelsPos.TICK_LABEL_POSITION_HIGH) else if(hor_labels_pos === c_oAscTickLabelsPos.TICK_LABEL_POSITION_HIGH)
...@@ -6793,19 +6793,19 @@ CChartSpace.prototype.recalculateAxis = function() ...@@ -6793,19 +6793,19 @@ CChartSpace.prototype.recalculateAxis = function()
} }
unit_width = checkFiniteNumber((rect.w - left_gap - first_val_lbl_half_width)/(arr_val[arr_val.length - 1] - arr_val[0])); unit_width = checkFiniteNumber((rect.w - left_gap - first_val_lbl_half_width)/(arr_val[arr_val.length - 1] - arr_val[0]));
cat_ax.xPos = rect.x + rect.w - first_val_lbl_half_width - (crosses_val_ax - arr_val[0])*unit_width; cat_ax.posX = rect.x + rect.w - first_val_lbl_half_width - (crosses_val_ax - arr_val[0])*unit_width;
if(cat_ax.labels) if(cat_ax.labels)
cat_ax.labels.x = cat_ax.xPos - (arr_val[arr_val.length-1] - crosses_val_ax)*unit_width - cat_ax.labels.extX; cat_ax.labels.x = cat_ax.posX - (arr_val[arr_val.length-1] - crosses_val_ax)*unit_width - cat_ax.labels.extX;
for(i = 0; i < arr_val.length; ++i) for(i = 0; i < arr_val.length; ++i)
arr_val_labels_points[i] = cat_ax.xPos - (arr_val[i] - crosses_val_ax)*unit_width; arr_val_labels_points[i] = cat_ax.posX - (arr_val[i] - crosses_val_ax)*unit_width;
} }
else else
{//подписей осей нет {//подписей осей нет
cat_ax.labels = null; cat_ax.labels = null;
unit_width = checkFiniteNumber((rect.w - last_val_lbl_half_width - first_val_lbl_half_width)/(arr_val[arr_val.length - 1] - arr_val[0])); unit_width = checkFiniteNumber((rect.w - last_val_lbl_half_width - first_val_lbl_half_width)/(arr_val[arr_val.length - 1] - arr_val[0]));
cat_ax.xPos = rect.x + rect.w - first_val_lbl_half_width - (crosses_val_ax - arr_val[0])*unit_width; cat_ax.posX = rect.x + rect.w - first_val_lbl_half_width - (crosses_val_ax - arr_val[0])*unit_width;
for(i = 0; i < arr_val.length; ++i) for(i = 0; i < arr_val.length; ++i)
arr_val_labels_points[i] = cat_ax.xPos - (arr_val[i] - crosses_val_ax)*unit_width; arr_val_labels_points[i] = cat_ax.posX - (arr_val[i] - crosses_val_ax)*unit_width;
} }
} }
val_ax.interval = unit_width; val_ax.interval = unit_width;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7