comparison: src/objecttypes/polygon.h
src/objecttypes/polygon.h
- changeset 13
- 6e838748867b
- parent 8
- 44679e468ba9
equal
deleted
inserted
replaced
| 12:fe67489523b5 | 13:6e838748867b |
|---|---|
| 1 #include <array> | 1 #include <array> |
| 2 #include "modelobject.h" | 2 #include "modelobject.h" |
| 3 | 3 |
| 4 namespace modelobjects | 4 namespace linetypes |
| 5 { | 5 { |
| 6 class Triangle; | 6 class Triangle; |
| 7 class Quadrilateral; | 7 class Quadrilateral; |
| 8 } | 8 } |
| 9 | 9 |
| 10 class modelobjects::Triangle : public ColoredBaseObject | 10 class linetypes::Triangle : public ColoredObject |
| 11 { | 11 { |
| 12 public: | 12 public: |
| 13 Triangle() = default; | 13 Triangle() = default; |
| 14 Triangle( | 14 Triangle( |
| 15 const Vertex &point_1, | 15 const Vertex &point_1, |
| 16 const Vertex &point_2, | 16 const Vertex &point_2, |
| 17 const Vertex &point_3, | 17 const Vertex &point_3, |
| 18 Color color_index = colors::main); | 18 Color colorIndex = colors::main); |
| 19 Triangle(const QVector<Vertex>& vertices, const Color color); | 19 Triangle(const QVector<Vertex>& vertices, const Color color); |
| 20 QVariant getProperty(Property id) const override; | 20 QVariant getProperty(Property id) const override; |
| 21 SetPropertyResult setProperty(Property id, const QVariant& value) override; | 21 SetPropertyResult setProperty(Property id, const QVariant& value) override; |
| 22 QString textRepresentation() const override; | 22 QString textRepresentation() const override; |
| 23 private: | 23 private: |
| 24 Vertex points[3] = {{}}; | 24 Vertex points[3] = {{}}; |
| 25 }; | 25 }; |
| 26 | 26 |
| 27 class modelobjects::Quadrilateral : public ColoredBaseObject | 27 class linetypes::Quadrilateral : public ColoredObject |
| 28 { | 28 { |
| 29 public: | 29 public: |
| 30 Quadrilateral() = default; | 30 Quadrilateral() = default; |
| 31 Quadrilateral( | 31 Quadrilateral( |
| 32 const Vertex &point_1, | 32 const Vertex &point_1, |
| 33 const Vertex &point_2, | 33 const Vertex &point_2, |
| 34 const Vertex &point_3, | 34 const Vertex &point_3, |
| 35 const Vertex &point_4, | 35 const Vertex &point_4, |
| 36 Color color_index = colors::main); | 36 Color colorIndex = colors::main); |
| 37 Quadrilateral(const QVector<Vertex>& vertices, const Color color); | 37 Quadrilateral(const QVector<Vertex>& vertices, const Color color); |
| 38 QVariant getProperty(Property id) const override; | 38 QVariant getProperty(Property id) const override; |
| 39 SetPropertyResult setProperty(Property id, const QVariant& value) override; | 39 SetPropertyResult setProperty(Property id, const QVariant& value) override; |
| 40 QString textRepresentation() const override; | 40 QString textRepresentation() const override; |
| 41 private: | 41 private: |
