examples: testStrokeLine example expanded

Added dashed lines to circles and arcs.

Change-Id: Ie37cdf944c20e3c6cc1f941bfd8a9f7693cf4079

diff --git a/src/examples/testStrokeLine.cpp b/src/examples/testStrokeLine.cpp
index 2acbda04c7904972c768be2695786dd5ee7f30d5..e5a01d6bba79b60efffb8ee1ace416306ededdeb 100644 (file)
--- a/src/examples/testStrokeLine.cpp
+++ b/src/examples/testStrokeLine.cpp
@@ -9,7 +9,7 @@ void tvgDrawCmds(tvg::Canvas* canvas)
     if (!canvas) return;
 
     //Test for Stroke Width
-    for (int i = 0; i < 10; ++i) {
+    for (int i = 0; i < 7; ++i) {
         auto shape = tvg::Shape::gen();
         shape->moveTo(50, 50 + (25 * i));
         shape->lineTo(750, 50 + (25 * i));
@@ -21,11 +21,11 @@ void tvgDrawCmds(tvg::Canvas* canvas)
 
     //Test for StrokeJoin & StrokeCap
     auto shape1 = tvg::Shape::gen();
-    shape1->moveTo(20, 350);
-    shape1->lineTo(250, 350);
-    shape1->lineTo(220, 500);
-    shape1->lineTo(70, 470);
-    shape1->lineTo(70, 330);
+    shape1->moveTo( 20, 250);
+    shape1->lineTo(250, 250);
+    shape1->lineTo(220, 350);
+    shape1->lineTo( 70, 320);
+    shape1->lineTo( 70, 230);
     shape1->stroke(255, 0, 0, 255);
     shape1->stroke(10);
     shape1->stroke(tvg::StrokeJoin::Round);
@@ -33,11 +33,11 @@ void tvgDrawCmds(tvg::Canvas* canvas)
     if (canvas->push(move(shape1)) != tvg::Result::Success) return;
 
     auto shape2 = tvg::Shape::gen();
-    shape2->moveTo(270, 350);
-    shape2->lineTo(500, 350);
-    shape2->lineTo(470, 500);
-    shape2->lineTo(320, 470);
-    shape2->lineTo(320, 330);
+    shape2->moveTo(270, 250);
+    shape2->lineTo(500, 250);
+    shape2->lineTo(470, 350);
+    shape2->lineTo(320, 320);
+    shape2->lineTo(320, 230);
     shape2->stroke(255, 255, 0, 255);
     shape2->stroke(10);
     shape2->stroke(tvg::StrokeJoin::Bevel);
@@ -45,11 +45,11 @@ void tvgDrawCmds(tvg::Canvas* canvas)
     if (canvas->push(move(shape2)) != tvg::Result::Success) return;
 
     auto shape3 = tvg::Shape::gen();
-    shape3->moveTo(520, 350);
-    shape3->lineTo(750, 350);
-    shape3->lineTo(720, 500);
-    shape3->lineTo(570, 470);
-    shape3->lineTo(570, 330);
+    shape3->moveTo(520, 250);
+    shape3->lineTo(750, 250);
+    shape3->lineTo(720, 350);
+    shape3->lineTo(570, 320);
+    shape3->lineTo(570, 230);
     shape3->stroke(0, 255, 0, 255);
     shape3->stroke(10);
     shape3->stroke(tvg::StrokeJoin::Miter);
@@ -58,49 +58,108 @@ void tvgDrawCmds(tvg::Canvas* canvas)
 
     //Test for Stroke Dash
     auto shape4 = tvg::Shape::gen();
-    shape4->moveTo(20, 600);
-    shape4->lineTo(250, 600);
-    shape4->lineTo(220, 750);
-    shape4->lineTo(70, 720);
-    shape4->lineTo(70, 580);
+    shape4->moveTo( 20, 380);
+    shape4->lineTo(250, 380);
+    shape4->lineTo(220, 480);
+    shape4->lineTo( 70, 450);
+    shape4->lineTo( 70, 360);
     shape4->stroke(255, 0, 0, 255);
     shape4->stroke(5);
     shape4->stroke(tvg::StrokeJoin::Round);
     shape4->stroke(tvg::StrokeCap::Round);
 
-    float dashPattern1[2] = {10, 10};
+    float dashPattern1[2] = {20, 10};
     shape4->stroke(dashPattern1, 2);
     if (canvas->push(move(shape4)) != tvg::Result::Success) return;
 
     auto shape5 = tvg::Shape::gen();
-    shape5->moveTo(270, 600);
-    shape5->lineTo(500, 600);
-    shape5->lineTo(470, 750);
-    shape5->lineTo(320, 720);
-    shape5->lineTo(320, 580);
+    shape5->moveTo(270, 380);
+    shape5->lineTo(500, 380);
+    shape5->lineTo(470, 480);
+    shape5->lineTo(320, 450);
+    shape5->lineTo(320, 360);
     shape5->stroke(255, 255, 0, 255);
     shape5->stroke(5);
     shape5->stroke(tvg::StrokeJoin::Bevel);
-    shape5->stroke(tvg::StrokeCap::Butt);
+    shape5->stroke(tvg::StrokeCap::Square);
 
     float dashPattern2[2] = {10, 10};
     shape5->stroke(dashPattern2, 2);
     if (canvas->push(move(shape5)) != tvg::Result::Success) return;
 
     auto shape6 = tvg::Shape::gen();
-    shape6->moveTo(520, 600);
-    shape6->lineTo(750, 600);
-    shape6->lineTo(720, 750);
-    shape6->lineTo(570, 720);
-    shape6->lineTo(570, 580);
-    shape6->stroke(255, 255, 255, 255);
+    shape6->moveTo(520, 380);
+    shape6->lineTo(750, 380);
+    shape6->lineTo(720, 480);
+    shape6->lineTo(570, 450);
+    shape6->lineTo(570, 360);
+    shape6->stroke(0, 255, 0, 255);
     shape6->stroke(5);
     shape6->stroke(tvg::StrokeJoin::Miter);
-    shape6->stroke(tvg::StrokeCap::Square);
+    shape6->stroke(tvg::StrokeCap::Butt);
 
-    float dashPattern3[2] = {10, 10};
-    shape6->stroke(dashPattern3, 2);
+    float dashPattern3[6] = {10, 10, 1, 8, 1, 10};
+    shape6->stroke(dashPattern3, 6);
     if (canvas->push(move(shape6)) != tvg::Result::Success) return;
+
+    //For a comparison with shapes 10-12
+    auto shape7 = tvg::Shape::gen();
+    shape7->appendArc(70, 500, 160, 10, 30, true);
+    shape7->stroke(255, 0, 0, 255);
+    shape7->stroke(7);
+    shape7->stroke(tvg::StrokeJoin::Round);
+    shape7->stroke(tvg::StrokeCap::Round);
+    if (canvas->push(move(shape7)) != tvg::Result::Success) return;
+
+    auto shape8 = tvg::Shape::gen();
+    shape8->appendArc(320, 500, 160, 10, 30, false);
+    shape8->stroke(255, 255, 0, 255);
+    shape8->stroke(7);
+    shape8->stroke(tvg::StrokeJoin::Bevel);
+    shape8->stroke(tvg::StrokeCap::Square);
+    if (canvas->push(move(shape8)) != tvg::Result::Success) return;
+
+    auto shape9 = tvg::Shape::gen();
+    shape9->appendArc(570, 500, 160, 10, 30, true);
+    shape9->stroke(0, 255, 0, 255);
+    shape9->stroke(7);
+    shape9->stroke(tvg::StrokeJoin::Miter);
+    shape9->stroke(tvg::StrokeCap::Butt);
+    if (canvas->push(move(shape9)) != tvg::Result::Success) return;
+
+    //Test for Stroke Dash for Arc, Circle, Rect
+    auto shape10 = tvg::Shape::gen();
+    shape10->appendArc(70, 620, 160, 10, 30, true);
+    shape10->appendCircle(70, 720, 20, 60);
+    shape10->appendRect(130, 740, 100, 40, 0, 0);
+    shape10->stroke(255, 0, 0, 255);
+    shape10->stroke(5);
+    shape10->stroke(tvg::StrokeJoin::Round);
+    shape10->stroke(tvg::StrokeCap::Round);
+    shape10->stroke(dashPattern1, 2);
+    if (canvas->push(move(shape10)) != tvg::Result::Success) return;
+
+    auto shape11 = tvg::Shape::gen();
+    shape11->appendArc(320, 620, 160, 10, 30, false);
+    shape11->appendCircle(320, 720, 20, 60);
+    shape11->appendRect(380, 740, 100, 40, 0, 0);
+    shape11->stroke(255, 255, 0, 255);
+    shape11->stroke(5);
+    shape11->stroke(tvg::StrokeJoin::Bevel);
+    shape11->stroke(tvg::StrokeCap::Square);
+    shape11->stroke(dashPattern2, 2);
+    if (canvas->push(move(shape11)) != tvg::Result::Success) return;
+
+    auto shape12 = tvg::Shape::gen();
+    shape12->appendArc(570, 620, 160, 10, 30, true);
+    shape12->appendCircle(570, 720, 20, 60);
+    shape12->appendRect(630, 740, 100, 40, 0, 0);
+    shape12->stroke(0, 255, 0, 255);
+    shape12->stroke(5);
+    shape12->stroke(tvg::StrokeJoin::Miter);
+    shape12->stroke(tvg::StrokeCap::Butt);
+    shape12->stroke(dashPattern3, 6);
+    if (canvas->push(move(shape12)) != tvg::Result::Success) return;
 }