comparison: src/objecttypes/conditionaledge.cpp
src/objecttypes/conditionaledge.cpp
- changeset 8
- 44679e468ba9
- parent 6
- 73e448b2943d
- child 13
- 6e838748867b
equal
deleted
inserted
replaced
| 7:68443f5be176 | 8:44679e468ba9 |
|---|---|
| 7 const Vertex& controlPoint_2, | 7 const Vertex& controlPoint_2, |
| 8 const Color color_index) : | 8 const Color color_index) : |
| 9 Edge{point_1, point_2, color_index}, | 9 Edge{point_1, point_2, color_index}, |
| 10 controlPoint_1{controlPoint_1}, | 10 controlPoint_1{controlPoint_1}, |
| 11 controlPoint_2{controlPoint_2} | 11 controlPoint_2{controlPoint_2} |
| 12 { | |
| 13 } | |
| 14 | |
| 15 modelobjects::ConditionalEdge::ConditionalEdge(const QVector<Vertex>& vertices, const Color color) : | |
| 16 Edge{vertices[0], vertices[1], color}, | |
| 17 controlPoint_1{vertices[2]}, | |
| 18 controlPoint_2{vertices[3]} | |
| 12 { | 19 { |
| 13 } | 20 } |
| 14 | 21 |
| 15 QVariant modelobjects::ConditionalEdge::getProperty(Property property) const | 22 QVariant modelobjects::ConditionalEdge::getProperty(Property property) const |
| 16 { | 23 { |
| 41 } | 48 } |
| 42 } | 49 } |
| 43 | 50 |
| 44 QString modelobjects::ConditionalEdge::textRepresentation() const | 51 QString modelobjects::ConditionalEdge::textRepresentation() const |
| 45 { | 52 { |
| 46 return Edge::textRepresentation() + format("%1 %2", | 53 return Edge::textRepresentation() + utility::format("%1 %2", |
| 47 vertexToStringParens(controlPoint_1), | 54 vertexToStringParens(controlPoint_1), |
| 48 vertexToStringParens(controlPoint_2)); | 55 vertexToStringParens(controlPoint_2)); |
| 49 } | 56 } |
