Merged in BojanKverh/valentina-issue331/feature (pull request #147)

Grainline implementation. ref #331.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2016-10-23 20:05:50 +00:00
commit 1aa896eff1
4 changed files with 15 additions and 3 deletions

View File

@ -728,7 +728,7 @@ void VPattern::ParseDetailElement(const QDomElement &domElement, const Document
detail.GetGrainlineGeometry().SetPos(ptPos); detail.GetGrainlineGeometry().SetPos(ptPos);
QString qsLength = GetParametrString(element, AttrLength, "0"); QString qsLength = GetParametrString(element, AttrLength, "0");
detail.GetGrainlineGeometry().SetLength(qsLength); detail.GetGrainlineGeometry().SetLength(qsLength);
QString qsRot = GetParametrString(element, VToolDetail::AttrRotation, "0"); QString qsRot = GetParametrString(element, VToolDetail::AttrRotation, "90");
detail.GetGrainlineGeometry().SetRotation(qsRot); detail.GetGrainlineGeometry().SetRotation(qsRot);
} }
} }

View File

@ -903,8 +903,7 @@ void DialogDetail::UpdateValues()
} }
else else
{ {
QIcon icon; ResetWarning();
ui.tabWidget->setTabIcon(2, icon);
} }
} }
@ -974,6 +973,7 @@ void DialogDetail::EnableGrainlineRotation()
ChangeColor(ui.labelEditLen, okColor); ChangeColor(ui.labelEditLen, okColor);
ChangeColor(ui.labelEditRot, okColor); ChangeColor(ui.labelEditRot, okColor);
bOk->setEnabled(true); bOk->setEnabled(true);
ResetWarning();
} }
} }
@ -1024,3 +1024,11 @@ void DialogDetail::DeployLength()
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void DialogDetail::ResetWarning()
{
QIcon icon;
ui.tabWidget->setTabIcon(2, icon);
}
//---------------------------------------------------------------------------------------------------------------------

View File

@ -135,6 +135,7 @@ private slots:
void EditFormula(); void EditFormula();
void DeployRotation(); void DeployRotation();
void DeployLength(); void DeployLength();
void ResetWarning();
}; };
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

View File

@ -509,6 +509,7 @@ void VToolDetail::AddToFile()
doc->SetAttribute(domData, AttrMy, glGeom.GetPos().y()); doc->SetAttribute(domData, AttrMy, glGeom.GetPos().y());
doc->SetAttribute(domData, AttrLength, glGeom.GetLength()); doc->SetAttribute(domData, AttrLength, glGeom.GetLength());
doc->SetAttribute(domData, AttrRotation, glGeom.GetRotation()); doc->SetAttribute(domData, AttrRotation, glGeom.GetRotation());
qDebug() << "XML ROTATION" << glGeom.GetRotation();
// nodes // nodes
for (int i = 0; i < detail.CountNode(); ++i) for (int i = 0; i < detail.CountNode(); ++i)
@ -587,6 +588,7 @@ void VToolDetail::RefreshDataInFile()
doc->SetAttribute(domData, AttrMy, glGeom.GetPos().y()); doc->SetAttribute(domData, AttrMy, glGeom.GetPos().y());
doc->SetAttribute(domData, AttrLength, glGeom.GetLength()); doc->SetAttribute(domData, AttrLength, glGeom.GetLength());
doc->SetAttribute(domData, AttrRotation, glGeom.GetRotation()); doc->SetAttribute(domData, AttrRotation, glGeom.GetRotation());
qDebug() << "XML ROTATION2" << glGeom.GetRotation();
// nodes // nodes
for (int i = 0; i < det.CountNode(); ++i) for (int i = 0; i < det.CountNode(); ++i)
@ -933,6 +935,7 @@ void VToolDetail::UpdateGrainline()
QString qsFormula; QString qsFormula;
qsFormula = geom.GetRotation().replace("\n", " "); qsFormula = geom.GetRotation().replace("\n", " ");
qsFormula = qApp->TrVars()->FormulaFromUser(qsFormula, qApp->Settings()->GetOsSeparator()); qsFormula = qApp->TrVars()->FormulaFromUser(qsFormula, qApp->Settings()->GetOsSeparator());
Calculator cal1; Calculator cal1;
dRotation = cal1.EvalFormula(VDataTool::data.PlainVariables(), qsFormula); dRotation = cal1.EvalFormula(VDataTool::data.PlainVariables(), qsFormula);