--- a/src/linetypes/quadrilateral.cpp Fri Dec 13 15:55:56 2019 +0200 +++ b/src/linetypes/quadrilateral.cpp Fri Dec 13 21:35:59 2019 +0200 @@ -1,17 +1,17 @@ #include "quadrilateral.h" linetypes::Quadrilateral::Quadrilateral( - const Vertex& point_1, - const Vertex& point_2, - const Vertex& point_3, - const Vertex& point_4, + const Point3D& point_1, + const Point3D& point_2, + const Point3D& point_3, + const Point3D& point_4, Color color_index) : ColoredObject{color_index}, points{point_1, point_2, point_3, point_4} { } -linetypes::Quadrilateral::Quadrilateral(const QVector<Vertex>& vertices, const Color color) : +linetypes::Quadrilateral::Quadrilateral(const QVector<Point3D>& vertices, const Color color) : ColoredObject{color}, points{vertices[0], vertices[1], vertices[2], vertices[3]} { @@ -42,16 +42,16 @@ switch (id) { case Property::Point1: - points[0] = value.value<Vertex>(); + points[0] = value.value<Point3D>(); return SetPropertyResult::Success; case Property::Point2: - points[1] = value.value<Vertex>(); + points[1] = value.value<Point3D>(); return SetPropertyResult::Success; case Property::Point3: - points[2] = value.value<Vertex>(); + points[2] = value.value<Point3D>(); return SetPropertyResult::Success; case Property::Point4: - points[3] = value.value<Vertex>(); + points[3] = value.value<Point3D>(); return SetPropertyResult::Success; default: return ColoredObject::setProperty(id, value);