diff -r 767592024ec5 -r 4c41bfe2ec6e src/linetypes/edge.cpp --- a/src/linetypes/edge.cpp Sun Jan 26 01:06:27 2020 +0200 +++ b/src/linetypes/edge.cpp Sun Jan 26 14:29:30 2020 +0200 @@ -1,14 +1,14 @@ #include "edge.h" linetypes::Edge::Edge( - const Point3D& point_1, - const Point3D& point_2, + const glm::vec3& point_1, + const glm::vec3& point_2, const Color color_index) : ColoredObject{color_index}, point_1{point_1}, point_2{point_2} {} -linetypes::Edge::Edge(const QVector& vertices, const Color color) : +linetypes::Edge::Edge(const QVector& vertices, const Color color) : ColoredObject{color}, point_1{vertices[0]}, point_2{vertices[1]} @@ -20,9 +20,9 @@ switch (property) { case Property::Point1: - return point_1; + return QVariant::fromValue(point_1); case Property::Point2: - return point_2; + return QVariant::fromValue(point_2); default: return BaseClass::getProperty(property); } @@ -34,10 +34,10 @@ switch (property) { case Property::Point1: - point_1 = value.value(); + point_1 = value.value(); return SetPropertyResult::Success; case Property::Point2: - point_2 = value.value(); + point_2 = value.value(); return SetPropertyResult::Success; default: return BaseClass::setProperty(property, value); @@ -46,7 +46,7 @@ QString linetypes::Edge::textRepresentation() const { - return utility::format("%1 %2", vertexToStringParens(point_1), vertexToStringParens(point_2)); + return utility::format("%1 %2", utility::vertexToStringParens(point_1), utility::vertexToStringParens(point_2)); } void linetypes::Edge::getPolygons(