Merged in nauck/valentina/feature (pull request #90)
Fix issue #431 --HG-- branch : develop
This commit is contained in:
commit
e90db08842
|
@ -961,6 +961,17 @@ void MainWindow::ToolCurveIntersectAxis(bool checked)
|
||||||
&MainWindow::ApplyDialog<VToolCurveIntersectAxis>);
|
&MainWindow::ApplyDialog<VToolCurveIntersectAxis>);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
void MainWindow::ToolArcIntersectAxis(bool checked)
|
||||||
|
{
|
||||||
|
// Reuse ToolCurveIntersectAxis but with different cursor and tool tip
|
||||||
|
SetToolButtonWithApply<DialogCurveIntersectAxis>(checked, Tool::CurveIntersectAxis,
|
||||||
|
":/cursor/arc_intersect_axis_cursor.png",
|
||||||
|
tr("Select arc"),
|
||||||
|
&MainWindow::ClosedDialogWithApply<VToolCurveIntersectAxis>,
|
||||||
|
&MainWindow::ApplyDialog<VToolCurveIntersectAxis>);
|
||||||
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
void MainWindow::ToolPointOfIntersectionArcs(bool checked)
|
void MainWindow::ToolPointOfIntersectionArcs(bool checked)
|
||||||
{
|
{
|
||||||
|
@ -1547,7 +1558,7 @@ void MainWindow::InitToolButtons()
|
||||||
connect(ui->toolButtonArcCutPoint, &QToolButton::clicked, this, &MainWindow::ToolCutArc);
|
connect(ui->toolButtonArcCutPoint, &QToolButton::clicked, this, &MainWindow::ToolCutArc);
|
||||||
connect(ui->toolButtonLineIntersectAxis, &QToolButton::clicked, this, &MainWindow::ToolLineIntersectAxis);
|
connect(ui->toolButtonLineIntersectAxis, &QToolButton::clicked, this, &MainWindow::ToolLineIntersectAxis);
|
||||||
connect(ui->toolButtonCurveIntersectAxis, &QToolButton::clicked, this, &MainWindow::ToolCurveIntersectAxis);
|
connect(ui->toolButtonCurveIntersectAxis, &QToolButton::clicked, this, &MainWindow::ToolCurveIntersectAxis);
|
||||||
connect(ui->toolButtonArcIntersectAxis, &QToolButton::clicked, this, &MainWindow::ToolCurveIntersectAxis);
|
connect(ui->toolButtonArcIntersectAxis, &QToolButton::clicked, this, &MainWindow::ToolArcIntersectAxis);
|
||||||
connect(ui->toolButtonLayoutSettings, &QToolButton::clicked, this, &MainWindow::ToolLayoutSettings);
|
connect(ui->toolButtonLayoutSettings, &QToolButton::clicked, this, &MainWindow::ToolLayoutSettings);
|
||||||
connect(ui->toolButtonPointOfIntersectionArcs, &QToolButton::clicked, this,
|
connect(ui->toolButtonPointOfIntersectionArcs, &QToolButton::clicked, this,
|
||||||
&MainWindow::ToolPointOfIntersectionArcs);
|
&MainWindow::ToolPointOfIntersectionArcs);
|
||||||
|
|
|
@ -122,6 +122,7 @@ public slots:
|
||||||
void ToolCutArc(bool checked);
|
void ToolCutArc(bool checked);
|
||||||
void ToolLineIntersectAxis(bool checked);
|
void ToolLineIntersectAxis(bool checked);
|
||||||
void ToolCurveIntersectAxis(bool checked);
|
void ToolCurveIntersectAxis(bool checked);
|
||||||
|
void ToolArcIntersectAxis(bool checked);
|
||||||
void ToolPointOfIntersectionArcs(bool checked);
|
void ToolPointOfIntersectionArcs(bool checked);
|
||||||
void ToolPointOfIntersectionCircles(bool checked);
|
void ToolPointOfIntersectionCircles(bool checked);
|
||||||
void ToolPointFromCircleAndTangent(bool checked);
|
void ToolPointFromCircleAndTangent(bool checked);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user