--- a/src/editmodes/circleMode.cpp Thu Jan 04 19:40:52 2018 +0200
+++ b/src/editmodes/circleMode.cpp Thu Jan 04 19:44:26 2018 +0200
@@ -27,31 +27,31 @@
#include "../mainwindow.h"
#include "../ldObjectMath.h"
-CircleMode::CircleMode (GLRenderer* renderer) :
- Super (renderer) {}
+CircleMode::CircleMode(GLRenderer* renderer) :
+ Super(renderer) {}
EditModeType CircleMode::type() const
{
return EditModeType::Circle;
}
-double CircleMode::getCircleDrawDist (int pos) const
+double CircleMode::getCircleDrawDist(int pos) const
{
if (m_drawedVerts.size() >= pos + 1)
{
Vertex v1 = (m_drawedVerts.size() >= pos + 2) ? m_drawedVerts[pos + 1] :
- renderer()->convert2dTo3d (renderer()->mousePosition(), false);
+ renderer()->convert2dTo3d(renderer()->mousePosition(), false);
Axis localx, localy;
- renderer()->getRelativeAxes (localx, localy);
+ renderer()->getRelativeAxes(localx, localy);
double dx = m_drawedVerts[0][localx] - v1[localx];
double dy = m_drawedVerts[0][localy] - v1[localy];
- return Grid::Snap (sqrt ((dx * dx) + (dy * dy)), Grid::Coordinate);
+ return Grid::Snap(sqrt((dx * dx) +(dy * dy)), Grid::Coordinate);
}
return 0.0;
}
-Matrix CircleMode::getCircleDrawMatrix (double scale)
+Matrix CircleMode::getCircleDrawMatrix(double scale)
{
// Matrix templates. 2 is substituted with the scale value, 1 is inverted to -1 if needed.
static const Matrix templates[3] =
@@ -77,42 +77,42 @@
void CircleMode::buildCircle()
{
LDObjectList objs;
- const int segments (m_window->ringToolSegments());
- const int divisions (m_window->ringToolHiRes() ? HighResolution : LowResolution);
- double dist0 (getCircleDrawDist (0));
- double dist1 (getCircleDrawDist (1));
+ const int segments(m_window->ringToolSegments());
+ const int divisions(m_window->ringToolHiRes() ? HighResolution : LowResolution);
+ double dist0(getCircleDrawDist(0));
+ double dist1(getCircleDrawDist(1));
LDDocument* refFile;
Matrix transform;
bool circleOrDisc = false;
if (dist1 < dist0)
- qSwap (dist0, dist1);
+ qSwap(dist0, dist1);
if (dist0 == dist1)
{
// If the radii are the same, there's no ring space to fill. Use a circle.
- refFile = GetPrimitive (::Circle, segments, divisions, 0);
- transform = getCircleDrawMatrix (dist0);
+ refFile = GetPrimitive(::Circle, segments, divisions, 0);
+ transform = getCircleDrawMatrix(dist0);
circleOrDisc = true;
}
else if (dist0 == 0 or dist1 == 0)
{
// If either radii is 0, use a disc.
- refFile = GetPrimitive (::Disc, segments, divisions, 0);
- transform = getCircleDrawMatrix ((dist0 != 0) ? dist0 : dist1);
+ refFile = GetPrimitive(::Disc, segments, divisions, 0);
+ transform = getCircleDrawMatrix((dist0 != 0) ? dist0 : dist1);
circleOrDisc = true;
}
- else if (g_RingFinder.findRings (dist0, dist1))
+ else if (g_RingFinder.findRings(dist0, dist1))
{
// The ring finder found a solution, use that. Add the component rings to the file.
for (const RingFinder::Component& cmp : g_RingFinder.bestSolution()->getComponents())
{
- refFile = GetPrimitive (::Ring, segments, divisions, cmp.num);
+ refFile = GetPrimitive(::Ring, segments, divisions, cmp.num);
LDSubfileReference* ref = LDSpawn<LDSubfileReference>();
- ref->setFileInfo (refFile);
- ref->setTransform (getCircleDrawMatrix (cmp.scale));
- ref->setPosition (m_drawedVerts[0]);
- ref->setColor (MainColor);
+ ref->setFileInfo(refFile);
+ ref->setTransform(getCircleDrawMatrix(cmp.scale));
+ ref->setPosition(m_drawedVerts[0]);
+ ref->setColor(MainColor);
objs << ref;
}
}
@@ -121,35 +121,35 @@
// Ring finder failed, last resort: draw the ring with quads
QList<QLineF> c0, c1;
Axis localx, localy, localz;
- renderer()->getRelativeAxes (localx, localy);
- localz = (Axis) (3 - localx - localy);
- double x0 (m_drawedVerts[0][localx]);
- double y0 (m_drawedVerts[0][localy]);
+ renderer()->getRelativeAxes(localx, localy);
+ localz = (Axis)(3 - localx - localy);
+ double x0(m_drawedVerts[0][localx]);
+ double y0(m_drawedVerts[0][localy]);
Vertex templ;
- templ.setCoordinate (localx, x0);
- templ.setCoordinate (localy, y0);
- templ.setCoordinate (localz, renderer()->getDepthValue());
+ templ.setCoordinate(localx, x0);
+ templ.setCoordinate(localy, y0);
+ templ.setCoordinate(localz, renderer()->getDepthValue());
// Calculate circle coords
- MakeCircle (segments, divisions, dist0, c0);
- MakeCircle (segments, divisions, dist1, c1);
+ MakeCircle(segments, divisions, dist0, c0);
+ MakeCircle(segments, divisions, dist1, c1);
for (int i = 0; i < segments; ++i)
{
Vertex v0, v1, v2, v3;
v0 = v1 = v2 = v3 = templ;
- v0.setCoordinate (localx, v0[localx] + c0[i].x1());
- v0.setCoordinate (localy, v0[localy] + c0[i].y1());
- v1.setCoordinate (localx, v1[localx] + c0[i].x2());
- v1.setCoordinate (localy, v1[localy] + c0[i].y2());
- v2.setCoordinate (localx, v2[localx] + c1[i].x2());
- v2.setCoordinate (localy, v2[localy] + c1[i].y2());
- v3.setCoordinate (localx, v3[localx] + c1[i].x1());
- v3.setCoordinate (localy, v3[localy] + c1[i].y1());
+ v0.setCoordinate(localx, v0[localx] + c0[i].x1());
+ v0.setCoordinate(localy, v0[localy] + c0[i].y1());
+ v1.setCoordinate(localx, v1[localx] + c0[i].x2());
+ v1.setCoordinate(localy, v1[localy] + c0[i].y2());
+ v2.setCoordinate(localx, v2[localx] + c1[i].x2());
+ v2.setCoordinate(localy, v2[localy] + c1[i].y2());
+ v3.setCoordinate(localx, v3[localx] + c1[i].x1());
+ v3.setCoordinate(localy, v3[localy] + c1[i].y1());
- LDQuad* quad (LDSpawn<LDQuad> (v0, v1, v2, v3));
- quad->setColor (MainColor);
+ LDQuad* quad(LDSpawn<LDQuad>(v0, v1, v2, v3));
+ quad->setColor(MainColor);
// Ensure the quads always are BFC-front towards the camera
if (renderer()->camera() % 3 <= 0)
@@ -162,23 +162,23 @@
if (circleOrDisc and refFile)
{
LDSubfileReference* ref = LDSpawn<LDSubfileReference>();
- ref->setFileInfo (refFile);
- ref->setTransform (transform);
- ref->setPosition (m_drawedVerts[0]);
- ref->setColor (MainColor);
+ ref->setFileInfo(refFile);
+ ref->setTransform(transform);
+ ref->setPosition(m_drawedVerts[0]);
+ ref->setColor(MainColor);
objs << ref;
}
if (not objs.isEmpty())
{
Axis relZ = renderer()->getRelativeZ();;
- const int l (relZ == X ? 1 : 0);
- const int m (relZ == Y ? 1 : 0);
- const int n (relZ == Z ? 1 : 0);
- RotateObjects (l, m, n, -m_angleOffset, objs);
+ const int l(relZ == X ? 1 : 0);
+ const int m(relZ == Y ? 1 : 0);
+ const int n(relZ == Z ? 1 : 0);
+ RotateObjects(l, m, n, -m_angleOffset, objs);
}
- finishDraw (objs);
+ finishDraw(objs);
}
double CircleMode::getAngleOffset() const
@@ -186,68 +186,68 @@
if (m_drawedVerts.isEmpty())
return 0.0;
- const int divisions (m_window->ringToolHiRes() ? HighResolution : LowResolution);
- QPointF originspot (renderer()->convert3dTo2d (m_drawedVerts.first()));
- QLineF bearing (originspot, renderer()->mousePositionF());
- QLineF bearing2 (originspot, QPointF (originspot.x(), 0.0));
- double angleoffset (-bearing.angleTo (bearing2) + 90);
+ const int divisions(m_window->ringToolHiRes() ? HighResolution : LowResolution);
+ QPointF originspot(renderer()->convert3dTo2d(m_drawedVerts.first()));
+ QLineF bearing(originspot, renderer()->mousePositionF());
+ QLineF bearing2(originspot, QPointF(originspot.x(), 0.0));
+ double angleoffset(-bearing.angleTo(bearing2) + 90);
angleoffset /= (360.0 / divisions); // convert angle to 0-16 scale
- angleoffset = round (angleoffset); // round to nearest 16th
+ angleoffset = round(angleoffset); // round to nearest 16th
angleoffset *= ((2 * Pi) / divisions); // convert to radians
angleoffset *= renderer()->depthNegateFactor(); // negate based on camera
return angleoffset;
}
-void CircleMode::render (QPainter& painter) const
+void CircleMode::render(QPainter& painter) const
{
- QFontMetrics metrics = QFontMetrics (QFont());
+ QFontMetrics metrics = QFontMetrics(QFont());
// If we have not specified the center point of the circle yet, preview it on the screen.
if (m_drawedVerts.isEmpty())
{
- QPoint pos2d = renderer()->convert3dTo2d (renderer()->position3D());
- renderer()->drawBlip (painter, pos2d);
- renderer()->drawBlipCoordinates (painter, renderer()->position3D(), pos2d);
+ QPoint pos2d = renderer()->convert3dTo2d(renderer()->position3D());
+ renderer()->drawBlip(painter, pos2d);
+ renderer()->drawBlipCoordinates(painter, renderer()->position3D(), pos2d);
return;
}
QVector<Vertex> innerverts, outerverts;
QVector<QPointF> innerverts2d, outerverts2d;
- const double innerdistance (getCircleDrawDist (0));
- const double outerdistance (m_drawedVerts.size() >= 2 ? getCircleDrawDist (1) : -1);
- const int divisions (m_window->ringToolHiRes() ? HighResolution : LowResolution);
- const int segments (m_window->ringToolSegments());
- const double angleUnit (2 * Pi / divisions);
+ const double innerdistance(getCircleDrawDist(0));
+ const double outerdistance(m_drawedVerts.size() >= 2 ? getCircleDrawDist(1) : -1);
+ const int divisions(m_window->ringToolHiRes() ? HighResolution : LowResolution);
+ const int segments(m_window->ringToolSegments());
+ const double angleUnit(2 * Pi / divisions);
Axis relX, relY;
- renderer()->getRelativeAxes (relX, relY);
- const double angleoffset (m_drawedVerts.size() < 3 ? getAngleOffset() : m_angleOffset);
+ renderer()->getRelativeAxes(relX, relY);
+ const double angleoffset(m_drawedVerts.size() < 3 ? getAngleOffset() : m_angleOffset);
// Calculate the preview positions of vertices
for (int i = 0; i < segments + 1; ++i)
{
- const double sinangle (sin (angleoffset + i * angleUnit));
- const double cosangle (cos (angleoffset + i * angleUnit));
- Vertex v (Origin);
- v.setCoordinate (relX, m_drawedVerts[0][relX] + (cosangle * innerdistance));
- v.setCoordinate (relY, m_drawedVerts[0][relY] + (sinangle * innerdistance));
+ const double sinangle(sin(angleoffset + i * angleUnit));
+ const double cosangle(cos(angleoffset + i * angleUnit));
+ Vertex v(Origin);
+ v.setCoordinate(relX, m_drawedVerts[0][relX] +(cosangle * innerdistance));
+ v.setCoordinate(relY, m_drawedVerts[0][relY] +(sinangle * innerdistance));
innerverts << v;
- innerverts2d << renderer()->convert3dTo2d (v);
+ innerverts2d << renderer()->convert3dTo2d(v);
if (outerdistance != -1)
{
- v.setCoordinate (relX, m_drawedVerts[0][relX] + (cosangle * outerdistance));
- v.setCoordinate (relY, m_drawedVerts[0][relY] + (sinangle * outerdistance));
+ v.setCoordinate(relX, m_drawedVerts[0][relX] +(cosangle * outerdistance));
+ v.setCoordinate(relY, m_drawedVerts[0][relY] +(sinangle * outerdistance));
outerverts << v;
- outerverts2d << renderer()->convert3dTo2d (v);
+ outerverts2d << renderer()->convert3dTo2d(v);
}
}
- QVector<QLineF> lines (segments);
+ QVector<QLineF> lines(segments);
if (outerdistance != -1 and outerdistance != innerdistance)
{
- painter.setBrush (m_polybrush);
- painter.setPen (Qt::NoPen);
+ painter.setBrush(m_polybrush);
+ painter.setPen(Qt::NoPen);
// Compile polygons
for (int i = 0; i < segments; ++i)
@@ -257,51 +257,51 @@
<< innerverts2d[i + 1]
<< outerverts2d[i + 1]
<< outerverts2d[i];
- painter.drawPolygon (QPolygonF (points));
- lines << QLineF (innerverts2d[i], innerverts2d[i + 1]);
- lines << QLineF (outerverts2d[i], outerverts2d[i + 1]);
+ painter.drawPolygon(QPolygonF(points));
+ lines << QLineF(innerverts2d[i], innerverts2d[i + 1]);
+ lines << QLineF(outerverts2d[i], outerverts2d[i + 1]);
}
// Add bordering edges for unclosed rings/discs
if (segments != divisions)
{
- lines << QLineF (innerverts2d.first(), outerverts2d.first());
- lines << QLineF (innerverts2d.last(), outerverts2d.last());
+ lines << QLineF(innerverts2d.first(), outerverts2d.first());
+ lines << QLineF(innerverts2d.last(), outerverts2d.last());
}
}
else
{
for (int i = 0; i < segments; ++i)
- lines << QLineF (innerverts2d[i], innerverts2d[i + 1]);
+ lines << QLineF(innerverts2d[i], innerverts2d[i + 1]);
}
// Draw green blips at where the points are
for (QPointF const& point : innerverts2d + outerverts2d)
- renderer()->drawBlip (painter, point);
+ renderer()->drawBlip(painter, point);
// Draw edge lines
- painter.setPen (renderer()->linePen());
- painter.drawLines (lines);
+ painter.setPen(renderer()->linePen());
+ painter.drawLines(lines);
// Draw the current radius in the middle of the circle.
- QPoint origin = renderer()->convert3dTo2d (m_drawedVerts[0]);
- QString label = QString::number (innerdistance);
- painter.setPen (renderer()->textPen());
- painter.drawText (origin.x() - (metrics.width (label) / 2), origin.y(), label);
+ QPoint origin = renderer()->convert3dTo2d(m_drawedVerts[0]);
+ QString label = QString::number(innerdistance);
+ painter.setPen(renderer()->textPen());
+ painter.drawText(origin.x() -(metrics.width(label) / 2), origin.y(), label);
if (m_drawedVerts.size() >= 2)
{
- painter.drawText (origin.x() - (metrics.width (label) / 2),
- origin.y() + metrics.height(), QString::number (outerdistance));
+ painter.drawText(origin.x() -(metrics.width(label) / 2),
+ origin.y() + metrics.height(), QString::number(outerdistance));
}
}
-bool CircleMode::mouseReleased (MouseEventData const& data)
+bool CircleMode::mouseReleased(MouseEventData const& data)
{
if (data.releasedButtons & Qt::LeftButton)
{
if (m_drawedVerts.size() < 2)
- addDrawnVertex (renderer()->position3D());
+ addDrawnVertex(renderer()->position3D());
else
buildCircle();
return true;
@@ -312,7 +312,7 @@
}
}
-bool CircleMode::preAddVertex (const Vertex&)
+bool CircleMode::preAddVertex(const Vertex&)
{
m_angleOffset = getAngleOffset();
return false;