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

Don't clean measurement before begin full parsing.

Browse Source 
--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2015-08-26 21:14:47 +03:00
parent 2f34e86322
commit 98a5d8aadb
4 changed files with 21 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2430,8 +2430,7 @@ void VPattern::PrepareForParse(const Document &parse)
TestUniqueId();
sceneDraw->clear();
sceneDetail->clear();
data->Clear();
UpdateMeasurements();
data->ClearForFullParse();
nameActivPP.clear();
patternPieces.clear();
tools.clear();
@ -2452,35 +2451,6 @@ void VPattern::PrepareForParse(const Document &parse)
}
}
//---------------------------------------------------------------------------------------------------------------------
void VPattern::UpdateMeasurements()
{
// try
// {
// const QString path = MPath();
// if (MType() == MeasurementsType::Standard)
// {
// VStandardMeasurements m(data);
// ValidateXML("://schema/standard_measurements.xsd", path);
// m.setXMLContent(path);
// m.Measurements();
// }
// else
// {
// VIndividualMeasurements m(data);
// ValidateXML("://schema/individual_measurements.xsd", path);
// m.setXMLContent(path);
// m.Measurements();
// }
// }
// catch (VException &e)
// {
// e.CriticalMessageBox(tr("File error."), qApp->getMainWindow());
// emit ClearMainWindow();
// return;
// }
}
//---------------------------------------------------------------------------------------------------------------------
void VPattern::ToolsCommonAttributes(const QDomElement &domElement, quint32 &id)
{

1
src/app/valentina/xml/vpattern.h
View File

@ -112,7 +112,6 @@ private:
const Document &parse, const QString& type);
void ParseIncrementsElement(const QDomNode& node);
void PrepareForParse(const Document &parse);
void UpdateMeasurements();
void ToolsCommonAttributes(const QDomElement &domElement, quint32 &id);
void PointsCommonAttributes(const QDomElement &domElement, quint32 &id, QString &name, qreal &mx,
qreal &my, QString &typeLine, QString &lineColor);

19
src/libs/vpatterndb/vcontainer.cpp
View File

@ -235,6 +235,25 @@ void VContainer::Clear()
ClearUniqueNames();
}
//---------------------------------------------------------------------------------------------------------------------
void VContainer::ClearForFullParse()
{
qCDebug(vCon, "Clearing container data for full parse.");
_id = NULL_ID;
d->details.clear();
ClearVariables(VarType::Increment);
ClearVariables(VarType::ArcLength);
ClearVariables(VarType::LineAngle);
ClearVariables(VarType::LineLength);
ClearVariables(VarType::SplineLength);
ClearVariables(VarType::ArcRadius);
ClearVariables(VarType::ArcAngle);
ClearVariables(VarType::SplineAngle);
ClearGObjects();
ClearUniqueNames();
}
//---------------------------------------------------------------------------------------------------------------------
/**
* @brief ClearObject points, splines, arcs, spline paths will be cleared.

1
src/libs/vpatterndb/vcontainer.h
View File

@ -126,6 +126,7 @@ public:
void UpdateDetail(quint32 id, const VDetail &detail);
void Clear();
void ClearForFullParse();
void ClearGObjects();
void ClearCalculationGObjects();
void ClearVariables(const VarType &type = VarType::Unknown);