From 42c54aa5036c711675e715579a9aef446425f00d Mon Sep 17 00:00:00 2001 From: dismine Date: Wed, 26 Feb 2014 10:18:59 +0200 Subject: [PATCH] Inline member functions defined outside the class. --HG-- branch : feature --- src/container/vcontainer.h | 171 +++++++++++++++--- src/container/vincrementtablerow.h | 70 ++++++- src/container/vstandardtablerow.h | 28 ++- .../app/dialogindividualmeasurements.h | 14 +- src/dialogs/tools/dialogalongline.h | 53 ++++-- src/dialogs/tools/dialogarc.h | 102 ++++++----- src/dialogs/tools/dialogbisector.h | 73 +++++--- src/dialogs/tools/dialogcutspline.h | 37 ++-- src/dialogs/tools/dialogcutsplinepath.h | 37 ++-- src/dialogs/tools/dialogdetail.h | 7 +- src/dialogs/tools/dialogendline.h | 49 +++-- src/dialogs/tools/dialogheight.h | 49 +++-- src/dialogs/tools/dialogline.h | 55 ++++-- src/dialogs/tools/dialoglineintersect.h | 49 +++-- src/dialogs/tools/dialognormal.h | 60 ++++-- src/dialogs/tools/dialogpointofcontact.h | 47 +++-- src/dialogs/tools/dialogpointofintersection.h | 39 ++-- src/dialogs/tools/dialogshoulderpoint.h | 56 ++++-- src/dialogs/tools/dialogsinglepoint.h | 28 ++- src/dialogs/tools/dialogspline.h | 49 +++-- src/dialogs/tools/dialogsplinepath.h | 21 ++- src/dialogs/tools/dialogtriangle.h | 49 +++-- src/dialogs/tools/dialoguniondetails.h | 28 ++- src/exception/vexception.h | 29 ++- src/exception/vexceptionbadid.h | 14 +- src/exception/vexceptionconversionerror.cpp | 6 + src/exception/vexceptionconversionerror.h | 10 +- src/exception/vexceptionemptyparameter.cpp | 6 + src/exception/vexceptionemptyparameter.h | 32 +++- src/exception/vexceptionobjecterror.cpp | 7 + src/exception/vexceptionobjecterror.h | 54 ++++-- src/exception/vexceptionuniqueid.cpp | 6 + src/exception/vexceptionuniqueid.h | 44 +++-- src/exception/vexceptionwrongparameterid.cpp | 6 + src/exception/vexceptionwrongparameterid.h | 46 +++-- src/geometry/varc.h | 99 ++++++---- src/geometry/vdetail.h | 158 ++++++++++++---- src/geometry/vnodedetail.h | 128 +++++++++---- src/geometry/vpointf.cpp | 15 ++ src/geometry/vpointf.h | 84 +++++++-- src/geometry/vspline.h | 62 +++++-- src/geometry/vsplinepath.h | 68 +++++-- src/geometry/vsplinepoint.h | 94 +++++++--- src/tools/vabstracttool.h | 32 ++-- src/tools/vdatatool.h | 42 +++-- src/widgets/vitem.cpp | 11 ++ src/widgets/vitem.h | 12 +- src/widgets/vmaingraphicsscene.h | 28 ++- src/widgets/vtablegraphicsview.h | 24 ++- src/xml/vdomdocument.cpp | 21 ++- src/xml/vpattern.h | 46 ++++- src/xml/vtoolrecord.h | 64 +++++-- 52 files changed, 1807 insertions(+), 612 deletions(-) diff --git a/src/container/vcontainer.h b/src/container/vcontainer.h index fd44cfcf7..0fb81df09 100644 --- a/src/container/vcontainer.h +++ b/src/container/vcontainer.h @@ -160,8 +160,7 @@ public: * @param name name of row of standard table * @param cell row of standard table */ - inline void AddStandardTableCell(const QString& name, const VStandardTableRow &cell) - {standardTable[name] = cell;} + void AddStandardTableCell(const QString& name, const VStandardTableRow &cell); /** * @brief AddIncrementTableRow add new row of increment table * @param name name of new row of increment table @@ -231,15 +230,13 @@ public: * @param name name of row * @param cell row of standard table */ - inline void UpdateStandardTableCell(const QString& name, VStandardTableRow cell) - {standardTable[name] = cell;} + void UpdateStandardTableCell(const QString& name, VStandardTableRow cell); /** * @brief UpdateIncrementTableRow update increment table row by name * @param name name of row * @param row row */ - inline void UpdateIncrementTableRow(const QString& name, VIncrementTableRow row) - {incrementTable[name] = row;} + void UpdateIncrementTableRow(const QString& name, VIncrementTableRow row); /** * @brief GetValueStandardTableCell return value of standard table row by name * @param name name of row @@ -264,44 +261,44 @@ public: /** * @brief ClearIncrementTable clear increment table */ - inline void ClearIncrementTable() {incrementTable.clear();} + void ClearIncrementTable(); /** * @brief ClearLengthLines clear length lines */ - inline void ClearLengthLines() {lengthLines.clear();} + void ClearLengthLines(); /** * @brief ClearLengthSplines clear length splines */ - inline void ClearLengthSplines() {lengthSplines.clear();} + void ClearLengthSplines(); /** * @brief ClearLengthArcs clear length arcs */ - inline void ClearLengthArcs() {lengthArcs.clear();} + void ClearLengthArcs(); /** * @brief ClearLineAngles clear angles of lines */ - inline void ClearLineAngles() {lineAngles.clear();} - inline void ClearDetails() {details.clear();} + void ClearLineAngles(); + void ClearDetails(); /** * @brief SetSize set value of size * @param size value of size in mm */ - inline void SetSize(qint32 size) {base["Сг"] = size;} + void SetSize(qint32 size); /** * @brief SetGrowth set value of growth * @param growth value of growth in mm */ - inline void SetGrowth(qint32 growth) {base["Р"] = growth;} + void SetGrowth(qint32 growth); /** * @brief size return size * @return size in mm */ - inline qint32 size() const {return base.value("Сг");} + qint32 size() const; /** * @brief growth return growth * @return growth in mm */ - inline qint32 growth() const {return base.value("Р");} + qint32 growth() const; /** * @brief FindVar return value of variable by name * @param name name of variable @@ -314,7 +311,7 @@ public: * @param name name of row * @return true if contains */ - inline bool IncrementTableContains(const QString& name) {return incrementTable.contains(name);} + bool IncrementTableContains(const QString& name); /** * @brief getNextId generate next unique id * @return next unique id @@ -324,52 +321,52 @@ public: * @brief RemoveIncrementTableRow remove row by name from increment table * @param name name of existing row */ - inline void RemoveIncrementTableRow(const QString& name) {incrementTable.remove(name);} + void RemoveIncrementTableRow(const QString& name); /** * @brief data container with datagObjects return container of gObjects * @return pointer on container of gObjects */ - inline const QHash *DataGObjects() const {return &gObjects;} + const QHash *DataGObjects() const; /** * @brief data container with dataBase return container of data * @return pointer on container of base data */ - inline const QHash *DataBase() const {return &base;} + const QHash *DataBase() const; /** * @brief data container with dataStandardTable return container of standard table * @return pointer on container of standard table */ - inline const QHash *DataStandardTable() const {return &standardTable;} + const QHash *DataStandardTable() const; /** * @brief data container with dataIncrementTable return container of increment table * @return pointer on container of increment table */ - inline const QHash *DataIncrementTable() const {return &incrementTable;} + const QHash *DataIncrementTable() const; /** * @brief data container with dataLengthLines return container of lines lengths * @return pointer on container of lines lengths */ - inline const QHash *DataLengthLines() const {return &lengthLines;} + const QHash *DataLengthLines() const; /** * @brief data container with dataLengthSplines return container of splines lengths * @return pointer on container of splines lengths */ - inline const QHash *DataLengthSplines() const {return &lengthSplines;} + const QHash *DataLengthSplines() const; /** * @brief data container with dataLengthArcs return container of arcs length * @return pointer on container of arcs length */ - inline const QHash *DataLengthArcs() const {return &lengthArcs;} + const QHash *DataLengthArcs() const; /** * @brief data container with dataLineAngles return container of angles of line * @return pointer on container of angles of line */ - inline const QHash *DataLineAngles() const {return &lineAngles;} + const QHash *DataLineAngles() const; /** * @brief data container with dataDetails return container of details * @return pointer on container of details */ - inline const QHash *DataDetails() const {return &details;} + const QHash *DataDetails() const; /** * @brief UpdateId update id. If new id bigger when current save new like current. * @param newId id @@ -456,4 +453,124 @@ private: static quint32 AddObject(QHash &obj, val value); }; +inline void VContainer::AddStandardTableCell(const QString &name, const VStandardTableRow &cell) +{ + standardTable[name] = cell; +} + +inline void VContainer::UpdateStandardTableCell(const QString &name, VStandardTableRow cell) +{ + standardTable[name] = cell; +} + +inline void VContainer::UpdateIncrementTableRow(const QString &name, VIncrementTableRow row) +{ + incrementTable[name] = row; +} + +inline void VContainer::ClearIncrementTable() +{ + incrementTable.clear(); +} + +inline void VContainer::ClearLengthLines() +{ + lengthLines.clear(); +} + +inline void VContainer::ClearLengthSplines() +{ + lengthSplines.clear(); +} + +inline void VContainer::ClearLengthArcs() +{ + lengthArcs.clear(); +} + +inline void VContainer::ClearLineAngles() +{ + lineAngles.clear(); +} + +inline void VContainer::ClearDetails() +{ + details.clear(); +} + +inline void VContainer::SetSize(qint32 size) +{ + base["Сг"] = size; +} + +inline void VContainer::SetGrowth(qint32 growth) +{ + base["Р"] = growth; +} + +inline qint32 VContainer::size() const +{ + return base.value("Сг"); +} + +inline qint32 VContainer::growth() const +{ + return base.value("Р"); +} + +inline bool VContainer::IncrementTableContains(const QString &name) +{ + return incrementTable.contains(name); +} + +inline void VContainer::RemoveIncrementTableRow(const QString &name) +{ + incrementTable.remove(name); +} + +inline const QHash *VContainer::DataGObjects() const +{ + return &gObjects; +} + +inline const QHash *VContainer::DataBase() const +{ + return &base; +} + +inline const QHash *VContainer::DataStandardTable() const +{ + return &standardTable; +} + +inline const QHash *VContainer::DataIncrementTable() const +{ + return &incrementTable; +} + +inline const QHash *VContainer::DataLengthLines() const +{ + return &lengthLines; +} + +inline const QHash *VContainer::DataLengthSplines() const +{ + return &lengthSplines; +} + +inline const QHash *VContainer::DataLengthArcs() const +{ + return &lengthArcs; +} + +inline const QHash *VContainer::DataLineAngles() const +{ + return &lineAngles; +} + +inline const QHash *VContainer::DataDetails() const +{ + return &details; +} + #endif // VCONTAINER_H diff --git a/src/container/vincrementtablerow.h b/src/container/vincrementtablerow.h index e7572befd..b077d7940 100644 --- a/src/container/vincrementtablerow.h +++ b/src/container/vincrementtablerow.h @@ -55,52 +55,52 @@ public: * @brief getId return id of row * @return id */ - inline quint32 getId() const {return id;} + quint32 getId() const; /** * @brief setId set id of row * @param value id */ - inline void setId(const quint32 &value) {id = value;} + void setId(const quint32 &value); /** * @brief getBase return value in base size and growth * @return value */ - inline qreal getBase() const {return base;} + qreal getBase() const; /** * @brief setBase set value in base size and growth * @param value base value */ - inline void setBase(const qreal &value) {base = value;} + void setBase(const qreal &value); /** * @brief getKsize return increment in sizes * @return increment */ - inline qreal getKsize() const {return ksize;} + qreal getKsize() const; /** * @brief setKsize set increment in sizes * @param value value of increment */ - inline void setKsize(const qreal &value) {ksize = value;} + void setKsize(const qreal &value); /** * @brief getKgrowth return increment in growths * @return increment */ - inline qreal getKgrowth() const {return kgrowth;} + qreal getKgrowth() const; /** * @brief setKgrowth set increment in growths * @param value value of increment */ - inline void setKgrowth(const qreal &value) {kgrowth = value;} + void setKgrowth(const qreal &value); /** * @brief getDescription return description * @return description */ - inline QString getDescription() const {return description;} + QString getDescription() const; /** * @brief setDescription set description for row * @param value description */ - inline void setDescription(const QString &value) {description = value;} + void setDescription(const QString &value); private: /** * @brief id identificator @@ -124,4 +124,54 @@ private: QString description; }; +inline quint32 VIncrementTableRow::getId() const +{ + return id; +} + +inline void VIncrementTableRow::setId(const quint32 &value) +{ + id = value; +} + +inline qreal VIncrementTableRow::getBase() const +{ + return base; +} + +inline void VIncrementTableRow::setBase(const qreal &value) +{ + base = value; +} + +inline qreal VIncrementTableRow::getKsize() const +{ + return ksize; +} + +inline void VIncrementTableRow::setKsize(const qreal &value) +{ + ksize = value; +} + +inline qreal VIncrementTableRow::getKgrowth() const +{ + return kgrowth; +} + +inline void VIncrementTableRow::setKgrowth(const qreal &value) +{ + kgrowth = value; +} + +inline QString VIncrementTableRow::getDescription() const +{ + return description; +} + +inline void VIncrementTableRow::setDescription(const QString &value) +{ + description = value; +} + #endif // VINCREMENTTABLEROW_H diff --git a/src/container/vstandardtablerow.h b/src/container/vstandardtablerow.h index 7f6298392..5dafdbac6 100644 --- a/src/container/vstandardtablerow.h +++ b/src/container/vstandardtablerow.h @@ -55,22 +55,22 @@ public: * @brief GetBase return value in base size and growth * @return value */ - inline qint32 GetBase() const {return base;} + qint32 GetBase() const; /** * @brief GetKsize return increment in sizes * @return increment */ - inline qreal GetKsize() const {return ksize;} + qreal GetKsize() const; /** * @brief GetKgrowth return increment in growths * @return increment */ - inline qreal GetKgrowth() const {return kgrowth;} + qreal GetKgrowth() const; /** * @brief GetDescription return description * @return description */ - inline QString GetDescription() const {return description;} + QString GetDescription() const; private: /** * @brief base value in base size and growth @@ -90,4 +90,24 @@ private: QString description; }; +inline qint32 VStandardTableRow::GetBase() const +{ + return base; +} + +inline qreal VStandardTableRow::GetKsize() const +{ + return ksize; +} + +inline qreal VStandardTableRow::GetKgrowth() const +{ + return kgrowth; +} + +inline QString VStandardTableRow::GetDescription() const +{ + return description; +} + #endif // VSTANDARDTABLEROW_H diff --git a/src/dialogs/app/dialogindividualmeasurements.h b/src/dialogs/app/dialogindividualmeasurements.h index 2f122c8e4..0e87bb685 100644 --- a/src/dialogs/app/dialogindividualmeasurements.h +++ b/src/dialogs/app/dialogindividualmeasurements.h @@ -42,8 +42,8 @@ class DialogIndividualMeasurements : public QDialog public: explicit DialogIndividualMeasurements(QWidget *parent = 0); ~DialogIndividualMeasurements(); - inline QString name() const {return _name;} - inline QString tablePath() const{return _tablePath;} + QString name() const; + QString tablePath() const; private: Q_DISABLE_COPY(DialogIndividualMeasurements) Ui::DialogIndividualMeasurements *ui; @@ -54,4 +54,14 @@ private: void CheckState(); }; +inline QString DialogIndividualMeasurements::name() const +{ + return _name; +} + +inline QString DialogIndividualMeasurements::tablePath() const +{ + return _tablePath; +} + #endif // DIALOGINDIVIDUALMEASUREMENTS_H diff --git a/src/dialogs/tools/dialogalongline.h b/src/dialogs/tools/dialogalongline.h index 33dceade7..693328fb0 100644 --- a/src/dialogs/tools/dialogalongline.h +++ b/src/dialogs/tools/dialogalongline.h @@ -43,18 +43,18 @@ class DialogAlongLine : public DialogTool { Q_OBJECT public: - /** - * @brief DialogAlongLine create dialog - * @param data container with data - * @param parent parent widget - */ - DialogAlongLine(const VContainer *data, QWidget *parent = 0); - ~DialogAlongLine(); + /** + * @brief DialogAlongLine create dialog + * @param data container with data + * @param parent parent widget + */ + DialogAlongLine(const VContainer *data, QWidget *parent = 0); + ~DialogAlongLine(); /** * @brief getPointName return name of point * @return name */ - inline QString getPointName() const {return pointName;} + QString getPointName() const; /** * @brief setPointName set name of point * @param value name @@ -64,7 +64,7 @@ public: * @brief getTypeLine return type of line * @return type */ - inline QString getTypeLine() const {return typeLine;} + QString getTypeLine() const; /** * @brief setTypeLine set type of line * @param value type @@ -74,7 +74,7 @@ public: * @brief getFormula return string of formula * @return formula */ - inline QString getFormula() const {return formula;} + QString getFormula() const; /** * @brief setFormula set string of formula * @param value formula @@ -84,7 +84,7 @@ public: * @brief getFirstPointId return id first point of line * @return id */ - inline quint32 getFirstPointId() const {return firstPointId;} + quint32 getFirstPointId() const; /** * @brief setFirstPointId set id first point of line * @param value id @@ -95,7 +95,7 @@ public: * @brief getSecondPointId return id second point of line * @return id */ - inline quint32 getSecondPointId() const {return secondPointId;} + quint32 getSecondPointId() const; /** * @brief setSecondPointId set id second point of line * @param value id @@ -138,11 +138,36 @@ private: /** * @brief firstPointId id first point of line */ - quint32 firstPointId; + quint32 firstPointId; /** * @brief secondPointId id second point of line */ - quint32 secondPointId; + quint32 secondPointId; }; +inline QString DialogAlongLine::getPointName() const +{ + return pointName; +} + +inline QString DialogAlongLine::getTypeLine() const +{ + return typeLine; +} + +inline QString DialogAlongLine::getFormula() const +{ + return formula; +} + +inline quint32 DialogAlongLine::getFirstPointId() const +{ + return firstPointId; +} + +inline quint32 DialogAlongLine::getSecondPointId() const +{ + return secondPointId; +} + #endif // DIALOGALONGLINE_H diff --git a/src/dialogs/tools/dialogarc.h b/src/dialogs/tools/dialogarc.h index f712ffc19..f1366f9e1 100644 --- a/src/dialogs/tools/dialogarc.h +++ b/src/dialogs/tools/dialogarc.h @@ -43,164 +43,184 @@ class DialogArc : public DialogTool { Q_OBJECT public: - /** - * @brief DialogArc create dialog - * @param data container with data - * @param parent parent widget - */ - DialogArc(const VContainer *data, QWidget *parent = 0); - ~DialogArc(); + /** + * @brief DialogArc create dialog + * @param data container with data + * @param parent parent widget + */ + DialogArc(const VContainer *data, QWidget *parent = 0); + ~DialogArc(); /** * @brief GetCenter return id of center point * @return id id */ - inline quint32 GetCenter() const {return center;} + quint32 GetCenter() const; /** * @brief SetCenter set id of center point * @param value id */ - void SetCenter(const quint32 &value); + void SetCenter(const quint32 &value); /** * @brief GetRadius return formula of radius * @return formula */ - inline QString GetRadius() const {return radius;} + QString GetRadius() const; /** * @brief SetRadius set formula of radius * @param value formula */ - void SetRadius(const QString &value); + void SetRadius(const QString &value); /** * @brief GetF1 return formula first angle of arc * @return formula */ - inline QString GetF1() const {return f1;} + QString GetF1() const; /** * @brief SetF1 set formula first angle of arc * @param value formula */ - void SetF1(const QString &value); + void SetF1(const QString &value); /** * @brief GetF2 return formula second angle of arc * @return formula */ - inline QString GetF2() const {return f2;} + QString GetF2() const; /** * @brief SetF2 set formula second angle of arc * @param value formula */ - void SetF2(const QString &value); + void SetF2(const QString &value); public slots: /** * @brief ChoosedObject gets id and type of selected object. Save right data and ignore wrong. * @param id id of point or detail * @param type type of object */ - virtual void ChoosedObject(quint32 id, const Scene::Scenes &type); + virtual void ChoosedObject(quint32 id, const Scene::Scenes &type); /** * @brief DialogAccepted save data and emit signal about closed dialog. */ - virtual void DialogAccepted(); + virtual void DialogAccepted(); /** * @brief ValChenged show description angles of lines * @param row number of row */ - virtual void ValChenged(int row); + virtual void ValChenged(int row); /** * @brief PutRadius put variable into formula of radius */ - void PutRadius(); + void PutRadius(); /** * @brief PutF1 put variable into formula of first angle */ - void PutF1(); + void PutF1(); /** * @brief PutF2 put variable into formula of second angle */ - void PutF2(); + void PutF2(); /** * @brief LineAngles show variable angles of lines */ - void LineAngles(); + void LineAngles(); /** * @brief RadiusChanged after change formula of radius calculate value and show result */ - void RadiusChanged(); + void RadiusChanged(); /** * @brief F1Changed after change formula of first angle calculate value and show result */ - void F1Changed(); + void F1Changed(); /** * @brief F2Changed after change formula of second angle calculate value and show result */ - void F2Changed(); + void F2Changed(); protected: /** * @brief CheckState if all is right enable button ok */ - virtual void CheckState(); + virtual void CheckState(); private: Q_DISABLE_COPY(DialogArc) /** * @brief ui keeps information about user interface */ - Ui::DialogArc *ui; + Ui::DialogArc *ui; /** * @brief flagRadius true if value of radius is correct */ - bool flagRadius; + bool flagRadius; /** * @brief flagF1 true if value of first angle is correct */ - bool flagF1; + bool flagF1; /** * @brief flagF2 true if value of second angle is correct */ - bool flagF2; + bool flagF2; /** * @brief timerRadius timer of check formula of radius */ - QTimer *timerRadius; + QTimer *timerRadius; /** * @brief timerF1 timer of check formula of first angle */ - QTimer *timerF1; + QTimer *timerF1; /** * @brief timerF2 timer of check formula of second angle */ - QTimer *timerF2; + QTimer *timerF2; /** * @brief center id of center point */ - quint32 center; + quint32 center; /** * @brief radius formula of radius */ - QString radius; + QString radius; /** * @brief f1 formula of first angle */ - QString f1; + QString f1; /** * @brief f2 formula of second angle */ - QString f2; + QString f2; /** * @brief EvalRadius calculate value of radius */ - void EvalRadius(); + void EvalRadius(); /** * @brief EvalF1 calculate value of first angle */ - void EvalF1(); + void EvalF1(); /** * @brief EvalF2 calculate value of second angle */ - void EvalF2(); + void EvalF2(); /** * @brief ShowLineAngles show varibles angles of lines */ - void ShowLineAngles(); + void ShowLineAngles(); }; +inline quint32 DialogArc::GetCenter() const +{ + return center; +} + +inline QString DialogArc::GetRadius() const +{ + return radius; +} + +inline QString DialogArc::GetF1() const +{ + return f1; +} + +inline QString DialogArc::GetF2() const +{ + return f2; +} + #endif // DIALOGARC_H diff --git a/src/dialogs/tools/dialogbisector.h b/src/dialogs/tools/dialogbisector.h index f93466e1e..ba581956d 100644 --- a/src/dialogs/tools/dialogbisector.h +++ b/src/dialogs/tools/dialogbisector.h @@ -43,87 +43,87 @@ class DialogBisector : public DialogTool { Q_OBJECT public: - /** - * @brief DialogBisector create dialog - * @param data container with data - * @param parent parent widget - */ - DialogBisector(const VContainer *data, QWidget *parent = 0); - ~DialogBisector(); + /** + * @brief DialogBisector create dialog + * @param data container with data + * @param parent parent widget + */ + DialogBisector(const VContainer *data, QWidget *parent = 0); + ~DialogBisector(); /** * @brief getPointName return name of point * @return name */ - QString getPointName() const {return pointName;} + QString getPointName() const {return pointName;} /** * @brief setPointName set name of point * @param value name */ - void setPointName(const QString &value); + void setPointName(const QString &value); /** * @brief getTypeLine return type of line * @return type */ - inline QString getTypeLine() const {return typeLine;} + QString getTypeLine() const; /** * @brief setTypeLine set type of line * @param value type */ - void setTypeLine(const QString &value); + void setTypeLine(const QString &value); /** * @brief getFormula return string of formula * @return formula */ - inline QString getFormula() const {return formula;} + QString getFormula() const; /** * @brief setFormula set string of formula * @param value formula */ - void setFormula(const QString &value); + void setFormula(const QString &value); /** * @brief getFirstPointId return id of first point * @return id */ - inline quint32 getFirstPointId() const {return firstPointId;} + quint32 getFirstPointId() const; /** * @brief setFirstPointId set id of first point * @param value id * @param id don't show this id in list */ - void setFirstPointId(const quint32 &value, const quint32 &id); + void setFirstPointId(const quint32 &value, const quint32 &id); /** * @brief getSecondPointId return id of second point * @return id */ - inline quint32 getSecondPointId() const {return secondPointId;} + quint32 getSecondPointId() const; /** * @brief setSecondPointId set id of second point * @param value id * @param id don't show this id in list */ - void setSecondPointId(const quint32 &value, const quint32 &id); + void setSecondPointId(const quint32 &value, const quint32 &id); /** * @brief getThirdPointId return id of third point * @return id */ - inline quint32 getThirdPointId() const {return thirdPointId;} + quint32 getThirdPointId() const; /** * @brief setThirdPointId set id of third point * @param value id * @param id don't show this id in list */ - void setThirdPointId(const quint32 &value, const quint32 &id); + void setThirdPointId(const quint32 &value, const quint32 &id); public slots: /** * @brief ChoosedObject gets id and type of selected object. Save right data and ignore wrong. * @param id id of point or detail * @param type type of object */ - virtual void ChoosedObject(quint32 id, const Scene::Scenes &type); + virtual void ChoosedObject(quint32 id, const Scene::Scenes &type); /** * @brief DialogAccepted save data and emit signal about closed dialog. */ - virtual void DialogAccepted(); + virtual void DialogAccepted(); private: Q_DISABLE_COPY(DialogBisector) /** @@ -149,15 +149,40 @@ private: /** * @brief firstPointId id of first point */ - quint32 firstPointId; + quint32 firstPointId; /** * @brief secondPointId id of second point */ - quint32 secondPointId; + quint32 secondPointId; /** * @brief thirdPointId id of third point */ - quint32 thirdPointId; + quint32 thirdPointId; }; +inline QString DialogBisector::getTypeLine() const +{ + return typeLine; +} + +inline QString DialogBisector::getFormula() const +{ + return formula; +} + +inline quint32 DialogBisector::getFirstPointId() const +{ + return firstPointId; +} + +inline quint32 DialogBisector::getSecondPointId() const +{ + return secondPointId; +} + +inline quint32 DialogBisector::getThirdPointId() const +{ + return thirdPointId; +} + #endif // DIALOGBISECTOR_H diff --git a/src/dialogs/tools/dialogcutspline.h b/src/dialogs/tools/dialogcutspline.h index c429eeb73..c7e9ef3f5 100644 --- a/src/dialogs/tools/dialogcutspline.h +++ b/src/dialogs/tools/dialogcutspline.h @@ -54,44 +54,44 @@ public: * @brief getPointName return name of point * @return name */ - inline QString getPointName() const {return pointName;} + QString getPointName() const; /** * @brief setPointName set name of point * @param value name */ - void setPointName(const QString &value); + void setPointName(const QString &value); /** * @brief getFormula return string of formula * @return formula */ - inline QString getFormula() const {return formula;} + QString getFormula() const; /** * @brief setFormula set string of formula * @param value formula */ - void setFormula(const QString &value); + void setFormula(const QString &value); /** * @brief getSplineId return id base point of line * @return id */ - inline quint32 getSplineId() const {return splineId;} + quint32 getSplineId() const; /** * @brief setSplineId set id spline * @param value id * @param id don't show this id in list */ - void setSplineId(const quint32 &value, const quint32 &id); + void setSplineId(const quint32 &value, const quint32 &id); public slots: /** * @brief ChoosedObject gets id and type of selected object. Save right data and ignore wrong. * @param id id of point or detail * @param type type of object */ - virtual void ChoosedObject(quint32 id, const Scene::Scenes &type); + virtual void ChoosedObject(quint32 id, const Scene::Scenes &type); /** * @brief DialogAccepted save data and emit signal about closed dialog. */ - virtual void DialogAccepted(); + virtual void DialogAccepted(); private: Q_DISABLE_COPY(DialogCutSpline) /** @@ -101,15 +101,30 @@ private: /** * @brief pointName name of created point */ - QString pointName; + QString pointName; /** * @brief formula string with formula */ - QString formula; + QString formula; /** * @brief splineId keep id of spline */ - quint32 splineId; + quint32 splineId; }; +inline QString DialogCutSpline::getPointName() const +{ + return pointName; +} + +inline QString DialogCutSpline::getFormula() const +{ + return formula; +} + +inline quint32 DialogCutSpline::getSplineId() const +{ + return splineId; +} + #endif // DIALOGCUTSPLINE_H diff --git a/src/dialogs/tools/dialogcutsplinepath.h b/src/dialogs/tools/dialogcutsplinepath.h index 6c19e15bb..0137e7f6c 100644 --- a/src/dialogs/tools/dialogcutsplinepath.h +++ b/src/dialogs/tools/dialogcutsplinepath.h @@ -54,44 +54,44 @@ public: * @brief getPointName return name of point * @return name */ - inline QString getPointName() const {return pointName;} + QString getPointName() const; /** * @brief setPointName set name of point * @param value name */ - void setPointName(const QString &value); + void setPointName(const QString &value); /** * @brief getFormula return string of formula * @return formula */ - inline QString getFormula() const {return formula;} + QString getFormula() const; /** * @brief setFormula set string of formula * @param value formula */ - void setFormula(const QString &value); + void setFormula(const QString &value); /** * @brief getSplineId return id base point of line * @return id */ - inline quint32 getSplinePathId() const {return splinePathId;} + quint32 getSplinePathId() const; /** * @brief setSplineId set id spline * @param value id * @param id don't show this id in list */ - void setSplinePathId(const quint32 &value, const quint32 &id); + void setSplinePathId(const quint32 &value, const quint32 &id); public slots: /** * @brief ChoosedObject gets id and type of selected object. Save right data and ignore wrong. * @param id id of point or detail * @param type type of object */ - virtual void ChoosedObject(quint32 id, const Scene::Scenes &type); + virtual void ChoosedObject(quint32 id, const Scene::Scenes &type); /** * @brief DialogAccepted save data and emit signal about closed dialog. */ - virtual void DialogAccepted(); + virtual void DialogAccepted(); private: Q_DISABLE_COPY(DialogCutSplinePath) /** @@ -101,15 +101,30 @@ private: /** * @brief pointName name of created point */ - QString pointName; + QString pointName; /** * @brief formula string with formula */ - QString formula; + QString formula; /** * @brief splinePathId keep id of splinePath */ - quint32 splinePathId; + quint32 splinePathId; }; +inline QString DialogCutSplinePath::getPointName() const +{ + return pointName; +} + +inline QString DialogCutSplinePath::getFormula() const +{ + return formula; +} + +inline quint32 DialogCutSplinePath::getSplinePathId() const +{ + return splinePathId; +} + #endif // DIALOGCUTSPLINEPATH_H diff --git a/src/dialogs/tools/dialogdetail.h b/src/dialogs/tools/dialogdetail.h index 0ddd2a653..fec51637f 100644 --- a/src/dialogs/tools/dialogdetail.h +++ b/src/dialogs/tools/dialogdetail.h @@ -49,7 +49,7 @@ public: * @brief getDetails return detail * @return detail */ - inline VDetail getDetails() const {return details;} + VDetail getDetails() const; /** * @brief setDetails set detail * @param value detail @@ -125,4 +125,9 @@ private: qreal mx = 0, qreal my = 0); }; +inline VDetail DialogDetail::getDetails() const +{ + return details; +} + #endif // DIALOGDETAIL_H diff --git a/src/dialogs/tools/dialogendline.h b/src/dialogs/tools/dialogendline.h index 4426170d8..8bfcc1d6b 100644 --- a/src/dialogs/tools/dialogendline.h +++ b/src/dialogs/tools/dialogendline.h @@ -43,18 +43,18 @@ class DialogEndLine : public DialogTool { Q_OBJECT public: - /** - * @brief DialogEndLine create dialog - * @param data container with data - * @param parent parent widget - */ - DialogEndLine(const VContainer *data, QWidget *parent = 0); - ~DialogEndLine(); + /** + * @brief DialogEndLine create dialog + * @param data container with data + * @param parent parent widget + */ + DialogEndLine(const VContainer *data, QWidget *parent = 0); + ~DialogEndLine(); /** * @brief getPointName return name of point * @return name */ - inline QString getPointName() const {return pointName;} + QString getPointName() const; /** * @brief setPointName set name of point * @param value name @@ -64,7 +64,7 @@ public: * @brief getTypeLine return type of line * @return type */ - inline QString getTypeLine() const {return typeLine;} + QString getTypeLine() const; /** * @brief setTypeLine set type of line * @param value type @@ -74,7 +74,7 @@ public: * @brief getFormula return string of formula * @return formula */ - inline QString getFormula() const {return formula;} + QString getFormula() const; /** * @brief setFormula set string of formula * @param value formula @@ -84,7 +84,7 @@ public: * @brief getAngle return angle of line * @return angle in degree */ - inline qreal getAngle() const {return angle;} + qreal getAngle() const; /** * @brief setAngle set angle of line * @param value angle in degree @@ -94,7 +94,7 @@ public: * @brief getBasePointId return id base point of line * @return id */ - inline quint32 getBasePointId() const {return basePointId;} + quint32 getBasePointId() const; /** * @brief setBasePointId set id base point of line * @param value id @@ -140,4 +140,29 @@ private: quint32 basePointId; }; +inline QString DialogEndLine::getPointName() const +{ + return pointName; +} + +inline QString DialogEndLine::getTypeLine() const +{ + return typeLine; +} + +inline QString DialogEndLine::getFormula() const +{ + return formula; +} + +inline qreal DialogEndLine::getAngle() const +{ + return angle; +} + +inline quint32 DialogEndLine::getBasePointId() const +{ + return basePointId; +} + #endif // DIALOGENDLINE_H diff --git a/src/dialogs/tools/dialogheight.h b/src/dialogs/tools/dialogheight.h index f767c6205..9c718d626 100644 --- a/src/dialogs/tools/dialogheight.h +++ b/src/dialogs/tools/dialogheight.h @@ -43,18 +43,18 @@ class DialogHeight : public DialogTool { Q_OBJECT public: - /** - * @brief DialogHeight create dialog - * @param data container with data - * @param parent parent widget - */ - DialogHeight(const VContainer *data, QWidget *parent = 0); - ~DialogHeight(); + /** + * @brief DialogHeight create dialog + * @param data container with data + * @param parent parent widget + */ + DialogHeight(const VContainer *data, QWidget *parent = 0); + ~DialogHeight(); /** * @brief getPointName return name of point * @return name */ - inline QString getPointName() const {return pointName;} + QString getPointName() const; /** * @brief setPointName set name of point * @param value name @@ -64,7 +64,7 @@ public: * @brief getTypeLine return type of line * @return type */ - inline QString getTypeLine() const {return typeLine;} + QString getTypeLine() const; /** * @brief setTypeLine set type of line * @param value type @@ -74,7 +74,7 @@ public: * @brief getBasePointId return id base point of height * @return id */ - inline quint32 getBasePointId() const {return basePointId;} + quint32 getBasePointId() const; /** * @brief setBasePointId set id base point of height * @param value id @@ -85,7 +85,7 @@ public: * @brief getP1LineId return id first point of line * @return id id */ - inline quint32 getP1LineId() const {return p1LineId;} + quint32 getP1LineId() const; /** * @brief setP1LineId set id first point of line * @param value id @@ -96,7 +96,7 @@ public: * @brief getP2LineId return id second point of line * @return id */ - inline quint32 getP2LineId() const{return p2LineId;} + quint32 getP2LineId() const; /** * @brief setP2LineId set id second point of line * @param value id @@ -146,4 +146,29 @@ private: quint32 p2LineId; }; +inline QString DialogHeight::getPointName() const +{ + return pointName; +} + +inline QString DialogHeight::getTypeLine() const +{ + return typeLine; +} + +inline quint32 DialogHeight::getBasePointId() const +{ + return basePointId; +} + +inline quint32 DialogHeight::getP1LineId() const +{ + return p1LineId; +} + +inline quint32 DialogHeight::getP2LineId() const +{ + return p2LineId; +} + #endif // DIALOGHEIGHT_H diff --git a/src/dialogs/tools/dialogline.h b/src/dialogs/tools/dialogline.h index f5b400379..ec53ffcdf 100644 --- a/src/dialogs/tools/dialogline.h +++ b/src/dialogs/tools/dialogline.h @@ -43,76 +43,91 @@ class DialogLine : public DialogTool { Q_OBJECT public: - /** - * @brief DialogLine create dialog - * @param data container with data - * @param parent parent widget - */ - DialogLine(const VContainer *data, QWidget *parent = 0); - ~DialogLine(); + /** + * @brief DialogLine create dialog + * @param data container with data + * @param parent parent widget + */ + DialogLine(const VContainer *data, QWidget *parent = 0); + ~DialogLine(); /** * @brief getFirstPoint return id first point * @return id */ - inline quint32 getFirstPoint() const {return firstPoint;} + quint32 getFirstPoint() const; /** * @brief setFirstPoint set id first point * @param value id */ - void setFirstPoint(const quint32 &value); + void setFirstPoint(const quint32 &value); /** * @brief getSecondPoint return id second point * @return id */ - inline quint32 getSecondPoint() const {return secondPoint;} + quint32 getSecondPoint() const; /** * @brief setSecondPoint set id second point * @param value id */ - void setSecondPoint(const quint32 &value); + void setSecondPoint(const quint32 &value); /** * @brief getTypeLine return type of line * @return type */ - inline QString getTypeLine() const {return typeLine;} + QString getTypeLine() const; /** * @brief setTypeLine set type of line * @param value type */ - void setTypeLine(const QString &value); + void setTypeLine(const QString &value); public slots: /** * @brief ChoosedObject gets id and type of selected object. Save right data and ignore wrong. * @param id id of point or detail * @param type type of object */ - virtual void ChoosedObject(quint32 id, const Scene::Scenes &type); + virtual void ChoosedObject(quint32 id, const Scene::Scenes &type); /** * @brief DialogAccepted save data and emit signal about closed dialog. */ - virtual void DialogAccepted(); + virtual void DialogAccepted(); private: Q_DISABLE_COPY(DialogLine) /** * @brief ui keeps information about user interface */ - Ui::DialogLine *ui; + Ui::DialogLine *ui; /** * @brief number number of handled objects */ - qint32 number; + qint32 number; /** * @brief firstPoint id first point */ - quint32 firstPoint; + quint32 firstPoint; /** * @brief secondPoint id second point */ - quint32 secondPoint; + quint32 secondPoint; /** * @brief typeLine type of line */ - QString typeLine; + QString typeLine; }; +inline quint32 DialogLine::getFirstPoint() const +{ + return firstPoint; +} + +inline quint32 DialogLine::getSecondPoint() const +{ + return secondPoint; +} + +inline QString DialogLine::getTypeLine() const +{ + return typeLine; +} + #endif // DIALOGLINE_H diff --git a/src/dialogs/tools/dialoglineintersect.h b/src/dialogs/tools/dialoglineintersect.h index bfc0c0888..dc0edbf22 100644 --- a/src/dialogs/tools/dialoglineintersect.h +++ b/src/dialogs/tools/dialoglineintersect.h @@ -43,18 +43,18 @@ class DialogLineIntersect : public DialogTool { Q_OBJECT public: - /** - * @brief DialogLineIntersect create dialog - * @param data container with data - * @param parent parent widget - */ - DialogLineIntersect(const VContainer *data, QWidget *parent = 0); - ~DialogLineIntersect(); + /** + * @brief DialogLineIntersect create dialog + * @param data container with data + * @param parent parent widget + */ + DialogLineIntersect(const VContainer *data, QWidget *parent = 0); + ~DialogLineIntersect(); /** * @brief getP1Line1 return id first point of first line * @return id */ - inline quint32 getP1Line1() const {return p1Line1;} + quint32 getP1Line1() const; /** * @brief setP1Line1 set id first point of first line * @param value id @@ -64,7 +64,7 @@ public: * @brief getP2Line1 return id second point of first line * @return id */ - inline quint32 getP2Line1() const {return p2Line1;} + quint32 getP2Line1() const; /** * @brief setP2Line1 set id second point of first line * @param value id @@ -74,7 +74,7 @@ public: * @brief getP1Line2 return id first point of second line * @return id */ - inline quint32 getP1Line2() const {return p1Line2;} + quint32 getP1Line2() const; /** * @brief setP1Line2 set id first point of second line * @param value id @@ -84,7 +84,7 @@ public: * @brief getP2Line2 return id second point of second line * @return id */ - inline quint32 getP2Line2() const {return p2Line2;} + quint32 getP2Line2() const; /** * @brief setP2Line2 set id second point of second line * @param value id @@ -94,7 +94,7 @@ public: * @brief getPointName return name of point * @return */ - inline QString getPointName() const {return pointName;} + QString getPointName() const; /** * @brief setPointName set name of point * @param value @@ -176,4 +176,29 @@ private: bool CheckIntersecion(); }; +inline quint32 DialogLineIntersect::getP1Line1() const +{ + return p1Line1; +} + +inline quint32 DialogLineIntersect::getP2Line1() const +{ + return p2Line1; +} + +inline quint32 DialogLineIntersect::getP1Line2() const +{ + return p1Line2; +} + +inline quint32 DialogLineIntersect::getP2Line2() const +{ + return p2Line2; +} + +inline QString DialogLineIntersect::getPointName() const +{ + return pointName; +} + #endif // DIALOGLINEINTERSECT_H diff --git a/src/dialogs/tools/dialognormal.h b/src/dialogs/tools/dialognormal.h index 5bf0459b5..11aef3280 100644 --- a/src/dialogs/tools/dialognormal.h +++ b/src/dialogs/tools/dialognormal.h @@ -43,18 +43,18 @@ class DialogNormal : public DialogTool { Q_OBJECT public: - /** - * @brief DialogNormal create dialog - * @param data container with data - * @param parent parent widget - */ - DialogNormal(const VContainer *data, QWidget *parent = 0); - ~DialogNormal(); + /** + * @brief DialogNormal create dialog + * @param data container with data + * @param parent parent widget + */ + DialogNormal(const VContainer *data, QWidget *parent = 0); + ~DialogNormal(); /** * @brief getPointName return name of point * @return name */ - inline QString getPointName() const{return pointName;} + QString getPointName() const; /** * @brief setPointName set name of point * @param value name @@ -64,7 +64,7 @@ public: * @brief getTypeLine return type of line * @return type */ - inline QString getTypeLine() const {return typeLine;} + QString getTypeLine() const; /** * @brief setTypeLine set type of line * @param value type @@ -74,7 +74,7 @@ public: * @brief getFormula return string of formula * @return formula */ - inline QString getFormula() const {return formula;} + QString getFormula() const; /** * @brief setFormula set string of formula * @param value formula @@ -84,7 +84,7 @@ public: * @brief getAngle return aditional angle of normal * @return angle in degree */ - inline qreal getAngle() const {return angle;} + qreal getAngle() const; /** * @brief setAngle set aditional angle of normal * @param value angle in degree @@ -94,7 +94,7 @@ public: * @brief getFirstPointId return id of first point * @return id */ - inline quint32 getFirstPointId() const {return firstPointId;} + quint32 getFirstPointId() const; /** * @brief setFirstPointId set id of first point * @param value id @@ -105,7 +105,7 @@ public: * @brief getSecondPointId return id of second point * @return id */ - inline quint32 getSecondPointId() const {return secondPointId;} + quint32 getSecondPointId() const; /** * @brief setSecondPointId set id of second point * @param value id @@ -152,11 +152,41 @@ private: /** * @brief firstPointId id first point of line */ - quint32 firstPointId; + quint32 firstPointId; /** * @brief secondPointId id second point of line */ - quint32 secondPointId; + quint32 secondPointId; }; +inline QString DialogNormal::getPointName() const +{ + return pointName; +} + +inline QString DialogNormal::getTypeLine() const +{ + return typeLine; +} + +inline QString DialogNormal::getFormula() const +{ + return formula; +} + +inline qreal DialogNormal::getAngle() const +{ + return angle; +} + +inline quint32 DialogNormal::getFirstPointId() const +{ + return firstPointId; +} + +inline quint32 DialogNormal::getSecondPointId() const +{ + return secondPointId; +} + #endif // DIALOGNORMAL_H diff --git a/src/dialogs/tools/dialogpointofcontact.h b/src/dialogs/tools/dialogpointofcontact.h index 75a2d6a13..f6a80ab6c 100644 --- a/src/dialogs/tools/dialogpointofcontact.h +++ b/src/dialogs/tools/dialogpointofcontact.h @@ -39,17 +39,17 @@ class DialogPointOfContact : public DialogTool { Q_OBJECT public: - /** - * @brief DialogPointOfContact create dialog - * @param data container with data - * @param parent parent widget - */ - DialogPointOfContact(const VContainer *data, QWidget *parent = 0); + /** + * @brief DialogPointOfContact create dialog + * @param data container with data + * @param parent parent widget + */ + DialogPointOfContact(const VContainer *data, QWidget *parent = 0); /** * @brief getPointName return name of point * @return name */ - inline QString getPointName() const {return pointName;} + QString getPointName() const; /** * @brief setPointName set name of point * @param value name @@ -59,7 +59,7 @@ public: * @brief getRadius return formula radius of arc * @return formula */ - inline QString getRadius() const {return radius;} + QString getRadius() const; /** * @brief setRadius set formula radius of arc * @param value formula @@ -69,7 +69,7 @@ public: * @brief GetCenter return id of center point * @return id */ - inline quint32 getCenter() const {return center;} + quint32 getCenter() const; /** * @brief SetCenter set id of center point * @param value id @@ -80,7 +80,7 @@ public: * @brief getFirstPoint return id first point * @return id */ - inline quint32 getFirstPoint() const {return firstPoint;} + quint32 getFirstPoint() const; /** * @brief setFirstPoint set id first point * @param value id @@ -91,7 +91,7 @@ public: * @brief getSecondPoint return id second point * @return id */ - inline quint32 getSecondPoint() const {return secondPoint;} + quint32 getSecondPoint() const; /** * @brief setSecondPoint set id second point * @param value id @@ -141,4 +141,29 @@ private: quint32 secondPoint; }; +inline QString DialogPointOfContact::getPointName() const +{ + return pointName; +} + +inline QString DialogPointOfContact::getRadius() const +{ + return radius; +} + +inline quint32 DialogPointOfContact::getCenter() const +{ + return center; +} + +inline quint32 DialogPointOfContact::getFirstPoint() const +{ + return firstPoint; +} + +inline quint32 DialogPointOfContact::getSecondPoint() const +{ + return secondPoint; +} + #endif // DIALOGPOINTOFCONTACT_H diff --git a/src/dialogs/tools/dialogpointofintersection.h b/src/dialogs/tools/dialogpointofintersection.h index 6798bd3ca..dfa8d51c4 100644 --- a/src/dialogs/tools/dialogpointofintersection.h +++ b/src/dialogs/tools/dialogpointofintersection.h @@ -43,18 +43,18 @@ class DialogPointOfIntersection : public DialogTool { Q_OBJECT public: - /** - * @brief DialogPointOfIntersection create dialog - * @param data container with data - * @param parent parent widget - */ - DialogPointOfIntersection(const VContainer *data, QWidget *parent = 0); - ~DialogPointOfIntersection(); + /** + * @brief DialogPointOfIntersection create dialog + * @param data container with data + * @param parent parent widget + */ + DialogPointOfIntersection(const VContainer *data, QWidget *parent = 0); + ~DialogPointOfIntersection(); /** * @brief getPointName return name of point * @return name */ - inline QString getPointName() const {return pointName;} + QString getPointName() const; /** * @brief setPointName set name of point * @param value name @@ -64,7 +64,7 @@ public: * @brief getFirstPointId return id of first point * @return id */ - inline quint32 getFirstPointId() const {return firstPointId;} + quint32 getFirstPointId() const; /** * @brief setFirstPointId set id of first point * @param value id @@ -75,7 +75,7 @@ public: * @brief getSecondPointId return id of second point * @return id */ - inline quint32 getSecondPointId() const {return secondPointId;} + quint32 getSecondPointId() const; /** * @brief setSecondPointId set id of second point * @param value id @@ -110,11 +110,26 @@ private: /** * @brief firstPointId id first point of line */ - quint32 firstPointId; + quint32 firstPointId; /** * @brief secondPointId id second point of line */ - quint32 secondPointId; + quint32 secondPointId; }; +inline QString DialogPointOfIntersection::getPointName() const +{ + return pointName; +} + +inline quint32 DialogPointOfIntersection::getFirstPointId() const +{ + return firstPointId; +} + +inline quint32 DialogPointOfIntersection::getSecondPointId() const +{ + return secondPointId; +} + #endif // DIALOGPOINTOFINTERSECTION_H diff --git a/src/dialogs/tools/dialogshoulderpoint.h b/src/dialogs/tools/dialogshoulderpoint.h index c456ebc68..642f742d3 100644 --- a/src/dialogs/tools/dialogshoulderpoint.h +++ b/src/dialogs/tools/dialogshoulderpoint.h @@ -43,18 +43,18 @@ class DialogShoulderPoint : public DialogTool { Q_OBJECT public: - /** - * @brief DialogShoulderPoint create dialog - * @param data container with data - * @param parent parent widget - */ - DialogShoulderPoint(const VContainer *data, QWidget *parent = 0); - ~DialogShoulderPoint(); + /** + * @brief DialogShoulderPoint create dialog + * @param data container with data + * @param parent parent widget + */ + DialogShoulderPoint(const VContainer *data, QWidget *parent = 0); + ~DialogShoulderPoint(); /** * @brief getPointName return name of point * @return name */ - inline QString getPointName() const {return pointName;} + QString getPointName() const; /** * @brief setPointName set name of point * @param value name @@ -64,7 +64,7 @@ public: * @brief getTypeLine return type of line * @return type */ - inline QString getTypeLine() const {return typeLine;} + QString getTypeLine() const; /** * @brief setTypeLine set type of line * @param value type @@ -74,7 +74,7 @@ public: * @brief getFormula return string of formula * @return formula */ - inline QString getFormula() const {return formula;} + QString getFormula() const; /** * @brief setFormula set string of formula * @param value formula @@ -84,7 +84,7 @@ public: * @brief getP1Line return id first point of line * @return id */ - inline quint32 getP1Line() const {return p1Line;} + quint32 getP1Line() const; /** * @brief setP1Line set id first point of line * @param value id @@ -95,7 +95,7 @@ public: * @brief getP2Line return id second point of line * @return id */ - inline quint32 getP2Line() const {return p2Line;} + quint32 getP2Line() const; /** * @brief setP2Line set id second point of line * @param value id @@ -106,7 +106,7 @@ public: * @brief getPShoulder return id shoulder point * @return id */ - inline quint32 getPShoulder() const {return pShoulder;} + quint32 getPShoulder() const; /** * @brief setPShoulder set id shoulder point * @param value id @@ -160,4 +160,34 @@ private: quint32 pShoulder; }; +inline QString DialogShoulderPoint::getPointName() const +{ + return pointName; +} + +inline QString DialogShoulderPoint::getTypeLine() const +{ + return typeLine; +} + +inline QString DialogShoulderPoint::getFormula() const +{ + return formula; +} + +inline quint32 DialogShoulderPoint::getP1Line() const +{ + return p1Line; +} + +inline quint32 DialogShoulderPoint::getP2Line() const +{ + return p2Line; +} + +inline quint32 DialogShoulderPoint::getPShoulder() const +{ + return pShoulder; +} + #endif // DIALOGSHOULDERPOINT_H diff --git a/src/dialogs/tools/dialogsinglepoint.h b/src/dialogs/tools/dialogsinglepoint.h index ac667adc5..f3d4d6e33 100644 --- a/src/dialogs/tools/dialogsinglepoint.h +++ b/src/dialogs/tools/dialogsinglepoint.h @@ -43,12 +43,13 @@ class DialogSinglePoint : public DialogTool { Q_OBJECT public: - /** - * @brief DialogSinglePoint create dialog - * @param data container with data - * @param parent parent widget - */ - DialogSinglePoint(const VContainer *data, QWidget *parent = 0); + /** + * @brief DialogSinglePoint create dialog + * @param data container with data + * @param parent parent widget + */ + DialogSinglePoint(const VContainer *data, QWidget *parent = 0); + ~DialogSinglePoint(); /** * @brief setData set name and point * @param name name of point @@ -59,13 +60,12 @@ public: * @brief getName return name * @return name */ - inline QString getName()const {return name;} + QString getName()const; /** * @brief getPoint return point * @return point */ - inline QPointF getPoint()const {return point;} - ~DialogSinglePoint(); + QPointF getPoint()const; public slots: /** * @brief mousePress get mouse position @@ -92,4 +92,14 @@ private: QPointF point; }; +inline QString DialogSinglePoint::getName() const +{ + return name; +} + +inline QPointF DialogSinglePoint::getPoint() const +{ + return point; +} + #endif // DIALOGSINGLEPOINT_H diff --git a/src/dialogs/tools/dialogspline.h b/src/dialogs/tools/dialogspline.h index 281d28ea8..40e0bebac 100644 --- a/src/dialogs/tools/dialogspline.h +++ b/src/dialogs/tools/dialogspline.h @@ -43,13 +43,13 @@ class DialogSpline : public DialogTool { Q_OBJECT public: - /** - * @brief DialogSpline create dialog - * @param data container with data - * @param parent parent widget - */ - DialogSpline(const VContainer *data, QWidget *parent = 0); - ~DialogSpline(); + /** + * @brief DialogSpline create dialog + * @param data container with data + * @param parent parent widget + */ + DialogSpline(const VContainer *data, QWidget *parent = 0); + ~DialogSpline(); /** * @brief getP1 return id first point of spline * @return id @@ -74,7 +74,7 @@ public: * @brief getAngle1 return first angle of spline * @return angle in degree */ - inline qreal getAngle1() const {return angle1;} + qreal getAngle1() const; /** * @brief setAngle1 set first angle of spline * @param value angle in degree @@ -84,7 +84,7 @@ public: * @brief getAngle2 return second angle of spline * @return angle in degree */ - inline qreal getAngle2() const {return angle2;} + qreal getAngle2() const; /** * @brief setAngle2 set second angle of spline * @param value angle in degree @@ -94,7 +94,7 @@ public: * @brief getKAsm1 return first coefficient asymmetry * @return value. Can be >= 0. */ - inline qreal getKAsm1() const {return kAsm1;} + qreal getKAsm1() const; /** * @brief setKAsm1 set first coefficient asymmetry * @param value value. Can be >= 0. @@ -104,7 +104,7 @@ public: * @brief getKAsm2 return second coefficient asymmetry * @return value. Can be >= 0. */ - inline qreal getKAsm2() const {return kAsm2;} + qreal getKAsm2() const; /** * @brief setKAsm2 set second coefficient asymmetry * @param value value. Can be >= 0. @@ -114,7 +114,7 @@ public: * @brief getKCurve return coefficient curve * @return value. Can be >= 0. */ - inline qreal getKCurve() const {return kCurve;} + qreal getKCurve() const; /** * @brief setKCurve set coefficient curve * @param value value. Can be >= 0. @@ -171,4 +171,29 @@ private: qreal kCurve; }; +inline qreal DialogSpline::getAngle1() const +{ + return angle1; +} + +inline qreal DialogSpline::getAngle2() const +{ + return angle2; +} + +inline qreal DialogSpline::getKAsm1() const +{ + return kAsm1; +} + +inline qreal DialogSpline::getKAsm2() const +{ + return kAsm2; +} + +inline qreal DialogSpline::getKCurve() const +{ + return kCurve; +} + #endif // DIALOGSPLINE_H diff --git a/src/dialogs/tools/dialogsplinepath.h b/src/dialogs/tools/dialogsplinepath.h index 5d9ab2ec6..5024c143a 100644 --- a/src/dialogs/tools/dialogsplinepath.h +++ b/src/dialogs/tools/dialogsplinepath.h @@ -44,18 +44,18 @@ class DialogSplinePath : public DialogTool { Q_OBJECT public: - /** - * @brief DialogSplinePath create dialog - * @param data container with data - * @param parent parent widget - */ - DialogSplinePath(const VContainer *data, QWidget *parent = 0); - ~DialogSplinePath(); + /** + * @brief DialogSplinePath create dialog + * @param data container with data + * @param parent parent widget + */ + DialogSplinePath(const VContainer *data, QWidget *parent = 0); + ~DialogSplinePath(); /** * @brief GetPath return spline path * @return path */ - inline VSplinePath GetPath() const {return path;} + VSplinePath GetPath() const; /** * @brief SetPath set spline path * @param value path @@ -136,4 +136,9 @@ private: void EnableFields(); }; +inline VSplinePath DialogSplinePath::GetPath() const +{ + return path; +} + #endif // DIALOGSPLINEPATH_H diff --git a/src/dialogs/tools/dialogtriangle.h b/src/dialogs/tools/dialogtriangle.h index 964921d70..c1667fc43 100644 --- a/src/dialogs/tools/dialogtriangle.h +++ b/src/dialogs/tools/dialogtriangle.h @@ -43,18 +43,18 @@ class DialogTriangle : public DialogTool { Q_OBJECT public: - /** - * @brief DialogTriangle create dialog - * @param data container with data - * @param parent parent widget - */ - DialogTriangle(const VContainer *data, QWidget *parent = 0); - ~DialogTriangle(); + /** + * @brief DialogTriangle create dialog + * @param data container with data + * @param parent parent widget + */ + DialogTriangle(const VContainer *data, QWidget *parent = 0); + ~DialogTriangle(); /** * @brief getAxisP1Id return id first point of axis * @return id */ - inline quint32 getAxisP1Id() const {return axisP1Id;} + quint32 getAxisP1Id() const; /** * @brief setAxisP1Id set id first point of axis * @param value id @@ -65,7 +65,7 @@ public: * @brief getAxisP2Id return id second point of axis * @return id */ - inline quint32 getAxisP2Id() const {return axisP2Id;} + quint32 getAxisP2Id() const; /** * @brief setAxisP2Id set id second point of axis * @param value id @@ -76,7 +76,7 @@ public: * @brief getFirstPointId return id of first point * @return id */ - inline quint32 getFirstPointId() const {return firstPointId;} + quint32 getFirstPointId() const; /** * @brief setFirstPointId set id of first point * @param value id @@ -87,7 +87,7 @@ public: * @brief getSecondPointId return id of second point * @return id */ - inline quint32 getSecondPointId() const {return secondPointId;} + quint32 getSecondPointId() const; /** * @brief setSecondPointId set id of second point * @param value id @@ -98,7 +98,7 @@ public: * @brief getPointName return name of point * @return name */ - inline QString getPointName() const {return pointName;} + QString getPointName() const; /** * @brief setPointName set name of point * @param value name @@ -147,4 +147,29 @@ private: quint32 secondPointId; }; +inline quint32 DialogTriangle::getAxisP1Id() const +{ + return axisP1Id; +} + +inline quint32 DialogTriangle::getAxisP2Id() const +{ + return axisP2Id; +} + +inline quint32 DialogTriangle::getFirstPointId() const +{ + return firstPointId; +} + +inline quint32 DialogTriangle::getSecondPointId() const +{ + return secondPointId; +} + +inline QString DialogTriangle::getPointName() const +{ + return pointName; +} + #endif // DIALOGTRIANGLE_H diff --git a/src/dialogs/tools/dialoguniondetails.h b/src/dialogs/tools/dialoguniondetails.h index c165436ab..a525c0aba 100644 --- a/src/dialogs/tools/dialoguniondetails.h +++ b/src/dialogs/tools/dialoguniondetails.h @@ -54,22 +54,22 @@ public: * @brief getD1 return id first detail * @return id */ - inline quint32 getD1() const {return d1;} + quint32 getD1() const; /** * @brief getD2 return id second detail * @return id */ - inline quint32 getD2() const {return d2;} + quint32 getD2() const; /** * @brief getIndexD1 return index edge first detail * @return index */ - inline ptrdiff_t getIndexD1() const {return indexD1;} + ptrdiff_t getIndexD1() const; /** * @brief getIndexD2 return index edge second detail * @return index */ - inline ptrdiff_t getIndexD2() const {return indexD2;} + ptrdiff_t getIndexD2() const; public slots: /** * @brief ChoosedObject gets id and type of selected object. Save correct data and ignore wrong. @@ -136,4 +136,24 @@ private: void ChoosedDetail(const quint32 &id, const Scene::Scenes &type, quint32 &idDetail, ptrdiff_t &index); }; +inline quint32 DialogUnionDetails::getD1() const +{ + return d1; +} + +inline quint32 DialogUnionDetails::getD2() const +{ + return d2; +} + +inline ptrdiff_t DialogUnionDetails::getIndexD1() const +{ + return indexD1; +} + +inline ptrdiff_t DialogUnionDetails::getIndexD2() const +{ + return indexD2; +} + #endif // DIALOGUNIONDETAILS_H diff --git a/src/exception/vexception.h b/src/exception/vexception.h index 6eea96e64..e25f6b9f1 100644 --- a/src/exception/vexception.h +++ b/src/exception/vexception.h @@ -54,37 +54,52 @@ public: /** * @brief raise method raise for exception */ - inline void raise() const { throw *this; } + void raise() const; /** * @brief clone clone exception * @return new exception */ - inline VException *clone() const { return new VException(*this); } + VException *clone() const; /** * @brief ErrorMessage return main error message * @return error message */ - virtual QString ErrorMessage() const; + virtual QString ErrorMessage() const; /** * @brief DetailedInformation return detailed information about error * @return detailed information */ - virtual QString DetailedInformation() const { return QString(); } + virtual QString DetailedInformation() const { return QString(); } /** * @brief What return string with error * @return string with error */ - inline QString What() const {return what;} + QString What() const; /** * @brief CriticalMessageBox show Critical Message Box. * @param situation main text message box. */ - virtual void CriticalMessageBox(const QString &situation, QWidget *parent = 0) const; + virtual void CriticalMessageBox(const QString &situation, QWidget *parent = 0) const; protected: /** * @brief what string with error */ - QString what; + QString what; }; +inline void VException::raise() const +{ + throw *this; +} + +inline VException *VException::clone() const +{ + return new VException(*this); +} + +inline QString VException::What() const +{ + return what; +} + #endif // VEXCEPTION_H diff --git a/src/exception/vexceptionbadid.h b/src/exception/vexceptionbadid.h index 587d74d7c..beee3cdf0 100644 --- a/src/exception/vexceptionbadid.h +++ b/src/exception/vexceptionbadid.h @@ -67,12 +67,12 @@ public: * @brief BadId return bad id * @return id */ - inline quint32 BadId() const {return id; } + quint32 BadId() const; /** * @brief BadKey return bad key * @return key */ - inline QString BadKey() const {return key; } + QString BadKey() const; protected: /** * @brief id id @@ -84,4 +84,14 @@ protected: QString key; }; +inline quint32 VExceptionBadId::BadId() const +{ + return id; +} + +inline QString VExceptionBadId::BadKey() const +{ + return key; +} + #endif // VEXCEPTIONBADID_H diff --git a/src/exception/vexceptionconversionerror.cpp b/src/exception/vexceptionconversionerror.cpp index cfc0634c5..bc216ba43 100644 --- a/src/exception/vexceptionconversionerror.cpp +++ b/src/exception/vexceptionconversionerror.cpp @@ -34,6 +34,12 @@ VExceptionConversionError::VExceptionConversionError(const QString &what, const Q_ASSERT_X(str.isEmpty() == false, Q_FUNC_INFO, "Error converting string is empty"); } +VExceptionConversionError::VExceptionConversionError(const VExceptionConversionError &e) + :VException(e), str(e.String()) +{ + +} + QString VExceptionConversionError::ErrorMessage() const { QString error = QString("ExceptionConversionError: %1 %2").arg(what, str); diff --git a/src/exception/vexceptionconversionerror.h b/src/exception/vexceptionconversionerror.h index 9f725b28f..fbf5d4ac2 100644 --- a/src/exception/vexceptionconversionerror.h +++ b/src/exception/vexceptionconversionerror.h @@ -47,8 +47,7 @@ public: * @brief VExceptionConversionError copy constructor * @param e exception */ - VExceptionConversionError(const VExceptionConversionError &e) - :VException(e), str(e.String()){} + VExceptionConversionError(const VExceptionConversionError &e); virtual ~VExceptionConversionError() noexcept (true) {} /** * @brief ErrorMessage return main error message @@ -59,7 +58,7 @@ public: * @brief String return string, where happend error * @return string */ - inline QString String() const {return str;} + QString String() const; protected: /** * @brief str string, where happend error @@ -67,4 +66,9 @@ protected: QString str; }; +inline QString VExceptionConversionError::String() const +{ + return str; +} + #endif // VEXCEPTIONCONVERSIONERROR_H diff --git a/src/exception/vexceptionemptyparameter.cpp b/src/exception/vexceptionemptyparameter.cpp index c3fdf6b7a..1d12deac5 100644 --- a/src/exception/vexceptionemptyparameter.cpp +++ b/src/exception/vexceptionemptyparameter.cpp @@ -42,6 +42,12 @@ VExceptionEmptyParameter::VExceptionEmptyParameter(const QString &what, const QS lineNumber = domElement.lineNumber(); } +VExceptionEmptyParameter::VExceptionEmptyParameter(const VExceptionEmptyParameter &e) + :VException(e), name(e.Name()), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()) +{ + +} + QString VExceptionEmptyParameter::ErrorMessage() const { QString error = QString("ExceptionEmptyParameter: %1 %2").arg(what, name); diff --git a/src/exception/vexceptionemptyparameter.h b/src/exception/vexceptionemptyparameter.h index b514683a9..8f9f5525a 100644 --- a/src/exception/vexceptionemptyparameter.h +++ b/src/exception/vexceptionemptyparameter.h @@ -50,9 +50,7 @@ public: * @brief VExceptionEmptyParameter copy constructor * @param e exception */ - VExceptionEmptyParameter(const VExceptionEmptyParameter &e) - :VException(e), name(e.Name()), tagText(e.TagText()), tagName(e.TagName()), - lineNumber(e.LineNumber()){} + VExceptionEmptyParameter(const VExceptionEmptyParameter &e); virtual ~VExceptionEmptyParameter() noexcept (true) {} /** * @brief ErrorMessage return main error message @@ -68,22 +66,22 @@ public: * @brief Name return name of attribute where error * @return name */ - inline QString Name() const {return name;} + QString Name() const; /** * @brief TagText return tag text * @return tag text */ - inline QString TagText() const {return tagText;} + QString TagText() const; /** * @brief TagName return tag name * @return tag name */ - inline QString TagName() const {return tagName;} + QString TagName() const; /** * @brief LineNumber return line number of tag * @return line number */ - inline qint32 LineNumber() const {return lineNumber;} + qint32 LineNumber() const; protected: /** * @brief name name attribute @@ -103,4 +101,24 @@ protected: qint32 lineNumber; }; +inline QString VExceptionEmptyParameter::Name() const +{ + return name; +} + +inline QString VExceptionEmptyParameter::TagText() const +{ + return tagText; +} + +inline QString VExceptionEmptyParameter::TagName() const +{ + return tagName; +} + +inline qint32 VExceptionEmptyParameter::LineNumber() const +{ + return lineNumber; +} + #endif // VEXCEPTIONEMPTYPARAMETER_H diff --git a/src/exception/vexceptionobjecterror.cpp b/src/exception/vexceptionobjecterror.cpp index 7b77be4a3..ab69f8a3b 100644 --- a/src/exception/vexceptionobjecterror.cpp +++ b/src/exception/vexceptionobjecterror.cpp @@ -39,6 +39,13 @@ VExceptionObjectError::VExceptionObjectError(const QString &what, const QDomElem lineNumber = domElement.lineNumber(); } +VExceptionObjectError::VExceptionObjectError(const VExceptionObjectError &e) + :VException(e), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()), + moreInfo(e.MoreInformation()) +{ + +} + QString VExceptionObjectError::ErrorMessage() const { QString error = QString("ExceptionObjectError: %1").arg(what); diff --git a/src/exception/vexceptionobjecterror.h b/src/exception/vexceptionobjecterror.h index 71e90329b..ab2baa4f5 100644 --- a/src/exception/vexceptionobjecterror.h +++ b/src/exception/vexceptionobjecterror.h @@ -39,20 +39,18 @@ class VExceptionObjectError : public VException { public: - /** - * @brief VExceptionObjectError exception object error - * @param what string with error - * @param domElement dom element - */ - VExceptionObjectError(const QString &what, const QDomElement &domElement); - /** - * @brief VExceptionObjectError copy constructor - * @param e exception - */ - VExceptionObjectError(const VExceptionObjectError &e) - :VException(e), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()), - moreInfo(e.MoreInformation()){} - virtual ~VExceptionObjectError() noexcept (true) {} + /** + * @brief VExceptionObjectError exception object error + * @param what string with error + * @param domElement dom element + */ + VExceptionObjectError(const QString &what, const QDomElement &domElement); + /** + * @brief VExceptionObjectError copy constructor + * @param e exception + */ + VExceptionObjectError(const VExceptionObjectError &e); + virtual ~VExceptionObjectError() noexcept (true) {} /** * @brief ErrorMessage return main error message * @return main error message @@ -67,17 +65,17 @@ public: * @brief TagText return tag text * @return tag text */ - inline QString TagText() const {return tagText;} + QString TagText() const; /** * @brief TagName return tag name * @return tag name */ - inline QString TagName() const {return tagName;} + QString TagName() const; /** * @brief LineNumber return line number in file * @return line number */ - inline qint32 LineNumber() const {return lineNumber;} + qint32 LineNumber() const; /** * @brief AddMoreInformation add more information for error * @param info information @@ -87,7 +85,7 @@ public: * @brief MoreInformation return more information for error * @return information */ - inline QString MoreInformation() const {return moreInfo;} + QString MoreInformation() const; protected: /** * @brief tagText tag text @@ -107,4 +105,24 @@ protected: QString moreInfo; }; +inline QString VExceptionObjectError::TagText() const +{ + return tagText; +} + +inline QString VExceptionObjectError::TagName() const +{ + return tagName; +} + +inline qint32 VExceptionObjectError::LineNumber() const +{ + return lineNumber; +} + +inline QString VExceptionObjectError::MoreInformation() const +{ + return moreInfo; +} + #endif // VEXCEPTIONOBJECTERROR_H diff --git a/src/exception/vexceptionuniqueid.cpp b/src/exception/vexceptionuniqueid.cpp index 9232d0ca7..6578290ca 100644 --- a/src/exception/vexceptionuniqueid.cpp +++ b/src/exception/vexceptionuniqueid.cpp @@ -40,6 +40,12 @@ VExceptionUniqueId::VExceptionUniqueId(const QString &what, const QDomElement &d lineNumber = domElement.lineNumber(); } +VExceptionUniqueId::VExceptionUniqueId(const VExceptionUniqueId &e) + :VException(e), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()) +{ + +} + QString VExceptionUniqueId::ErrorMessage() const { QString error = QString("ExceptionUniqueId: %1").arg(what); diff --git a/src/exception/vexceptionuniqueid.h b/src/exception/vexceptionuniqueid.h index 7e8abd569..8125c2966 100644 --- a/src/exception/vexceptionuniqueid.h +++ b/src/exception/vexceptionuniqueid.h @@ -39,18 +39,17 @@ class VExceptionUniqueId : public VException { public: - /** - * @brief VExceptionUniqueId exception unique id - * @param what string with error - * @param domElement dom element - */ - VExceptionUniqueId(const QString &what, const QDomElement &domElement); - /** - * @brief VExceptionUniqueId copy constructor - * @param e exception - */ - VExceptionUniqueId(const VExceptionUniqueId &e) - :VException(e), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()){} + /** + * @brief VExceptionUniqueId exception unique id + * @param what string with error + * @param domElement dom element + */ + VExceptionUniqueId(const QString &what, const QDomElement &domElement); + /** + * @brief VExceptionUniqueId copy constructor + * @param e exception + */ + VExceptionUniqueId(const VExceptionUniqueId &e); virtual ~VExceptionUniqueId() noexcept (true){} /** * @brief ErrorMessage return main error message @@ -66,17 +65,17 @@ public: * @brief TagText return tag text * @return tag text */ - inline QString TagText() const {return tagText;} + QString TagText() const; /** * @brief TagName return tag name * @return tag name */ - inline QString TagName() const {return tagName;} + QString TagName() const; /** * @brief LineNumber return line number in file * @return line number */ - inline qint32 LineNumber() const {return lineNumber;} + qint32 LineNumber() const; protected: /** * @brief tagText tag text @@ -92,4 +91,19 @@ protected: qint32 lineNumber; }; +inline QString VExceptionUniqueId::TagText() const +{ + return tagText; +} + +inline QString VExceptionUniqueId::TagName() const +{ + return tagName; +} + +inline qint32 VExceptionUniqueId::LineNumber() const +{ + return lineNumber; +} + #endif // VEXCEPTIONUNIQUEID_H diff --git a/src/exception/vexceptionwrongparameterid.cpp b/src/exception/vexceptionwrongparameterid.cpp index 14f5ab8ef..0e99ee018 100644 --- a/src/exception/vexceptionwrongparameterid.cpp +++ b/src/exception/vexceptionwrongparameterid.cpp @@ -39,6 +39,12 @@ VExceptionWrongParameterId::VExceptionWrongParameterId(const QString &what, cons lineNumber = domElement.lineNumber(); } +VExceptionWrongParameterId::VExceptionWrongParameterId(const VExceptionWrongParameterId &e) + :VException(e), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()) +{ + +} + QString VExceptionWrongParameterId::ErrorMessage() const { QString error = QString("ExceptionWrongParameterId: %1").arg(what); diff --git a/src/exception/vexceptionwrongparameterid.h b/src/exception/vexceptionwrongparameterid.h index bc10495c8..55879c986 100644 --- a/src/exception/vexceptionwrongparameterid.h +++ b/src/exception/vexceptionwrongparameterid.h @@ -39,19 +39,18 @@ class VExceptionWrongParameterId : public VException { public: - /** - * @brief VExceptionWrongParameterId exception wrong parameter id - * @param what string with error - * @param domElement som element - */ - VExceptionWrongParameterId(const QString &what, const QDomElement &domElement); - /** - * @brief VExceptionWrongParameterId copy constructor - * @param e exception - */ - VExceptionWrongParameterId(const VExceptionWrongParameterId &e) - :VException(e), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()){} - virtual ~VExceptionWrongParameterId() noexcept (true){} + /** + * @brief VExceptionWrongParameterId exception wrong parameter id + * @param what string with error + * @param domElement som element + */ + VExceptionWrongParameterId(const QString &what, const QDomElement &domElement); + /** + * @brief VExceptionWrongParameterId copy constructor + * @param e exception + */ + VExceptionWrongParameterId(const VExceptionWrongParameterId &e); + virtual ~VExceptionWrongParameterId() noexcept (true){} /** * @brief ErrorMessage return main error message * @return main error message @@ -66,17 +65,17 @@ public: * @brief TagText return tag text * @return tag text */ - inline QString TagText() const {return tagText;} + QString TagText() const; /** * @brief TagName return tag name * @return tag name */ - inline QString TagName() const {return tagName;} + QString TagName() const; /** * @brief LineNumber return line number in file * @return line number */ - inline qint32 LineNumber() const {return lineNumber;} + qint32 LineNumber() const; protected: /** * @brief tagText tag text @@ -92,4 +91,19 @@ protected: qint32 lineNumber; }; +inline QString VExceptionWrongParameterId::TagText() const +{ + return tagText; +} + +inline QString VExceptionWrongParameterId::TagName() const +{ + return tagName; +} + +inline qint32 VExceptionWrongParameterId::LineNumber() const +{ + return lineNumber; +} + #endif // VEXCEPTIONWRONGPARAMETERID_H diff --git a/src/geometry/varc.h b/src/geometry/varc.h index ccb13fef0..3bfceac46 100644 --- a/src/geometry/varc.h +++ b/src/geometry/varc.h @@ -44,50 +44,50 @@ class VArc: public VGObject { Q_DECLARE_TR_FUNCTIONS(VArc) public: - /** - * @brief VArc default constructor. - */ - VArc (); - /** - * @brief VArc constructor. - * @param center center point. - * @param radius arc radius. - * @param f1 start angle (degree). - * @param f2 end angle (degree). - */ - VArc (VPointF center, qreal radius, QString formulaRadius, qreal f1, QString formulaF1, qreal f2, - QString formulaF2, quint32 idObject = 0, Draw::Draws mode = Draw::Calculation); - /** - * @brief VArc copy constructor - * @param arc arc - */ - VArc(const VArc &arc); - /** - * @brief operator = assignment operator - * @param arc arc - * @return arc - */ - VArc& operator= (const VArc &arc); + /** + * @brief VArc default constructor. + */ + VArc (); + /** + * @brief VArc constructor. + * @param center center point. + * @param radius arc radius. + * @param f1 start angle (degree). + * @param f2 end angle (degree). + */ + VArc (VPointF center, qreal radius, QString formulaRadius, qreal f1, QString formulaF1, qreal f2, + QString formulaF2, quint32 idObject = 0, Draw::Draws mode = Draw::Calculation); + /** + * @brief VArc copy constructor + * @param arc arc + */ + VArc(const VArc &arc); + /** + * @brief operator = assignment operator + * @param arc arc + * @return arc + */ + VArc& operator= (const VArc &arc); /** * @brief GetF1 return start angle. * @return angle in degree. */ - inline QString GetFormulaF1 () const {return formulaF1;} + QString GetFormulaF1 () const; /** * @brief GetF1 return formula for start angle. * @return string with formula. */ - inline qreal GetF1 () const {return f1;} + qreal GetF1 () const; /** * @brief GetF2 return end angle. * @return angle in degree. */ - inline QString GetFormulaF2 () const {return formulaF2;} + QString GetFormulaF2 () const; /** * @brief GetF2 return formula for end angle. * @return string with formula. */ - inline qreal GetF2 () const {return f2;} + qreal GetF2 () const; /** * @brief GetLength return arc length. * @return length. @@ -97,22 +97,22 @@ public: * @brief GetRadius return arc radius. * @return radius. */ - inline QString GetFormulaRadius () const {return formulaRadius;} + QString GetFormulaRadius () const; /** * @brief GetRadius return formula for radius. * @return string with formula. */ - inline qreal GetRadius () const {return radius;} + qreal GetRadius () const; /** * @brief GetCenter return center point. * @return center point. */ - inline VPointF GetCenter () const {return center;} + VPointF GetCenter () const; /** * @brief GetP1 return point associated with start angle. * @return point. */ - QPointF GetP1() const; + QPointF GetP1() const; /** * @brief GetP2 return point associated with end angle. * @return точку point. @@ -182,4 +182,39 @@ private: VPointF center; }; +inline QString VArc::GetFormulaF1() const +{ + return formulaF1; +} + +inline qreal VArc::GetF1() const +{ + return f1; +} + +inline QString VArc::GetFormulaF2() const +{ + return formulaF2; +} + +inline qreal VArc::GetF2() const +{ + return f2; +} + +inline QString VArc::GetFormulaRadius() const +{ + return formulaRadius; +} + +inline qreal VArc::GetRadius() const +{ + return radius; +} + +inline VPointF VArc::GetCenter() const +{ + return center; +} + #endif // VARC_H diff --git a/src/geometry/vdetail.h b/src/geometry/vdetail.h index fa4318fef..6c0a2975c 100644 --- a/src/geometry/vdetail.h +++ b/src/geometry/vdetail.h @@ -59,32 +59,32 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(Detail::Equidistants) class VDetail { public: - /** - * @brief VDetail default contructor. Create empty detail. - */ - VDetail(); - /** - * @brief VDetail constructor. - * @param name detail name. - * @param nodes list of nodes. - */ - VDetail(const QString &name, const QVector &nodes); - /** - * @brief VDetail copy constructor. - * @param detail detail. - */ - VDetail(const VDetail &detail); - /** - * @brief operator = assignment operator. - * @param detail detail. - * @return new detail. - */ - VDetail &operator=(const VDetail &detail); + /** + * @brief VDetail default contructor. Create empty detail. + */ + VDetail(); + /** + * @brief VDetail constructor. + * @param name detail name. + * @param nodes list of nodes. + */ + VDetail(const QString &name, const QVector &nodes); + /** + * @brief VDetail copy constructor. + * @param detail detail. + */ + VDetail(const VDetail &detail); + /** + * @brief operator = assignment operator. + * @param detail detail. + * @return new detail. + */ + VDetail &operator=(const VDetail &detail); /** * @brief append append in the end of list node. * @param node new node. */ - inline void append(const VNodeDetail &node) {nodes.append(node);} + void append(const VNodeDetail &node); /** * @brief Clear detail full clear. */ @@ -97,7 +97,7 @@ public: * @brief CountNode return count nodes. * @return count. */ - inline qint32 CountNode() const {return nodes.size();} + qint32 CountNode() const; /** * @brief Containes check if detail containe this id. * @param id object id. @@ -120,72 +120,72 @@ public: * @brief getName return detail name. * @return name. */ - inline QString getName() const {return name;} + QString getName() const; /** * @brief setName set detail name. * @param value new name. */ - inline void setName(const QString &value) {name = value;} + void setName(const QString &value); /** * @brief getMx return bias for X axis. * @return x bias. */ - inline qreal getMx() const {return mx;} + qreal getMx() const; /** * @brief setMx set bias for X axis. * @param value new x bias. */ - inline void setMx(const qreal &value) {mx = value;} + void setMx(const qreal &value); /** * @brief getMy get bias for y axis. * @return y axis. */ - inline qreal getMy() const {return my;} + qreal getMy() const; /** * @brief setMy set bias for y axis. * @param value new y bias. */ - inline void setMy(const qreal &value) {my = value;} + void setMy(const qreal &value); /** * @brief getSeamAllowance keep status for seam allowance detail. * @return true - need seam allowance, false - no need seam allowance. */ - inline bool getSeamAllowance() const {return seamAllowance;} + bool getSeamAllowance() const; /** * @brief setSeamAllowance set status for seam allowance detail. * @param value true - need seam allowance, false - no need seam allowance. */ - inline void setSeamAllowance(bool value) {seamAllowance = value;} + void setSeamAllowance(bool value); /** * @brief getClosed keep close status for detail equdistant. * @return true - close equdistant, false - don't close equdistant. */ - inline bool getClosed() const {return closed;} + bool getClosed() const; /** * @brief setClosed set close status for detail equdistant. * @param value true - close equdistant, false - don't close equdistant. */ - inline void setClosed(bool value) {closed = value;} + void setClosed(bool value); /** * @brief getWidth return value detail seam allowance. * @return value in mm. */ - inline qreal getWidth() const {return width;} + qreal getWidth() const; /** * @brief setWidth set value detail seam allowance. * @param value width in mm. */ - inline void setWidth(const qreal &value) {width = value;} + void setWidth(const qreal &value); /** * @brief getNodes return list of nodes. * @return list of nodes. */ - inline QVector getNodes() const {return nodes;} + QVector getNodes() const; /** * @brief setNodes set list of nodes * @param value list of nodes */ - inline void setNodes(const QVector &value) {nodes = value;} + void setNodes(const QVector &value); /** * @brief indexOfNode return index in list node using id object. * @param id object (arc, point, spline, splinePath) id. @@ -237,12 +237,12 @@ public: * @param det changed detail. * @return list with missing detail. */ - QList Missing(const VDetail &det) const; + QList Missing(const VDetail &det) const; private: /** * @brief _id id detail. */ - quint32 _id; + quint32 _id; /** * @brief nodes list detail nodes. */ @@ -285,4 +285,84 @@ private: static ptrdiff_t indexOfNode(const QVector &list, const quint32 &id); }; +inline void VDetail::append(const VNodeDetail &node) +{ + nodes.append(node); +} + +inline qint32 VDetail::CountNode() const +{ + return nodes.size(); +} + +inline QString VDetail::getName() const +{ + return name; +} + +inline void VDetail::setName(const QString &value) +{ + name = value; +} + +inline qreal VDetail::getMx() const +{ + return mx; +} + +inline void VDetail::setMx(const qreal &value) +{ + mx = value; +} + +inline qreal VDetail::getMy() const +{ + return my; +} + +inline void VDetail::setMy(const qreal &value) +{ + my = value; +} + +inline bool VDetail::getSeamAllowance() const +{ + return seamAllowance; +} + +inline void VDetail::setSeamAllowance(bool value) +{ + seamAllowance = value; +} + +inline bool VDetail::getClosed() const +{ + return closed; +} + +inline void VDetail::setClosed(bool value) +{ + closed = value; +} + +inline qreal VDetail::getWidth() const +{ + return width; +} + +inline void VDetail::setWidth(const qreal &value) +{ + width = value; +} + +inline QVector VDetail::getNodes() const +{ + return nodes; +} + +inline void VDetail::setNodes(const QVector &value) +{ + nodes = value; +} + #endif // VDETAIL_H diff --git a/src/geometry/vnodedetail.h b/src/geometry/vnodedetail.h index 6d018339c..ec7d77e38 100644 --- a/src/geometry/vnodedetail.h +++ b/src/geometry/vnodedetail.h @@ -48,90 +48,90 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(NodeDetail::NodeDetails) class VNodeDetail { public: - /** - * @brief VNodeDetail default constructor. - */ - VNodeDetail(); - /** - * @brief VNodeDetail constructor. - * @param id object id - * @param typeTool type tool - * @param typeNode type node - * @param mx object bias x axis - * @param my object bias y axis - */ - VNodeDetail(quint32 id, Tool::Tools typeTool, NodeDetail::NodeDetails typeNode, qreal mx = 0, - qreal my = 0); - /** - * @brief VNodeDetail copy constructor - * @param node node - */ - VNodeDetail(const VNodeDetail &node); - /** - * @brief operator = assignment operator - * @param node node - * @return node - */ - VNodeDetail &operator=(const VNodeDetail &node); + /** + * @brief VNodeDetail default constructor. + */ + VNodeDetail(); + /** + * @brief VNodeDetail constructor. + * @param id object id + * @param typeTool type tool + * @param typeNode type node + * @param mx object bias x axis + * @param my object bias y axis + */ + VNodeDetail(quint32 id, Tool::Tools typeTool, NodeDetail::NodeDetails typeNode, qreal mx = 0, + qreal my = 0); + /** + * @brief VNodeDetail copy constructor + * @param node node + */ + VNodeDetail(const VNodeDetail &node); + /** + * @brief operator = assignment operator + * @param node node + * @return node + */ + VNodeDetail &operator=(const VNodeDetail &node); /** * @brief getId return object id. * @return id. */ - inline quint32 getId() const {return id;} + quint32 getId() const; /** * @brief setId set object id. * @param value object id. */ - inline void setId(const quint32 &value) {id = value;} + void setId(const quint32 &value); /** * @brief getTypeTool return tool type. * @return tool type. */ - inline Tool::Tools getTypeTool() const {return typeTool;} + Tool::Tools getTypeTool() const; /** * @brief setTypeTool set tool type. * @param value tool type. */ - inline void setTypeTool(const Tool::Tools &value) {typeTool = value;} + void setTypeTool(const Tool::Tools &value); /** * @brief getTypeNode return node type. * @return node type. */ - inline NodeDetail::NodeDetails getTypeNode() const {return typeNode;} + NodeDetail::NodeDetails getTypeNode() const; /** * @brief setTypeNode set node type. * @param value node type. */ - inline void setTypeNode(const NodeDetail::NodeDetails &value) {typeNode = value;} + void setTypeNode(const NodeDetail::NodeDetails &value); /** * @brief getMx return object bias x axis. * @return bias x axis. */ - inline qreal getMx() const {return mx;} + qreal getMx() const; /** * @brief setMx set object bias x axis. * @param value bias x axis. */ - inline void setMx(const qreal &value) {mx = value;} + void setMx(const qreal &value); /** * @brief getMy return object bias y axis. * @return bias y axis. */ - inline qreal getMy() const {return my;} + qreal getMy() const; /** * @brief setMy set object bias y axis. * @param value bias y axis. */ - inline void setMy(const qreal &value) {my = value;} + void setMy(const qreal &value); private: /** * @brief id object id. */ - quint32 id; + quint32 id; /** * @brief typeTool type of tool */ - Tool::Tools typeTool; + Tool::Tools typeTool; /** * @brief typeNode node type. */ @@ -139,13 +139,63 @@ private: /** * @brief mx bias x axis. */ - qreal mx; + qreal mx; /** * @brief my bias y axis. */ - qreal my; + qreal my; }; +inline quint32 VNodeDetail::getId() const +{ + return id; +} + +inline void VNodeDetail::setId(const quint32 &value) +{ + id = value; +} + +inline Tool::Tools VNodeDetail::getTypeTool() const +{ + return typeTool; +} + +inline void VNodeDetail::setTypeTool(const Tool::Tools &value) +{ + typeTool = value; +} + +inline NodeDetail::NodeDetails VNodeDetail::getTypeNode() const +{ + return typeNode; +} + +inline void VNodeDetail::setTypeNode(const NodeDetail::NodeDetails &value) +{ + typeNode = value; +} + +inline qreal VNodeDetail::getMx() const +{ + return mx; +} + +inline void VNodeDetail::setMx(const qreal &value) +{ + mx = value; +} + +inline qreal VNodeDetail::getMy() const +{ + return my; +} + +inline void VNodeDetail::setMy(const qreal &value) +{ + my = value; +} + Q_DECLARE_METATYPE(VNodeDetail) #endif // VNODEDETAIL_H diff --git a/src/geometry/vpointf.cpp b/src/geometry/vpointf.cpp index 703b93fe1..0455cfbb7 100644 --- a/src/geometry/vpointf.cpp +++ b/src/geometry/vpointf.cpp @@ -34,6 +34,21 @@ VPointF::VPointF(qreal x, qreal y, QString name, qreal mx, qreal my, quint32 idO this->_name = name; } +VPointF::VPointF() :VGObject(GObject::Point, 0, Draw::Calculation), _mx(0), _my(0), _x(0), _y(0) +{ + +} + +VPointF::VPointF(const VPointF &point) :VGObject(point), _mx(point.mx()), _my(point.my()), _x(point.x()), _y(point.y()) +{ + +} + +VPointF::VPointF(const QPointF &point) :VGObject(VPointF()), _mx(0), _my(0), _x(point.x()), _y(point.y()) +{ + +} + VPointF &VPointF::operator =(const VPointF &point) { VGObject::operator=(point); diff --git a/src/geometry/vpointf.h b/src/geometry/vpointf.h index 51aaffcaa..416c5e58f 100644 --- a/src/geometry/vpointf.h +++ b/src/geometry/vpointf.h @@ -43,16 +43,13 @@ public: /** * @brief VPointF creat empty point */ - inline VPointF () - :VGObject(GObject::Point, 0, Draw::Calculation), _mx(0), _my(0), _x(0), _y(0){} + VPointF (); /** * @brief VPointF copy constructor * @param point */ - inline VPointF (const VPointF &point ) - :VGObject(point), _mx(point.mx()), _my(point.my()), _x(point.x()), _y(point.y()){} - inline VPointF (const QPointF &point ) - :VGObject(VPointF()), _mx(0), _my(0), _x(point.x()), _y(point.y()){} + VPointF (const VPointF &point ); + VPointF (const QPointF &point ); /** * @brief VPointF create new point * @param x x coordinate @@ -62,59 +59,60 @@ public: */ VPointF ( qreal x, qreal y, QString name, qreal mx, qreal my, quint32 idObject = 0, Draw::Draws mode = Draw::Calculation); + ~VPointF(){} /** * @brief operator = assignment operator * @param point point * @return point */ - VPointF &operator=(const VPointF &point); - ~VPointF(){} + VPointF &operator=(const VPointF &point); + /** * @brief mx return offset name respect to x * @return offset */ - inline qreal mx() const {return _mx;} + qreal mx() const; /** * @brief my return offset name respect to y * @return offset */ - inline qreal my() const {return _my;} + qreal my() const; /** * @brief setMx set offset name respect to x * @param mx offset */ - inline void setMx(qreal mx) {_mx = mx;} + void setMx(qreal mx); /** * @brief setMy set offset name respect to y * @param my offset */ - inline void setMy(qreal my) {_my = my;} + void setMy(qreal my); /** * @brief toQPointF convert to QPointF * @return QPointF point */ - inline QPointF toQPointF()const {return QPointF(_x, _y);} + QPointF toQPointF()const; /** * @brief x return x coordinate * @return value */ - inline qreal x() const {return _x;} + qreal x() const; /** * @brief setX set x coordinate * @param value x coordinate */ - inline void setX(const qreal &value){_x = value;} + void setX(const qreal &value); /** * @brief y return y coordinate * @return value */ - inline qreal y() const {return _y;} + qreal y() const; /** * @brief setY set y coordinate * @param value y coordinate */ - inline void setY(const qreal &value){_y = value;} - virtual QString name() const{return _name;} + void setY(const qreal &value); + virtual QString name() const; private: /** * @brief _mx offset name respect to x @@ -134,4 +132,54 @@ private: qreal _y; }; +inline qreal VPointF::mx() const +{ + return _mx; +} + +inline qreal VPointF::my() const +{ + return _my; +} + +inline void VPointF::setMx(qreal mx) +{ + _mx = mx; +} + +inline void VPointF::setMy(qreal my) +{ + _my = my; +} + +inline QPointF VPointF::toQPointF() const +{ + return QPointF(_x, _y); +} + +inline qreal VPointF::x() const +{ + return _x; +} + +inline void VPointF::setX(const qreal &value) +{ + _x = value; +} + +inline qreal VPointF::y() const +{ + return _y; +} + +inline void VPointF::setY(const qreal &value) +{ + _y = value; +} + +inline QString VPointF::name() const +{ + return _name; +} + #endif // VPOINTF_H diff --git a/src/geometry/vspline.h b/src/geometry/vspline.h index af1bebfb8..96211ba50 100644 --- a/src/geometry/vspline.h +++ b/src/geometry/vspline.h @@ -80,57 +80,57 @@ public: * @brief GetP1 return first spline point. * @return first point. */ - VPointF GetP1 () const {return p1;} + VPointF GetP1 () const {return p1;} /** * @brief GetP2 return first control point. * @return first control point. */ - inline QPointF GetP2 () const {return p2;} + QPointF GetP2 () const; /** * @brief GetP3 return second control point. * @return second control point. */ - inline QPointF GetP3 () const {return p3;} + QPointF GetP3 () const; /** * @brief GetP4 return last spline point. * @return остання точка сплайну. */ - inline VPointF GetP4 () const {return p4;} + VPointF GetP4 () const; /** * @brief GetAngle1 return first angle control line. * @return angle. */ - inline qreal GetAngle1 () const {return angle1;} + qreal GetAngle1 () const; /** * @brief GetAngle2 return second angle control line. * @return angle. */ - inline qreal GetAngle2() const {return angle2;} + qreal GetAngle2() const; /** * @brief GetLength return length of spline. * @return length. */ - qreal GetLength () const; + qreal GetLength () const; /** * @brief name return spline name. Used for variables. * @return name. */ - QString name () const; + QString name () const; /** * @brief GetKasm1 return coefficient of length first control line. * @return coefficient. */ - inline qreal GetKasm1() const {return kAsm1;} + qreal GetKasm1() const; /** * @brief GetKasm2 return coefficient of length second control line. * @return coefficient. */ - inline qreal GetKasm2() const {return kAsm2;} + qreal GetKasm2() const; /** * @brief GetKcurve return coefficient of curvature spline. * @return coefficient */ - inline qreal GetKcurve() const {return kCurve;} + qreal GetKcurve() const; /** * @brief CrossingSplLine check intersection spline with line. * @param line line. @@ -266,4 +266,44 @@ private: void CreateName(); }; +inline QPointF VSpline::GetP2() const +{ + return p2; +} + +inline QPointF VSpline::GetP3() const +{ + return p3; +} + +inline VPointF VSpline::GetP4() const +{ + return p4; +} + +inline qreal VSpline::GetAngle1() const +{ + return angle1; +} + +inline qreal VSpline::GetAngle2() const +{ + return angle2; +} + +inline qreal VSpline::GetKasm1() const +{ + return kAsm1; +} + +inline qreal VSpline::GetKasm2() const +{ + return kAsm2; +} + +inline qreal VSpline::GetKcurve() const +{ + return kCurve; +} + #endif // VSPLINE_H diff --git a/src/geometry/vsplinepath.h b/src/geometry/vsplinepath.h index b13cc4922..127ed5b3f 100644 --- a/src/geometry/vsplinepath.h +++ b/src/geometry/vsplinepath.h @@ -53,18 +53,18 @@ class VSplinePath :public VGObject { Q_DECLARE_TR_FUNCTIONS(VSplinePath) public: - /** - * @brief VSplinePath constructor. - * @param kCurve coefficient of curvature spline path. - * @param idObject parent id. - * @param mode mode creation spline path. - */ - VSplinePath(qreal kCurve = 1, quint32 idObject = 0, Draw::Draws mode = Draw::Calculation); - /** - * @brief VSplinePath copy constructor. - * @param splPath spline path. - */ - VSplinePath(const VSplinePath& splPath); + /** + * @brief VSplinePath constructor. + * @param kCurve coefficient of curvature spline path. + * @param idObject parent id. + * @param mode mode creation spline path. + */ + VSplinePath(qreal kCurve = 1, quint32 idObject = 0, Draw::Draws mode = Draw::Calculation); + /** + * @brief VSplinePath copy constructor. + * @param splPath spline path. + */ + VSplinePath(const VSplinePath& splPath); /** * @brief append add point in the end of list points. * @param point new point. @@ -79,7 +79,7 @@ public: * @brief CountPoint return count point. * @return count. */ - inline qint32 CountPoint() const {return path.size();} + qint32 CountPoint() const; /** * @brief GetSpline return spline by index. * @param index index spline in spline path. @@ -90,7 +90,7 @@ public: * @brief GetPath return QPainterPath which reprezent spline path. * @return path. */ - QPainterPath GetPath() const; + QPainterPath GetPath() const; /** * @brief GetPathPoints return list of points what located on path. * @return list. @@ -100,7 +100,7 @@ public: * @brief GetSplinePath return list with spline points. * @return list. */ - inline QVector GetSplinePath() const {return path;} + QVector GetSplinePath() const; /** * @brief GetLength return length of spline path. * @return length. @@ -123,22 +123,22 @@ public: /** * @brief Clear clear list of points. */ - inline void Clear() {path.clear();} + void Clear(); /** * @brief getKCurve return coefficient of curvature spline path. * @return coefficient of curvature spline. */ - inline qreal getKCurve() const {return kCurve;} + qreal getKCurve() const; /** * @brief setKCurve set coefficient of curvature spline path. * @param value coefficient of curvature spline path. */ - inline void setKCurve(const qreal &value) {kCurve = value;} + void setKCurve(const qreal &value); /** * @brief GetPoint pointer to list spline point. * @return list. */ - inline const QVector *GetPoint() const {return &path;} + const QVector *GetPoint() const; /** * @brief operator = assignment operator. * @param path spline path. @@ -212,4 +212,34 @@ protected: qint32 maxCountPoints; }; +inline qint32 VSplinePath::CountPoint() const +{ + return path.size(); +} + +inline QVector VSplinePath::GetSplinePath() const +{ + return path; +} + +inline void VSplinePath::Clear() +{ + path.clear(); +} + +inline qreal VSplinePath::getKCurve() const +{ + return kCurve; +} + +inline void VSplinePath::setKCurve(const qreal &value) +{ + kCurve = value; +} + +inline const QVector *VSplinePath::GetPoint() const +{ + return &path; +} + #endif // VSPLINEPATH_H diff --git a/src/geometry/vsplinepoint.h b/src/geometry/vsplinepoint.h index 30517c406..dbe57a5db 100644 --- a/src/geometry/vsplinepoint.h +++ b/src/geometry/vsplinepoint.h @@ -39,73 +39,73 @@ class VSplinePoint { public: - /** - * @brief VSplinePoint default constructor. - */ - VSplinePoint(); - /** - * @brief VSplinePoint constructor. - * @param pSpline spline point. - * @param angle second angle control line. - * @param factor coefficient of length second control line. - */ - VSplinePoint(VPointF pSpline, qreal kAsm1, qreal angle1, qreal kAsm2, qreal angle2); - /** - * @brief VSplinePoint copy constructor - * @param point point - */ - VSplinePoint(const VSplinePoint &point); - ~VSplinePoint() {} + /** + * @brief VSplinePoint default constructor. + */ + VSplinePoint(); + /** + * @brief VSplinePoint constructor. + * @param pSpline spline point. + * @param angle second angle control line. + * @param factor coefficient of length second control line. + */ + VSplinePoint(VPointF pSpline, qreal kAsm1, qreal angle1, qreal kAsm2, qreal angle2); + /** + * @brief VSplinePoint copy constructor + * @param point point + */ + VSplinePoint(const VSplinePoint &point); + ~VSplinePoint() {} /** * @brief P return point. * @return point. */ - inline VPointF P() const {return pSpline;} + VPointF P() const; /** * @brief SetP set point. * @param value point. */ - inline void SetP(const VPointF &value) {pSpline = value;} + void SetP(const VPointF &value); /** * @brief Angle1 return first angle of spline. * @return angle. */ - inline qreal Angle1() const {return angle1;} + qreal Angle1() const; /** * @brief SetAngle1 set first angle of spline. * @param value angle. */ - void SetAngle1(const qreal &value); + void SetAngle1(const qreal &value); /** * @brief SetAngle2 set second angle of spline. * @param value angle. */ - void SetAngle2(const qreal &value); + void SetAngle2(const qreal &value); /** * @brief Angle2 return second angle of spline. * @return angle. */ - inline qreal Angle2() const {return angle2;} + qreal Angle2() const; /** * @brief KAsm1 return coefficient of length first control line. * @return coefficient. */ - inline qreal KAsm1() const {return kAsm1;} + qreal KAsm1() const; /** * @brief SetKAsm1 set coefficient of length first control line. * @param value coefficient. */ - inline void SetKAsm1(const qreal &value) {kAsm1 = value;} + void SetKAsm1(const qreal &value); /** * @brief KAsm2 return coefficient of length second control line. * @return coefficient. */ - inline qreal KAsm2() const {return kAsm2;} + qreal KAsm2() const; /** * @brief SetKAsm2 set coefficient of length second control line. * @param value coefficient. */ - inline void SetKAsm2(const qreal &value) {kAsm2 = value;} + void SetKAsm2(const qreal &value); protected: /** * @brief pSpline point. @@ -129,6 +129,46 @@ protected: qreal kAsm2; }; +inline VPointF VSplinePoint::P() const +{ + return pSpline; +} + +inline void VSplinePoint::SetP(const VPointF &value) +{ + pSpline = value; +} + +inline qreal VSplinePoint::Angle1() const +{ + return angle1; +} + +inline qreal VSplinePoint::Angle2() const +{ + return angle2; +} + +inline qreal VSplinePoint::KAsm1() const +{ + return kAsm1; +} + +inline void VSplinePoint::SetKAsm1(const qreal &value) +{ + kAsm1 = value; +} + +inline qreal VSplinePoint::KAsm2() const +{ + return kAsm2; +} + +inline void VSplinePoint::SetKAsm2(const qreal &value) +{ + kAsm2 = value; +} + Q_DECLARE_METATYPE(VSplinePoint) #endif // VSPLINEPOINT_H diff --git a/src/tools/vabstracttool.h b/src/tools/vabstracttool.h index 13b170661..0b2351d4c 100644 --- a/src/tools/vabstracttool.h +++ b/src/tools/vabstracttool.h @@ -40,15 +40,15 @@ class VAbstractTool: public VDataTool { Q_OBJECT public: - /** - * @brief VAbstractTool container. - * @param doc dom document container. - * @param data container with data. - * @param id object id in container. - * @param parent parent object. - */ - VAbstractTool(VPattern *doc, VContainer *data, quint32 id, QObject *parent = 0); - virtual ~VAbstractTool(){} + /** + * @brief VAbstractTool container. + * @param doc dom document container. + * @param data container with data. + * @param id object id in container. + * @param parent parent object. + */ + VAbstractTool(VPattern *doc, VContainer *data, quint32 id, QObject *parent = 0); + virtual ~VAbstractTool(){} /** * @brief NewSceneRect calculate scene rect what contains all items and doesn't less that size of scene view. * @param sc scene. @@ -93,7 +93,7 @@ public: * @brief getId return object id. * @return id. */ - inline quint32 getId() const {return id;} + quint32 getId() const; /** * @brief LineCoefficients coefficient for equation of segment. Segment equestion ax+by+c=0. * @param line line @@ -207,7 +207,7 @@ protected: * @brief getData return pointer to data container. * @return container. */ - inline const VContainer *getData() const {return &data;} + const VContainer *getData() const; /** * @brief RemoveReferens decrement value of reference. */ @@ -230,4 +230,14 @@ protected: private: Q_DISABLE_COPY(VAbstractTool) }; + +inline quint32 VAbstractTool::getId() const +{ + return id; +} + +inline const VContainer *VAbstractTool::getData() const +{ + return &data; +} #endif // VABSTRACTTOOL_H diff --git a/src/tools/vdatatool.h b/src/tools/vdatatool.h index 6f6c5a6c3..d2b941393 100644 --- a/src/tools/vdatatool.h +++ b/src/tools/vdatatool.h @@ -39,13 +39,13 @@ class VDataTool : public QObject { Q_OBJECT public: - /** - * @brief VDataTool constructor. - * @param data container with variables - * @param parent parent object - */ - VDataTool(VContainer *data, QObject *parent = 0); - virtual ~VDataTool(){} + /** + * @brief VDataTool constructor. + * @param data container with variables + * @param parent parent object + */ + VDataTool(VContainer *data, QObject *parent = 0); + virtual ~VDataTool(){} /** * @brief operator = assignment operator. * @param tool tool @@ -56,21 +56,21 @@ public: * @brief getData return data container. * @return container. */ - inline VContainer getData() const { return data; } + VContainer getData() const; /** * @brief setData set data container. * @param value container. */ - inline void setData(const VContainer *value){data = *value;} + void setData(const VContainer *value); /** * @brief referens return count of referens. * @return count count of referens. */ - virtual inline quint32 referens() const {return _referens;} + virtual quint32 referens() const; /** * @brief incrementReferens increment referens. */ - virtual inline void incrementReferens(){++_referens;} + virtual void incrementReferens(); /** * @brief decrementReferens decrement referens. */ @@ -86,4 +86,24 @@ protected: quint32 _referens; }; +inline VContainer VDataTool::getData() const +{ + return data; +} + +inline void VDataTool::setData(const VContainer *value) +{ + data = *value; +} + +inline quint32 VDataTool::referens() const +{ + return _referens; +} + +inline void VDataTool::incrementReferens() +{ + ++_referens; +} + #endif // VDATATOOL_H diff --git a/src/widgets/vitem.cpp b/src/widgets/vitem.cpp index f42b9a4d2..8d548a648 100644 --- a/src/widgets/vitem.cpp +++ b/src/widgets/vitem.cpp @@ -37,6 +37,17 @@ VItem::VItem (const QPainterPath & path, int numInList, QGraphicsItem * parent ) { } +VItem::VItem():numInOutList(0), paper(0) +{ + +} + +VItem::VItem(int numInList, QGraphicsItem *parent):QGraphicsPathItem (parent), numInOutList(numInList), + paper(0) +{ + +} + void VItem::checkItemChange() { QRectF rect; diff --git a/src/widgets/vitem.h b/src/widgets/vitem.h index cc2df7284..0b8523045 100644 --- a/src/widgets/vitem.h +++ b/src/widgets/vitem.h @@ -42,14 +42,13 @@ public: /** * @brief VItem default constructor. */ - VItem ():numInOutList(0), paper(0){} + VItem (); /** * @brief VItem constructor. * @param numInList index in list of details. * @param parent parent object. */ - VItem (int numInList, QGraphicsItem * parent = 0):QGraphicsPathItem (parent), numInOutList(numInList), - paper(0){} + VItem (int numInList, QGraphicsItem * parent = 0); /** * @brief VItem constructor. * @param path detail path. @@ -81,7 +80,7 @@ public slots: * @brief SetIndexInList set detail index in list. * @param index index in list. */ - inline void SetIndexInList( qint32 index ) {numInOutList = index;} + void SetIndexInList( qint32 index ); protected: /** * @brief itemChange handle item change. @@ -118,4 +117,9 @@ signals: */ void itemColliding ( QList list, int number ); }; + +inline void VItem::SetIndexInList(qint32 index) +{ + numInOutList = index; +} #endif // VITEM_H diff --git a/src/widgets/vmaingraphicsscene.h b/src/widgets/vmaingraphicsscene.h index 49b134cf8..a25b4a74f 100644 --- a/src/widgets/vmaingraphicsscene.h +++ b/src/widgets/vmaingraphicsscene.h @@ -53,22 +53,22 @@ public: * @brief getHorScrollBar return scene horizontal scrollbar. * @return horizontal scrollbar. */ - inline qint32 getHorScrollBar() const {return horScrollBar;} + qint32 getHorScrollBar() const; /** * @brief setHorScrollBar set scene horizontal scrollbar. * @param value horizontal scrollbar. */ - inline void setHorScrollBar(const qint32 &value) {horScrollBar = value;} + void setHorScrollBar(const qint32 &value); /** * @brief getVerScrollBar return scene vertical scrollbar. * @return vertical scrollbar. */ - inline qint32 getVerScrollBar() const {return verScrollBar;} + qint32 getVerScrollBar() const; /** * @brief setVerScrollBar set scene vertical scrollbar. * @param value vertical scrollbar. */ - inline void setVerScrollBar(const qint32 &value) {verScrollBar = value;} + void setVerScrollBar(const qint32 &value); /** * @brief transform return view transformation. * @return view transformation. @@ -143,4 +143,24 @@ private: QTransform _transform; }; +inline qint32 VMainGraphicsScene::getHorScrollBar() const +{ + return horScrollBar; +} + +inline void VMainGraphicsScene::setHorScrollBar(const qint32 &value) +{ + horScrollBar = value; +} + +inline qint32 VMainGraphicsScene::getVerScrollBar() const +{ + return verScrollBar; +} + +inline void VMainGraphicsScene::setVerScrollBar(const qint32 &value) +{ + verScrollBar = value; +} + #endif // VMAINGRAPHICSSCENE_H diff --git a/src/widgets/vtablegraphicsview.h b/src/widgets/vtablegraphicsview.h index 6fbdafabe..7d7ebd5c9 100644 --- a/src/widgets/vtablegraphicsview.h +++ b/src/widgets/vtablegraphicsview.h @@ -42,7 +42,8 @@ public: * @brief The typeMove_e enum type items moves. */ enum typeMove_e { Left, Right, Up, Down }; - VTableGraphicsView(QGraphicsScene* pScene, QWidget *parent = 0); + + VTableGraphicsView(QGraphicsScene* pScene, QWidget *parent = 0); signals: /** * @brief itemChect emit after change selection state detail. @@ -57,7 +58,7 @@ public slots: /** * @brief rotateItems handle rotatation detail. */ - inline void rotateItems() {rotateIt();} + void rotateItems(); /** * @brief MirrorItem mirror detail. */ @@ -65,11 +66,11 @@ public slots: /** * @brief ZoomIn zoom in paper scale. */ - inline void ZoomIn() {scale(1.1, 1.1);} + void ZoomIn(); /** * @brief ZoomOut zoom out paper scale. */ - inline void ZoomOut() {scale(1/1.1, 1/1.1);} + void ZoomOut(); protected: /** * @brief wheelEvent handle wheel events. @@ -103,4 +104,19 @@ protected: }; +inline void VTableGraphicsView::rotateItems() +{ + rotateIt(); +} + +inline void VTableGraphicsView::ZoomIn() +{ + scale(1.1, 1.1); +} + +inline void VTableGraphicsView::ZoomOut() +{ + scale(1/1.1, 1/1.1); +} + #endif // VTABLEGRAPHICSVIEW_H diff --git a/src/xml/vdomdocument.cpp b/src/xml/vdomdocument.cpp index 734ebae19..de4449ec4 100644 --- a/src/xml/vdomdocument.cpp +++ b/src/xml/vdomdocument.cpp @@ -42,9 +42,9 @@ class MessageHandler : public QAbstractMessageHandler public: MessageHandler() : QAbstractMessageHandler(0), m_messageType(QtMsgType()), m_description(QString()), m_sourceLocation(QSourceLocation()){} - inline QString statusMessage() const {return m_description;} - inline qint64 line() const {return m_sourceLocation.line();} - inline qint64 column() const {return m_sourceLocation.column();} + QString statusMessage() const; + qint64 line() const; + qint64 column() const; protected: virtual void handleMessage(QtMsgType type, const QString &description, const QUrl &identifier, const QSourceLocation &sourceLocation) @@ -62,6 +62,21 @@ private: QSourceLocation m_sourceLocation; }; +inline QString MessageHandler::statusMessage() const +{ + return m_description; +} + +inline qint64 MessageHandler::line() const +{ + return m_sourceLocation.line(); +} + +inline qint64 MessageHandler::column() const +{ + return m_sourceLocation.column(); +} + VDomDocument::VDomDocument(VContainer *data) : QDomDocument(), data(data), map(QHash()) { diff --git a/src/xml/vpattern.h b/src/xml/vpattern.h index afdb02e3e..454786598 100644 --- a/src/xml/vpattern.h +++ b/src/xml/vpattern.h @@ -67,7 +67,7 @@ public: * @brief GetNameActivDraw return current pattern peace name. * @return pattern peace name. */ - inline QString GetNameActivDraw() const {return nameActivDraw;} + QString GetNameActivDraw() const; /** * @brief GetActivDrawElement return draw tag for current pattern peace. * @param element draw tag. @@ -98,23 +98,23 @@ public: * @brief getTools return list of tools pointers. * @return list. */ - inline QHash* getTools() {return &tools;} + QHash* getTools(); /** * @brief getTool return tool from tool list. * @param id tool id. * @return tool. */ - VDataTool* getTool(const quint32 &id); + VDataTool* getTool(const quint32 &id); /** * @brief getHistory return list with list of history records. * @return list of history records. */ - inline QVector *getHistory() {return &history;} + QVector *getHistory(); /** * @brief getCursor return cursor. * @return cursor. */ - inline quint32 getCursor() const {return cursor;} + quint32 getCursor() const; /** * @brief setCursor set cursor. * @param value cursor. @@ -154,9 +154,9 @@ public: * @brief SPointActiveDraw return id base point current pattern peace. * @return id base point. */ - quint32 SPointActiveDraw(); - inline bool isPatternModified() const {return patternModified;} - inline void setPatternModified(bool value) {patternModified = value;} + quint32 SPointActiveDraw(); + bool isPatternModified() const; + void setPatternModified(bool value); /** * @brief GetActivNodeElement find element in current pattern piece by name. * @param name name tag. @@ -377,4 +377,34 @@ private: VMainGraphicsScene *sceneDetail); }; +inline QString VPattern::GetNameActivDraw() const +{ + return nameActivDraw; +} + +inline QHash *VPattern::getTools() +{ + return &tools; +} + +inline QVector *VPattern::getHistory() +{ + return &history; +} + +inline quint32 VPattern::getCursor() const +{ + return cursor; +} + +inline bool VPattern::isPatternModified() const +{ + return patternModified; +} + +inline void VPattern::setPatternModified(bool value) +{ + patternModified = value; +} + #endif // VPATTERN_H diff --git a/src/xml/vtoolrecord.h b/src/xml/vtoolrecord.h index 0746b1e0b..3530d1c5e 100644 --- a/src/xml/vtoolrecord.h +++ b/src/xml/vtoolrecord.h @@ -39,47 +39,47 @@ class VToolRecord { public: - /** - * @brief VToolRecord default constructor. - */ - VToolRecord(); - /** - * @brief VToolRecord constructor. - * @param id tool id. - * @param typeTool tool type. - * @param nameDraw pattern peace name. - */ - VToolRecord(const quint32 &id, const Tool::Tools &typeTool, const QString &nameDraw); + /** + * @brief VToolRecord default constructor. + */ + VToolRecord(); + /** + * @brief VToolRecord constructor. + * @param id tool id. + * @param typeTool tool type. + * @param nameDraw pattern peace name. + */ + VToolRecord(const quint32 &id, const Tool::Tools &typeTool, const QString &nameDraw); /** * @brief getId return tool id. * @return id. */ - inline quint32 getId() const {return id;} + quint32 getId() const; /** * @brief setId set tool id. * @param value id. */ - inline void setId(const quint32 &value) {id = value;} + void setId(const quint32 &value); /** * @brief getTypeTool return tool type. * @return tool type. */ - inline Tool::Tools getTypeTool() const {return typeTool;} + Tool::Tools getTypeTool() const; /** * @brief setTypeTool set tool type. * @param value tool type. */ - inline void setTypeTool(const Tool::Tools &value) {typeTool = value;} + void setTypeTool(const Tool::Tools &value); /** * @brief getNameDraw return pattern peace name. * @return pattern peace name. */ - inline QString getNameDraw() const {return nameDraw;} + QString getNameDraw() const; /** * @brief setNameDraw set pattern peace name. * @param value pattern peace name. */ - inline void setNameDraw(const QString &value) {nameDraw = value;} + void setNameDraw(const QString &value); private: /** * @brief id tool id. @@ -95,4 +95,34 @@ private: QString nameDraw; }; +inline quint32 VToolRecord::getId() const +{ + return id; +} + +inline void VToolRecord::setId(const quint32 &value) +{ + id = value; +} + +inline Tool::Tools VToolRecord::getTypeTool() const +{ + return typeTool; +} + +inline void VToolRecord::setTypeTool(const Tool::Tools &value) +{ + typeTool = value; +} + +inline QString VToolRecord::getNameDraw() const +{ + return nameDraw; +} + +inline void VToolRecord::setNameDraw(const QString &value) +{ + nameDraw = value; +} + #endif // VTOOLRECORD_H