diff --git a/src/libs/vtools/dialogs/tools/dialogpiecepath.cpp b/src/libs/vtools/dialogs/tools/dialogpiecepath.cpp index 68e2b4f84..e9addb95c 100644 --- a/src/libs/vtools/dialogs/tools/dialogpiecepath.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpiecepath.cpp @@ -378,11 +378,13 @@ void DialogPiecePath::PassmarkChanged(int index) ui->radioButtonOneLine->setDisabled(true); ui->radioButtonTwoLines->setDisabled(true); ui->radioButtonThreeLines->setDisabled(true); + ui->radioButtonTMark->setDisabled(true); + ui->radioButtonVMark->setDisabled(true); ui->radioButtonStraightforward->setDisabled(true); ui->radioButtonBisector->setDisabled(true); - ui->groupBoxLineType->blockSignals(true); + ui->groupBoxMarkType->blockSignals(true); ui->groupBoxAngleType->blockSignals(true); if (index != -1) @@ -397,6 +399,8 @@ void DialogPiecePath::PassmarkChanged(int index) ui->radioButtonOneLine->setEnabled(true); ui->radioButtonTwoLines->setEnabled(true); ui->radioButtonThreeLines->setEnabled(true); + ui->radioButtonTMark->setEnabled(true); + ui->radioButtonVMark->setEnabled(true); switch(node.GetPassmarkLineType()) { @@ -409,6 +413,12 @@ void DialogPiecePath::PassmarkChanged(int index) case PassmarkLineType::ThreeLines: ui->radioButtonThreeLines->setChecked(true); break; + case PassmarkLineType::TMark: + ui->radioButtonTMark->setChecked(true); + break; + case PassmarkLineType::VMark: + ui->radioButtonVMark->setChecked(true); + break; default: break; } @@ -430,7 +440,7 @@ void DialogPiecePath::PassmarkChanged(int index) } } } - ui->groupBoxLineType->blockSignals(false); + ui->groupBoxMarkType->blockSignals(false); ui->groupBoxAngleType->blockSignals(false); } @@ -458,18 +468,26 @@ void DialogPiecePath::PassmarkLineTypeChanged(int id) VPieceNode rowNode = qvariant_cast(rowItem->data(Qt::UserRole)); PassmarkLineType lineType = PassmarkLineType::OneLine; - if (id == ui->buttonGroupLineType->id(ui->radioButtonOneLine)) + if (id == ui->buttonGroupMarkType->id(ui->radioButtonOneLine)) { lineType = PassmarkLineType::OneLine; } - else if (id == ui->buttonGroupLineType->id(ui->radioButtonTwoLines)) + else if (id == ui->buttonGroupMarkType->id(ui->radioButtonTwoLines)) { lineType = PassmarkLineType::TwoLines; } - else if (id == ui->buttonGroupLineType->id(ui->radioButtonThreeLines)) + else if (id == ui->buttonGroupMarkType->id(ui->radioButtonThreeLines)) { lineType = PassmarkLineType::ThreeLines; } + else if (id == ui->buttonGroupMarkType->id(ui->radioButtonTMark)) + { + lineType = PassmarkLineType::TMark; + } + else if (id == ui->buttonGroupMarkType->id(ui->radioButtonVMark)) + { + lineType = PassmarkLineType::VMark; + } rowNode.SetPassmarkLineType(lineType); rowItem->setData(Qt::UserRole, QVariant::fromValue(rowNode)); @@ -729,7 +747,7 @@ void DialogPiecePath::InitPassmarksTab() connect(ui->comboBoxPassmarks, static_cast(&QComboBox::currentIndexChanged), this, &DialogPiecePath::PassmarkChanged); - connect(ui->buttonGroupLineType, static_cast(&QButtonGroup::buttonClicked), + connect(ui->buttonGroupMarkType, static_cast(&QButtonGroup::buttonClicked), this, &DialogPiecePath::PassmarkLineTypeChanged); connect(ui->buttonGroupAngleType, static_cast(&QButtonGroup::buttonClicked), this, &DialogPiecePath::PassmarkAngleTypeChanged); diff --git a/src/libs/vtools/dialogs/tools/dialogpiecepath.ui b/src/libs/vtools/dialogs/tools/dialogpiecepath.ui index 7089b91d6..e08a7b3d6 100644 --- a/src/libs/vtools/dialogs/tools/dialogpiecepath.ui +++ b/src/libs/vtools/dialogs/tools/dialogpiecepath.ui @@ -815,12 +815,12 @@ - + true - Lines + Marks @@ -832,7 +832,7 @@ One line - buttonGroupLineType + buttonGroupMarkType @@ -845,7 +845,7 @@ Two lines - buttonGroupLineType + buttonGroupMarkType @@ -858,7 +858,33 @@ Three lines - buttonGroupLineType + buttonGroupMarkType + + + + + + + false + + + T mark + + + buttonGroupMarkType + + + + + + + false + + + V mark + + + buttonGroupMarkType @@ -967,7 +993,7 @@ - + diff --git a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp index 1d778d831..29b70b2ef 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp +++ b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp @@ -854,7 +854,7 @@ void DialogSeamAllowance::PassmarkChanged(int index) uiTabPassmarks->radioButtonStraightforward->setDisabled(true); uiTabPassmarks->radioButtonBisector->setDisabled(true); - uiTabPassmarks->groupBoxLineType->blockSignals(true); + uiTabPassmarks->groupBoxMarkType->blockSignals(true); uiTabPassmarks->groupBoxAngleType->blockSignals(true); if (index != -1) @@ -910,7 +910,7 @@ void DialogSeamAllowance::PassmarkChanged(int index) } } } - uiTabPassmarks->groupBoxLineType->blockSignals(false); + uiTabPassmarks->groupBoxMarkType->blockSignals(false); uiTabPassmarks->groupBoxAngleType->blockSignals(false); } diff --git a/src/libs/vtools/dialogs/tools/piece/tabs/tabpassmarks.ui b/src/libs/vtools/dialogs/tools/piece/tabs/tabpassmarks.ui index edc651b7a..78b0f3f38 100644 --- a/src/libs/vtools/dialogs/tools/piece/tabs/tabpassmarks.ui +++ b/src/libs/vtools/dialogs/tools/piece/tabs/tabpassmarks.ui @@ -7,7 +7,7 @@ 0 0 208 - 285 + 321 @@ -32,12 +32,12 @@ - + true - Lines + Marks