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

Refactor method VPattern::setCurrentData().

Browse Source 
It should use method VAbstractPattern::getLocalHistory().

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2017-09-25 18:15:28 +03:00
parent 3a358f7633
commit 6bd1a460e6
3 changed files with 18 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -254,41 +254,23 @@ void VPattern::setCurrentData()
{ {
if (*mode == Draw::Calculation) if (*mode == Draw::Calculation)
{ {
if (CountPP() > 1)//don't need upadate data if we have only one pattern piece const int countPP = CountPP();
if (countPP > 1)//don't need upadate data if we have only one pattern piece
{ {
qCDebug(vXML, "Setting current data"); qCDebug(vXML, "Setting current data");
qCDebug(vXML, "Current PP name %s", qUtf8Printable(nameActivPP)); qCDebug(vXML, "Current PP name %s", qUtf8Printable(nameActivPP));
qCDebug(vXML, "PP count %d", CountPP()); qCDebug(vXML, "PP count %d", countPP);
quint32 id = 0; const QVector<VToolRecord> localHistory = getLocalHistory();
if (history.size() == 0) if (localHistory.size() == 0)
{ {
qCDebug(vXML, "History is empty!"); qCDebug(vXML, "History is empty!");
return; return;
} }
for (qint32 i = 0; i < history.size(); ++i)
{
const VToolRecord tool = history.at(i);
if (tool.getNameDraw() == nameActivPP)
{
id = tool.getId();
}
}
qCDebug(vXML, "Resoring data from tool with id %u", id);
if (id == NULL_ID)
{
qCDebug(vXML, "Could not find record for this current pattern piece %s",
qUtf8Printable(nameActivPP));
const VToolRecord tool = history.at(history.size()-1); const quint32 id = localHistory.last().getId();
id = tool.getId(); qCDebug(vXML, "Resoring data from tool with id %u", id);
qCDebug(vXML, "Taking record with id %u from PP %s", id, qUtf8Printable(tool.getNameDraw()));
if (id == NULL_ID)
{
qCDebug(vXML, "Bad id for last record in history.");
return;
}
}
if (tools.size() > 0) if (tools.size() > 0)
{ {
try try

10
src/libs/ifc/xml/vabstractpattern.cpp
View File

@ -307,16 +307,6 @@ void VAbstractPattern::ChangeActivPP(const QString &name, const Document &parse)
} }
} }
//---------------------------------------------------------------------------------------------------------------------
/**
* @brief GetNameActivPP return current pattern piece name.
* @return pattern piece name.
*/
QString VAbstractPattern::GetNameActivPP() const
{
return nameActivPP;
}
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
/** /**
* @brief GetActivDrawElement return draw tag for current pattern peace. * @brief GetActivDrawElement return draw tag for current pattern peace.

10
src/libs/ifc/xml/vabstractpattern.h
View File

@ -446,4 +446,14 @@ private:
void SetMaterials(QDomElement &element, const QMap<int, QString> &materials); void SetMaterials(QDomElement &element, const QMap<int, QString> &materials);
}; };
//---------------------------------------------------------------------------------------------------------------------
/**
* @brief GetNameActivPP return current pattern piece name.
* @return pattern piece name.
*/
inline QString VAbstractPattern::GetNameActivPP() const
{
return nameActivPP;
}
#endif // VABSTRACTPATTERN_H #endif // VABSTRACTPATTERN_H