Revert "-- corr"

This reverts commit 5315c47fcd.
This commit is contained in:
2024-11-05 10:55:34 -07:00
parent 5315c47fcd
commit 927295c7ba
276 changed files with 6381 additions and 3001 deletions

View File

@@ -44,7 +44,9 @@ Sys.Extended.UI.PieChart.prototype = {
svgContents = svgContents + '<stop offset="25%" id="RadialGradient2"></stop>';
svgContents = svgContents + '<stop offset="100%" id="RadialGradient3"></stop></RadialGradient>';
svgContents = svgContents + '</defs>';
svgContents = svgContents + String.format('<rect id="ChartBackGround" width="{0}" height="{1}" style="opacity: 0"/>', this._chartWidth, this._chartHeight);
svgContents = svgContents + String.format('<path fill="none" stroke-opacity="1" fill-opacity="1" stroke-linejoin="round" stroke-linecap="square" d="M5 {0} {1} {0} {1} {2} 5 {2} z"/>', parseInt(this._chartHeight) * 1 / 10 + 5, parseInt(this._chartWidth) - 5, parseInt(this._chartHeight) - parseInt(this._chartHeight) * 1 / 10);
svgContents = svgContents + String.format('<path id="ChartBackGround" stroke="" d="M0 0 {0} 0 {0} {1} 0 {1} z"/>', this._chartWidth, this._chartHeight);
svgContents = svgContents + String.format('<path fill="#ffffff" stroke-opacity="1" fill-opacity="0" stroke-linejoin="round" stroke-linecap="square" stroke="" d="M5 {0} {1} {0} {1} {2} 5 {2} z" />', parseInt(this._chartHeight) * 1 / 10 + 5, parseInt(this._chartWidth) - 5, parseInt(this._chartHeight) - parseInt(this._chartHeight) * 1 / 10);
// Set Title of Chart
svgContents = svgContents + String.format('<text x="{0}" y="{1}" id="ChartTitle" style="fill:{3}">{2}</text>', parseInt(this._chartWidth) / 2 - (this._chartTitle.length * this.charLength), parseInt(this._chartHeight) * 5 / 100, this._chartTitle, this._chartTitleColor);
@@ -117,18 +119,11 @@ Sys.Extended.UI.PieChart.prototype = {
for(var i = 0; i < this._pieChartClientValues.length; i++)
totalValue = totalValue + Math.abs(parseFloat(this._pieChartClientValues[i].Data));
var drawCircle = this.isSingleValueEqualsTotal(totalValue);
if (drawCircle) {
var strokeColor = this.getStrokeColor(totalValue);
var color = this.getColor(totalValue);
}
this._parentDiv.innerHTML = svgContents;
this.drawSegments(this, 0, categoryValue, totalValue, radius, angle, radAngle, textRadAngle, startX, endX, startY, endY, textX, textY, lastEndX, lastEndY, arc, drawCircle, color, strokeColor);
this.drawSegments(this, 0, categoryValue, totalValue, radius, angle, radAngle, textRadAngle, startX, endX, startY, endY, textX, textY, lastEndX, lastEndY, arc);
},
drawSegments: function (me, index, categoryValue, totalValue, radius, angle, radAngle, textRadAngle, startX, endX, startY, endY, textX, textY, lastEndX, lastEndY, arc, drawCircle, color, strokeColor) {
drawSegments: function (me, index, categoryValue, totalValue, radius, angle, radAngle, textRadAngle, startX, endX, startY, endY, textX, textY, lastEndX, lastEndY, arc) {
var absClientValues = Math.abs(parseFloat(me._pieChartClientValues[index].Data));
categoryValue = categoryValue + absClientValues;
angle = (categoryValue / totalValue) * 360;
@@ -137,8 +132,8 @@ Sys.Extended.UI.PieChart.prototype = {
textRadAngle = textRadAngle * (Math.PI / 180);
endX = parseFloat(Math.sin(radAngle) * radius);
endY = parseFloat(Math.cos(radAngle) * radius);
textX = parseFloat((drawCircle ? 0 : Math.sin(textRadAngle)) * (radius + 10));
textY = parseFloat((drawCircle ? -1 : Math.cos(textRadAngle)) * (radius + 10));
textX = parseFloat(Math.sin(textRadAngle) * (radius + 10));
textY = parseFloat(Math.cos(textRadAngle) * (radius + 10));
textX = (startX + textX) > startX ? startX + textX : (startX + textX) - (me._pieChartClientValues[index].Data.toString().length * this.charLength);
textY = (startY + (-1 * textY)) < startY ? startY + (-1 * textY) : startY + (-1 * textY) + 10;
@@ -148,37 +143,7 @@ Sys.Extended.UI.PieChart.prototype = {
else {
arc = 0;
}
me._parentDiv.innerHTML = me._parentDiv.innerHTML.replace('</svg>', '')
+ (drawCircle ?
String.format('<g><circle cx="{0}" cy="{1}" r="{2}" stroke="{3}" fill="{4}" />',
startX,
startY,
radius,
strokeColor,
color)
: String.format('<g><path id="Segment{8}" d="M{0} {1} A {2} {2} 0 {3},1 {4} {5} L {6} {7} z" style="stroke:{10};fill:{9};"></path>',
lastEndX,
lastEndY,
radius,
arc,
startX + endX,
startY + (-1 * endY),
startX,
startY,
index + 1,
me._pieChartClientValues[index].PieChartValueColor,
me._pieChartClientValues[index].PieChartValueStrokeColor))
+ (me._pieChartClientValues[index].Data || drawCircle ?
String.format('<text fill="#000000" style="font: 11px Arial,Helvetica,sans-serif" fill-opacity="1" y="{1}" x="{0}">{2}</text></g>',
textX,
textY,
drawCircle ? totalValue : me._pieChartClientValues[index].Data)
: "")
+ '</svg>';
if (drawCircle)
return;
me._parentDiv.innerHTML = me._parentDiv.innerHTML.replace('</svg>', '') + String.format('<g><path id="Segment{8}" d="M{0} {1} A {2} {2} 0 {3},1 {4} {5} L {6} {7} z" style="stroke:{10};fill:{9};"></path>', lastEndX, lastEndY, radius, arc, startX + endX, startY + (-1 * endY), startX, startY, index + 1, me._pieChartClientValues[index].PieChartValueColor, me._pieChartClientValues[index].PieChartValueStrokeColor) + String.format('<text fill="#000000" style="font: 11px Arial,Helvetica,sans-serif" fill-opacity="1" y="{1}" x="{0}">{2}</text></g>', textX, textY, me._pieChartClientValues[index].Data) + '</svg>';
lastEndX = startX + endX;
lastEndY = startY + (-1 * endY);
@@ -186,31 +151,8 @@ Sys.Extended.UI.PieChart.prototype = {
if(index < me._pieChartClientValues.length) // if the counter < series length, call the loop function
setTimeout(function() {
me.drawSegments(me, index, drawCircle ? 0 : categoryValue, totalValue, radius, angle, radAngle, textRadAngle, startX, endX, startY, endY, textX, textY, lastEndX, lastEndY, arc, drawCircle, color, strokeColor);
}, me._pieChartClientValues[index].Data == 0 ? 0 : 400);
},
isSingleValueEqualsTotal: function (totalValue) {
for (var i = 0; i < this._pieChartClientValues.length; i++) {
if (this._pieChartClientValues[i].Data == totalValue)
return true;
}
return false;
},
getStrokeColor: function (totalValue) {
for (var i = 0; i < this._pieChartClientValues.length; i++) {
if (this._pieChartClientValues[i].Data == totalValue)
return this._pieChartClientValues[i].PieChartValueStrokeColor;
}
},
getColor: function (totalValue) {
for (var i = 0; i < this._pieChartClientValues.length; i++) {
if (this._pieChartClientValues[i].Data == totalValue)
return this._pieChartClientValues[i].PieChartValueColor;
}
me.drawSegments(me, index, categoryValue, totalValue, radius, angle, radAngle, textRadAngle, startX, endX, startY, endY, textX, textY, lastEndX, lastEndY, arc);
}, 400);
},
/// <summary>