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

Fixed the grainline tab icon in details dialog

Browse Source 
--HG--
branch : feature
This commit is contained in:
BojanKverh 2016-10-23 20:59:38 +02:00
parent 0ca37fdecb
commit e82f65fc6a
5 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -726,11 +726,19 @@ void VPattern::ParseDetailElement(const QDomElement &domElement, const Document
ptPos.setX(GetParametrDouble(element, AttrMx, "0"));
ptPos.setY(GetParametrDouble(element, AttrMy, "0"));
detail.GetGrainlineGeometry().SetPos(ptPos);
QString qsLength = GetParametrString(element, AttrLength, "0");
if (detail.GetGrainlineGeometry().IsVisible() == true)
{
QString qsLength = GetParametrString(element, AttrLength);
detail.GetGrainlineGeometry().SetLength(qsLength);
QString qsRot = GetParametrString(element, VToolDetail::AttrRotation, "0");
QString qsRot = GetParametrString(element, VToolDetail::AttrRotation);
detail.GetGrainlineGeometry().SetRotation(qsRot);
}
else
{
detail.GetGrainlineGeometry().SetLength("");
detail.GetGrainlineGeometry().SetRotation("");
}
}
}
}
VToolDetail::Create(id, detail, sceneDetail, this, data, parse, Source::FromFile);

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

@ -502,6 +502,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)
@ -580,6 +581,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)
@ -926,6 +928,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);

3
src/libs/vtools/undocommands/savedetailoptions.cpp
View File

@ -208,8 +208,11 @@ void SaveDetailOptions::SaveGrainline(QDomElement &domElement, const VDetail &de
doc->SetAttribute(domData, VAbstractPattern::AttrVisible, glGeom.IsVisible() == true? trueStr : falseStr);
doc->SetAttribute(domData, AttrMx, glGeom.GetPos().x());
doc->SetAttribute(domData, AttrMy, glGeom.GetPos().y());
if (glGeom.IsVisible() == true)
{
doc->SetAttribute(domData, AttrLength, glGeom.GetLength());
doc->SetAttribute(domData, VToolDetail::AttrRotation, glGeom.GetRotation());
}
domElement.appendChild(domData);
}