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

Готовая окружность

Browse Source 
Пока без наложения базовых ограничений
This commit is contained in:
ParkSuMin
2025-12-24 21:24:46 +03:00
parent 95f99575e2
commit 85d8e614d8
5 changed files with 91 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
Canvas.cpp
View File

@@ -98,6 +98,16 @@ Curve* Canvas::findAt(QPointF& pos, qreal tolerance)
return line;
}
}
else if (Circle* circle = dynamic_cast<Circle*>(curve)) {
QPointF center(*circle->center.x, *circle->center.y);
double radius = *circle->rad;
double distToCenter = dist_P2P(center, pos);
// Проверяем, лежит ли точка вблизи окружности (с допуском)
if (std::abs(distToCenter - radius) <= tolerance) {
return circle;
}
}
}
return nullptr;
}
@@ -240,7 +250,7 @@ void Canvas::mousePressEvent(QMouseEvent* event)
Line* found = dynamic_cast<Line*>(findAt(scene));
if (found) {
draggedLine = found;
draggedCurve = found;
QPointF lineCenter(
(*found->p1.x + *found->p2.x) / 2.0,
(*found->p1.y + *found->p2.y) / 2.0
@@ -251,7 +261,9 @@ void Canvas::mousePressEvent(QMouseEvent* event)
Circle* found_circle = dynamic_cast<Circle*>(findAt(scene));
if (found_circle) {
// TODO
draggedCurve = found_circle;
QPointF center(*found_circle->center.x, *found_circle->center.y);
dragOffset = scene - center;
return;
}
}
@@ -401,6 +413,7 @@ void Canvas::mousePressEvent(QMouseEvent* event)
mode = Mode::None;
}
solve_for_canvas();
return;
}
// ====================== Режим Parallel: задание параллельности ======================
else if (mode == Mode::Parallel) {
@@ -581,12 +594,11 @@ void Canvas::mouseMoveEvent(QMouseEvent* event)
}
}
}
solve_for_canvas();
}
// ====================== Перемещение линии ======================
else if (draggedLine) {
else if (draggedCurve) {
if (Line* draggedLine = dynamic_cast<Line*>(draggedCurve)) {
QPointF newCenter = UCS_POSITION - dragOffset;
QPointF oldCenter(
(*draggedLine->p1.x + *draggedLine->p2.x) / 2.0,
@@ -614,12 +626,28 @@ void Canvas::mouseMoveEvent(QMouseEvent* event)
}
}
}
solve_for_canvas();
}
else if (Circle* circle = dynamic_cast<Circle*>(draggedCurve)) {
QPointF newCenter = UCS_POSITION - dragOffset;
*circle->center.x = newCenter.x();
*circle->center.y = newCenter.y();
*circle->center_ref->x = newCenter.x();
*circle->center_ref->y = newCenter.y();
// Также обновляем все совпадающие точки (если центр совпадает с другими точками через P2P)
for (Point* other : points) {
if (other != circle->center_ref && areCoincident(circle->center_ref, other)) {
*other->x = newCenter.x();
*other->y = newCenter.y();
}
}
}
}
#ifdef _DEBUG
else
showObjectTag(WIDGET_POSITION);
#endif
solve_for_canvas();
}
void Canvas::mouseReleaseEvent(QMouseEvent* event)
@@ -631,8 +659,8 @@ void Canvas::mouseReleaseEvent(QMouseEvent* event)
solve_for_canvas();
}
if (draggedLine) {
draggedLine = nullptr;
if (draggedCurve) {
draggedCurve = nullptr;
solve_for_canvas();
}
@@ -681,16 +709,16 @@ void Canvas::paintEvent(QPaintEvent* event)
p.drawEllipse(QPointF(*line->p2.x, *line->p2.y), 5, 5);
}
else if (Circle* circle = dynamic_cast<Circle*>(curve)) {
p.setPen(QPen(Qt::black, 2));
p.setBrush(Qt::NoBrush);
// Настройка пера для линии
QPen linePen = QPen(Qt::black, 2);
p.setPen(linePen);
p.drawEllipse(QPointF(*circle->center.x, *circle->center.y),
*circle->rad, *circle->rad);
p.drawEllipse(QPointF(*circle->center.x, *circle->center.y), *circle->rad, *circle->rad);
QBrush pointBrush = QBrush(Qt::darkBlue);
p.setBrush(pointBrush);
p.setBrush(QBrush(Qt::darkBlue));
p.setPen(Qt::NoPen);
p.drawEllipse(QPointF(*circle->center.x, *circle->center.y), 5, 5);
p.setBrush(Qt::NoBrush);
}
}

1
Canvas.h
View File

@@ -251,6 +251,7 @@ private:
// ====================== Данные для перемещения объектов ======================
Point* draggedPoint{ nullptr }; ///< Точка, которую перемещают
Line* draggedLine{ nullptr }; ///< Линия, которую перемещают
Curve* draggedCurve { nullptr };
QPointF dragOffset; ///< Смещение при начале перемещения
// ====================== Данные геометрической системы ======================

6
DRAWer_2_0.cpp
View File

@@ -43,3 +43,9 @@ void DRAWer_2_0::on_Perpendicular_Button_clicked()
ui.widget->changeMode(Mode::Perpendicular);
}
void DRAWer_2_0::on_Circle_Button_clicked()
{
ui.widget->changeMode(Mode::DrawingCircle);
}

2
DRAWer_2_0.h
View File

@@ -24,6 +24,8 @@ private slots:
void on_Perpendicular_Button_clicked();
void on_Circle_Button_clicked();
private:
Ui::DRAWer_2_0Class ui;
};

35
DRAWer_2_0.ui
View File

@@ -28,19 +28,6 @@
</property>
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0">
<widget class="QPushButton" name="Line_Button">
<property name="minimumSize">
<size>
<width>75</width>
<height>24</height>
</size>
</property>
<property name="text">
<string>Line</string>
</property>
</widget>
</item>
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_6">
<item>
@@ -58,6 +45,26 @@
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="Line_Button">
<property name="minimumSize">
<size>
<width>75</width>
<height>24</height>
</size>
</property>
<property name="text">
<string>Line</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QPushButton" name="Circle_Button">
<property name="text">
<string>Circle</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
@@ -163,7 +170,7 @@
<x>0</x>
<y>0</y>
<width>776</width>
<height>21</height>
<height>22</height>
</rect>
</property>
</widget>