Remove mode for areCoincedent
This commit is contained in:
@@ -41,15 +41,11 @@ Point* Canvas::findPointAt(QPointF pos, qreal tolerance)
|
||||
return temp;
|
||||
}
|
||||
|
||||
bool Canvas::areCoincident(Point* p1, Point* p2, bool mode)
|
||||
bool Canvas::areCoincident(Point* p1, Point* p2)
|
||||
{
|
||||
int tag_0 = p1->get_tag();
|
||||
int tag_1 = p2->get_tag();
|
||||
|
||||
if (!mode) {
|
||||
return tag_0 != tag_1 && *p1 == *p2;
|
||||
}
|
||||
else {
|
||||
for (PointPair pair : P2Ppairs) {
|
||||
int pair_tag_0 = pair.first->get_tag();
|
||||
int pair_tag_1 = pair.second->get_tag();
|
||||
@@ -61,7 +57,6 @@ bool Canvas::areCoincident(Point* p1, Point* p2, bool mode)
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
bool Canvas::areAlreadyParallel(Line* l1, Line* l2)
|
||||
{
|
||||
@@ -256,7 +251,7 @@ void Canvas::mouseMoveEvent(QMouseEvent* event)
|
||||
if (draggedPoint) {
|
||||
QPointF pos = event->pos() - dragOffset;
|
||||
for (Point* pair : points) {
|
||||
if (areCoincident(draggedPoint, pair)) {
|
||||
if (areCoincident(draggedPoint, pair, true)) {
|
||||
*pair->x = pos.x();
|
||||
*pair->y = pos.y();
|
||||
}
|
||||
|
||||
2
Canvas.h
2
Canvas.h
@@ -52,7 +52,7 @@ private:
|
||||
// ====================== Поиск и выбор ======================
|
||||
Line* findAt(QPointF&); // ищет линию под курсором
|
||||
Point* findPointAt(QPointF, qreal tolerance = 5.0);
|
||||
bool areCoincident(Point*, Point*, bool mode = false);
|
||||
bool areCoincident(Point*, Point*);
|
||||
// ====================== Параллельность ======================
|
||||
bool areAlreadyParallel(Line* l1, Line* l2); // проверка на дубликат
|
||||
|
||||
|
||||
Reference in New Issue
Block a user