Ellipse drawing: now uses the smallest pen and the user defined color.

Vincent Drevelle · Vincent Drevelle · commit bf34a0fadd19 · 2013-12-16T18:42:12.000+01:00
diff --git a/viewer/vibeswindow.cpp b/viewer/vibeswindow.cpp
@@ -257,7 +257,7 @@ VibesWindow::processMessage(const QByteArray &msg_data)
                 }
                 else if (type == "ellipse")
                 {
-                    QJsonArray center = shape["center"].toArray();                    
+                    QJsonArray center = shape["center"].toArray();
                     if (center.size() >= 2)
                     {
                         double x = center[0].toDouble();
@@ -310,7 +310,7 @@ VibesWindow::processMessage(const QByteArray &msg_data)
                             // should not be here
                             return false;
                         }
-                        item = fig->scene()->addEllipse(x, y, 2*wx, 2*wy);
+                        item = fig->scene()->addEllipse(x, y, 2*wx, 2*wy, defaultPen, brush);
                         item->setTransformOriginPoint(wx,wy);
                         item->setRotation(angle);
                     }

Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ VibesWindow::processMessage(const QByteArray &msg_data)`
`257`	`257`	`}`
`258`	`258`	`else if (type == "ellipse")`
`259`	`259`	`{`
`260`		`- QJsonArray center = shape["center"].toArray();`
	`260`	`+ QJsonArray center = shape["center"].toArray();`
`261`	`261`	`if (center.size() >= 2)`
`262`	`262`	`{`
`263`	`263`	`double x = center[0].toDouble();`
`@@ -310,7 +310,7 @@ VibesWindow::processMessage(const QByteArray &msg_data)`
`310`	`310`	`// should not be here`
`311`	`311`	`return false;`
`312`	`312`	`}`
`313`		`- item = fig->scene()->addEllipse(x, y, 2wx, 2wy);`
	`313`	`+ item = fig->scene()->addEllipse(x, y, 2wx, 2wy, defaultPen, brush);`
`314`	`314`	`item->setTransformOriginPoint(wx,wy);`
`315`	`315`	`item->setRotation(angle);`
`316`	`316`	`}`