Implicit Sharing for class VLineAngle.

--HG--
branch : develop
This commit is contained in:
dismine 2014-08-20 20:24:11 +03:00
parent a16402f747
commit 3e9d5aa975
4 changed files with 80 additions and 21 deletions

View File

@ -27,4 +27,5 @@ HEADERS += \
container/vinternalvariable_p.h \ container/vinternalvariable_p.h \
container/vvariable_p.h \ container/vvariable_p.h \
container/vincrement_p.h \ container/vincrement_p.h \
container/vcurvelength_p.h container/vcurvelength_p.h \
container/vlineangle_p.h

View File

@ -27,6 +27,7 @@
*************************************************************************/ *************************************************************************/
#include "vlineangle.h" #include "vlineangle.h"
#include "vlineangle_p.h"
#include "../geometry/vpointf.h" #include "../geometry/vpointf.h"
#include "../widgets/vapplication.h" #include "../widgets/vapplication.h"
@ -34,14 +35,14 @@
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
VLineAngle::VLineAngle() VLineAngle::VLineAngle()
:VInternalVariable(), p1Id(NULL_ID), p2Id(NULL_ID) :VInternalVariable(), d(new VLineAngleData)
{ {
SetType(VarType::LineAngle); SetType(VarType::LineAngle);
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
VLineAngle::VLineAngle(const VPointF *p1, const quint32 &p1Id, const VPointF *p2, const quint32 &p2Id) VLineAngle::VLineAngle(const VPointF *p1, const quint32 &p1Id, const VPointF *p2, const quint32 &p2Id)
:VInternalVariable(), p1Id(p1Id), p2Id(p2Id) :VInternalVariable(), d(new VLineAngleData(p1Id, p2Id))
{ {
SetType(VarType::LineAngle); SetType(VarType::LineAngle);
@ -54,7 +55,7 @@ VLineAngle::VLineAngle(const VPointF *p1, const quint32 &p1Id, const VPointF *p2
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
VLineAngle::VLineAngle(const VLineAngle &var) VLineAngle::VLineAngle(const VLineAngle &var)
:VInternalVariable(var), p1Id(var.GetP1Id()), p2Id(var.GetP2Id()) :VInternalVariable(var), d(var.d)
{} {}
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -65,8 +66,7 @@ VLineAngle &VLineAngle::operator=(const VLineAngle &var)
return *this; return *this;
} }
VInternalVariable::operator=(var); VInternalVariable::operator=(var);
this->p1Id = var.GetP1Id(); d = var.d;
this->p2Id = var.GetP2Id();
return *this; return *this;
} }
@ -77,7 +77,7 @@ VLineAngle::~VLineAngle()
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
bool VLineAngle::Filter(quint32 id) bool VLineAngle::Filter(quint32 id)
{ {
return id == p1Id || id == p2Id; return id == d->p1Id || id == d->p2Id;
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -87,3 +87,15 @@ void VLineAngle::SetValue(const VPointF *p1, const VPointF *p2)
SCASSERT(p2 != nullptr); SCASSERT(p2 != nullptr);
VInternalVariable::SetValue(QLineF(p1->toQPointF(), p2->toQPointF()).angle()); VInternalVariable::SetValue(QLineF(p1->toQPointF(), p2->toQPointF()).angle());
} }
//---------------------------------------------------------------------------------------------------------------------
quint32 VLineAngle::GetP1Id() const
{
return d->p1Id;
}
//---------------------------------------------------------------------------------------------------------------------
quint32 VLineAngle::GetP2Id() const
{
return d->p2Id;
}

View File

@ -32,6 +32,7 @@
#include "vinternalvariable.h" #include "vinternalvariable.h"
class VPointF; class VPointF;
class VLineAngleData;
class VLineAngle :public VInternalVariable class VLineAngle :public VInternalVariable
{ {
@ -47,20 +48,7 @@ public:
quint32 GetP1Id() const; quint32 GetP1Id() const;
quint32 GetP2Id() const; quint32 GetP2Id() const;
private: private:
quint32 p1Id; QSharedDataPointer<VLineAngleData> d;
quint32 p2Id;
}; };
//---------------------------------------------------------------------------------------------------------------------
inline quint32 VLineAngle::GetP1Id() const
{
return p1Id;
}
//---------------------------------------------------------------------------------------------------------------------
inline quint32 VLineAngle::GetP2Id() const
{
return p2Id;
}
#endif // VLINEANGLE_H #endif // VLINEANGLE_H

View File

@ -0,0 +1,58 @@
/************************************************************************
**
** @file vlineangle_p.h
** @author Roman Telezhynskyi <dismine(at)gmail.com>
** @date 20 8, 2014
**
** @brief
** @copyright
** This source code is part of the Valentine project, a pattern making
** program, whose allow create and modeling patterns of clothing.
** Copyright (C) 2014 Valentina project
** <https://bitbucket.org/dismine/valentina> All Rights Reserved.
**
** Valentina is free software: you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
** the Free Software Foundation, either version 3 of the License, or
** (at your option) any later version.
**
** Valentina is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
**
** You should have received a copy of the GNU General Public License
** along with Valentina. If not, see <http://www.gnu.org/licenses/>.
**
*************************************************************************/
#ifndef VLINEANGLE_P_H
#define VLINEANGLE_P_H
#include <QSharedData>
#include "../options.h"
class VLineAngleData : public QSharedData
{
public:
VLineAngleData()
:p1Id(NULL_ID), p2Id(NULL_ID)
{}
VLineAngleData(const quint32 &p1Id, const quint32 &p2Id)
:p1Id(p1Id), p2Id(p2Id)
{}
VLineAngleData(const VLineAngleData &var)
:QSharedData(var), p1Id(var.p1Id), p2Id(var.p2Id)
{}
virtual ~VLineAngleData() {}
quint32 p1Id;
quint32 p2Id;
};
#endif // VLINEANGLE_P_H