VContainer supports working with VPiece class.

--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2016-11-08 12:52:07 +02:00
parent 940a1e404b
commit 977b52b787
2 changed files with 42 additions and 0 deletions

View File

@ -166,6 +166,19 @@ const VDetail VContainer::GetDetail(quint32 id) const
} }
} }
//---------------------------------------------------------------------------------------------------------------------
VPiece VContainer::GetPiece(quint32 id) const
{
if (d->pieces->contains(id))
{
return d->pieces->value(id);
}
else
{
throw VExceptionBadId(tr("Can't find object"), id);
}
}
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
/** /**
* @brief AddGObject add new GObject to container * @brief AddGObject add new GObject to container
@ -193,6 +206,14 @@ quint32 VContainer::AddDetail(const VDetail &detail)
return id; return id;
} }
//---------------------------------------------------------------------------------------------------------------------
quint32 VContainer::AddPiece(const VPiece &detail)
{
const quint32 id = getNextId();
d->pieces->insert(id, detail);
return id;
}
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
quint32 VContainer::getId() quint32 VContainer::getId()
{ {
@ -500,6 +521,14 @@ void VContainer::UpdateDetail(quint32 id, const VDetail &detail)
UpdateId(id); UpdateId(id);
} }
//---------------------------------------------------------------------------------------------------------------------
void VContainer::UpdatePiece(quint32 id, const VPiece &detail)
{
Q_ASSERT_X(id != NULL_ID, Q_FUNC_INFO, "id == 0"); //-V654 //-V712
d->pieces->insert(id, detail);
UpdateId(id);
}
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
qreal VContainer::GetTableValue(const QString &name, MeasurementsType patternType) const qreal VContainer::GetTableValue(const QString &name, MeasurementsType patternType) const
{ {
@ -734,6 +763,12 @@ const QHash<quint32, VDetail> *VContainer::DataDetails() const
return d->details.data(); return d->details.data();
} }
//---------------------------------------------------------------------------------------------------------------------
const QHash<quint32, VPiece> *VContainer::DataPieces() const
{
return d->pieces.data();
}
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
const QHash<QString, QSharedPointer<VInternalVariable> > *VContainer::DataVariables() const const QHash<QString, QSharedPointer<VInternalVariable> > *VContainer::DataVariables() const
{ {

View File

@ -54,6 +54,7 @@
#include "variables.h" #include "variables.h"
#include "variables/vinternalvariable.h" #include "variables/vinternalvariable.h"
#include "vdetail.h" #include "vdetail.h"
#include "vpiece.h"
#include "vtranslatevars.h" #include "vtranslatevars.h"
class VAbstractCubicBezierPath; class VAbstractCubicBezierPath;
@ -81,6 +82,7 @@ public:
: gObjects(QHash<quint32, QSharedPointer<VGObject> >()), : gObjects(QHash<quint32, QSharedPointer<VGObject> >()),
variables(QHash<QString, QSharedPointer<VInternalVariable> > ()), variables(QHash<QString, QSharedPointer<VInternalVariable> > ()),
details(QSharedPointer<QHash<quint32, VDetail>>(new QHash<quint32, VDetail>())), details(QSharedPointer<QHash<quint32, VDetail>>(new QHash<quint32, VDetail>())),
pieces(QSharedPointer<QHash<quint32, VPiece>>(new QHash<quint32, VPiece>())),
trVars(trVars), patternUnit(patternUnit) trVars(trVars), patternUnit(patternUnit)
{} {}
@ -108,6 +110,7 @@ public:
* @brief details container of details * @brief details container of details
*/ */
QSharedPointer<QHash<quint32, VDetail>> details; QSharedPointer<QHash<quint32, VDetail>> details;
QSharedPointer<QHash<quint32, VPiece>> pieces;
const VTranslateVars *trVars; const VTranslateVars *trVars;
const Unit *patternUnit; const Unit *patternUnit;
@ -135,6 +138,7 @@ public:
const QSharedPointer<VGObject> GetGObject(quint32 id) const; const QSharedPointer<VGObject> GetGObject(quint32 id) const;
static const QSharedPointer<VGObject> GetFakeGObject(quint32 id); static const QSharedPointer<VGObject> GetFakeGObject(quint32 id);
const VDetail GetDetail(quint32 id) const; const VDetail GetDetail(quint32 id) const;
VPiece GetPiece(quint32 id) const;
qreal GetTableValue(const QString& name, MeasurementsType patternType) const; qreal GetTableValue(const QString& name, MeasurementsType patternType) const;
template <typename T> template <typename T>
QSharedPointer<T> GetVariable(QString name) const; QSharedPointer<T> GetVariable(QString name) const;
@ -144,6 +148,7 @@ public:
quint32 AddGObject(VGObject *obj); quint32 AddGObject(VGObject *obj);
quint32 AddDetail(const VDetail &detail); quint32 AddDetail(const VDetail &detail);
quint32 AddPiece(const VPiece &detail);
void AddLine(const quint32 &firstPointId, const quint32 &secondPointId); void AddLine(const quint32 &firstPointId, const quint32 &secondPointId);
void AddArc(const QSharedPointer<VArc> &arc, const quint32 &arcId, const quint32 &parentId = NULL_ID); void AddArc(const QSharedPointer<VArc> &arc, const quint32 &arcId, const quint32 &parentId = NULL_ID);
void AddSpline(const QSharedPointer<VAbstractBezier> &curve, quint32 id, quint32 parentId = NULL_ID); void AddSpline(const QSharedPointer<VAbstractBezier> &curve, quint32 id, quint32 parentId = NULL_ID);
@ -156,6 +161,7 @@ public:
void UpdateGObject(quint32 id, VGObject* obj); void UpdateGObject(quint32 id, VGObject* obj);
void UpdateDetail(quint32 id, const VDetail &detail); void UpdateDetail(quint32 id, const VDetail &detail);
void UpdatePiece(quint32 id, const VPiece &detail);
void Clear(); void Clear();
void ClearForFullParse(); void ClearForFullParse();
@ -178,6 +184,7 @@ public:
const QHash<quint32, QSharedPointer<VGObject> > *DataGObjects() const; const QHash<quint32, QSharedPointer<VGObject> > *DataGObjects() const;
const QHash<quint32, VDetail> *DataDetails() const; const QHash<quint32, VDetail> *DataDetails() const;
const QHash<quint32, VPiece> *DataPieces() const;
const QHash<QString, QSharedPointer<VInternalVariable>> *DataVariables() const; const QHash<QString, QSharedPointer<VInternalVariable>> *DataVariables() const;
const QMap<QString, QSharedPointer<VMeasurement> > DataMeasurements() const; const QMap<QString, QSharedPointer<VMeasurement> > DataMeasurements() const;