aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/valentina/xml/vpattern.cpp
View File

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

12
src/libs/vtools/dialogs/tools/dialogdetail.cpp
View File

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

1
src/libs/vtools/dialogs/tools/dialogdetail.h
View File

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

3
src/libs/vtools/tools/vtooldetail.cpp
View File

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