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

MSVC warning.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2017-01-27 17:41:08 +02:00
parent d17dda3f9f
commit d6c68a4df8
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2749,7 +2749,7 @@ void VPattern::ParseToolRotation(VMainGraphicsScene *scene, QDomElement &domElem
QVector<quint32> source; QVector<quint32> source;
QVector<DestinationItem> destination; QVector<DestinationItem> destination;
VAbstractOperation::ExtractData(this, domElement, source, destination); VAbstractOperation::ExtractData(domElement, source, destination);
VToolRotation::Create(id, center, a, suffix, source, destination, scene, this, data, parse, Source::FromFile); VToolRotation::Create(id, center, a, suffix, source, destination, scene, this, data, parse, Source::FromFile);
//Rewrite attribute formula. Need for situation when we have wrong formula. //Rewrite attribute formula. Need for situation when we have wrong formula.
@ -2791,7 +2791,7 @@ void VPattern::ParseToolFlippingByLine(VMainGraphicsScene *scene, QDomElement &d
QVector<quint32> source; QVector<quint32> source;
QVector<DestinationItem> destination; QVector<DestinationItem> destination;
VAbstractOperation::ExtractData(this, domElement, source, destination); VAbstractOperation::ExtractData(domElement, source, destination);
VToolFlippingByLine::Create(id, p1, p2, suffix, source, destination, scene, this, data, parse, VToolFlippingByLine::Create(id, p1, p2, suffix, source, destination, scene, this, data, parse,
Source::FromFile); Source::FromFile);
@ -2821,7 +2821,7 @@ void VPattern::ParseToolFlippingByAxis(VMainGraphicsScene *scene, QDomElement &d
QVector<quint32> source; QVector<quint32> source;
QVector<DestinationItem> destination; QVector<DestinationItem> destination;
VAbstractOperation::ExtractData(this, domElement, source, destination); VAbstractOperation::ExtractData(domElement, source, destination);
VToolFlippingByAxis::Create(id, origin, axisType, suffix, source, destination, scene, this, data, parse, VToolFlippingByAxis::Create(id, origin, axisType, suffix, source, destination, scene, this, data, parse,
Source::FromFile); Source::FromFile);
@ -2853,7 +2853,7 @@ void VPattern::ParseToolMove(VMainGraphicsScene *scene, QDomElement &domElement,
QVector<quint32> source; QVector<quint32> source;
QVector<DestinationItem> destination; QVector<DestinationItem> destination;
VAbstractOperation::ExtractData(this, domElement, source, destination); VAbstractOperation::ExtractData(domElement, source, destination);
VToolMove::Create(id, a, len, suffix, source, destination, scene, this, data, parse, Source::FromFile); VToolMove::Create(id, a, len, suffix, source, destination, scene, this, data, parse, Source::FromFile);
//Rewrite attribute formula. Need for situation when we have wrong formula. //Rewrite attribute formula. Need for situation when we have wrong formula.

11
src/libs/vtools/tools/drawTools/operation/vabstractoperation.cpp
View File

@ -96,10 +96,9 @@ void VAbstractOperation::paint(QPainter *painter, const QStyleOptionGraphicsItem
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void VAbstractOperation::ExtractData(VAbstractPattern *doc, const QDomElement &domElement, QVector<quint32> &source, void VAbstractOperation::ExtractData(const QDomElement &domElement, QVector<quint32> &source,
QVector<DestinationItem> &destination) QVector<DestinationItem> &destination)
{ {
SCASSERT(doc != nullptr)
const QDomNodeList nodeList = domElement.childNodes(); const QDomNodeList nodeList = domElement.childNodes();
for (qint32 i = 0; i < nodeList.size(); ++i) for (qint32 i = 0; i < nodeList.size(); ++i)
{ {
@ -113,7 +112,7 @@ void VAbstractOperation::ExtractData(VAbstractPattern *doc, const QDomElement &d
const QDomElement element = srcList.at(j).toElement(); const QDomElement element = srcList.at(j).toElement();
if (not element.isNull()) if (not element.isNull())
{ {
source.append(doc->GetParametrUInt(element, AttrIdObject, NULL_ID_STR)); source.append(VDomDocument::GetParametrUInt(element, AttrIdObject, NULL_ID_STR));
} }
} }
} }
@ -128,9 +127,9 @@ void VAbstractOperation::ExtractData(VAbstractPattern *doc, const QDomElement &d
if (not element.isNull()) if (not element.isNull())
{ {
DestinationItem d; DestinationItem d;
d.id = doc->GetParametrUInt(element, AttrIdObject, NULL_ID_STR); d.id = VDomDocument::GetParametrUInt(element, AttrIdObject, NULL_ID_STR);
d.mx = qApp->toPixel(doc->GetParametrDouble(element, AttrMx, QString::number(INT_MAX))); d.mx = qApp->toPixel(VDomDocument::GetParametrDouble(element, AttrMx, QString::number(INT_MAX)));
d.my = qApp->toPixel(doc->GetParametrDouble(element, AttrMy, QString::number(INT_MAX))); d.my = qApp->toPixel(VDomDocument::GetParametrDouble(element, AttrMy, QString::number(INT_MAX)));
destination.append(d); destination.append(d);
} }
} }

2
src/libs/vtools/tools/drawTools/operation/vabstractoperation.h
View File

@ -84,7 +84,7 @@ public:
virtual void GroupVisibility(quint32 object, bool visible) Q_DECL_OVERRIDE; virtual void GroupVisibility(quint32 object, bool visible) Q_DECL_OVERRIDE;
virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE; virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE;
static void ExtractData(VAbstractPattern *doc, const QDomElement &domElement, QVector<quint32> &source, static void ExtractData(const QDomElement &domElement, QVector<quint32> &source,
QVector<DestinationItem> &destination); QVector<DestinationItem> &destination);
public slots: public slots:
virtual void FullUpdateFromFile() Q_DECL_OVERRIDE; virtual void FullUpdateFromFile() Q_DECL_OVERRIDE;