Fix regression in dialog Placelabel.
--HG-- branch : develop
This commit is contained in:
parent
60fabf0b71
commit
eeedebbac3
|
@ -505,22 +505,19 @@ void DialogPlaceLabel::FillPlaceLabelTypes()
|
|||
//---------------------------------------------------------------------------------------------------------------------
|
||||
void DialogPlaceLabel::CheckPieces()
|
||||
{
|
||||
if (not m_showMode)
|
||||
QColor color;
|
||||
if (ui->comboBoxPiece->count() <= 0 || ui->comboBoxPiece->currentIndex() == -1)
|
||||
{
|
||||
QColor color;
|
||||
if (ui->comboBoxPiece->count() <= 0 || ui->comboBoxPiece->currentIndex() == -1)
|
||||
{
|
||||
m_flagError = false;
|
||||
color = errorColor;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_flagError = true;
|
||||
color = OkColor(this);
|
||||
}
|
||||
ChangeColor(ui->labelPiece, color);
|
||||
CheckState();
|
||||
m_flagError = false;
|
||||
color = errorColor;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_flagError = true;
|
||||
color = OkColor(this);
|
||||
}
|
||||
ChangeColor(ui->labelPiece, color);
|
||||
CheckState();
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
|
|
|
@ -870,14 +870,14 @@ void DialogSeamAllowance::ShowPlaceLabelsContextMenu(const QPoint &pos)
|
|||
else if (selectedAction == actionOption)
|
||||
{
|
||||
auto *dialog = new DialogPlaceLabel(data, labelId, this);
|
||||
dialog->SetCenterPoint(labelId);
|
||||
dialog->EnbleShowMode(true);
|
||||
dialog->SetLabelType(currentLabel.GetLabelType());
|
||||
dialog->SetWidth(currentLabel.GetWidthFormula());
|
||||
dialog->SetHeight(currentLabel.GetHeightFormula());
|
||||
dialog->SetAngle(currentLabel.GetAngleFormula());
|
||||
dialog->SetFormulaVisible(currentLabel.GetVisibilityTrigger());
|
||||
dialog->SetPieceId(toolId);
|
||||
dialog->EnbleShowMode(true);
|
||||
dialog->SetCenterPoint(currentLabel.GetCenterPoint());
|
||||
m_dialog = dialog;
|
||||
m_dialog->setModal(true);
|
||||
connect(m_dialog.data(), &DialogTool::DialogClosed, this, &DialogSeamAllowance::PlaceLabelDialogClosed);
|
||||
|
|
Loading…
Reference in New Issue
Block a user