Fixed error in merging branches.

--HG--
branch : feature
This commit is contained in:
dismine 2013-09-29 13:29:29 +03:00
parent 18aa3d71d5
commit 14c8fdeee7
9 changed files with 18 additions and 25 deletions

View File

@ -20,7 +20,6 @@
****************************************************************************/ ****************************************************************************/
#include "calculator.h" #include "calculator.h"
#include <cmath>
#include <QDebug> #include <QDebug>
#define DELIMITER 1 #define DELIMITER 1

View File

@ -23,8 +23,6 @@
#define CALCULATOR_H #define CALCULATOR_H
#include <QString> #include <QString>
#include <QMap>
#include <QLineF>
#include "vcontainer.h" #include "vcontainer.h"
/** /**

View File

@ -26,13 +26,25 @@ VPointF::VPointF():_name(QString()), _mx(0), _my(0), _x(0), _y(0), _referens(0),
} }
VPointF::VPointF ( const VPointF & point ):_name(point.name()), _mx(point.mx()), _my(point.my()), VPointF::VPointF ( const VPointF & point ):_name(point.name()), _mx(point.mx()), _my(point.my()),
_x(point.x()), _y(point.y()), _referens(0), mode(point.getMode()), idObject(point.getIdObject()){ _x(point.x()), _y(point.y()), _referens(point.referens()), mode(point.getMode()), idObject(point.getIdObject()){
} }
VPointF::VPointF (qreal x, qreal y , QString name, qreal mx, qreal my, Draw::Draws mode, qint64 idObject):_name(name), _mx(mx), VPointF::VPointF (qreal x, qreal y , QString name, qreal mx, qreal my, Draw::Draws mode, qint64 idObject):_name(name), _mx(mx),
_my(my), _x(x), _y(y), _referens(0), mode(mode), idObject(idObject){ _my(my), _x(x), _y(y), _referens(0), mode(mode), idObject(idObject){
} }
VPointF &VPointF::operator =(const VPointF &point){
_name = point.name();
_mx = point.mx();
_my = point.my();
_x = point.x();
_y = point.y();
_referens = point.referens();
mode = point.getMode();
idObject = point.getIdObject();
return *this;
}
VPointF::~VPointF(){ VPointF::~VPointF(){
} }

View File

@ -26,8 +26,7 @@
#include <QString> #include <QString>
#include "options.h" #include "options.h"
class VPointF class VPointF{
{
public: public:
VPointF(); VPointF();
VPointF (const VPointF &point ); VPointF (const VPointF &point );

View File

@ -34,8 +34,7 @@ namespace Tool{
}; };
} }
class VAbstractTool:public VDataTool class VAbstractTool:public VDataTool{
{
Q_OBJECT Q_OBJECT
public: public:
VAbstractTool(VDomDocument *doc, VContainer *data, qint64 id, QObject *parent = 0); VAbstractTool(VDomDocument *doc, VContainer *data, qint64 id, QObject *parent = 0);

View File

@ -33,10 +33,6 @@ VDataTool &VDataTool::operator =(const VDataTool &tool){
return *this; return *this;
} }
VContainer VDataTool::getData() const{
return data;
}
void VDataTool::setData(const VContainer *value){ void VDataTool::setData(const VContainer *value){
data = *value; data = *value;
} }

View File

@ -22,26 +22,18 @@
#ifndef VDATATOOL_H #ifndef VDATATOOL_H
#define VDATATOOL_H #define VDATATOOL_H
#include <QObject>
#include "container/vcontainer.h" #include "container/vcontainer.h"
class VDataTool : public QObject class VDataTool : public QObject{
{
Q_OBJECT Q_OBJECT
public: public:
explicit VDataTool(VContainer *data, QObject *parent = 0); explicit VDataTool(VContainer *data, QObject *parent = 0);
virtual ~VDataTool(); virtual ~VDataTool();
VDataTool& operator= (const VDataTool &tool); VDataTool& operator= (const VDataTool &tool);
VContainer getData() const; VContainer getData() const { return data; }
void setData(const VContainer *value); void setData(const VContainer *value);
signals:
public slots:
protected: protected:
VContainer data; VContainer data;
}; };
#endif // VDATATOOL_H #endif // VDATATOOL_H

View File

@ -370,8 +370,6 @@ qreal VDomDocument::GetParametrDouble(const QDomElement &domElement, const QStri
return param; return param;
} }
void VDomDocument::ParseDrawElement(VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail, void VDomDocument::ParseDrawElement(VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail,
const QDomNode& node, const Document::Documents &parse){ const QDomNode& node, const Document::Documents &parse){
QDomNode domNode = node.firstChild(); QDomNode domNode = node.firstChild();

View File

@ -112,7 +112,7 @@ private:
qint64 GetParametrId(const QDomElement& domElement) const; qint64 GetParametrId(const QDomElement& domElement) const;
qint64 GetParametrLongLong(const QDomElement& domElement, const QString &name) const; qint64 GetParametrLongLong(const QDomElement& domElement, const QString &name) const;
QString GetParametrString(const QDomElement& domElement, const QString &name) const; QString GetParametrString(const QDomElement& domElement, const QString &name) const;
qreal GetParametrDouble(const QDomElement& domElement, const QString &name) const; qreal GetParametrDouble(const QDomElement& domElement, const QString &name) const;
}; };
#pragma GCC diagnostic pop #pragma GCC diagnostic pop