ParkSuMin/DRAwer_2_0
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'Замена вектора из объектов Point на вектор из указателей на объекты Point' (#1) from point_ptr_QList into master

Browse Source 
Reviewed-on: #1
This commit was merged in pull request #1.
This commit is contained in:
ParkSuMin
2025-12-09 17:12:53 +01:00
parent 2a8607afc2 9d383f6410
commit 512e873682
3 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Canvas.cpp
View File

@@ -34,9 +34,9 @@ Point* Canvas::findPointAt(QPointF pos, qreal tolerance)
QPointF p2(*line->p2.x, *line->p2.y); QPointF p2(*line->p2.x, *line->p2.y);
if (dist_P2P(p1, pos) <= tolerance) if (dist_P2P(p1, pos) <= tolerance)
temp = &line->p1; temp = line->p1_ref;
else if (dist_P2P(p2, pos) <= tolerance) else if (dist_P2P(p2, pos) <= tolerance)
temp = &line->p2; temp = line->p2_ref;
} }
return temp; return temp;
} }
@@ -97,13 +97,15 @@ void Canvas::mousePressEvent(QMouseEvent* event)
params.push_back(x1); params.push_back(x1);
params.push_back(y1); params.push_back(y1);
points.push_back(Point(x1, y1, obj_count)); points.push_back(new Point(x1, y1, obj_count));
points.push_back(Point(x2, y2, obj_count)); points.push_back(new Point(x2, y2, obj_count));
current_line->p1.x = x1; current_line->p1.x = x1;
current_line->p1.y = y1; current_line->p1.y = y1;
current_line->p2.x = x2; current_line->p2.x = x2;
current_line->p2.y = y2; current_line->p2.y = y2;
current_line->p1_ref = points[points.size() - 2];
current_line->p2_ref = points[points.size() - 1];
} }
else { else {
*current_line->p2.x = scene.x(); *current_line->p2.x = scene.x();
@@ -115,9 +117,13 @@ void Canvas::mousePressEvent(QMouseEvent* event)
delete current_line; delete current_line;
current_line = nullptr; current_line = nullptr;
delete points.back();
points.pop_back(); points.pop_back();
delete points.back();
points.pop_back(); points.pop_back();
delete params.back();
params.pop_back(); params.pop_back();
delete params.back();
params.pop_back(); params.pop_back();
mode = Mode::None; mode = Mode::None;
@@ -208,8 +214,8 @@ void Canvas::mousePressEvent(QMouseEvent* event)
Line *l1 = nullptr, *l2 = nullptr; Line *l1 = nullptr, *l2 = nullptr;
for (Line* l : lines) { for (Line* l : lines) {
if (&l->p1 == firstPoint || &l->p2 == firstPoint) l1 = l; if (l->p1_ref == firstPoint || l->p2_ref == firstPoint) l1 = l;
if (&l->p1 == clickedPoint || &l->p2 == clickedPoint) l2 = l; if (l->p1_ref == clickedPoint || l->p2_ref == clickedPoint) l2 = l;
} }
if (l1 == l2 || if (l1 == l2 ||
@@ -235,10 +241,10 @@ void Canvas::mouseMoveEvent(QMouseEvent* event)
{ {
if (draggedPoint) { if (draggedPoint) {
QPointF pos = event->pos() - dragOffset; QPointF pos = event->pos() - dragOffset;
for (Point pair : points) { for (Point* pair : points) {
if (areCoincident(draggedPoint, &pair)) { if (areCoincident(draggedPoint, pair)) {
*pair.x = pos.x(); *pair->x = pos.x();
*pair.y = pos.y(); *pair->y = pos.y();
} }
} }
*draggedPoint->x = pos.x(); *draggedPoint->x = pos.x();

4
Canvas.h
View File

@@ -49,7 +49,7 @@ protected:
private: private:
// ====================== Поиск и выбор ====================== // ====================== Поиск и выбор ======================
Line* findAt(QPointF&); // ищет линию под курсором Line* findAt(QPointF&); // ищет линию под курсором
Point* findPointAt(QPointF, qreal tolerance = 10.0); Point* findPointAt(QPointF, qreal tolerance = 5.0);
bool areCoincident(Point*, Point*, bool mode = false); bool areCoincident(Point*, Point*, bool mode = false);
// ====================== Параллельность ====================== // ====================== Параллельность ======================
bool areAlreadyParallel(Line* l1, Line* l2); // проверка на дубликат bool areAlreadyParallel(Line* l1, Line* l2); // проверка на дубликат
@@ -61,7 +61,7 @@ private:
// ====================== Данные сцены ====================== // ====================== Данные сцены ======================
System sys; // геометрический солвер System sys; // геометрический солвер
QVector<Line*> lines; // завершённые линии QVector<Line*> lines; // завершённые линии
QVector<Point> points; // все точки (для удобного доступа) QVector<Point*> points; // все точки (для удобного доступа)
std::vector<double*> params; // все параметры, передаваемые в солвер std::vector<double*> params; // все параметры, передаваемые в солвер
std::set<LinePair> parallelPairs; // уже запараллеленные пары (защита от дублей) std::set<LinePair> parallelPairs; // уже запараллеленные пары (защита от дублей)

3
GCS/Geo.h
View File

@@ -228,6 +228,8 @@ public:
{} {}
Point p1; Point p1;
Point p2; Point p2;
Point* p1_ref;
Point* p2_ref;
DeriVector2 CalculateNormal(const Point& p, const double* derivparam = nullptr) const override; DeriVector2 CalculateNormal(const Point& p, const double* derivparam = nullptr) const override;
DeriVector2 Value(double u, double du, const double* derivparam = nullptr) const override; DeriVector2 Value(double u, double du, const double* derivparam = nullptr) const override;
int PushOwnParams(VEC_pD& pvec) override; int PushOwnParams(VEC_pD& pvec) override;
@@ -237,6 +239,7 @@ public:
void set_tag(int); void set_tag(int);
int get_tag(); int get_tag();
bool contains(QPointF, qreal tol = 10.0) const; bool contains(QPointF, qreal tol = 10.0) const;
}; };
class Circle: public Curve class Circle: public Curve