Skip to content

Commit cb346e7

Browse files
kirsan31kirsan31
committed
Collections initialization refactoring.
1 parent 042d108 commit cb346e7

36 files changed

+359
-329
lines changed

‎src/System.Windows.Forms.DataVisualization/Annotation/AnnotationBase.cs‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2045,8 +2045,7 @@ virtual internal void PaintSelectionHandles(ChartGraphics chartGraphics, Rectang
20452045
}
20462046

20472047
// Define 3D points of annotation object
2048-
Point3D[] annot3DPoints = new Point3D[1];
2049-
annot3DPoints[0] = new Point3D((float)anchorX, (float)anchorY, positionZ);
2048+
Point3D[] annot3DPoints = [new Point3D((float)anchorX, (float)anchorY, positionZ)];
20502049

20512050
// Transform cube coordinates
20522051
chartArea.matrix3D.TransformPoints(annot3DPoints);
@@ -2546,10 +2545,12 @@ virtual internal void GetRelativePosition(out PointF location, out SizeF size, o
25462545
}
25472546

25482547
// Define 3D points of annotation object
2549-
Point3D[] annot3DPoints = new Point3D[3];
2550-
annot3DPoints[0] = new Point3D((float)relativeX, (float)relativeY, positionZ);
2551-
annot3DPoints[1] = new Point3D((float)(relativeX + relativeWidth), (float)(relativeY + relativeHeight), positionZ);
2552-
annot3DPoints[2] = new Point3D((float)anchorX, (float)anchorY, positionZ);
2548+
Point3D[] annot3DPoints =
2549+
[
2550+
new Point3D((float)relativeX, (float)relativeY, positionZ),
2551+
new Point3D((float)(relativeX + relativeWidth), (float)(relativeY + relativeHeight), positionZ),
2552+
new Point3D((float)anchorX, (float)anchorY, positionZ),
2553+
];
25532554

25542555
// Transform cube coordinates
25552556
chartArea.matrix3D.TransformPoints(annot3DPoints);
@@ -3313,8 +3314,7 @@ internal void AddSmartLabelMarkerPositions(List<RectangleF> list)
33133314
}
33143315

33153316
// Define 3D points of annotation object
3316-
Point3D[] annot3DPoints = new Point3D[1];
3317-
annot3DPoints[0] = new Point3D((float)anchorX, (float)anchorY, positionZ);
3317+
Point3D[] annot3DPoints = [new Point3D((float)anchorX, (float)anchorY, positionZ)];
33183318

33193319
// Transform cube coordinates
33203320
chartArea.matrix3D.TransformPoints(annot3DPoints);
@@ -3861,8 +3861,7 @@ internal bool IsAnchorVisible()
38613861
}
38623862

38633863
// Define 3D points of annotation object
3864-
Point3D[] annot3DPoints = new Point3D[1];
3865-
annot3DPoints[0] = new Point3D((float)anchorX, (float)anchorY, positionZ);
3864+
Point3D[] annot3DPoints = [new Point3D((float)anchorX, (float)anchorY, positionZ)];
38663865

38673866
// Transform cube coordinates
38683867
chartArea.matrix3D.TransformPoints(annot3DPoints);

‎src/System.Windows.Forms.DataVisualization/Annotation/ArrowAnnotation.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -342,18 +342,18 @@ private GraphicsPath GetArrowPath(
342342
PointF[] points;
343343
if (this.ArrowStyle == ArrowStyle.Simple)
344344
{
345-
points = new PointF[] {
345+
points = [
346346
firstPoint,
347347
new PointF(firstPoint.X + this.ArrowSize*pointerRatio, firstPoint.Y - this.ArrowSize*pointerRatio),
348348
new PointF(firstPoint.X + this.ArrowSize*pointerRatio, firstPoint.Y - this.ArrowSize),
349349
new PointF(firstPoint.X + arrowLength, firstPoint.Y - this.ArrowSize),
350350
new PointF(firstPoint.X + arrowLength, firstPoint.Y + this.ArrowSize),
351351
new PointF(firstPoint.X + this.ArrowSize*pointerRatio, firstPoint.Y + this.ArrowSize),
352-
new PointF(firstPoint.X + this.ArrowSize*pointerRatio, firstPoint.Y + this.ArrowSize*pointerRatio) };
352+
new PointF(firstPoint.X + this.ArrowSize*pointerRatio, firstPoint.Y + this.ArrowSize*pointerRatio) ];
353353
}
354354
else if (this.ArrowStyle == ArrowStyle.DoubleArrow)
355355
{
356-
points = new PointF[] {
356+
points = [
357357
firstPoint,
358358
new PointF(firstPoint.X + this.ArrowSize*pointerRatio, firstPoint.Y - this.ArrowSize*pointerRatio),
359359
new PointF(firstPoint.X + this.ArrowSize*pointerRatio, firstPoint.Y - this.ArrowSize),
@@ -363,20 +363,20 @@ private GraphicsPath GetArrowPath(
363363
new PointF(firstPoint.X + arrowLength - this.ArrowSize*pointerRatio, firstPoint.Y + this.ArrowSize*pointerRatio),
364364
new PointF(firstPoint.X + arrowLength - this.ArrowSize*pointerRatio, firstPoint.Y + this.ArrowSize),
365365
new PointF(firstPoint.X + this.ArrowSize*pointerRatio, firstPoint.Y + this.ArrowSize),
366-
new PointF(firstPoint.X + this.ArrowSize*pointerRatio, firstPoint.Y + this.ArrowSize*pointerRatio) };
366+
new PointF(firstPoint.X + this.ArrowSize*pointerRatio, firstPoint.Y + this.ArrowSize*pointerRatio) ];
367367
}
368368
else if (this.ArrowStyle == ArrowStyle.Tailed)
369369
{
370370
float tailRatio = 2.1f;
371-
points = new PointF[] {
371+
points = [
372372
firstPoint,
373373
new PointF(firstPoint.X + this.ArrowSize*pointerRatio, firstPoint.Y - this.ArrowSize*pointerRatio),
374374
new PointF(firstPoint.X + this.ArrowSize*pointerRatio, firstPoint.Y - this.ArrowSize),
375375
new PointF(firstPoint.X + arrowLength, firstPoint.Y - this.ArrowSize*tailRatio),
376376
new PointF(firstPoint.X + arrowLength - this.ArrowSize*tailRatio, firstPoint.Y),
377377
new PointF(firstPoint.X + arrowLength, firstPoint.Y + this.ArrowSize*tailRatio),
378378
new PointF(firstPoint.X + this.ArrowSize*pointerRatio, firstPoint.Y + this.ArrowSize),
379-
new PointF(firstPoint.X + this.ArrowSize*pointerRatio, firstPoint.Y + this.ArrowSize*pointerRatio) };
379+
new PointF(firstPoint.X + this.ArrowSize*pointerRatio, firstPoint.Y + this.ArrowSize*pointerRatio) ];
380380
}
381381
else
382382
{

‎src/System.Windows.Forms.DataVisualization/Annotation/CalloutAnnotation.cs‎

Lines changed: 48 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1255,68 +1255,84 @@ private GraphicsPath DrawPerspectiveCallout(
12551255
// Create paths of perspective
12561256
if (anchorPoint.Y < rectanglePosition.Y)
12571257
{
1258-
PointF[] points1 = new PointF[3];
1259-
points1[0] = new PointF(rectanglePositionAbs.X, rectanglePositionAbs.Y);
1260-
points1[1] = new PointF(rectanglePositionAbs.Right, rectanglePositionAbs.Y);
1261-
points1[2] = new PointF(anchorPointAbs.X, anchorPointAbs.Y);
1258+
PointF[] points1 =
1259+
[
1260+
new PointF(rectanglePositionAbs.X, rectanglePositionAbs.Y),
1261+
new PointF(rectanglePositionAbs.Right, rectanglePositionAbs.Y),
1262+
new PointF(anchorPointAbs.X, anchorPointAbs.Y),
1263+
];
12621264
perspectivePaths[0].AddLines(points1);
12631265
if (anchorPoint.X < rectanglePosition.X)
12641266
{
1265-
PointF[] points2 = new PointF[3];
1266-
points2[0] = new PointF(rectanglePositionAbs.X, rectanglePositionAbs.Bottom);
1267-
points2[1] = new PointF(rectanglePositionAbs.X, rectanglePositionAbs.Y);
1268-
points2[2] = new PointF(anchorPointAbs.X, anchorPointAbs.Y);
1267+
PointF[] points2 =
1268+
[
1269+
new PointF(rectanglePositionAbs.X, rectanglePositionAbs.Bottom),
1270+
new PointF(rectanglePositionAbs.X, rectanglePositionAbs.Y),
1271+
new PointF(anchorPointAbs.X, anchorPointAbs.Y),
1272+
];
12691273
perspectivePaths[1].AddLines(points2);
12701274
}
12711275
else if (anchorPoint.X > rectanglePosition.Right)
12721276
{
1273-
PointF[] points2 = new PointF[3];
1274-
points2[0] = new PointF(rectanglePositionAbs.Right, rectanglePositionAbs.Bottom);
1275-
points2[1] = new PointF(rectanglePositionAbs.Right, rectanglePositionAbs.Y);
1276-
points2[2] = new PointF(anchorPointAbs.X, anchorPointAbs.Y);
1277+
PointF[] points2 =
1278+
[
1279+
new PointF(rectanglePositionAbs.Right, rectanglePositionAbs.Bottom),
1280+
new PointF(rectanglePositionAbs.Right, rectanglePositionAbs.Y),
1281+
new PointF(anchorPointAbs.X, anchorPointAbs.Y),
1282+
];
12771283
perspectivePaths[1].AddLines(points2);
12781284
}
12791285
}
12801286
else if (anchorPoint.Y > rectanglePosition.Bottom)
12811287
{
1282-
PointF[] points1 = new PointF[3];
1283-
points1[0] = new PointF(rectanglePositionAbs.X, rectanglePositionAbs.Bottom);
1284-
points1[1] = new PointF(rectanglePositionAbs.Right, rectanglePositionAbs.Bottom);
1285-
points1[2] = new PointF(anchorPointAbs.X, anchorPointAbs.Y);
1288+
PointF[] points1 =
1289+
[
1290+
new PointF(rectanglePositionAbs.X, rectanglePositionAbs.Bottom),
1291+
new PointF(rectanglePositionAbs.Right, rectanglePositionAbs.Bottom),
1292+
new PointF(anchorPointAbs.X, anchorPointAbs.Y),
1293+
];
12861294
perspectivePaths[0].AddLines(points1);
12871295
if (anchorPoint.X < rectanglePosition.X)
12881296
{
1289-
PointF[] points2 = new PointF[3];
1290-
points2[0] = new PointF(rectanglePositionAbs.X, rectanglePositionAbs.Bottom);
1291-
points2[1] = new PointF(rectanglePositionAbs.X, rectanglePositionAbs.Y);
1292-
points2[2] = new PointF(anchorPointAbs.X, anchorPointAbs.Y);
1297+
PointF[] points2 =
1298+
[
1299+
new PointF(rectanglePositionAbs.X, rectanglePositionAbs.Bottom),
1300+
new PointF(rectanglePositionAbs.X, rectanglePositionAbs.Y),
1301+
new PointF(anchorPointAbs.X, anchorPointAbs.Y),
1302+
];
12931303
perspectivePaths[1].AddLines(points2);
12941304
}
12951305
else if (anchorPoint.X > rectanglePosition.Right)
12961306
{
1297-
PointF[] points2 = new PointF[3];
1298-
points2[0] = new PointF(rectanglePositionAbs.Right, rectanglePositionAbs.Bottom);
1299-
points2[1] = new PointF(rectanglePositionAbs.Right, rectanglePositionAbs.Y);
1300-
points2[2] = new PointF(anchorPointAbs.X, anchorPointAbs.Y);
1307+
PointF[] points2 =
1308+
[
1309+
new PointF(rectanglePositionAbs.Right, rectanglePositionAbs.Bottom),
1310+
new PointF(rectanglePositionAbs.Right, rectanglePositionAbs.Y),
1311+
new PointF(anchorPointAbs.X, anchorPointAbs.Y),
1312+
];
13011313
perspectivePaths[1].AddLines(points2);
13021314
}
13031315
}
13041316
else
13051317
{
13061318
if (anchorPoint.X < rectanglePosition.X)
13071319
{
1308-
PointF[] points2 = new PointF[3];
1309-
points2[0] = new PointF(rectanglePositionAbs.X, rectanglePositionAbs.Bottom);
1310-
points2[1] = new PointF(rectanglePositionAbs.X, rectanglePositionAbs.Y);
1311-
points2[2] = new PointF(anchorPointAbs.X, anchorPointAbs.Y);
1320+
PointF[] points2 =
1321+
[
1322+
new PointF(rectanglePositionAbs.X, rectanglePositionAbs.Bottom),
1323+
new PointF(rectanglePositionAbs.X, rectanglePositionAbs.Y),
1324+
new PointF(anchorPointAbs.X, anchorPointAbs.Y),
1325+
];
13121326
perspectivePaths[1].AddLines(points2);
13131327
}
13141328
else if (anchorPoint.X > rectanglePosition.Right)
13151329
{
1316-
PointF[] points2 = new PointF[3];
1317-
points2[0] = new PointF(rectanglePositionAbs.Right, rectanglePositionAbs.Bottom);
1318-
points2[1] = new PointF(rectanglePositionAbs.Right, rectanglePositionAbs.Y);
1319-
points2[2] = new PointF(anchorPointAbs.X, anchorPointAbs.Y);
1330+
PointF[] points2 =
1331+
[
1332+
new PointF(rectanglePositionAbs.Right, rectanglePositionAbs.Bottom),
1333+
new PointF(rectanglePositionAbs.Right, rectanglePositionAbs.Y),
1334+
new PointF(anchorPointAbs.X, anchorPointAbs.Y),
1335+
];
13201336
perspectivePaths[1].AddLines(points2);
13211337
}
13221338
}

0 commit comments

Comments
 (0)