Skip to content

Commit 46b03d1

Browse files
imaNNeoimaNNeo
committed
Fix test and analyze issues
1 parent fc7cdfd commit 46b03d1

File tree

3 files changed

+34
-19
lines changed

3 files changed

+34
-19
lines changed

‎example/lib/presentation/samples/bar/bar_chart_sample7.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ class _IconWidgetState extends AnimatedWidgetBaseState<_IconWidget> {
230230
final rotation = math.pi * 4 * _rotationTween!.evaluate(animation);
231231
final scale = 1 + _rotationTween!.evaluate(animation) * 0.5;
232232
return Transform(
233-
transform: Matrix4.rotationZ(rotation).scaled(scale, scale),
233+
transform: Matrix4.rotationZ(rotation).scaledByDouble(scale, scale, scale, 1.0),
234234
origin: const Offset(14, 14),
235235
child: Icon(
236236
widget.isSelected ? Icons.face_retouching_natural : Icons.face,

‎lib/src/chart/base/custom_interactive_viewer.dart‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -416,9 +416,11 @@ class _CustomInteractiveViewerState extends State<CustomInteractiveViewer>
416416
}
417417

418418
final nextMatrix = matrix.clone()
419-
..translate(
419+
..translateByDouble(
420420
alignedTranslation.dx,
421421
alignedTranslation.dy,
422+
0,
423+
1,
422424
);
423425

424426
// Transform the viewport to determine where its four corners will be after
@@ -528,7 +530,8 @@ class _CustomInteractiveViewerState extends State<CustomInteractiveViewer>
528530
widget.maxScale,
529531
);
530532
final clampedScale = clampedTotalScale / currentScale;
531-
return matrix.clone()..scale(clampedScale);
533+
return matrix.clone()
534+
..scaleByDouble(clampedScale, clampedScale, clampedScale, 1);
532535
}
533536

534537
// Returns true iff the given _GestureType is enabled.
@@ -749,7 +752,7 @@ class _CustomInteractiveViewerState extends State<CustomInteractiveViewer>
749752
}
750753
}
751754

752-
// Handle mousewheel and web trackpad scroll events.
755+
// Handle mouse wheel and web trackpad scroll events.
753756
void _receivedPointerSignal(PointerSignalEvent event) {
754757
final double scaleChange;
755758
if (event is PointerScrollEvent) {
@@ -1108,9 +1111,9 @@ Offset _getMatrixTranslation(Matrix4 matrix) {
11081111
// the given amount.
11091112
Quad _getAxisAlignedBoundingBoxWithRotation(Rect rect, double rotation) {
11101113
final rotationMatrix = Matrix4.identity()
1111-
..translate(rect.size.width / 2, rect.size.height / 2)
1114+
..translateByDouble(rect.size.width / 2, rect.size.height / 2, 0, 1)
11121115
..rotateZ(rotation)
1113-
..translate(-rect.size.width / 2, -rect.size.height / 2);
1116+
..translateByDouble(-rect.size.width / 2, -rect.size.height / 2, 0, 1);
11141117
final boundariesRotated = Quad.points(
11151118
rotationMatrix.transform3(Vector3(rect.left, rect.top, 0)),
11161119
rotationMatrix.transform3(Vector3(rect.right, rect.top, 0)),

‎test/chart/base/axis_chart/axis_chart_scaffold_widget_test.dart‎

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1247,7 +1247,7 @@ void main() {
12471247
'Initializes zoomed chart rect when controller scale != 1.0',
12481248
(WidgetTester tester) async {
12491249
final controller = TransformationController(
1250-
Matrix4.identity()..scale(3.0),
1250+
Matrix4.identity()..scaleByDouble(3, 3, 3, 1),
12511251
);
12521252
Rect? chartVirtualRect;
12531253
await tester.pumpWidget(
@@ -1323,7 +1323,8 @@ void main() {
13231323
expect(chartVirtualRects, actualChartVirtualRects);
13241324

13251325
final transformationController = getTransformationController(tester);
1326-
transformationController!.value = Matrix4.identity()..scale(2.0);
1326+
transformationController!.value = Matrix4.identity()
1327+
..scaleByDouble(2, 2, 2, 1);
13271328
await tester.pump();
13281329
expect(chartVirtualRects, actualChartVirtualRects..add(isScaled));
13291330

@@ -1332,7 +1333,8 @@ void main() {
13321333

13331334
final transformationController2 = getTransformationController(tester);
13341335
expect(transformationController2, transformationController);
1335-
transformationController2!.value = Matrix4.identity()..scale(3.0);
1336+
transformationController2!.value = Matrix4.identity()
1337+
..scaleByDouble(3, 3, 3, 1);
13361338
await tester.pump();
13371339
expect(chartVirtualRects, actualChartVirtualRects..add(isScaled));
13381340
},
@@ -1347,7 +1349,8 @@ void main() {
13471349
expect(chartVirtualRects, actualChartVirtualRects);
13481350

13491351
final transformationController = getTransformationController(tester);
1350-
transformationController!.value = Matrix4.identity()..scale(2.0);
1352+
transformationController!.value = Matrix4.identity()
1353+
..scaleByDouble(2, 2, 2, 1);
13511354
await tester.pump();
13521355
expect(chartVirtualRects, actualChartVirtualRects..add(isScaled));
13531356

@@ -1363,7 +1366,8 @@ void main() {
13631366
() => transformationController.addListener(() {}),
13641367
throwsA(isA<FlutterError>()),
13651368
);
1366-
transformationController2.value = Matrix4.identity()..scale(2.0);
1369+
transformationController2.value = Matrix4.identity()
1370+
..scaleByDouble(2, 2, 2, 1);
13671371
await tester.pump();
13681372
expect(chartVirtualRects, actualChartVirtualRects..add(isScaled));
13691373
},
@@ -1381,7 +1385,8 @@ void main() {
13811385
);
13821386
expect(chartVirtualRects, actualChartVirtualRects);
13831387

1384-
transformationController.value = Matrix4.identity()..scale(2.0);
1388+
transformationController.value = Matrix4.identity()
1389+
..scaleByDouble(2, 2, 2, 1);
13851390
await tester.pump();
13861391
expect(chartVirtualRects, actualChartVirtualRects..add(isScaled));
13871392

@@ -1394,7 +1399,8 @@ void main() {
13941399
// ignore: invalid_use_of_protected_member
13951400
expect(transformationController.hasListeners, false);
13961401
transformationController.addListener(() {}); // throws if disposed
1397-
transformationController2!.value = Matrix4.identity()..scale(2.0);
1402+
transformationController2!.value = Matrix4.identity()
1403+
..scaleByDouble(2, 2, 2, 1);
13981404
await tester.pump();
13991405
expect(chartVirtualRects, actualChartVirtualRects..add(isScaled));
14001406
},
@@ -1413,7 +1419,8 @@ void main() {
14131419
);
14141420
expect(chartVirtualRects, actualChartVirtualRects);
14151421

1416-
transformationController.value = Matrix4.identity()..scale(2.0);
1422+
transformationController.value = Matrix4.identity()
1423+
..scaleByDouble(2, 2, 2, 1);
14171424
await tester.pump();
14181425
expect(chartVirtualRects, actualChartVirtualRects..add(isScaled));
14191426

@@ -1429,7 +1436,8 @@ void main() {
14291436
// ignore: invalid_use_of_protected_member
14301437
expect(transformationController.hasListeners, false);
14311438
transformationController.addListener(() {}); // throws if disposed
1432-
transformationController2.value = Matrix4.identity()..scale(2.0);
1439+
transformationController2.value = Matrix4.identity()
1440+
..scaleByDouble(2, 2, 2, 1);
14331441
await tester.pump();
14341442
expect(chartVirtualRects, actualChartVirtualRects..add(isScaled));
14351443
},
@@ -1448,7 +1456,8 @@ void main() {
14481456
);
14491457
expect(chartVirtualRects, actualChartVirtualRects);
14501458

1451-
transformationController.value = Matrix4.identity()..scale(2.0);
1459+
transformationController.value = Matrix4.identity()
1460+
..scaleByDouble(2, 2, 2, 1);
14521461
await tester.pump();
14531462
expect(chartVirtualRects, actualChartVirtualRects..add(isScaled));
14541463

@@ -1461,7 +1470,8 @@ void main() {
14611470

14621471
final transformationController2 = getTransformationController(tester);
14631472
expect(transformationController2, transformationController);
1464-
transformationController.value = Matrix4.identity()..scale(3.0);
1473+
transformationController.value = Matrix4.identity()
1474+
..scaleByDouble(3, 3, 3, 1);
14651475
await tester.pump();
14661476
expect(chartVirtualRects, actualChartVirtualRects..add(isScaled));
14671477
},
@@ -1491,11 +1501,13 @@ void main() {
14911501
);
14921502
expect(chartVirtualRects, actualChartVirtualRects);
14931503

1494-
transformationController.value = Matrix4.identity()..scale(2.0);
1504+
transformationController.value = Matrix4.identity()
1505+
..scaleByDouble(2, 2, 2, 1);
14951506
await tester.pump();
14961507
expect(chartVirtualRects, actualChartVirtualRects..add(isScaled));
14971508

1498-
transformationController.value = Matrix4.identity()..scale(1.0);
1509+
transformationController.value = Matrix4.identity()
1510+
..scaleByDouble(1, 1, 1, 1);
14991511
await tester.pump();
15001512
expect(chartVirtualRects, actualChartVirtualRects..add(isNotScaled));
15011513
},

0 commit comments

Comments
 (0)