From 45856338f9423362413b679f891dee1db70c16a6 Mon Sep 17 00:00:00 2001 From: dismine Date: Mon, 5 Aug 2013 11:37:56 +0300 Subject: [PATCH] Add tool spline --- Valentina.pro | 21 +- container/vcontainer.cpp | 117 +- container/vcontainer.h | 41 +- cursor.qrc | 1 + cursor/spline_cursor.png | Bin 0 -> 1335 bytes dialogs/dialogalongline.cpp | 2 +- dialogs/dialogalongline.h | 2 +- dialogs/dialogbisector.cpp | 2 +- dialogs/dialogbisector.h | 2 +- dialogs/dialogendline.cpp | 2 +- dialogs/dialogendline.h | 2 +- dialogs/dialogincrements.cpp | 68 +- dialogs/dialogincrements.h | 4 + dialogs/dialogincrements.ui | 6 +- dialogs/dialogline.cpp | 2 +- dialogs/dialogline.h | 2 +- dialogs/dialoglineintersect.cpp | 2 +- dialogs/dialoglineintersect.h | 2 +- dialogs/dialognormal.cpp | 2 +- dialogs/dialognormal.h | 2 +- dialogs/dialogshoulderpoint.cpp | 2 +- dialogs/dialogshoulderpoint.h | 2 +- dialogs/dialogspline.cpp | 127 +++ dialogs/dialogspline.h | 46 + dialogs/dialogspline.ui | 230 ++++ dialogs/dialogtool.cpp | 2 +- dialogs/dialogtool.h | 2 +- docs/Doxyfile | 1792 +++++++++++++++++++++++++++++++ geometry/varc.cpp | 294 +++++ geometry/varc.h | 192 ++++ geometry/vspline.cpp | 729 +++++++++++++ geometry/vspline.h | 261 +++++ icon.qrc | 1 + icon/32x32/spline.png | Bin 0 -> 375 bytes mainwindow.cpp | 83 +- mainwindow.h | 9 +- mainwindow.ui | 24 +- tools/vabstracttool.h | 2 +- tools/vtoolalongline.cpp | 2 +- tools/vtoolbisector.cpp | 2 +- tools/vtoolendline.cpp | 3 +- tools/vtoolline.cpp | 2 +- tools/vtoollineintersect.cpp | 2 +- tools/vtoolnormal.cpp | 2 +- tools/vtoolpoint.cpp | 131 ++- tools/vtoolpoint.h | 13 +- tools/vtoolshoulderpoint.cpp | 2 +- tools/vtoolsimplepoint.cpp | 66 +- tools/vtoolsimplepoint.h | 22 +- tools/vtoolsinglepoint.cpp | 68 ++ tools/vtoolsinglepoint.h | 27 + tools/vtoolspline.cpp | 202 ++++ tools/vtoolspline.h | 36 + widgets/vcontrolpointspline.cpp | 119 ++ widgets/vcontrolpointspline.h | 30 + xml/vdomdocument.cpp | 62 +- xml/vdomdocument.h | 2 + 57 files changed, 4648 insertions(+), 225 deletions(-) create mode 100644 cursor/spline_cursor.png create mode 100644 dialogs/dialogspline.cpp create mode 100644 dialogs/dialogspline.h create mode 100644 dialogs/dialogspline.ui create mode 100644 docs/Doxyfile create mode 100644 geometry/varc.cpp create mode 100644 geometry/varc.h create mode 100644 geometry/vspline.cpp create mode 100644 geometry/vspline.h create mode 100644 icon/32x32/spline.png create mode 100644 tools/vtoolsinglepoint.cpp create mode 100644 tools/vtoolsinglepoint.h create mode 100644 tools/vtoolspline.cpp create mode 100644 tools/vtoolspline.h create mode 100644 widgets/vcontrolpointspline.cpp create mode 100644 widgets/vcontrolpointspline.h diff --git a/Valentina.pro b/Valentina.pro index 09a9a93aa..e46816eb4 100644 --- a/Valentina.pro +++ b/Valentina.pro @@ -15,7 +15,6 @@ SOURCES += main.cpp\ mainwindow.cpp \ widgets/vmaingraphicsscene.cpp \ dialogs/dialogsinglepoint.cpp \ - tools/vtoolsimplepoint.cpp \ widgets/vgraphicssimpletextitem.cpp \ xml/vdomdocument.cpp \ container/vpointf.cpp \ @@ -43,13 +42,18 @@ SOURCES += main.cpp\ dialogs/dialogbisector.cpp \ tools/vtoollinepoint.cpp \ tools/vtoollineintersect.cpp \ - dialogs/dialoglineintersect.cpp + dialogs/dialoglineintersect.cpp \ + geometry/vspline.cpp \ + tools/vtoolsinglepoint.cpp \ + geometry/varc.cpp \ + widgets/vcontrolpointspline.cpp \ + tools/vtoolspline.cpp \ + dialogs/dialogspline.cpp HEADERS += mainwindow.h \ widgets/vmaingraphicsscene.h \ dialogs/dialogsinglepoint.h \ options.h \ - tools/vtoolsimplepoint.h \ widgets/vgraphicssimpletextitem.h \ xml/vdomdocument.h \ container/vpointf.h \ @@ -77,7 +81,13 @@ HEADERS += mainwindow.h \ dialogs/dialogbisector.h \ tools/vtoollinepoint.h \ tools/vtoollineintersect.h \ - dialogs/dialoglineintersect.h + dialogs/dialoglineintersect.h \ + geometry/vspline.h \ + tools/vtoolsinglepoint.h \ + geometry/varc.h \ + widgets/vcontrolpointspline.h \ + tools/vtoolspline.h \ + dialogs/dialogspline.h FORMS += mainwindow.ui \ dialogs/dialogsinglepoint.ui \ @@ -88,7 +98,8 @@ FORMS += mainwindow.ui \ dialogs/dialogshoulderpoint.ui \ dialogs/dialognormal.ui \ dialogs/dialogbisector.ui \ - dialogs/dialoglineintersect.ui + dialogs/dialoglineintersect.ui \ + dialogs/dialogspline.ui RESOURCES += \ icon.qrc \ diff --git a/container/vcontainer.cpp b/container/vcontainer.cpp index 9e30f8b99..c78caaccd 100644 --- a/container/vcontainer.cpp +++ b/container/vcontainer.cpp @@ -73,6 +73,20 @@ void VContainer::UpdatePoint(qint64 id, const VPointF& point){ } } +void VContainer::UpdateSpline(qint64 id, const VSpline &spl){ + splines[id] = spl; + if(id > _id){ + _id = id; + } +} + +void VContainer::UpdateArc(qint64 id, const VArc &arc){ + arcs[id] = arc; + if(id > _id){ + _id = id; + } +} + void VContainer::UpdateStandartTableCell(const QString& name, const VStandartTableCell& cell){ standartTable[name] = cell; } @@ -103,6 +117,9 @@ void VContainer::Clear(){ standartTable.clear(); incrementTable.clear(); lengthLines.clear(); + splines.clear(); + arcs.clear(); + lengthArcs.clear(); } void VContainer::ClearIncrementTable(){ @@ -113,6 +130,14 @@ void VContainer::ClearLengthLines(){ lengthLines.clear(); } +void VContainer::ClearLengthSplines(){ + lengthSplines.clear(); +} + +void VContainer::ClearLengthArcs(){ + lengthArcs.clear(); +} + void VContainer::SetSize(qint32 size){ base["Сг"] = size; } @@ -159,6 +184,14 @@ const QMap *VContainer::DataPoints() const{ return &points; } +const QMap *VContainer::DataSplines() const{ + return &splines; +} + +const QMap *VContainer::DataArcs() const{ + return &arcs; +} + const QMap *VContainer::DataBase() const{ return &base; } @@ -175,11 +208,27 @@ const QMap *VContainer::DataLengthLines() const{ return &lengthLines; } +const QMap *VContainer::DataLengthSplines() const{ + return &lengthSplines; +} + void VContainer::AddLine(const qint64 &firstPointId, const qint64 &secondPointId){ QString nameLine = GetNameLine(firstPointId, secondPointId); VPointF firstPoint = GetPoint(firstPointId); VPointF secondPoint = GetPoint(secondPointId); - AddLine(nameLine, QLineF(firstPoint.toQPointF(), secondPoint.toQPointF()).length()); + AddLengthLine(nameLine, QLineF(firstPoint.toQPointF(), secondPoint.toQPointF()).length()); +} + +qint64 VContainer::AddSpline(const VSpline &spl){ + qint64 id = getNextId(); + splines[id] = spl; + return id; +} + +qint64 VContainer::AddArc(const VArc &arc){ + qint64 id = getNextId(); + arcs[id] = arc; + return id; } QString VContainer::GetNameLine(const qint64 &firstPoint, const qint64 &secondPoint) const{ @@ -188,11 +237,50 @@ QString VContainer::GetNameLine(const qint64 &firstPoint, const qint64 &secondPo return QString("Line_%1_%2").arg(first.name(), second.name()); } -void VContainer::AddLine(const QString &name, const qreal &value){ +QString VContainer::GetNameSpline(const qint64 &firstPoint, const qint64 &secondPoint) const{ + VPointF first = GetPoint(firstPoint); + VPointF second = GetPoint(secondPoint); + return QString("Spl_%1_%2").arg(first.name(), second.name()); +} + +QString VContainer::GetNameArc(const qint64 &firstPoint, const qint64 ¢erPoint, + const qint64 &secondPoint) const{ + VPointF first = GetPoint(firstPoint); + VPointF center = GetPoint(centerPoint); + VPointF second = GetPoint(secondPoint); + return QString("Arc_%1_%2_%3").arg(first.name(), center.name(), second.name()); +} + +void VContainer::AddLengthLine(const QString &name, const qreal &value){ Q_ASSERT(!name.isEmpty()); lengthLines[name] = value/PrintDPI*25.4; } +void VContainer::AddLengthSpline(const qint64 &firstPointId, const qint64 &secondPointId){ + QString nameLine = GetNameSpline(firstPointId, secondPointId); + VPointF firstPoint = GetPoint(firstPointId); + VPointF secondPoint = GetPoint(secondPointId); + AddLengthSpline(nameLine, QLineF(firstPoint.toQPointF(), secondPoint.toQPointF()).length()); +} + +void VContainer::AddLengthSpline(const QString &name, const qreal &value){ + Q_ASSERT(!name.isEmpty()); + lengthSplines[name] = value/PrintDPI*25.4; +} + +void VContainer::AddLengthArc(const qint64 &firstPointId, const qint64 ¢erPoint, + const qint64 &secondPointId){ + QString nameLine = GetNameArc(firstPointId, centerPoint, secondPointId); + VPointF firstPoint = GetPoint(firstPointId); + VPointF secondPoint = GetPoint(secondPointId); + AddLengthArc(nameLine, QLineF(firstPoint.toQPointF(), secondPoint.toQPointF()).length()); +} + +void VContainer::AddLengthArc(const QString &name, const qreal &value){ + Q_ASSERT(!name.isEmpty()); + lengthArcs[name] = value/PrintDPI*25.4; +} + qreal VContainer::GetLine(const QString &name) const{ Q_ASSERT(!name.isEmpty()); if(lengthLines.contains(name)){ @@ -203,3 +291,28 @@ qreal VContainer::GetLine(const QString &name) const{ } return 0; } + +VSpline VContainer::GetSpline(qint64 id) const{ + if(splines.contains(id)){ + return splines.value(id); + } else { + qCritical()<<"Не можу знайти id = "< *VContainer::DataLengthArcs() const{ + return &lengthArcs; +} diff --git a/container/vcontainer.h b/container/vcontainer.h index 8cd3a828f..eadfe56cf 100644 --- a/container/vcontainer.h +++ b/container/vcontainer.h @@ -3,27 +3,52 @@ #include #include - #include "vpointf.h" #include "vstandarttablecell.h" #include "vincrementtablerow.h" +#include "../geometry/vspline.h" +#include "../geometry/varc.h" +/** + * @brief The VContainer class + */ class VContainer { public: + /** + * @brief VContainer + */ VContainer(); + /** + * @brief GetPoint + * @param id + * @return + */ VPointF GetPoint(qint64 id) const; VStandartTableCell GetStandartTableCell(const QString& name) const; VIncrementTableRow GetIncrementTableRow(const QString& name) const; qreal GetLine(const QString &name) const; + VSpline GetSpline(qint64 id) const; + VArc GetArc(qint64 id) const; qint64 getId(); qint64 AddPoint(const VPointF& point); void AddStandartTableCell(const QString& name, const VStandartTableCell& cell); void AddIncrementTableRow(const QString& name, const VIncrementTableRow &cell); - void AddLine(const QString &name, const qreal &value); + void AddLengthLine(const QString &name, const qreal &value); + void AddLengthSpline(const qint64 &firstPointId, const qint64 &secondPointId); + void AddLengthSpline(const QString &name, const qreal &value); + void AddLengthArc(const qint64 &firstPointId, const qint64 ¢erPoint, const qint64 &secondPointId); + void AddLengthArc(const QString &name, const qreal &value); void AddLine(const qint64 &firstPointId, const qint64 &secondPointId); + qint64 AddSpline(const VSpline& spl); + qint64 AddArc(const VArc& arc); QString GetNameLine(const qint64 &firstPoint, const qint64 &secondPoint) const; + QString GetNameSpline(const qint64 &firstPoint, const qint64 &secondPoint) const; + QString GetNameArc(const qint64 &firstPoint, const qint64 ¢erPoint, + const qint64 &secondPoint) const; void UpdatePoint(qint64 id, const VPointF& point); + void UpdateSpline(qint64 id, const VSpline& spl); + void UpdateArc(qint64 id, const VArc& arc); void UpdateStandartTableCell(const QString& name, const VStandartTableCell& cell); void UpdateIncrementTableRow(const QString& name, const VIncrementTableRow& cell); qreal GetValueStandartTableCell(const QString& name) const; @@ -31,6 +56,8 @@ public: void Clear(); void ClearIncrementTable(); void ClearLengthLines(); + void ClearLengthSplines(); + void ClearLengthArcs(); void SetSize(qint32 size); void SetGrowth(qint32 growth); qint32 size() const; @@ -40,10 +67,14 @@ public: qint64 getNextId(); void RemoveIncrementTableRow(const QString& name); const QMap *DataPoints() const; + const QMap *DataSplines() const; + const QMap *DataArcs() const; const QMap *DataBase() const; const QMap *DataStandartTable() const; const QMap *DataIncrementTable() const; - const QMap * DataLengthLines() const; + const QMap *DataLengthLines() const; + const QMap *DataLengthSplines() const; + const QMap *DataLengthArcs() const; private: qint64 _id; QMap base; @@ -51,6 +82,10 @@ private: QMap standartTable; QMap incrementTable; QMap lengthLines; + QMap splines; + QMap lengthSplines; + QMap arcs; + QMap lengthArcs; }; #endif // VCONTAINER_H diff --git a/cursor.qrc b/cursor.qrc index b0c81b9d3..a43af671e 100644 --- a/cursor.qrc +++ b/cursor.qrc @@ -8,5 +8,6 @@ cursor/normal_cursor.png cursor/bisector_cursor.png cursor/intersect_cursor.png + cursor/spline_cursor.png diff --git a/cursor/spline_cursor.png b/cursor/spline_cursor.png new file mode 100644 index 0000000000000000000000000000000000000000..90a937a4142228b79a10aa0cfb6c22d6485b2747 GIT binary patch literal 1335 zcmV-71<3k|P)Vl&|00006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-3S5-8VaRium}JE06}y` zSad^gZEa<4bO1wAML|?gQaT`KWG!lNWoICEF)lD5D0OpbZf77#N=G0{P(?=|b~Z98 zEFf`pVQgu1c_2L?IWP*aMOc#n00ehQL_t(Y$HkUyXj^p@#()3Zq_KHvm)I?_tuj=K z15+0%?xouYJ7z6(Zk?<2!~C+&NwAhxXK+ADw-n@Bq%a$!S?n!X@sLvOOQi|c> zVIq;p@c8&RB_$d~V||5(3%{k*RO9E+-XCa~LsGYsR7XJWCKAMgi*!MllY9ncGS z?*P{{EjwhCQdpLS*Xxyi}jb6q>#Z_>;ig``fo~&+czJX zd!Th+#18ZWHv)mc_ig(R+*$Js)c|d6ZA0bd<){39|4+@$%}ZXXV>c68U{#=aVq)SM z5%~Zp0~+_WMaM?23@SkEw=Wfk!-1~rcs!ngg9i`3vk07(KndVX`-4iUHDC37y%l&G zr~p0%4!!&S$BEZo-^CZ7e}mswI-7Y~Eckpr*}Z%BpPikZAL_b3k_TutunKqu*qhq` zfSLYHipVYCAK=@{^72>h8uvJ3NmpEs^Q>oecP*G8#Iy*Zn0gfCw zk_%b{dOaZ5WW+0vhnFjQ8eK`p1BquBk}jYh?ocp0TjXy&LZ@gME2A9 z5a1ga7?A${{>E@Pd^!iX3K#-z0ULn@$Jg^)pH;sM4Plr%sbmtpG?} z$(kps7o6>H0DWn?^~EZEZ8$6sJrbmBg_l&)pv3FO>v7?A7vpw05zE9`Lc(h8QP0oU`*>9f53)&T;+ t0O!ud(3D2#skM}ruAqH?2hF=)GetPoint(id); if(number == 0){ diff --git a/dialogs/dialogalongline.h b/dialogs/dialogalongline.h index 2c8c64e62..72478f42e 100644 --- a/dialogs/dialogalongline.h +++ b/dialogs/dialogalongline.h @@ -27,7 +27,7 @@ public: qint64 getSecondPointId() const; void setSecondPointId(const qint64 &value); public slots: - virtual void ChoosedPoint(qint64 id, Scene::Type type); + virtual void ChoosedObject(qint64 id, Scene::Type type); virtual void DialogAccepted(); private: Ui::DialogAlongLine *ui; diff --git a/dialogs/dialogbisector.cpp b/dialogs/dialogbisector.cpp index 65ed24215..909d463be 100644 --- a/dialogs/dialogbisector.cpp +++ b/dialogs/dialogbisector.cpp @@ -44,7 +44,7 @@ DialogBisector::~DialogBisector(){ delete ui; } -void DialogBisector::ChoosedPoint(qint64 id, Scene::Type type){ +void DialogBisector::ChoosedObject(qint64 id, Scene::Type type){ if(type == Scene::Point){ VPointF point = data->GetPoint(id); if(number == 0){ diff --git a/dialogs/dialogbisector.h b/dialogs/dialogbisector.h index e2f05d72a..a3453814f 100644 --- a/dialogs/dialogbisector.h +++ b/dialogs/dialogbisector.h @@ -34,7 +34,7 @@ public: qint64 getThirdPointId() const; void setThirdPointId(const qint64 &value); public slots: - virtual void ChoosedPoint(qint64 id, Scene::Type type); + virtual void ChoosedObject(qint64 id, Scene::Type type); virtual void DialogAccepted(); private: Ui::DialogBisector *ui; diff --git a/dialogs/dialogendline.cpp b/dialogs/dialogendline.cpp index 94001b2ba..c8ef58f23 100644 --- a/dialogs/dialogendline.cpp +++ b/dialogs/dialogendline.cpp @@ -59,7 +59,7 @@ DialogEndLine::DialogEndLine(const VContainer *data, QWidget *parent) : connect(ui->lineEditFormula, &QLineEdit::textChanged, this, &DialogEndLine::FormulaChanged); } -void DialogEndLine::ChoosedPoint(qint64 id, Scene::Type type){ +void DialogEndLine::ChoosedObject(qint64 id, Scene::Type type){ if(type == Scene::Point){ VPointF point = data->GetPoint(id); ChangeCurrentText(ui->comboBoxBasePoint, point.name()); diff --git a/dialogs/dialogendline.h b/dialogs/dialogendline.h index 04449e3df..d9a714264 100644 --- a/dialogs/dialogendline.h +++ b/dialogs/dialogendline.h @@ -31,7 +31,7 @@ public: qint64 getBasePointId() const; void setBasePointId(const qint64 &value); public slots: - virtual void ChoosedPoint(qint64 id, Scene::Type type); + virtual void ChoosedObject(qint64 id, Scene::Type type); virtual void DialogAccepted(); private: Ui::DialogEndLine *ui; diff --git a/dialogs/dialogincrements.cpp b/dialogs/dialogincrements.cpp index 0e1a7dbee..cc9d3471a 100644 --- a/dialogs/dialogincrements.cpp +++ b/dialogs/dialogincrements.cpp @@ -137,7 +137,49 @@ void DialogIncrements::FillLengthLines(){ item = new QTableWidgetItem(QString().setNum(length)); item->setTextAlignment(Qt::AlignHCenter); ui->tableWidgetLines->setItem(currentRow, 1, item); - } + } +} + +void DialogIncrements::FillLengthSplines(){ + const QMap *splinesTable = data->DataLengthSplines(); + qint32 currentRow = -1; + QMapIterator i(*splinesTable); + while (i.hasNext()) { + i.next(); + qreal length = i.value(); + currentRow++; + ui->tableWidgetSplines->setRowCount ( splinesTable->size() ); + + QTableWidgetItem *item = new QTableWidgetItem(QString(i.key())); + item->setTextAlignment(Qt::AlignHCenter); + item->setFont(QFont("Times", 12, QFont::Bold)); + ui->tableWidgetSplines->setItem(currentRow, 0, item); + + item = new QTableWidgetItem(QString().setNum(length)); + item->setTextAlignment(Qt::AlignHCenter); + ui->tableWidgetSplines->setItem(currentRow, 1, item); + } +} + +void DialogIncrements::FillLengthArcs(){ + const QMap *arcsTable = data->DataLengthArcs(); + qint32 currentRow = -1; + QMapIterator i(*arcsTable); + while (i.hasNext()) { + i.next(); + qreal length = i.value(); + currentRow++; + ui->tableWidgetArcs->setRowCount ( arcsTable->size() ); + + QTableWidgetItem *item = new QTableWidgetItem(QString(i.key())); + item->setTextAlignment(Qt::AlignHCenter); + item->setFont(QFont("Times", 12, QFont::Bold)); + ui->tableWidgetArcs->setItem(currentRow, 0, item); + + item = new QTableWidgetItem(QString().setNum(length)); + item->setTextAlignment(Qt::AlignHCenter); + ui->tableWidgetArcs->setItem(currentRow, 1, item); + } } void DialogIncrements::FullUpdateFromFile(){ @@ -156,6 +198,14 @@ void DialogIncrements::FullUpdateFromFile(){ InitialLinesTable(); FillLengthLines(); + ui->tableWidgetSplines->clear(); + InitialSplinesTable(); + FillLengthSplines(); + + ui->tableWidgetArcs->clear(); + InitialArcsTable(); + FillLengthArcs(); + connect(ui->tableWidgetIncrement, &QTableWidget::cellChanged, this, &DialogIncrements::cellChanged); } @@ -367,6 +417,22 @@ void DialogIncrements::InitialLinesTable(){ ui->tableWidgetLines->setHorizontalHeaderItem(1, new QTableWidgetItem("Довжина")); } +void DialogIncrements::InitialSplinesTable(){ + ui->tableWidgetSplines->resizeColumnsToContents(); + ui->tableWidgetSplines->resizeRowsToContents(); + ui->tableWidgetSplines->verticalHeader()->setDefaultSectionSize(20); + ui->tableWidgetSplines->setHorizontalHeaderItem(0, new QTableWidgetItem("Лінія")); + ui->tableWidgetSplines->setHorizontalHeaderItem(1, new QTableWidgetItem("Довжина")); +} + +void DialogIncrements::InitialArcsTable(){ + ui->tableWidgetArcs->resizeColumnsToContents(); + ui->tableWidgetArcs->resizeRowsToContents(); + ui->tableWidgetArcs->verticalHeader()->setDefaultSectionSize(20); + ui->tableWidgetArcs->setHorizontalHeaderItem(0, new QTableWidgetItem("Лінія")); + ui->tableWidgetArcs->setHorizontalHeaderItem(1, new QTableWidgetItem("Довжина")); +} + void DialogIncrements::DialogAccepted(){ emit DialogClosed(QDialog::Accepted); } diff --git a/dialogs/dialogincrements.h b/dialogs/dialogincrements.h index 92019090d..209edb791 100644 --- a/dialogs/dialogincrements.h +++ b/dialogs/dialogincrements.h @@ -33,9 +33,13 @@ private: void InitialStandartTable(); void InitialIncrementTable(); void InitialLinesTable(); + void InitialSplinesTable(); + void InitialArcsTable(); void FillStandartTable(); void FillIncrementTable(); void FillLengthLines(); + void FillLengthSplines(); + void FillLengthArcs(); void AddIncrementToFile(quint64 id, QString name, qint32 base, qreal ksize, qreal kgrowth, QString description); }; diff --git a/dialogs/dialogincrements.ui b/dialogs/dialogincrements.ui index 010025acc..07ce391ed 100644 --- a/dialogs/dialogincrements.ui +++ b/dialogs/dialogincrements.ui @@ -20,7 +20,7 @@ QTabWidget::North - 2 + 0 @@ -245,7 +245,7 @@ - + QAbstractItemView::NoEditTriggers @@ -281,7 +281,7 @@ - + QAbstractItemView::NoEditTriggers diff --git a/dialogs/dialogline.cpp b/dialogs/dialogline.cpp index 1fd7a6356..a62fbfbcd 100644 --- a/dialogs/dialogline.cpp +++ b/dialogs/dialogline.cpp @@ -55,7 +55,7 @@ void DialogLine::DialogAccepted(){ DialogClosed(QDialog::Accepted); } -void DialogLine::ChoosedPoint(qint64 id, Scene::Type type){ +void DialogLine::ChoosedObject(qint64 id, Scene::Type type){ if(type == Scene::Point){ VPointF point = data->GetPoint(id); if(number == 0){ diff --git a/dialogs/dialogline.h b/dialogs/dialogline.h index 65cbf996f..ce02c7f66 100644 --- a/dialogs/dialogline.h +++ b/dialogs/dialogline.h @@ -21,7 +21,7 @@ public: qint64 getSecondPoint() const; void setSecondPoint(const qint64 &value); public slots: - void ChoosedPoint(qint64 id, Scene::Type type); + void ChoosedObject(qint64 id, Scene::Type type); virtual void DialogAccepted(); private: Ui::DialogLine *ui; diff --git a/dialogs/dialoglineintersect.cpp b/dialogs/dialoglineintersect.cpp index 5f681cb0c..57a917b72 100644 --- a/dialogs/dialoglineintersect.cpp +++ b/dialogs/dialoglineintersect.cpp @@ -25,7 +25,7 @@ DialogLineIntersect::~DialogLineIntersect() delete ui; } -void DialogLineIntersect::ChoosedPoint(qint64 id, Scene::Type type){ +void DialogLineIntersect::ChoosedObject(qint64 id, Scene::Type type){ if(type == Scene::Point){ VPointF point = data->GetPoint(id); if(number == 0){ diff --git a/dialogs/dialoglineintersect.h b/dialogs/dialoglineintersect.h index d7354804f..6074e71b9 100644 --- a/dialogs/dialoglineintersect.h +++ b/dialogs/dialoglineintersect.h @@ -24,7 +24,7 @@ public: QString getPointName() const; void setPointName(const QString &value); public slots: - virtual void ChoosedPoint(qint64 id, Scene::Type type); + virtual void ChoosedObject(qint64 id, Scene::Type type); virtual void DialogAccepted(); void P1Line1Changed( int index); void P2Line1Changed( int index); diff --git a/dialogs/dialognormal.cpp b/dialogs/dialognormal.cpp index 4f95743c4..4119a3882 100644 --- a/dialogs/dialognormal.cpp +++ b/dialogs/dialognormal.cpp @@ -62,7 +62,7 @@ DialogNormal::~DialogNormal() delete ui; } -void DialogNormal::ChoosedPoint(qint64 id, Scene::Type type){ +void DialogNormal::ChoosedObject(qint64 id, Scene::Type type){ if(type == Scene::Point){ VPointF point = data->GetPoint(id); if(number == 0){ diff --git a/dialogs/dialognormal.h b/dialogs/dialognormal.h index 91bbc69a7..1fba7c52e 100644 --- a/dialogs/dialognormal.h +++ b/dialogs/dialognormal.h @@ -33,7 +33,7 @@ public: qint64 getSecondPointId() const; void setSecondPointId(const qint64 &value); public slots: - virtual void ChoosedPoint(qint64 id, Scene::Type type); + virtual void ChoosedObject(qint64 id, Scene::Type type); virtual void DialogAccepted(); private: Ui::DialogNormal *ui; diff --git a/dialogs/dialogshoulderpoint.cpp b/dialogs/dialogshoulderpoint.cpp index 801f6bf83..a1fbdf152 100644 --- a/dialogs/dialogshoulderpoint.cpp +++ b/dialogs/dialogshoulderpoint.cpp @@ -45,7 +45,7 @@ DialogShoulderPoint::~DialogShoulderPoint() delete ui; } -void DialogShoulderPoint::ChoosedPoint(qint64 id, Scene::Type type){ +void DialogShoulderPoint::ChoosedObject(qint64 id, Scene::Type type){ if(type == Scene::Point){ VPointF point = data->GetPoint(id); if(number == 0){ diff --git a/dialogs/dialogshoulderpoint.h b/dialogs/dialogshoulderpoint.h index dc7864ed9..887ec7bae 100644 --- a/dialogs/dialogshoulderpoint.h +++ b/dialogs/dialogshoulderpoint.h @@ -29,7 +29,7 @@ public: qint64 getPShoulder() const; void setPShoulder(const qint64 &value); public slots: - virtual void ChoosedPoint(qint64 id, Scene::Type type); + virtual void ChoosedObject(qint64 id, Scene::Type type); virtual void DialogAccepted(); private: Ui::DialogShoulderPoint *ui; diff --git a/dialogs/dialogspline.cpp b/dialogs/dialogspline.cpp new file mode 100644 index 000000000..f1075d820 --- /dev/null +++ b/dialogs/dialogspline.cpp @@ -0,0 +1,127 @@ +#include "dialogspline.h" +#include "ui_dialogspline.h" + +DialogSpline::DialogSpline(const VContainer *data, QWidget *parent) : + DialogTool(data, parent), ui(new Ui::DialogSpline) +{ + ui->setupUi(this); + number = 0; + bOk = ui->buttonBox->button(QDialogButtonBox::Ok); + connect(bOk, &QPushButton::clicked, this, &DialogSpline::DialogAccepted); + + QPushButton *bCansel = ui->buttonBox->button(QDialogButtonBox::Cancel); + connect(bCansel, &QPushButton::clicked, this, &DialogSpline::DialogRejected); + FillComboBoxPoints(ui->comboBoxP1); + FillComboBoxPoints(ui->comboBoxP4); +} + +DialogSpline::~DialogSpline() +{ + delete ui; +} + +void DialogSpline::ChoosedObject(qint64 id, Scene::Type type){ + if(type == Scene::Point){ + VPointF point = data->GetPoint(id); + if(number == 0){ + qint32 index = ui->comboBoxP1->findText(point.name()); + if ( index != -1 ) { // -1 for not found + ui->comboBoxP1->setCurrentIndex(index); + number++; + return; + } + } + if(number == 1){ + qint32 index = ui->comboBoxP4->findText(point.name()); + if ( index != -1 ) { // -1 for not found + ui->comboBoxP4->setCurrentIndex(index); + number = 0; + index = ui->comboBoxP1->currentIndex(); + qint64 p1Id = qvariant_cast(ui->comboBoxP1->itemData(index)); + QPointF p1 = data->GetPoint(p1Id); + QPointF p4 = data->GetPoint(id); + ui->spinBoxAngle1->setValue(QLineF(p1, p4).angle()); + ui->spinBoxAngle2->setValue(QLineF(p4, p1).angle()); + } + if(!isInitialized){ + this->show(); + } + } + } +} + +void DialogSpline::DialogAccepted(){ + qint32 index = ui->comboBoxP1->currentIndex(); + p1 = qvariant_cast(ui->comboBoxP1->itemData(index)); + index = ui->comboBoxP4->currentIndex(); + p4 = qvariant_cast(ui->comboBoxP4->itemData(index)); + angle1 = ui->spinBoxAngle1->value(); + angle2 = ui->spinBoxAngle2->value(); + kAsm1 = ui->doubleSpinBoxKasm1->value(); + kAsm2 = ui->doubleSpinBoxKasm2->value(); + kCurve = ui->doubleSpinBoxKcurve->value(); + emit DialogClosed(QDialog::Accepted); +} + +qreal DialogSpline::getKCurve() const{ + return kCurve; +} + +void DialogSpline::setKCurve(const qreal &value){ + kCurve = value; + ui->doubleSpinBoxKcurve->setValue(value); +} + +qreal DialogSpline::getKAsm2() const{ + return kAsm2; +} + +void DialogSpline::setKAsm2(const qreal &value){ + kAsm2 = value; + ui->doubleSpinBoxKasm2->setValue(value); +} + +qreal DialogSpline::getKAsm1() const{ + return kAsm1; +} + +void DialogSpline::setKAsm1(const qreal &value){ + kAsm1 = value; + ui->doubleSpinBoxKasm1->setValue(value); +} + +qreal DialogSpline::getAngle2() const{ + return angle2; +} + +void DialogSpline::setAngle2(const qreal &value){ + angle2 = value; + ui->spinBoxAngle2->setValue(value); +} + +qreal DialogSpline::getAngle1() const{ + return angle1; +} + +void DialogSpline::setAngle1(const qreal &value){ + angle1 = value; + ui->spinBoxAngle1->setValue(value); +} + +qint64 DialogSpline::getP4() const{ + return p4; +} + +void DialogSpline::setP4(const qint64 &value){ + p4 = value; + ChangeCurrentData(ui->comboBoxP4, value); +} + +qint64 DialogSpline::getP1() const{ + return p1; +} + +void DialogSpline::setP1(const qint64 &value){ + p1 = value; + ChangeCurrentData(ui->comboBoxP1, value); +} diff --git a/dialogs/dialogspline.h b/dialogs/dialogspline.h new file mode 100644 index 000000000..10c4f4c61 --- /dev/null +++ b/dialogs/dialogspline.h @@ -0,0 +1,46 @@ +#ifndef DIALOGSPLINE_H +#define DIALOGSPLINE_H + +#include "dialogtool.h" +#include "../container/vcontainer.h" + +namespace Ui { +class DialogSpline; +} + +class DialogSpline : public DialogTool +{ + Q_OBJECT +public: + explicit DialogSpline(const VContainer *data, QWidget *parent = 0); + ~DialogSpline(); + qint64 getP1() const; + void setP1(const qint64 &value); + qint64 getP4() const; + void setP4(const qint64 &value); + qreal getAngle1() const; + void setAngle1(const qreal &value); + qreal getAngle2() const; + void setAngle2(const qreal &value); + qreal getKAsm1() const; + void setKAsm1(const qreal &value); + qreal getKAsm2() const; + void setKAsm2(const qreal &value); + qreal getKCurve() const; + void setKCurve(const qreal &value); +public slots: + virtual void ChoosedObject(qint64 id, Scene::Type type); + virtual void DialogAccepted(); +private: + Ui::DialogSpline *ui; + qint32 number; + qint64 p1; // перша точка + qint64 p4; // четверта точка + qreal angle1; // кут нахилу дотичної в першій точці + qreal angle2; // кут нахилу дотичної в другій точці + qreal kAsm1; + qreal kAsm2; + qreal kCurve; +}; + +#endif // DIALOGSPLINE_H diff --git a/dialogs/dialogspline.ui b/dialogs/dialogspline.ui new file mode 100644 index 000000000..9d14dc4e7 --- /dev/null +++ b/dialogs/dialogspline.ui @@ -0,0 +1,230 @@ + + + DialogSpline + + + + 0 + 0 + 524 + 254 + + + + Dialog + + + + + + + + + + + + Перша точка + + + + + + + + + + + + + + Коефіцієнт довжини першої контрольної точки + + + true + + + + + + + 1.000000000000000 + + + + + + + + + + + Кут першої контрольної точки + + + true + + + + + + + 360 + + + + + + + + + + + + + + + Друга точка + + + + + + + + + + + + + + Коефіцієнт довжини другої контрольної точки + + + true + + + + + + + 1.000000000000000 + + + + + + + + + + + Кут другої контрольної точки + + + true + + + + + + + 360 + + + + + + + + + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Коефіцієнт кривизни сплайну + + + + + + + + 0 + 0 + + + + + 72 + 0 + + + + 1.000000000000000 + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + + buttonBox + accepted() + DialogSpline + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + DialogSpline + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff --git a/dialogs/dialogtool.cpp b/dialogs/dialogtool.cpp index 7e8e318d0..2e9aad21a 100644 --- a/dialogs/dialogtool.cpp +++ b/dialogs/dialogtool.cpp @@ -170,7 +170,7 @@ void DialogTool::CheckState(){ } -void DialogTool::ChoosedPoint(qint64 id, Scene::Type type){ +void DialogTool::ChoosedObject(qint64 id, Scene::Type type){ Q_UNUSED(id); Q_UNUSED(type); } diff --git a/dialogs/dialogtool.h b/dialogs/dialogtool.h index afb2f049e..ba744b1bb 100644 --- a/dialogs/dialogtool.h +++ b/dialogs/dialogtool.h @@ -22,7 +22,7 @@ public: signals: void DialogClosed(int result); public slots: - virtual void ChoosedPoint(qint64 id, Scene::Type type); + virtual void ChoosedObject(qint64 id, Scene::Type type); void NamePointChanged(); virtual void DialogAccepted(); virtual void DialogRejected(); diff --git a/docs/Doxyfile b/docs/Doxyfile new file mode 100644 index 000000000..f47ebdb2c --- /dev/null +++ b/docs/Doxyfile @@ -0,0 +1,1792 @@ +# Doxyfile 1.8.1.2 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project. +# +# All text after a hash (#) is considered a comment and will be ignored. +# The format is: +# TAG = value [value, ...] +# For lists items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (" "). + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all +# text before the first occurrence of this tag. Doxygen uses libiconv (or the +# iconv built into libc) for the transcoding. See +# http://www.gnu.org/software/libiconv for the list of possible encodings. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or sequence of words) that should +# identify the project. Note that if you do not use Doxywizard you need +# to put quotes around the project name if it contains spaces. + +PROJECT_NAME = "Valentina" + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or +# if some version control system is used. + +PROJECT_NUMBER = + +# Using the PROJECT_BRIEF tag one can provide an optional one line description +# for a project that appears at the top of each page and should give viewer +# a quick idea about the purpose of the project. Keep the description short. + +PROJECT_BRIEF = + +# With the PROJECT_LOGO tag one can specify an logo or icon that is +# included in the documentation. The maximum height of the logo should not +# exceed 55 pixels and the maximum width should not exceed 200 pixels. +# Doxygen will copy the logo to the output directory. + +PROJECT_LOGO = + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location +# where doxygen was started. If left blank the current directory will be used. + +OUTPUT_DIRECTORY = + +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would +# otherwise cause performance problems for the file system. + +CREATE_SUBDIRS = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, +# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English +# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, +# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, +# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. + +OUTPUT_LANGUAGE = Ukrainian + +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). +# Set to NO to disable this. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" +# "represents" "a" "an" "the" + +ABBREVIATE_BRIEF = + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief +# description. + +ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set +# to NO the shortest path that makes the file name unique will be used. + +FULL_PATH_NAMES = YES + +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the +# path to strip. + +STRIP_FROM_PATH = + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that +# are normally passed to the compiler using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful if your file system +# doesn't support long names like on DOS, Mac, or CD-ROM. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like regular Qt-style comments +# (thus requiring an explicit @brief command for a brief description.) + +JAVADOC_AUTOBRIEF = NO + +# If the QT_AUTOBRIEF tag is set to YES then Doxygen will +# interpret the first line (until the first dot) of a Qt-style +# comment as the brief description. If set to NO, the comments +# will behave just like regular Qt-style comments (thus requiring +# an explicit \brief command for a brief description.) + +QT_AUTOBRIEF = NO + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed +# description. Set this tag to YES if you prefer the old behaviour instead. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it +# re-implements. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will +# be part of the file/class/namespace that contains it. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# Doxygen uses this value to replace tabs by spaces in code fragments. + +TAB_SIZE = 8 + +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". +# You can put \n's in the value part of an alias to insert newlines. + +ALIASES = + +# This tag can be used to specify a number of word-keyword mappings (TCL only). +# A mapping has the form "name=value". For example adding +# "class=itcl::class" will allow you to use the command class in the +# itcl::class meaning. + +TCL_SUBST = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list +# of all members will be omitted, etc. + +OPTIMIZE_OUTPUT_FOR_C = NO + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for +# Java. For instance, namespaces will be presented as packages, qualified +# scopes will look different, etc. + +OPTIMIZE_OUTPUT_JAVA = NO + +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources only. Doxygen will then generate output that is more tailored for +# Fortran. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for +# VHDL. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Doxygen selects the parser to use depending on the extension of the files it +# parses. With this tag you can assign which parser to use for a given extension. +# Doxygen has a built-in mapping, but you can override or extend it using this +# tag. The format is ext=language, where ext is a file extension, and language +# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C, +# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make +# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C +# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions +# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen. + +EXTENSION_MAPPING = + +# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all +# comments according to the Markdown format, which allows for more readable +# documentation. See http://daringfireball.net/projects/markdown/ for details. +# The output of markdown processing is further processed by doxygen, so you +# can mix doxygen, HTML, and XML commands with Markdown formatting. +# Disable only in case of backward compatibilities issues. + +MARKDOWN_SUPPORT = YES + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also makes the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. + +CPP_CLI_SUPPORT = NO + +# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. +# Doxygen will parse them like normal C++ but will assume all classes use public +# instead of private inheritance when no explicit protection keyword is present. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate getter +# and setter methods for a property. Setting this option to YES (the default) +# will make doxygen replace the get and set methods by a property in the +# documentation. This will only work if the methods are indeed getting or +# setting a simple type. If this is not the case, or you want to show the +# methods anyway, you should set this option to NO. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. + +DISTRIBUTE_GROUP_DOC = NO + +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using +# the \nosubgrouping command. + +SUBGROUPING = YES + +# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and +# unions are shown inside the group in which they are included (e.g. using +# @ingroup) instead of on a separate page (for HTML and Man pages) or +# section (for LaTeX and RTF). + +INLINE_GROUPED_CLASSES = NO + +# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and +# unions with only public data fields will be shown inline in the documentation +# of the scope in which they are defined (i.e. file, namespace, or group +# documentation), provided this scope is documented. If set to NO (the default), +# structs, classes, and unions are shown on a separate page (for HTML and Man +# pages) or section (for LaTeX and RTF). + +INLINE_SIMPLE_STRUCTS = NO + +# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum +# is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically +# be useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. + +TYPEDEF_HIDES_STRUCT = NO + +# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to +# determine which symbols to keep in memory and which to flush to disk. +# When the cache is full, less often used symbols will be written to disk. +# For small to medium size projects (<1000 input files) the default value is +# probably good enough. For larger projects a too small cache size can cause +# doxygen to be busy swapping symbols to and from disk most of the time +# causing a significant performance penalty. +# If the system has enough physical memory increasing the cache will improve the +# performance by keeping more symbols in memory. Note that the value works on +# a logarithmic scale so increasing the size by one will roughly double the +# memory usage. The cache size is given by this formula: +# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, +# corresponding to a cache size of 2^16 = 65536 symbols. + +SYMBOL_CACHE_SIZE = 0 + +# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be +# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given +# their name and scope. Since this can be an expensive process and often the +# same symbol appear multiple times in the code, doxygen keeps a cache of +# pre-resolved symbols. If the cache is too small doxygen will become slower. +# If the cache is too large, memory is wasted. The cache size is given by this +# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0, +# corresponding to a cache size of 2^16 = 65536 symbols. + +LOOKUP_CACHE_SIZE = 0 + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless +# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES + +EXTRACT_ALL = YES + +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# will be included in the documentation. + +EXTRACT_PRIVATE = YES + +# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal scope will be included in the documentation. + +EXTRACT_PACKAGE = NO + +# If the EXTRACT_STATIC tag is set to YES all static members of a file +# will be included in the documentation. + +EXTRACT_STATIC = NO + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. +# If set to NO only classes defined in header files are included. + +EXTRACT_LOCAL_CLASSES = YES + +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. +# If set to NO (the default) only methods in the interface are included. + +EXTRACT_LOCAL_METHODS = NO + +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base +# name of the file that contains the anonymous namespace. By default +# anonymous namespaces are hidden. + +EXTRACT_ANON_NSPACES = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. +# This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_MEMBERS = NO + +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various +# overviews. This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_CLASSES = NO + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the +# documentation. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the +# function's detailed documentation block. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. +# Set it to YES to include the internal documentation. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. + +CASE_SENSE_NAMES = YES + +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the +# documentation. If set to YES the scope will be hidden. + +HIDE_SCOPE_NAMES = NO + +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation +# of that file. + +SHOW_INCLUDE_FILES = YES + +# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen +# will list include files with double quotes in the documentation +# rather than with sharp brackets. + +FORCE_LOCAL_INCLUDES = NO + +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# is inserted in the documentation for inline members. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in +# declaration order. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in +# declaration order. + +SORT_BRIEF_DOCS = NO + +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen +# will sort the (brief and detailed) documentation of class members so that +# constructors and destructors are listed first. If set to NO (the default) +# the constructors will appear in the respective orders defined by +# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. +# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO +# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. + +SORT_MEMBERS_CTORS_1ST = NO + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the +# hierarchy of group names into alphabetical order. If set to NO (the default) +# the group names will appear in their defined order. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the +# alphabetical list. + +SORT_BY_SCOPE_NAME = NO + +# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to +# do proper type resolution of all parameters of a function it will reject a +# match between the prototype and the implementation of a member function even +# if there is only one candidate or it is obvious which candidate to choose +# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen +# will still accept a match between prototype and implementation in such cases. + +STRICT_PROTO_MATCHING = NO + +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo +# commands in the documentation. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test +# commands in the documentation. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug +# commands in the documentation. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting +# \deprecated commands in the documentation. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional +# documentation sections, marked by \if sectionname ... \endif. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or macro consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and macros in the +# documentation can be controlled using \showinitializer or \hideinitializer +# command in the documentation regardless of this setting. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the +# list will mention the files that were used to generate the documentation. + +SHOW_USED_FILES = YES + +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. +# This will remove the Files entry from the Quick Index and from the +# Folder Tree View (if specified). The default is YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the +# Namespaces page. +# This will remove the Namespaces entry from the Quick Index +# and from the Folder Tree View (if specified). The default is YES. + +SHOW_NAMESPACES = YES + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command , where is the value of +# the FILE_VERSION_FILTER tag, and is the name of an input file +# provided by doxygen. Whatever the program writes to standard output +# is used as the file version. See the manual for examples. + +FILE_VERSION_FILTER = + +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed +# by doxygen. The layout file controls the global structure of the generated +# output files in an output format independent way. To create the layout file +# that represents doxygen's defaults, run doxygen with the -l option. +# You can optionally specify a file name after the option, if omitted +# DoxygenLayout.xml will be used as the name of the layout file. + +LAYOUT_FILE = + +# The CITE_BIB_FILES tag can be used to specify one or more bib files +# containing the references data. This must be a list of .bib files. The +# .bib extension is automatically appended if omitted. Using this command +# requires the bibtex tool to be installed. See also +# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style +# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this +# feature you need bibtex and perl available in the search path. + +CITE_BIB_FILES = + +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated +# by doxygen. Possible values are YES and NO. If left blank NO is used. + +QUIET = YES + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank +# NO is used. + +WARNINGS = YES + +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# automatically be disabled. + +WARN_IF_UNDOCUMENTED = YES + +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that +# don't exist or using markup commands wrongly. + +WARN_IF_DOC_ERROR = YES + +# The WARN_NO_PARAMDOC option can be enabled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of +# documentation. + +WARN_NO_PARAMDOC = YES + +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could +# be obtained via FILE_VERSION_FILTER) + +WARN_FORMAT = "$file:$line: $text" + +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written +# to stderr. + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories +# with spaces. + +INPUT = + +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is +# also the default input encoding. Doxygen uses libiconv (or the iconv built +# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for +# the list of possible encodings. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh +# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py +# *.f90 *.f *.for *.vhd *.vhdl + +FILE_PATTERNS = *.h + +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. +# If left blank NO is used. + +RECURSIVE = YES + +# The EXCLUDE tag can be used to specify files and/or directories that should be +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. +# Note that relative paths are relative to the directory from which doxygen is +# run. + +EXCLUDE = + +# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or +# directories that are symbolic links (a Unix file system feature) are excluded +# from the input. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories +# for example use the pattern */test/* + +EXCLUDE_PATTERNS = */.hg/* + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see +# the \include command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank all files are included. + +EXAMPLE_PATTERNS = + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. +# Possible values are YES and NO. If left blank NO is used. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see +# the \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command , where +# is the value of the INPUT_FILTER tag, and is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. +# If FILTER_PATTERNS is specified, this tag will be +# ignored. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. +# Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. +# The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty or if +# non of the patterns match the file name, INPUT_FILTER is applied. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source +# files to browse (i.e. when SOURCE_BROWSER is set to YES). + +FILTER_SOURCE_FILES = NO + +# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file +# pattern. A pattern will override the setting for FILTER_PATTERN (if any) +# and it is also possible to disable source filtering for a specific pattern +# using *.ext= (so without naming a filter). This option only has effect when +# FILTER_SOURCE_FILES is enabled. + +FILTER_SOURCE_PATTERNS = + +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also +# VERBATIM_HEADERS is set to NO. + +SOURCE_BROWSER = NO + +# Setting the INLINE_SOURCES tag to YES will include the body +# of functions and classes directly in the documentation. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code +# fragments. Normal C, C++ and Fortran comments will always remain visible. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES +# then for each documented function all documented +# functions referencing it will be listed. + +REFERENCED_BY_RELATION = NO + +# If the REFERENCES_RELATION tag is set to YES +# then for each documented function all documented entities +# called/used by that function will be listed. + +REFERENCES_RELATION = NO + +# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) +# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from +# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will +# link to the source code. +# Otherwise they will link to the documentation. + +REFERENCES_LINK_SOURCE = YES + +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You +# will need version 4.8.6 or higher. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for +# which an include is specified. Set to NO to disable this. + +VERBATIM_HEADERS = YES + +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project +# contains a lot of classes, structs, unions or interfaces. + +ALPHABETICAL_INDEX = YES + +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# in which this list will be split (can be a number in the range [1..20]) + +COLS_IN_ALPHA_INDEX = 5 + +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# should be ignored while generating the index headers. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# generate HTML output. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `html' will be used as the default path. + +HTML_OUTPUT = html + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# doxygen will generate files with .html extension. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a +# standard header. Note that when using a custom header you are responsible +# for the proper inclusion of any scripts and style sheets that doxygen +# needs, which is dependent on the configuration options used. +# It is advised to generate a default header using "doxygen -w html +# header.html footer.html stylesheet.css YourConfigFile" and then modify +# that header. Note that the header is subject to change so you typically +# have to redo this when upgrading to a newer version of doxygen or when +# changing the value of configuration settings such as GENERATE_TREEVIEW! + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a +# standard footer. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own +# style sheet in the HTML output directory as well, or it will be erased! + +HTML_STYLESHEET = + +# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or +# other source files which should be copied to the HTML output directory. Note +# that these files will be copied to the base HTML output directory. Use the +# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these +# files. In the HTML_STYLESHEET file, use the file name only. Also note that +# the files will be copied as-is; there are no commands or markers available. + +HTML_EXTRA_FILES = + +# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. +# Doxygen will adjust the colors in the style sheet and background images +# according to this color. Hue is specified as an angle on a colorwheel, +# see http://en.wikipedia.org/wiki/Hue for more information. +# For instance the value 0 represents red, 60 is yellow, 120 is green, +# 180 is cyan, 240 is blue, 300 purple, and 360 is red again. +# The allowed range is 0 to 359. + +HTML_COLORSTYLE_HUE = 220 + +# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of +# the colors in the HTML output. For a value of 0 the output will use +# grayscales only. A value of 255 will produce the most vivid colors. + +HTML_COLORSTYLE_SAT = 100 + +# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to +# the luminance component of the colors in the HTML output. Values below +# 100 gradually make the output lighter, whereas values above 100 make +# the output darker. The value divided by 100 is the actual gamma applied, +# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2, +# and 100 does not change the gamma. + +HTML_COLORSTYLE_GAMMA = 80 + +# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML +# page will contain the date and time when the page was generated. Setting +# this to NO can help when comparing the output of multiple runs. + +HTML_TIMESTAMP = YES + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. + +HTML_DYNAMIC_SECTIONS = NO + +# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of +# entries shown in the various tree structured indices initially; the user +# can expand and collapse entries dynamically later on. Doxygen will expand +# the tree to such a level that at most the specified number of entries are +# visible (unless a fully collapsed tree already exceeds this amount). +# So setting the number of entries 1 will produce a full collapsed tree by +# default. 0 is a special value representing an infinite number of entries +# and will result in a full expanded tree by default. + +HTML_INDEX_NUM_ENTRIES = 100 + +# If the GENERATE_DOCSET tag is set to YES, additional index files +# will be generated that can be used as input for Apple's Xcode 3 +# integrated development environment, introduced with OSX 10.5 (Leopard). +# To create a documentation set, doxygen will generate a Makefile in the +# HTML output directory. Running make will produce the docset in that +# directory and running "make install" will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find +# it at startup. +# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# for more information. + +GENERATE_DOCSET = NO + +# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the +# feed. A documentation feed provides an umbrella under which multiple +# documentation sets from a single provider (such as a company or product suite) +# can be grouped. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that +# should uniquely identify the documentation set bundle. This should be a +# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen +# will append .docset to the name. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify +# the documentation publisher. This should be a reverse domain-name style +# string, e.g. com.mycompany.MyDocSet.documentation. + +DOCSET_PUBLISHER_ID = org.doxygen.Publisher + +# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher. + +DOCSET_PUBLISHER_NAME = Publisher + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) +# of the generated HTML documentation. + +GENERATE_HTMLHELP = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be +# written to the html output directory. + +CHM_FILE = + +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# the HTML help compiler on the generated index.hhp. + +HHC_LOCATION = + +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that +# it should be included in the master .chm file (NO). + +GENERATE_CHI = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING +# is used to encode HtmlHelp index (hhk), content (hhc) and project file +# content. + +CHM_INDEX_ENCODING = + +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a +# normal table of contents (NO) in the .chm file. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members +# to the contents of the HTML help documentation and to the tree view. + +TOC_EXPAND = NO + +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and +# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated +# that can be used as input for Qt's qhelpgenerator to generate a +# Qt Compressed Help (.qch) of the generated HTML documentation. + +GENERATE_QHP = NO + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can +# be used to specify the file name of the resulting .qch file. +# The path specified is relative to the HTML output folder. + +QCH_FILE = + +# The QHP_NAMESPACE tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#namespace + +QHP_NAMESPACE = org.doxygen.Project + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#virtual-folders + +QHP_VIRTUAL_FOLDER = doc + +# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to +# add. For more information please see +# http://doc.trolltech.com/qthelpproject.html#custom-filters + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the +# custom filter to add. For more information please see +# +# Qt Help Project / Custom Filters. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this +# project's +# filter section matches. +# +# Qt Help Project / Filter Attributes. + +QHP_SECT_FILTER_ATTRS = + +# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can +# be used to specify the location of Qt's qhelpgenerator. +# If non-empty doxygen will try to run qhelpgenerator on the generated +# .qhp file. + +QHG_LOCATION = + +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files +# will be generated, which together with the HTML files, form an Eclipse help +# plugin. To install this plugin and make it available under the help contents +# menu in Eclipse, the contents of the directory containing the HTML and XML +# files needs to be copied into the plugins directory of eclipse. The name of +# the directory within the plugins directory should be the same as +# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before +# the help appears. + +GENERATE_ECLIPSEHELP = NO + +# A unique identifier for the eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have +# this name. + +ECLIPSE_DOC_ID = org.doxygen.Project + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) +# at top of each HTML page. The value NO (the default) enables the index and +# the value YES disables it. Since the tabs have the same information as the +# navigation tree you can set this option to NO if you already set +# GENERATE_TREEVIEW to YES. + +DISABLE_INDEX = NO + +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. +# If the tag value is set to YES, a side panel will be generated +# containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). +# Windows users are probably better off using the HTML help feature. +# Since the tree basically has the same information as the tab index you +# could consider to set DISABLE_INDEX to NO when enabling this option. + +GENERATE_TREEVIEW = NO + +# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values +# (range [0,1..20]) that doxygen will group on one line in the generated HTML +# documentation. Note that a value of 0 will completely suppress the enum +# values from appearing in the overview section. + +ENUM_VALUES_PER_LINE = 4 + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree +# is shown. + +TREEVIEW_WIDTH = 250 + +# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open +# links to external symbols imported via tag files in a separate window. + +EXT_LINKS_IN_WINDOW = NO + +# Use this tag to change the font size of Latex formulas included +# as images in the HTML documentation. The default is 10. Note that +# when you change the font size after a successful doxygen run you need +# to manually remove any form_*.png images from the HTML output directory +# to force them to be regenerated. + +FORMULA_FONTSIZE = 10 + +# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# generated for formulas are transparent PNGs. Transparent PNGs are +# not supported properly for IE 6.0, but are supported on all modern browsers. +# Note that when changing this option you need to delete any form_*.png files +# in the HTML output before the changes have effect. + +FORMULA_TRANSPARENT = YES + +# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax +# (see http://www.mathjax.org) which uses client side Javascript for the +# rendering instead of using prerendered bitmaps. Use this if you do not +# have LaTeX installed or if you want to formulas look prettier in the HTML +# output. When enabled you may also need to install MathJax separately and +# configure the path to it using the MATHJAX_RELPATH option. + +USE_MATHJAX = NO + +# When MathJax is enabled you need to specify the location relative to the +# HTML output directory using the MATHJAX_RELPATH option. The destination +# directory should contain the MathJax.js script. For instance, if the mathjax +# directory is located at the same level as the HTML output directory, then +# MATHJAX_RELPATH should be ../mathjax. The default value points to +# the MathJax Content Delivery Network so you can quickly see the result without +# installing MathJax. +# However, it is strongly recommended to install a local +# copy of MathJax from http://www.mathjax.org before deployment. + +MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest + +# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension +# names that should be enabled during MathJax rendering. + +MATHJAX_EXTENSIONS = + +# When the SEARCHENGINE tag is enabled doxygen will generate a search box +# for the HTML output. The underlying search engine uses javascript +# and DHTML and should work on any modern browser. Note that when using +# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets +# (GENERATE_DOCSET) there is already a search function so this one should +# typically be disabled. For large projects the javascript based search engine +# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. + +SEARCHENGINE = YES + +# When the SERVER_BASED_SEARCH tag is enabled the search engine will be +# implemented using a PHP enabled web server instead of at the web client +# using Javascript. Doxygen will generate the search PHP script and index +# file to put on the web server. The advantage of the server +# based approach is that it scales better to large projects and allows +# full text search. The disadvantages are that it is more difficult to setup +# and does not have live searching capabilities. + +SERVER_BASED_SEARCH = NO + +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# generate Latex output. + +GENERATE_LATEX = YES + +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `latex' will be used as the default path. + +LATEX_OUTPUT = latex + +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. If left blank `latex' will be used as the default command name. +# Note that when enabling USE_PDFLATEX this option is only used for +# generating bitmaps for formulas in the HTML output, but not in the +# Makefile that is written to the output directory. + +LATEX_CMD_NAME = latex + +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the +# default command name. + +MAKEINDEX_CMD_NAME = makeindex + +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_LATEX = NO + +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, letter, legal and +# executive. If left blank a4wide will be used. + +PAPER_TYPE = a4 + +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# packages that should be included in the LaTeX output. + +EXTRA_PACKAGES = + +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a +# standard header. Notice: only use this tag if you know what you are doing! + +LATEX_HEADER = + +# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for +# the generated latex document. The footer should contain everything after +# the last chapter. If it is left blank doxygen will generate a +# standard footer. Notice: only use this tag if you know what you are doing! + +LATEX_FOOTER = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references +# This makes the output suitable for online browsing using a pdf viewer. + +PDF_HYPERLINKS = YES + +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a +# higher quality PDF documentation. + +USE_PDFLATEX = YES + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. +# This option is also used when generating formulas in HTML. + +LATEX_BATCHMODE = NO + +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) +# in the output. + +LATEX_HIDE_INDICES = NO + +# If LATEX_SOURCE_CODE is set to YES then doxygen will include +# source code with syntax highlighting in the LaTeX output. +# Note that which sources are shown also depends on other settings +# such as SOURCE_BROWSER. + +LATEX_SOURCE_CODE = NO + +# The LATEX_BIB_STYLE tag can be used to specify the style to use for the +# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See +# http://en.wikipedia.org/wiki/BibTeX for more info. + +LATEX_BIB_STYLE = plain + +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- + +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with +# other RTF readers or editors. + +GENERATE_RTF = NO + +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `rtf' will be used as the default path. + +RTF_OUTPUT = rtf + +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_RTF = NO + +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. +# Note: wordpad (write) and others do not support links. + +RTF_HYPERLINKS = NO + +# Load style sheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide +# replacements, missing definitions are set to their default value. + +RTF_STYLESHEET_FILE = + +# Set optional variables used in the generation of an rtf document. +# Syntax is similar to doxygen's config file. + +RTF_EXTENSIONS_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# generate man pages + +GENERATE_MAN = NO + +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `man' will be used as the default path. + +MAN_OUTPUT = man + +# The MAN_EXTENSION tag determines the extension that is added to +# the generated man pages (default is the subroutine's section .3) + +MAN_EXTENSION = .3 + +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command +# would be unable to find the correct page. The default is NO. + +MAN_LINKS = NO + +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- + +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of +# the code including all documentation. + +GENERATE_XML = NO + +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `xml' will be used as the default path. + +XML_OUTPUT = xml + +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_SCHEMA = + +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_DTD = + +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that +# enabling this will significantly increase the size of the XML output. + +XML_PROGRAMLISTING = YES + +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- + +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental +# and incomplete at the moment. + +GENERATE_AUTOGEN_DEF = NO + +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- + +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the +# moment. + +GENERATE_PERLMOD = NO + +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# to generate PDF and DVI output from the Perl module output. + +PERLMOD_LATEX = NO + +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. +# This is useful +# if you want to understand what is going on. +# On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller +# and Perl will parse it just the same. + +PERLMOD_PRETTY = YES + +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same +# Makefile don't overwrite each other's variables. + +PERLMOD_MAKEVAR_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include +# files. + +ENABLE_PREPROCESSING = YES + +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled +# way by setting EXPAND_ONLY_PREDEF to YES. + +MACRO_EXPANSION = NO + +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the +# PREDEFINED and EXPAND_AS_DEFINED tags. + +EXPAND_ONLY_PREDEF = NO + +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# pointed to by INCLUDE_PATH will be searched when a #include is found. + +SEARCH_INCLUDES = YES + +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by +# the preprocessor. + +INCLUDE_PATH = + +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will +# be used. + +INCLUDE_FILE_PATTERNS = + +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator +# instead of the = operator. + +PREDEFINED = + +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. +# Use the PREDEFINED tag if you want to use a different macro definition that +# overrules the definition found in the source code. + +EXPAND_AS_DEFINED = + +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all references to function-like macros +# that are alone on a line, have an all uppercase name, and do not end with a +# semicolon, because these will confuse the parser if not removed. + +SKIP_FUNCTION_MACROS = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- + +# The TAGFILES option can be used to specify one or more tagfiles. For each +# tag file the location of the external documentation should be added. The +# format of a tag file without this location is as follows: +# +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths +# or URLs. Note that each tag file must have a unique name (where the name does +# NOT include the path). If a tag file is not located in the directory in which +# doxygen is run, you must also specify the path to the tagfile here. + +TAGFILES = + +# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# a tag file that is based on the input files it reads. + +GENERATE_TAGFILE = + +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes +# will be listed. + +ALLEXTERNALS = NO + +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will +# be listed. + +EXTERNAL_GROUPS = YES + +# The PERL_PATH should be the absolute path and name of the perl script +# interpreter (i.e. the result of `which perl'). + +PERL_PATH = /usr/bin/perl + +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- + +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# or super classes. Setting the tag to NO turns the diagrams off. Note that +# this option also works with HAVE_DOT disabled, but it is recommended to +# install and use dot, since it yields more powerful graphs. + +CLASS_DIAGRAMS = YES + +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see +# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the +# documentation. The MSCGEN_PATH tag allows you to specify the directory where +# the mscgen tool resides. If left empty the tool is assumed to be found in the +# default search path. + +MSCGEN_PATH = + +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented +# or is not a class. + +HIDE_UNDOC_RELATIONS = YES + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# have no effect if this option is set to NO (the default) + +HAVE_DOT = YES + +# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is +# allowed to run in parallel. When set to 0 (the default) doxygen will +# base this on the number of processors available in the system. You can set it +# explicitly to a value larger than 0 to get control over the balance +# between CPU load and processing speed. + +DOT_NUM_THREADS = 0 + +# By default doxygen will use the Helvetica font for all dot files that +# doxygen generates. When you want a differently looking font you can specify +# the font name using DOT_FONTNAME. You need to make sure dot is able to find +# the font, which can be done by putting it in a standard location or by setting +# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. + +DOT_FONTNAME = Helvetica + +# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. +# The default size is 10pt. + +DOT_FONTSIZE = 10 + +# By default doxygen will tell dot to use the Helvetica font. +# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to +# set the path where dot can find it. + +DOT_FONTPATH = + +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the +# CLASS_DIAGRAMS tag to NO. + +CLASS_GRAPH = YES + +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and +# class references variables) of the class with other documented classes. + +COLLABORATION_GRAPH = YES + +# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for groups, showing the direct groups dependencies + +GROUP_GRAPHS = YES + +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling +# Language. + +UML_LOOK = YES + +# If the UML_LOOK tag is enabled, the fields and methods are shown inside +# the class node. If there are many fields or methods and many nodes the +# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS +# threshold limits the number of items for each type to make the size more +# managable. Set this to 0 for no limit. Note that the threshold may be +# exceeded by 50% before the limit is enforced. + +UML_LIMIT_NUM_FIELDS = 10 + +# If set to YES, the inheritance and collaboration graphs will show the +# relations between templates and their instances. + +TEMPLATE_RELATIONS = NO + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with +# other documented files. + +INCLUDE_GRAPH = YES + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or +# indirectly include this file. + +INCLUDED_BY_GRAPH = YES + +# If the CALL_GRAPH and HAVE_DOT options are set to YES then +# doxygen will generate a call dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable call graphs +# for selected functions only using the \callgraph command. + +CALL_GRAPH = NO + +# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then +# doxygen will generate a caller dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable caller +# graphs for selected functions only using the \callergraph command. + +CALLER_GRAPH = NO + +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# will generate a graphical hierarchy of all classes instead of a textual one. + +GRAPHICAL_HIERARCHY = YES + +# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES +# then doxygen will show the dependencies a directory has on other directories +# in a graphical way. The dependency relations are determined by the #include +# relations between the files in the directories. + +DIRECTORY_GRAPH = YES + +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# generated by dot. Possible values are svg, png, jpg, or gif. +# If left blank png will be used. If you choose svg you need to set +# HTML_FILE_EXTENSION to xhtml in order to make the SVG files +# visible in IE 9+ (other browsers do not have this requirement). + +DOT_IMAGE_FORMAT = svg + +# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to +# enable generation of interactive SVG images that allow zooming and panning. +# Note that this requires a modern browser other than Internet Explorer. +# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you +# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files +# visible. Older versions of IE do not have SVG support. + +INTERACTIVE_SVG = YES + +# The tag DOT_PATH can be used to specify the path where the dot tool can be +# found. If left blank, it is assumed the dot tool can be found in the path. + +DOT_PATH = + +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the +# \dotfile command). + +DOTFILE_DIRS = + +# The MSCFILE_DIRS tag can be used to specify one or more directories that +# contain msc files that are included in the documentation (see the +# \mscfile command). + +MSCFILE_DIRS = + +# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of +# nodes that will be shown in the graph. If the number of nodes in a graph +# becomes larger than this value, doxygen will truncate the graph, which is +# visualized by representing a node as a red box. Note that doxygen if the +# number of direct children of the root node in a graph is already larger than +# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note +# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. + +DOT_GRAPH_MAX_NODES = 50 + +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the +# graphs generated by dot. A depth value of 3 means that only nodes reachable +# from the root by following a path via at most 3 edges will be shown. Nodes +# that lay further from the root node will be omitted. Note that setting this +# option to 1 or 2 may greatly reduce the computation time needed for large +# code bases. Also note that the size of a graph can be further restricted by +# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. + +MAX_DOT_GRAPH_DEPTH = 0 + +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is disabled by default, because dot on Windows does not +# seem to support this out of the box. Warning: Depending on the platform used, +# enabling this option may lead to badly anti-aliased labels on the edges of +# a graph (i.e. they become hard to read). + +DOT_TRANSPARENT = NO + +# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) +# support this, this feature is disabled by default. + +DOT_MULTI_TARGETS = YES + +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and +# arrows in the dot generated graphs. + +GENERATE_LEGEND = YES + +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate +# the various graphs. + +DOT_CLEANUP = YES diff --git a/geometry/varc.cpp b/geometry/varc.cpp new file mode 100644 index 000000000..c201bb4b9 --- /dev/null +++ b/geometry/varc.cpp @@ -0,0 +1,294 @@ +#define _USE_MATH_DEFINES +#include +#include "varc.h" +#include + +VArc::VArc (){ + f1 = 0; + f2 = 0; + length = 0; + radius = 0; + center = 0; + p1 = QPointF( 0, 0 ); + p2 = QPointF( 0, 0 ); + points = 0; +} + +VArc::VArc (const QMap *points, qint64 center, qreal radius, qreal f1, qreal f2 ){ + this->points = points; + ModifiArc( center, radius, f1, f2 ); +} + +qreal VArc::GetF1 () const{ + return f1; +} + +qreal VArc::GetF2 () const{ + return f2; +} + +qreal VArc::GetLength () const{ + return length; +} + +qreal VArc::GetRadius () const{ + return radius; +} + +qint64 VArc::GetCenter() const{ + return center; +} + +QPointF VArc::GetCenterPoint() const{ + if(points->contains(center)){ + return points->value(center); + } else { + qCritical()<<"Не можу знайти id = "< *VArc::GetDataPoints() const{ + return points; +} + +void VArc::ModifiArc (qint64 center, qreal radius, qreal f1, qreal f2 ){ + this->f1 = f1; + this->f2 = f2; + this->radius = radius; + this->center = center; + QPointF p1 ( GetCenterPoint().x () + radius, GetCenterPoint().y () ); + QLineF centerP1(GetCenterPoint(), p1); + centerP1.setAngle(f1); + p1 = centerP1.p2(); + QPointF p2 ( GetCenterPoint().x () + radius, GetCenterPoint().y () ); + QLineF centerP2(GetCenterPoint(), p2); + centerP2.setAngle(f2); + p2 = centerP2.p2(); + this->p1 = p1; + this->p2 = p2; + // визначимо довжину дуги за формулою. + // МОЖЛИВО НЕ ПРАВИЛЬНО. ПОТРІБНО ПЕРЕВІРИТИ ФОРМУЛУ, ОСКІЛЬКИ КУТ ПОВЕРТАЄТЬСЯ В ГРАДУСАХ!!!!! + //qreal ang = AngleArc ( f1, f2 ) ; + qreal ang = centerP1.angleTo(centerP2); + this->length = ang * radius * M_PI/180; + //qDebug()<<"ang = "<center = QPointF( center.x()+mx, center.y()+my ); +// this->p1 = QPointF( p1.x()+mx, p1.y()+my ); +// this->p2 = QPointF( p2.x()+mx, p2.y()+my ); +//} + +//void VArc::RotationArc (QPointF pRotate, qreal angle ){ +// QLineF pRotateCenter( pRotate, center ); +// pRotateCenter.setAngle( angle ); +// center = pRotateCenter.p2(); +// QLineF pRotateP1( pRotate, p1 ); +// pRotateP1.setAngle( angle ); +// p1 = pRotateP1.p2(); +// QLineF pRotateP2( pRotate, p2 ); +// pRotateP2.setAngle( angle ); +// p2 = pRotateP2.p2(); +// QLineF centerP1 ( center, p1 ); +// QLineF centerP2 ( center, p2 ); +// f1 = centerP1.angle(); +// f2 = centerP2.angle(); +//} + +VSpline VArc::SplOfArc ( qint32 number ) const{ + qint32 n = NumberSplOfArc (); + if( number > n ){ + throw "Дуга не складається з такої кількості сплайнів."; + } + qreal f1 = GetF1 (); + qreal f2 = GetF2 (); + qint32 i; + for ( i = 0; i < n; ++i ){ + if ( i == n - 1 ){ + f2 = GetF2 (); + } else { + if ( f1 + 90 > 360 ){ + f2 = f1 + 90 - 360; + } else { + f2 = f1 + 90; + } + } + qreal anglF1, anglF2; + if ( f1 + 90 > 360 ){ + anglF1 = f1 + 90 - 360 ; + } else { + anglF1 = f1 + 90 ; + } + if ( f2 - 90 < 0 ){ + anglF2 = 360 + f2 - 90 ; + } else { + anglF2 = f2 - 90 ; + } + if ( i + 1 == number ){ +// return VSpline (GetDataPoints(), GetP1 (), GetP2 (), anglF1, anglF2, 1., 1., 1. ); + f1 = f2; + } + } + return VSpline(); +} + +//void VArc::CutArc ( qreal length, VArc &arcFir, VArc &arcSec ) const{ +// if ( length > GetLength () ){ +// qDebug()<<"Не правильна довжина дуги/n"; +// exit(-1); +// } +// qreal angle; +// angle = GetF1 () + (length * 180) / (radius * M_PI); +// arcFir.ModifiArc ( GetCenter (), GetRadius (), GetF1 (), angle ); +// arcSec.ModifiArc ( GetCenter (), GetRadius (), angle, GetF2 () ); +//} + +//void VArc::CutArc ( QPointF point, VArc &arcFir, VArc &arcSec ) const{ +// VArc arc = VArc(center,radius, f1, QLineF(center, point).angle()); +// if(this->length VArc::GetPoints () const{ + QVector points; + qint32 numberSpl = NumberSplOfArc(); + for(qint32 i = 1; i <= numberSpl; ++i){ + VSpline spl = SplOfArc ( i ); + points< GetRadius() + CO.length() ){ + throw"Немає перетину кіл для знаходження дотичних."; + } + if ( d < qAbs(GetRadius() - CO.length()) ){ + throw"Не можу знайти дотичну. Одне коло знаходиться в іншому."; + } + qreal a = (pow(GetRadius(),2) - pow(CO.length(),2) + pow(d,2) ) / (2*d); + qreal h = sqrt(pow(GetRadius(),2) - pow(a,2)); + qreal x2 = GetCenterPoint().x() + a * (O.x() - GetCenterPoint().x())/d; + qreal y2 = GetCenterPoint().y() + a * (O.y() - GetCenterPoint().y())/d; + if(tan == VArc::FirstTangent){ + qreal x3 = x2 - h * ( O.y() - GetCenterPoint().y() ) / d; + qreal y3 = y2 + h * ( O.x() - GetCenterPoint().x() ) / d; + return QPointF(x3,y3); + } else { + qreal x3 = x2 + h * ( O.y() - GetCenterPoint().y() ) / d; + qreal y3 = y2 - h * ( O.x() - GetCenterPoint().x() ) / d; + return QPointF(x3,y3); + } +} + +bool VArc::Contains(const QPointF P)const{ + QVector points = GetPoints (); + for(qint32 i=0; i< points.size();++i){ + if((qint32)points[i].x()==(qint32)P.x() && (qint32)points[i].y()==(qint32)P.y()){ + return true; + } + } + return false; +} + +QPointF VArc::PutAlongArc(qreal length) const{ + if(GetLength()ModifiArc ( Center, radius, QLineF(Center,P2).angle(), QLineF(Center,P1).angle() ); +//} diff --git a/geometry/varc.h b/geometry/varc.h new file mode 100644 index 000000000..1e16bcfec --- /dev/null +++ b/geometry/varc.h @@ -0,0 +1,192 @@ +#ifndef VARC_H +#define VARC_H + +#include "vspline.h" +#include +#include +#include +#include "container/vpointf.h" + +/** + * @brief VArc клас, що реалізує дугу. Дуга розраховується за годиниковою стрілкою. + */ +class VArc{ +public: + enum Tangent_e { FirstTangent, SecondTangent }; + /** + * @brief VArc конструктор по замовчуванню. + */ + VArc (); + /** + * @brief VArc конструктор. + * @param center точка центру. + * @param radius радіус. + * @param f1 початковий кут в градусах. + * @param f2 кінцевий кут в градусах. + */ + VArc ( const QMap *points, qint64 center, qreal radius, qreal f1, + qreal f2 ); + /** + * @brief GetF1 повертає початковий кут дуги. + * @return повертає кут в градусах. + */ + qreal GetF1 () const; + /** + * @brief GetF2 повертає кінцевий кут дуги. + * @return повертає кут в градусах. + */ + qreal GetF2 () const; + /** + * @brief GetLength повертає довжину дуги. + * @return повертає довжину дуги. + */ + qreal GetLength () const; + /** + * @brief GetRadius повертає радіус дуги. + * @return повертає радіус дуги. + */ + qreal GetRadius () const; + /** + * @brief GetCenter повертає точку центра дуги. + * @return повертає точку центра дуги. + */ + qint64 GetCenter () const; + QPointF GetCenterPoint() const; + /** + * @brief GetP1 повертає першу точку з якої починається дуга. + * @return точку початку дуги. + */ + QPointF GetP1 () const; + /** + * @brief GetP2 повертає другу точку в якій закінчується дуга. + * @return точку кінця дуги. + */ + QPointF GetP2 () const; + const QMap *GetDataPoints() const; + /** + * @brief ModifiArc змінює параметри дуги. + * @param center новий центр дуги. + * @param radius новий радіус дуги. + * @param f1 новий початковий кут в градусах. + * @param f2 новий кінцевий кут в градусах. + */ + void ModifiArc (qint64 center, qreal radius, qreal f1, qreal f2 ); + /** + * @brief BiasArc зміщує дугу. + * @param mx зміщення по х координаті. + * @param my зміщення по у координаті. + */ +// void BiasArc ( qreal mx, qreal my ); + /** + * @brief RotationArc повертає дугу на кут проти годиникової стрілки відносно точки. + * @param pRotate точка відносно якої повертається. + * @param angle кут в градусах на який повертається в градусах. + */ +// void RotationArc ( QPointF pRotate, qreal angle ); + /** + * @brief SplOfArc повертає сплайн дуги за номером. + * @param number номер сплайна в дузі. + * @return сплайн. + */ + VSpline SplOfArc ( qint32 number ) const; + /** + * @brief CutArc розрізає дугу на дві дуги. + * @param length довжина першої дуги. + * @param arcFir перша дуга. + * @param arcSec друга дуга. + */ +// void CutArc ( qreal length, VArc &arcFir, VArc &arcSec ) const; + /** + * @brief CutArc розрізає дугу на дві дуги. + * @param point точка яка ділить дугу. + * @param arcFir перша дуга. + * @param arcSec друга дуга. + */ +// void CutArc ( QPointF point, VArc &arcFir, VArc &arcSec ) const; + /** + * @brief CrossingArcLine перевіряє перетин дуги і лінії. + * @param line лінія з якою шукаємо перетин. + * @param intersectionPoint точка перетину. + * @return результат перевірки на перетин. + */ + QLineF::IntersectType CrossingArcLine(const QLineF &line, QPointF *intersectionPoint) const; + /** + * @brief NumberSplOfArc метод шукає кілкість сплайнів які необхідні для відтворення такої дуги. + * @return кількість сплайнів. + */ + qint32 NumberSplOfArc () const; + /** + * @brief GetPath будує шлях по даній дузі. + * @return повертає шлях. + */ + QPainterPath GetPath() const; + /** + * @brief GetPoints повертає набір точок по яких можна побудувати дугу. + * @return набір точок дуги. + */ + QVector + GetPoints () const; + /** + * @brief Tangent розраховує дотичну до дуги. + * @param P точка через, що не належить дузі, через яку проходить дотична. + * @param tan перша чи друга дотична. + * @return точку дотичної на дузі. + */ + QPointF Tangent(const QPointF P,VArc::Tangent_e tan = VArc::FirstTangent)const; + /** + * @brief Contains перевіряє чи точка належить дузі. + * @param P точка що перевіряється. + * @return true - належить дузі, false - не належить дузі. + */ + bool Contains(const QPointF P)const; + /** + * @brief PutAlongArc розміщує точку на дузі. + * @param length довжина від початку дуги. + * @return точка що лежить на дузі. + */ + QPointF PutAlongArc(qreal length) const; + /** + * @brief Mirror дзеркальне відображення дуги. + * @param Pmirror точка відносно якої відбувається дзеркалення. + */ +// void Mirror(const QPointF Pmirror); +private: + /** + * @brief f1 початковий кут в градусах + */ + qreal f1; // початковий кут нахилу дуги (градуси) + /** + * @brief f2 кінцевий кут в градусах + */ + qreal f2; // кінцевий кут нахилу дуги (градуси) + /** + * @brief length довжина дуги. + */ + qreal length; // довжина дуги + /** + * @brief radius радіус дуги. + */ + qreal radius; + /** + * @brief center центральна точка дуги. + */ + qint64 center; + /** + * @brief p1 точка початку побудови дуги. + */ + QPointF p1; + /** + * @brief p2 кінцева точка побудови дуги. + */ + QPointF p2; + const QMap *points; + /** + * @brief AngleArc визначає кут дуги. + * @param f1 початковий кут дуги в градусах. + * @param f2 кінцевий кут в градусах. + * @return повертає кут в градусах. + */ + qreal AngleArc(qreal f1, qreal f2 ) const; +}; + +#endif // VARC_H diff --git a/geometry/vspline.cpp b/geometry/vspline.cpp new file mode 100644 index 000000000..a5ea329e8 --- /dev/null +++ b/geometry/vspline.cpp @@ -0,0 +1,729 @@ +#define _USE_MATH_DEFINES +#include +#include "vspline.h" +#include + +VSpline::VSpline(){ + p1 = 0; + p2 = QPointF(); + p3 = QPointF(); + p4 = 0; + angle1 = 0; + angle2 = 0; + points = 0; + kAsm1 = 1; + kAsm2 = 1; + kCurve = 1; +} + +VSpline::VSpline ( const VSpline & spline ){ + p1 = spline.GetP1 (); + p2 = spline.GetP2 (); + p3 = spline.GetP3 (); + p4 = spline.GetP4 (); + angle1 = spline.GetAngle1 (); + angle2 = spline.GetAngle2 (); + points = spline.GetDataPoints(); + kAsm1 = spline.GetKasm1(); + kAsm2 = spline.GetKasm2(); + kCurve = spline.GetKcurve(); +} + +VSpline::VSpline (const QMap *points, qint64 p1, qint64 p4, qreal angle1, qreal angle2, + qreal kAsm1, qreal kAsm2 , qreal kCurve){ + this->points = points; + ModifiSpl ( p1, p4, angle1, angle2, kAsm1, kAsm2, kCurve ); +} + +VSpline::VSpline (const QMap *points, qint64 p1, QPointF p2, QPointF p3, qint64 p4, + qreal kCurve){ + this->points = points; + ModifiSpl ( p1, p2, p3, p4, kCurve); +} + +void VSpline::ModifiSpl ( qint64 p1, qint64 p4, qreal angle1, qreal angle2, + qreal kAsm1, qreal kAsm2, qreal kCurve){ + this->p1 = p1; + this->p4 = p4; + this->angle1 = angle1; + this->angle2 = angle2; + this->kAsm1 = kAsm1; + this->kAsm2 = kAsm2; + this->kCurve = kCurve; + QLineF p1pX(GetPointP1().x(), GetPointP1().y(), GetPointP1().x() + 100, GetPointP1().y()); + p1pX.setAngle( angle1 ); + qreal L = 0, radius = 0, angle = 90; +// angle = QLineF(GetPointP1(), p1pX.p2()).angleTo(QLineF(GetPointP1(), GetPointP4())); +// if ( angle > 180 ){ +// angle = 360 - angle; +// } + QPointF point1 = GetPointP1(); + QPointF point4 = GetPointP4(); + radius = QLineF(QPointF(point1.x(), point4.y()),point4).length(); +// radius = QLineF(GetPointP1(), GetPointP4()).length() / 2 / sin( angle * M_PI / 180.0 ); + L = kCurve * radius * 4 / 3 * tan( angle * M_PI / 180.0 / 4 ); + QLineF p1p2(GetPointP1().x(), GetPointP1().y(), GetPointP1().x() + L * kAsm1, GetPointP1().y()); + p1p2.setAngle(angle1); + QLineF p4p3(GetPointP4().x(), GetPointP4().y(), GetPointP4().x() + L * kAsm2, GetPointP4().y()); + p4p3.setAngle(angle2); + this->p2 = p1p2.p2(); + this->p3 = p4p3.p2(); +} + +void VSpline::ModifiSpl (qint64 p1, QPointF p2, QPointF p3, qint64 p4, qreal kCurve){ + this->p1 = p1; + this->p2 = p2; + this->p3 = p3; + this->p4 = p4; + this->angle1 = QLineF ( GetPointP1(), p2 ).angle(); + this->angle2 = QLineF ( GetPointP4(), p3 ).angle(); + + QLineF p1pX(GetPointP1().x(), GetPointP1().y(), GetPointP1().x() + 100, GetPointP1().y()); + p1pX.setAngle( angle1 ); + qreal L = 0, radius = 0, angle = 90; +// angle = QLineF(GetPointP1(), p1pX.p2()).angleTo(QLineF(GetPointP1(), GetPointP4())); +// if ( angle >= 180 ){ +// angle = 360 - angle; +// } + QPointF point1 = GetPointP1(); + QPointF point4 = GetPointP4(); + radius = QLineF(QPointF(point1.x(), point4.y()),point4).length(); +// radius = QLineF(GetPointP1(), GetPointP4()).length() / 2 / sin( angle * M_PI / 180.0 ); + L = kCurve * radius * 4 / 3 * tan( angle * M_PI / 180.0 / 4 ); + + this->kCurve = kCurve; + this->kAsm1 = QLineF ( GetPointP1(), p2 ).length()/L; + this->kAsm2 = QLineF ( GetPointP4(), p3 ).length()/L; +} + +//void VSpline::RotationSpl (QPointF pRotate, qreal angle ){ +// QLineF pRotateP1 (pRotate, p1); +// pRotateP1.setAngle(angle); +// p1 = pRotateP1.p2(); +// QLineF pRotateP2 (pRotate, p2); +// pRotateP2.setAngle(angle); +// p2 = pRotateP2.p2(); +// QLineF pRotateP3 (pRotate, p3); +// pRotateP3.setAngle(angle); +// p3 = pRotateP3.p2(); +// QLineF pRotateP4 (pRotate, p4); +// pRotateP4.setAngle(angle); +// p4 = pRotateP4.p2(); +// angle1 = QLineF(p1, p2).angle(); +// angle2 = QLineF(p4, p2).angle(); +//} + +//void VSpline::BiasSpl ( qreal mx, qreal my ){ +// p1 = QPointF(p1.x()+mx, p1.y()+my); +// p2 = QPointF(p2.x()+mx, p2.y()+my); +// p3 = QPointF(p3.x()+mx, p3.y()+my); +// p4 = QPointF(p4.x()+mx, p4.y()+my); +//} + +qint64 VSpline::GetP1 () const{ + return p1; +} + +VPointF VSpline::GetPointP1() const{ + if(points->contains(p1)){ + return points->value(p1); + } else { + qCritical()<<"Не можу знайти id = "<contains(p4)){ + return points->value(p4); + } else { + qCritical()<<"Не можу знайти id = "<p2, this->p3, GetPointP4()); +} + +QString VSpline::GetName() const{ + VPointF first = GetPointP1(); + VPointF second = GetPointP4(); + return QString("Spl_%1_%2").arg(first.name(), second.name()); +} + +qreal VSpline::GetKasm1() const{ + return kAsm1; +} + +qreal VSpline::GetKasm2() const{ + return kAsm2; +} + +qreal VSpline::GetKcurve() const{ + return kCurve; +} + +const QMap *VSpline::GetDataPoints() const{ + return points; +} + +QLineF::IntersectType VSpline::CrossingSplLine ( const QLineF &line, QPointF *intersectionPoint ) const{ + QVector px; + QVector py; + px.append ( GetPointP1 ().x () ); + py.append ( GetPointP1 ().y () ); + QVector& wpx = px; + QVector& wpy = py; + PointBezier_r ( GetPointP1 ().x (), GetPointP1 ().y (), GetP2 ().x (), GetP2 ().y (), + GetP3 ().x (), GetP3 ().y (), GetPointP4 ().x (), GetPointP4 ().y (), + 0, wpx, wpy); + px.append ( GetPointP4 ().x () ); + py.append ( GetPointP4 ().y () ); + qint32 i = 0; + QPointF crosPoint; + QLineF::IntersectType type = QLineF::NoIntersection; + for ( i = 0; i < px.count()-1; ++i ){ + type = line.intersect(QLineF ( QPointF ( px[i], py[i] ), + QPointF ( px[i+1], py[i+1] )), &crosPoint); + if ( type == QLineF::BoundedIntersection ){ + *intersectionPoint = crosPoint; + return type; + } + } + throw "Не можу знайти точку перетину сплайну з лінією."; +} + +//void VSpline::CutSpline ( qreal length, VSpline* curFir, VSpline* curSec ) const{ +// if ( length > GetLength()){ +// throw"Не правильна довжина нового сплайну\n"; +// } +// qreal parT = length / GetLength(); +// QLineF seg1_2 ( GetPointP1 (), GetP2 () ); +// seg1_2.setLength(seg1_2.length () * parT); +// QPointF p12 = seg1_2.p2(); +// QLineF seg2_3 ( GetP2 (), GetP3 () ); +// seg2_3.setLength(seg2_3.length () * parT); +// QPointF p23 = seg2_3.p2(); +// QLineF seg12_23 ( p12, p23 ); +// seg12_23.setLength(seg12_23.length () * parT); +// QPointF p123 = seg12_23.p2(); +// QLineF seg3_4 ( GetP3 (), GetPointP4 () ); +// seg3_4.setLength(seg3_4.length () * parT); +// QPointF p34 = seg3_4.p2(); +// QLineF seg23_34 ( p23, p34 ); +// seg23_34.setLength(seg23_34.length () * parT); +// QPointF p234 = seg23_34.p2(); +// QLineF seg123_234 ( p123, p234 ); +// seg123_234.setLength(seg123_234.length () * parT); +// QPointF p1234 = seg123_234.p2(); +// curFir->ModifiSpl ( GetPointP1 (), p12, p123, p1234 ); +// curSec->ModifiSpl ( p1234, p234, p34, GetPointP4 () ); +//} + +//void VSpline::CutSpline ( QPointF point, VSpline* curFir, VSpline* curSec ) const{ +// qreal t = param_t (point); +// qreal length = t*this->GetLength(); +// CutSpline ( length, curFir, curSec ); +//} + +void VSpline::PutAlongSpl (QPointF &moveP, qreal move ) const{ + if ( GetLength () < move ){ + qDebug()<<"Довжина більше довжини сплайну."; + qDebug()< VSpline::GetPoints () const{ + return GetPoints(GetPointP1(), p2, p3, GetPointP4()); +} + +QVector VSpline::GetPoints (QPointF p1, QPointF p2, QPointF p3, QPointF p4) const{ + QVector pvector; + QVector x; + QVector y; + QVector& wx = x; + QVector& wy = y; + x.append ( p1.x () ); + y.append ( p1.y () ); + PointBezier_r ( p1.x (), p1.y (), p2.x (), p2.y (), + p3.x (), p3.y (), p4.x (), p4.y (), 0, wx, wy ); + x.append ( p4.x () ); + y.append ( p4.y () ); + for ( qint32 i = 0; i < x.count(); ++i ){ + pvector.append( QPointF ( x[i], y[i] ) ); + } + return pvector; +} + +qreal VSpline::LengthBezier ( QPointF p1, QPointF p2, QPointF p3, QPointF p4 ) const{ + /*QVector px; + QVector py; + QVector& wpx = px; + QVector& wpy = py; + px.append ( p1.x () ); + py.append ( p1.y () ); + PointBezier_r ( p1.x (), p1.y (), p2.x (), p2.y (), + p3.x (), p3.y (), p4.x (), p4.y (), 0, wpx, wpy); + px.append ( p4.x () ); + py.append ( p4.y () ); + qint32 i = 0; + qreal length = 0.0; + /* + * Наприклад маємо 10 точок. Від 0 до 9 і останню точку не опрацьовуємо. + * Тому від 0 до 8(<10-1). + * + for ( i = 0; i < px.count() - 1; ++i ){ + length += QLineF ( QPointF ( px[i], py[i] ), QPointF ( px[i+1], py[i+1] ) ).length (); + }*/ + QPainterPath splinePath; + QVector points = GetPoints (p1, p2, p3, p4); + splinePath.moveTo(points[0]); + for (qint32 i = 1; i < points.count(); ++i){ + splinePath.lineTo(points[i]); + } + return splinePath.length(); +} + +void VSpline::PointBezier_r ( qreal x1, qreal y1, qreal x2, qreal y2, + qreal x3, qreal y3, qreal x4, qreal y4, + qint16 level, QVector &px, QVector &py) const{ + const double curve_collinearity_epsilon = 1e-30; + const double curve_angle_tolerance_epsilon = 0.01; + const double m_angle_tolerance = 0.0; + enum curve_recursion_limit_e { curve_recursion_limit = 32 }; + const double m_cusp_limit = 0.0; + double m_approximation_scale = 1.0; + double m_distance_tolerance_square; + + m_distance_tolerance_square = 0.5 / m_approximation_scale; + m_distance_tolerance_square *= m_distance_tolerance_square; + + if(level > curve_recursion_limit) + { + return; + } + + // Calculate all the mid-points of the line segments + //---------------------- + double x12 = (x1 + x2) / 2; + double y12 = (y1 + y2) / 2; + double x23 = (x2 + x3) / 2; + double y23 = (y2 + y3) / 2; + double x34 = (x3 + x4) / 2; + double y34 = (y3 + y4) / 2; + double x123 = (x12 + x23) / 2; + double y123 = (y12 + y23) / 2; + double x234 = (x23 + x34) / 2; + double y234 = (y23 + y34) / 2; + double x1234 = (x123 + x234) / 2; + double y1234 = (y123 + y234) / 2; + + + // Try to approximate the full cubic curve by a single straight line + //------------------ + double dx = x4-x1; + double dy = y4-y1; + + double d2 = fabs(((x2 - x4) * dy - (y2 - y4) * dx)); + double d3 = fabs(((x3 - x4) * dy - (y3 - y4) * dx)); + double da1, da2, k; + + switch(((int)(d2 > curve_collinearity_epsilon) << 1) + + (int)(d3 > curve_collinearity_epsilon)) + { + case 0: + // All collinear OR p1==p4 + //---------------------- + k = dx*dx + dy*dy; + if(k == 0) + { + d2 = CalcSqDistance(x1, y1, x2, y2); + d3 = CalcSqDistance(x4, y4, x3, y3); + } + else + { + k = 1 / k; + da1 = x2 - x1; + da2 = y2 - y1; + d2 = k * (da1*dx + da2*dy); + da1 = x3 - x1; + da2 = y3 - y1; + d3 = k * (da1*dx + da2*dy); + if(d2 > 0 && d2 < 1 && d3 > 0 && d3 < 1) + { + // Simple collinear case, 1---2---3---4 + // We can leave just two endpoints + return; + } + if(d2 <= 0) + d2 = this->CalcSqDistance(x2, y2, x1, y1); + else if(d2 >= 1) + d2 = CalcSqDistance(x2, y2, x4, y4); + else + d2 = CalcSqDistance(x2, y2, x1 + d2*dx, y1 + d2*dy); + + if(d3 <= 0) + d3 = this->CalcSqDistance(x3, y3, x1, y1); + else if(d3 >= 1) + d3 = this->CalcSqDistance(x3, y3, x4, y4); + else + d3 = CalcSqDistance(x3, y3, x1 + d3*dx, y1 + d3*dy); + } + if(d2 > d3) + { + if(d2 < m_distance_tolerance_square) + { + + px.append(x2); + py.append(y2); + //m_points.add(point_d(x2, y2)); + return; + } + } + else + { + if(d3 < m_distance_tolerance_square) + { + + px.append(x3); + py.append(y3); + //m_points.add(point_d(x3, y3)); + return; + } + } + break; + case 1: + // p1,p2,p4 are collinear, p3 is significant + //---------------------- + if(d3 * d3 <= m_distance_tolerance_square * (dx*dx + dy*dy)) + { + if(m_angle_tolerance < curve_angle_tolerance_epsilon) + { + + px.append(x23); + py.append(y23); + //m_points.add(point_d(x23, y23)); + return; + } + + // Angle Condition + //---------------------- + da1 = fabs(atan2(y4 - y3, x4 - x3) - atan2(y3 - y2, x3 - x2)); + if(da1 >= M_PI) + da1 = 2*M_PI - da1; + + if(da1 < m_angle_tolerance) + { + + px.append(x2); + py.append(y2); + + px.append(x3); + py.append(y3); + //m_points.add(point_d(x2, y2)); + //m_points.add(point_d(x3, y3)); + return; + } + + if(m_cusp_limit != 0.0) + { + if(da1 > m_cusp_limit) + { + + px.append(x3); + py.append(y3); + //m_points.add(point_d(x3, y3)); + return; + } + } + } + break; + + case 2: + // p1,p3,p4 are collinear, p2 is significant + //---------------------- + if(d2 * d2 <= m_distance_tolerance_square * (dx*dx + dy*dy)) + { + if(m_angle_tolerance < curve_angle_tolerance_epsilon) + { + + px.append(x23); + py.append(y23); + //m_points.add(point_d(x23, y23)); + return; + } + + // Angle Condition + //---------------------- + da1 = fabs(atan2(y3 - y2, x3 - x2) - atan2(y2 - y1, x2 - x1)); + if(da1 >= M_PI) da1 = 2*M_PI - da1; + + if(da1 < m_angle_tolerance) + { + + px.append(x2); + py.append(y2); + + px.append(x3); + py.append(y3); + //m_points.add(point_d(x2, y2)); + //m_points.add(point_d(x3, y3)); + return; + } + + if(m_cusp_limit != 0.0) + { + if(da1 > m_cusp_limit) + { + px.append(x2); + py.append(y2); + + //m_points.add(point_d(x2, y2)); + return; + } + } + } + break; + + case 3: + // Regular case + //----------------- + if((d2 + d3)*(d2 + d3) <= m_distance_tolerance_square * (dx*dx + dy*dy)) + { + // If the curvature doesn't exceed the distance_tolerance value + // we tend to finish subdivisions. + //---------------------- + if(m_angle_tolerance < curve_angle_tolerance_epsilon) + { + + px.append(x23); + py.append(y23); + //m_points.add(point_d(x23, y23)); + return; + } + + // Angle & Cusp Condition + //---------------------- + k = atan2(y3 - y2, x3 - x2); + da1 = fabs(k - atan2(y2 - y1, x2 - x1)); + da2 = fabs(atan2(y4 - y3, x4 - x3) - k); + if(da1 >= M_PI) da1 = 2*M_PI - da1; + if(da2 >= M_PI) da2 = 2*M_PI - da2; + + if(da1 + da2 < m_angle_tolerance) + { + // Finally we can stop the recursion + //---------------------- + + px.append(x23); + py.append(y23); + //m_points.add(point_d(x23, y23)); + return; + } + + if(m_cusp_limit != 0.0) + { + if(da1 > m_cusp_limit) + { + px.append(x2); + py.append(y2); + return; + } + + if(da2 > m_cusp_limit) + { + px.append(x3); + py.append(y3); + return; + } + } + } + break; + } + + // Continue subdivision + //---------------------- + PointBezier_r(x1, y1, x12, y12, x123, y123, x1234, y1234, level + 1, px, py); + PointBezier_r(x1234, y1234, x234, y234, x34, y34, x4, y4, level + 1, px, py); +} + +qreal VSpline::CalcSqDistance (qreal x1, qreal y1, qreal x2, qreal y2) const{ + qreal dx = x2 - x1; + qreal dy = y2 - y1; + return dx * dx + dy * dy; +} + +QPainterPath VSpline::GetPath() const{ + QPainterPath splinePath; + QVector points = GetPoints (); + splinePath.moveTo(points[0]); + for (qint32 i = 1; i < points.count(); ++i){ + splinePath.lineTo(points[i]); + } + return splinePath; +} + +/* Cubic equation solution. Real coefficients case. + + int Cubic(double *x,double a,double b,double c); + Parameters: + x - solution array (size 3). On output: + 3 real roots -> then x is filled with them; + 1 real + 2 complex -> x[0] is real, x[1] is real part of + complex roots, x[2] - non-negative + imaginary part. + a, b, c - coefficients, as described + Returns: 3 - 3 real roots; + 1 - 1 real root + 2 complex; + 2 - 1 real root + complex roots imaginary part is zero + (i.e. 2 real roots). +*/ +qint32 VSpline::Cubic(qreal *x, qreal a, qreal b, qreal c)const{ + qreal q,r,r2,q3; + + q = (a*a - 3.*b)/9.; + r = (a*(2.*a*a - 9.*b) + 27.*c)/54.; + r2 = r*r; + q3 = pow(q,3); + if(r21){ + qDebug()<<"Неправильне значення параметра. фунція calc_t"; + throw"Неправильне значення параметра. фунція calc_t"; + } + return ret_t; +} +/* + * Функція знаходить підходяще значення параметна t якому відповідає точка на сплайні. + */ +qreal VSpline::param_t (QPointF pBt)const{ + qreal t_x, t_y; + t_x = calc_t (GetPointP1().x(), p2.x(), p3.x(), GetPointP4().x(), pBt.x()); + t_y = calc_t (GetPointP1().y(), p2.y(), p3.y(), GetPointP4().y(), pBt.y()); + /* + * Порівнюємо значення по х і по у і визначаємо найбільше. Це значення і + * буде шуканим. + */ + if(t_x>t_y) + return t_x; + else + return t_y; +} + +//void VSpline::Mirror(const QPointF Pmirror){ +// QPointF P1 = p1; +// P1 = QPointF(P1.x() - Pmirror.x(), P1.y() - Pmirror.y()); +// P1 = QPointF(P1.x() * -1.0, P1.y() * 1.0); +// P1 = QPointF(P1.x() + Pmirror.x(), P1.y() + Pmirror.y()); +// QPointF P2 = p2; +// P2 = QPointF(P2.x() - Pmirror.x(), P2.y() - Pmirror.y()); +// P2 = QPointF(P2.x() * -1.0, P2.y() * 1.0); +// P2 = QPointF(P2.x() + Pmirror.x(), P2.y() + Pmirror.y()); +// QPointF P3 = p3; +// P3 = QPointF(P3.x() - Pmirror.x(), P3.y() - Pmirror.y()); +// P3 = QPointF(P3.x() * -1.0, P3.y() * 1.0); +// P3 = QPointF(P3.x() + Pmirror.x(), P3.y() + Pmirror.y()); +// QPointF P4 = p4; +// P4 = QPointF(P4.x() - Pmirror.x(), P4.y() - Pmirror.y()); +// P4 = QPointF(P4.x() * -1.0, P4.y() * 1.0); +// P4 = QPointF(P4.x() + Pmirror.x(), P4.y() + Pmirror.y()); +// this->ModifiSpl(P1, P2, P3, P4); +//} diff --git a/geometry/vspline.h b/geometry/vspline.h new file mode 100644 index 000000000..7f2b3abbe --- /dev/null +++ b/geometry/vspline.h @@ -0,0 +1,261 @@ +#ifndef VSPLINE_H +#define VSPLINE_H + +#define M_2PI 6.28318530717958647692528676655900576 + +#include +#include +#include +#include "container/vpointf.h" + +/** + * @brief VSpline клас, що реалізує сплайн. + */ +class VSpline{ +public: + VSpline(); + /** + * @brief VSpline конструктор. + * @param spline сплайн з якого копіюємо. + */ + VSpline (const VSpline &spline ); + /** + * @brief VSpline конструктор. + * @param p1 початкова точка сплайна. + * @param p4 кінцева точка сплайна. + * @param angle1 кут в градусах першої напрямної. + * @param angle2 кут в градусах другої напрямної. + * @param kCurve коефіцієнт кривизни сплайна. + * @param kAsm1 коефіцієнт довжини першої напрямної. + * @param kAsm2 коефіцієнт довжини другої напрямної. + */ + VSpline (const QMap *points, qint64 p1, qint64 p4, qreal angle1, + qreal angle2, qreal kAsm1, qreal kAsm2, qreal kCurve); + /** + * @brief VSpline конструктор. + * @param p1 початкова точка сплайну. + * @param p2 перша контролююча точка сплайну. + * @param p3 друга контролююча точка сплайну. + * @param p4 кінцева точка сплайну. + */ + VSpline (const QMap *points, qint64 p1, QPointF p2, QPointF p3, + qint64 p4, qreal kCurve); + /** + * @brief ModifiSpl модифікує сплайн. + * @param p1 початкова точка сплайну. + * @param p4 кінцева точка сплайну. + * @param angle1 кут в градусах першої напрямної. + * @param angle2 кут в градусах другої напрямної. + * @param kCurve коефіцієнт кривизни сплайну. + * @param kAsm1 коефіцієнт довжини першої напрямної. + * @param kAsm2 коефіцієнт довжини другої напрямної. + */ + void ModifiSpl ( qint64 p1, qint64 p4, qreal angle1, qreal angle2, qreal kAsm1, qreal kAsm2, + qreal kCurve); + /** + * @brief ModifiSpl модифікує сплайн. + * @param p1 початкова точка сплайну. + * @param p2 перша контролююча точка сплайну. + * @param p3 друга контролююча точка сплайну. + * @param p4 кінцева точка сплайну. + */ + void ModifiSpl (qint64 p1, QPointF p2, QPointF p3, qint64 p4, qreal kCurve); + /** + * @brief RotationSpl поворот сплайна навколо точки на кут в градусах проти годиникової стрілки. + * @param pRotate точка навколо якої повертаємо. + * @param angle кут в градусах. + */ +// void RotationSpl ( QPointF pRotate, qreal angle ); + /** + * @brief BiasSpl зміщує сплайн. + * @param mx зміщення по х координаті. + * @param my зміщення по у координаті. + */ +// void BiasSpl ( qreal mx, qreal my ); + /** + * @brief GetP1 повертає першу точку сплайну. + * @return перша точка сплайну. + */ + qint64 GetP1 () const; + VPointF GetPointP1() const; + /** + * @brief GetP2 повертує першу контрольну точку сплайну. + * @return перша контрольна точка сплайну. + */ + QPointF GetP2 () const; + /** + * @brief GetP3 повертає другу контрольну точку сплайну. + * @return друга контрольна точка сплайну. + */ + QPointF GetP3 () const; + /** + * @brief GetP4 повертає останню точку сплайну. + * @return остання точка сплайну. + */ + qint64 GetP4 () const; + VPointF GetPointP4 () const; + /** + * @brief GetAngle1 повертає кут першої напрямної. + * @return кут в градусах. + */ + qreal GetAngle1 () const; + /** + * @brief GetAngle2 повертає кут другої напрямної. + * @return кут в градусах. + */ + qreal GetAngle2() const; + /** + * @brief GetLength повертає довжину сплайну. + * @return довжина сплайну. + */ + qreal GetLength () const; + QString GetName () const; + qreal GetKasm1() const; + qreal GetKasm2() const; + qreal GetKcurve() const; + const QMap *GetDataPoints() const; + /** + * @brief CrossingSplLine перевіряє перетин сплайну з лінією. + * @param line лінія з якою перевіряється перетин. + * @param intersectionPoint точка перетину. + * @return результат перевірки. + */ + QLineF::IntersectType CrossingSplLine(const QLineF &line, QPointF *intersectionPoint ) const; + /** + * @brief CutSpline розрізає сплайн. + * @param length дожина першого сплайну. + * @param curFir перший сплайн. + * @param curSec другий сплайн. + */ +// void CutSpline ( qreal length, VSpline* curFir, VSpline* curSec ) const; + /** + * @brief CutSpline розрізає сплайн. + * @param point точка що ділить сплайн. + * @param curFir перший сплайн. + * @param curSec другий сплайн. + */ +// void CutSpline (QPointF point, VSpline* curFir, VSpline* curSec ) const; + /** + * @brief PutAlongSpl розміщає точку на сплайні. + * @param moveP точка яка розміщується на сплайні. + * @param move довжина від початку сплайну. + */ + void PutAlongSpl ( QPointF &moveP, qreal move ) const; + /** + * @brief GetPoints повертає точки з яких складається сплайн. + * @return список точок. + */ + QVector GetPoints () const; + /** + * @brief GetPath повертає шлях сплайну. + * @return шлях. + */ + QPainterPath GetPath() const; + /** + * @brief Mirror вертикальне дзеркалення сплайну відносно точки. + * @param Pmirror точка відносно якої відбувається вертикальне дзеркалення сплайну. + */ +// void Mirror(const QPointF Pmirror); +protected: + /** + * @brief GetPoints повертає точки з яких складається сплайн. + * @param p1 початкова точка сплайну. + * @param p2 перша контролююча точка сплайну. + * @param p3 друга контролююча точка сплайну. + * @param p4 кінцева точка сплайну. + * @return список точок. + */ + QVector GetPoints ( QPointF p1, QPointF p2, QPointF p3, QPointF p4 ) const; +private: + /** + * @brief p1 початкова точка сплайну + */ + qint64 p1; // перша точка + /** + * @brief p2 перша контрольна точка сплайну. + */ + QPointF p2; // друга точка + /** + * @brief p3 друга контрольна точка сплайну. + */ + QPointF p3; // третя точка + /** + * @brief p4 кінцеві точка сплайну. + */ + qint64 p4; // четверта точка + /** + * @brief angle1 кут в градусах першої напрямної. + */ + qreal angle1; // кут нахилу дотичної в першій точці + /** + * @brief angle2 кут в градусах другої напрямної. + */ + qreal angle2; // кут нахилу дотичної в другій точці + qreal kAsm1; + qreal kAsm2; + qreal kCurve; + const QMap *points; + /** + * @brief LengthBezier повертає дожину сплайну за його чотирьма точками. + * @param p1 початкова точка сплайну. + * @param p2 перша контролююча точка сплайну. + * @param p3 друга контролююча точка сплайну. + * @param p4 кінцева точка сплайну. + * @return дожина сплайну. + */ + qreal LengthBezier ( QPointF p1, QPointF p2, QPointF p3, QPointF p4 ) const; + /** + * @brief PointBezier_r знаходить точки сплайну по його чотирьом точках. + * @param x1 х координата першої точки сплайну. + * @param y1 у координата другої точки сплайну. + * @param x2 х координата першої контрольної точки сплайну. + * @param y2 у координата першої контрольної точки сплайну. + * @param x3 х координата другої контрольної точки сплайну. + * @param y3 у координата другої контрольної точки сплайну. + * @param x4 х координата кінцевої точки сплайну. + * @param y4 у координата кінцевої точки сплайну. + * @param level рівень рекурсії. Напочатку повинен дорівнювати 0. + * @param px список х координат точок сплайну. + * @param py список у коодринат сплайну. + */ + void PointBezier_r ( qreal x1, qreal y1, qreal x2, qreal y2, + qreal x3, qreal y3, qreal x4, qreal y4, + qint16 level, QVector &px, QVector &py) const; + /** + * @brief CalcSqDistance розраховує довжину між точками. + * @param x1 х координата першої точки. + * @param y1 у координата другої точки. + * @param x2 х координата першої точки. + * @param y2 у координата другої точки. + * @return довжину. + */ + qreal CalcSqDistance ( qreal x1, qreal y1, qreal x2, qreal y2) const; + /** + * @brief Cubic знаходить розв'язок кубічного рівняння. + * @param x коефіцієнт. + * @param a коефіцієнт. + * @param b коефіцієнт. + * @param c коефіцієнт. + * @return повертає корені рівняння. + */ + qint32 Cubic(qreal *x, qreal a, qreal b, qreal c)const; + /** + * @brief calc_t знаходить параметр t якому відповідає точка на сплайні. + * @param curve_coord1 координата Х або У кривої. + * @param curve_coord2 координата Х або У кривої. + * @param curve_coord3 координата Х або У кривої. + * @param curve_coord4 координата Х або У кривої. + * @param point_coord координата Х або У точки на кривій. + * @return + */ + qreal calc_t (qreal curve_coord1, qreal curve_coord2, qreal curve_coord3, + qreal curve_coord4, qreal point_coord)const; + /** + * @brief param_t знаходить підходяще значення параметра t якому відповідає точка на сплайні + * @param pBt точка для якої шукається значення параметра t. + * @return підходяще значення t. + */ + qreal param_t (QPointF pBt)const; +}; + +#endif // VSPLINE_H diff --git a/icon.qrc b/icon.qrc index c0924d234..c3e3ef962 100644 --- a/icon.qrc +++ b/icon.qrc @@ -25,5 +25,6 @@ icon/32x32/normal.png icon/32x32/bisector.png icon/32x32/intersect.png + icon/32x32/spline.png diff --git a/icon/32x32/spline.png b/icon/32x32/spline.png new file mode 100644 index 0000000000000000000000000000000000000000..626f7e9feb790c7006aa1d8efa864615378f539b GIT binary patch literal 375 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI zppNSx%;=;sy8 literal 0 HcmV?d00001 diff --git a/mainwindow.cpp b/mainwindow.cpp index da9f72d7b..1ae4c1e1b 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -18,6 +18,8 @@ #include "tools/vtoolnormal.h" #include "tools/vtoolbisector.h" #include "tools/vtoollineintersect.h" +#include "tools/vtoolspline.h" +#include "geometry/vspline.h" MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) @@ -61,6 +63,8 @@ MainWindow::MainWindow(QWidget *parent) : &MainWindow::ToolBisector); connect(ui->toolButtonLineIntersect, &QToolButton::clicked, this, &MainWindow::ToolLineIntersect); + connect(ui->toolButtonSpline, &QToolButton::clicked, this, + &MainWindow::ToolSpline); data = new VContainer; CreateManTableIGroup (); @@ -181,7 +185,7 @@ void MainWindow::ToolEndLine(bool checked){ helpLabel->setText("Заповніть усі поля."); dialogEndLine = new DialogEndLine(data, this); connect(scene, &VMainGraphicsScene::ChoosedObject, dialogEndLine, - &DialogEndLine::ChoosedPoint); + &DialogEndLine::ChoosedObject); connect(dialogEndLine, &DialogEndLine::DialogClosed, this, &MainWindow::ClosedDialogEndLine); connect(doc, &VDomDocument::FullUpdateFromFile, dialogEndLine, &DialogEndLine::UpdateList); @@ -211,7 +215,7 @@ void MainWindow::ClosedDialogEndLine(int result){ VToolEndLine *point = new VToolEndLine(doc, data, id, typeLine, formula, angle, basePointId, Tool::FromGui); scene->addItem(point); - connect(point, &VToolPoint::ChoosedPoint, scene, &VMainGraphicsScene::ChoosedItem); + connect(point, &VToolPoint::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); } } @@ -227,7 +231,7 @@ void MainWindow::ToolLine(bool checked){ ui->graphicsView->setCursor(cur); helpLabel->setText("Виберіть точки."); dialogLine = new DialogLine(data, this); - connect(scene, &VMainGraphicsScene::ChoosedObject, dialogLine, &DialogLine::ChoosedPoint); + connect(scene, &VMainGraphicsScene::ChoosedObject, dialogLine, &DialogLine::ChoosedObject); connect(dialogLine, &DialogLine::DialogClosed, this, &MainWindow::ClosedDialogLine); } else { ui->toolButtonLine->setChecked(true); @@ -243,7 +247,7 @@ void MainWindow::ClosedDialogLine(int result){ qint64 id = data->getNextId(); VToolLine *line = new VToolLine(doc, data, id, firstPoint, secondPoint, Tool::FromGui); scene->addItem(line); - connect(line, &VToolLine::ChoosedPoint, scene, &VMainGraphicsScene::ChoosedItem); + connect(line, &VToolLine::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); } ArrowTool(); @@ -258,7 +262,7 @@ void MainWindow::ToolAlongLine(bool checked){ ui->graphicsView->setCursor(cur); helpLabel->setText("Виберіть точки."); dialogAlongLine = new DialogAlongLine(data, this); - connect(scene, &VMainGraphicsScene::ChoosedObject, dialogAlongLine, &DialogAlongLine::ChoosedPoint); + connect(scene, &VMainGraphicsScene::ChoosedObject, dialogAlongLine, &DialogAlongLine::ChoosedObject); connect(dialogAlongLine, &DialogLine::DialogClosed, this, &MainWindow::ClosedDialogAlongLine); } else { ui->toolButtonAlongLine->setChecked(true); @@ -287,7 +291,7 @@ void MainWindow::ClosedDialogAlongLine(int result){ VToolAlongLine *point = new VToolAlongLine(doc, data, id, formula, firstPointId, secondPointId, typeLine, Tool::FromGui); scene->addItem(point); - connect(point, &VToolAlongLine::ChoosedPoint, scene, &VMainGraphicsScene::ChoosedItem); + connect(point, &VToolAlongLine::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); } } ArrowTool(); @@ -303,7 +307,7 @@ void MainWindow::ToolShoulderPoint(bool checked){ helpLabel->setText("Виберіть точки."); dialogShoulderPoint = new DialogShoulderPoint(data, this); connect(scene, &VMainGraphicsScene::ChoosedObject, dialogShoulderPoint, - &DialogShoulderPoint::ChoosedPoint); + &DialogShoulderPoint::ChoosedObject); connect(dialogShoulderPoint, &DialogShoulderPoint::DialogClosed, this, &MainWindow::ClosedDialogShoulderPoint); } else { @@ -336,7 +340,7 @@ void MainWindow::ClosedDialogShoulderPoint(int result){ VToolShoulderPoint *point = new VToolShoulderPoint(doc, data, id, typeLine, formula, p1Line, p2Line, pShoulder, Tool::FromGui); scene->addItem(point); - connect(point, &VToolShoulderPoint::ChoosedPoint, scene, &VMainGraphicsScene::ChoosedItem); + connect(point, &VToolShoulderPoint::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); } } ArrowTool(); @@ -352,7 +356,7 @@ void MainWindow::ToolNormal(bool checked){ helpLabel->setText("Виберіть точки."); dialogNormal = new DialogNormal(data, this); connect(scene, &VMainGraphicsScene::ChoosedObject, dialogNormal, - &DialogNormal::ChoosedPoint); + &DialogNormal::ChoosedObject); connect(dialogNormal, &DialogNormal::DialogClosed, this, &MainWindow::ClosedDialogNormal); } else { @@ -383,7 +387,7 @@ void MainWindow::ClosedDialogNormal(int result){ VToolNormal *point = new VToolNormal(doc, data, id, typeLine, formula, angle, firstPointId, secondPointId, Tool::FromGui); scene->addItem(point); - connect(point, &VToolNormal::ChoosedPoint, scene, &VMainGraphicsScene::ChoosedItem); + connect(point, &VToolNormal::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); } } ArrowTool(); @@ -399,7 +403,7 @@ void MainWindow::ToolBisector(bool checked){ helpLabel->setText("Виберіть точки."); dialogBisector = new DialogBisector(data, this); connect(scene, &VMainGraphicsScene::ChoosedObject, dialogBisector, - &DialogBisector::ChoosedPoint); + &DialogBisector::ChoosedObject); connect(dialogBisector, &DialogBisector::DialogClosed, this, &MainWindow::ClosedDialogBisector); } else { @@ -431,7 +435,7 @@ void MainWindow::ClosedDialogBisector(int result){ VToolBisector *point = new VToolBisector(doc, data, id, typeLine, formula, firstPointId, secondPointId, thirdPointId, Tool::FromGui); scene->addItem(point); - connect(point, &VToolBisector::ChoosedPoint, scene, &VMainGraphicsScene::ChoosedItem); + connect(point, &VToolBisector::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); } } ArrowTool(); @@ -447,7 +451,7 @@ void MainWindow::ToolLineIntersect(bool checked){ helpLabel->setText("Виберіть точки."); dialogLineIntersect = new DialogLineIntersect(data, this); connect(scene, &VMainGraphicsScene::ChoosedObject, dialogLineIntersect, - &DialogLineIntersect::ChoosedPoint); + &DialogLineIntersect::ChoosedObject); connect(dialogLineIntersect, &DialogLineIntersect::DialogClosed, this, &MainWindow::ClosedDialogLineIntersect); } else { @@ -480,14 +484,52 @@ void MainWindow::ClosedDialogLineIntersect(int result){ data->AddLine(id, p2Line2Id); VToolLineIntersect *point = new VToolLineIntersect(doc, data, id, p1Line1Id, p2Line1Id, p1Line2Id, - p2Line2Id, Tool::FromFile); + p2Line2Id, Tool::FromGui); scene->addItem(point); - connect(point, &VToolLineIntersect::ChoosedPoint, scene, &VMainGraphicsScene::ChoosedItem); + connect(point, &VToolLineIntersect::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); } } ArrowTool(); } +void MainWindow::ToolSpline(bool checked){ + if(checked){ + CanselTool(); + tool = Tools::SplineTool; + QPixmap pixmap(":/cursor/spline_cursor.png"); + QCursor cur(pixmap, 2, 3); + ui->graphicsView->setCursor(cur); + helpLabel->setText("Виберіть точки."); + dialogSpline = new DialogSpline(data, this); + connect(scene, &VMainGraphicsScene::ChoosedObject, dialogSpline, + &DialogSpline::ChoosedObject); + connect(dialogSpline, &DialogSpline::DialogClosed, this, + &MainWindow::ClosedDialogSpline); + } else { + ui->toolButtonSpline->setChecked(true); + } +} + +void MainWindow::ClosedDialogSpline(int result){ + if(result == QDialog::Accepted){ + qint64 p1 = dialogSpline->getP1(); + qint64 p4 = dialogSpline->getP4(); + qreal kAsm1 = dialogSpline->getKAsm1(); + qreal kAsm2 = dialogSpline->getKAsm2(); + qreal angle1 = dialogSpline->getAngle1(); + qreal angle2 = dialogSpline->getAngle2(); + qreal kCurve = dialogSpline->getKCurve(); + + VSpline spline = VSpline(data->DataPoints(), p1, p4, angle1, angle2, kAsm1, kAsm2, kCurve); + qint64 id = data->AddSpline(spline); + data->AddLengthSpline(data->GetNameSpline(p1, p4), spline.GetLength()); + VToolSpline *spl = new VToolSpline(doc, data, id, Tool::FromGui); + scene->addItem(spl); + connect(spl, &VToolSpline::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); + } + ArrowTool(); +} + void MainWindow::showEvent( QShowEvent *event ){ QMainWindow::showEvent( event ); if( event->spontaneous() ){ @@ -638,6 +680,12 @@ void MainWindow::CanselTool(){ scene->setFocus(Qt::OtherFocusReason); scene->clearSelection(); break; + case Tools::SplineTool: + delete dialogSpline; + ui->toolButtonSpline->setChecked(false); + scene->setFocus(Qt::OtherFocusReason); + scene->clearSelection(); + break; } } @@ -668,9 +716,9 @@ void MainWindow::ClosedDialogSinglePoint(int result){ QPointF point = dialogSinglePoint->getPoint(); QString name = dialogSinglePoint->getName(); qint64 id = data->AddPoint(VPointF(point.x(), point.y(), name, 5, 10)); - VToolSimplePoint *spoint = new VToolSimplePoint(doc, data, id, Tool::FromGui); + VToolSinglePoint *spoint = new VToolSinglePoint(doc, data, id, Tool::FromGui); scene->addItem(spoint); - connect(spoint, &VToolPoint::ChoosedPoint, scene, &VMainGraphicsScene::ChoosedItem); + connect(spoint, &VToolPoint::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); ArrowTool(); ui->toolButtonSinglePoint->setEnabled(false); qint32 index = comboBoxDraws->currentIndex(); @@ -900,6 +948,7 @@ void MainWindow::SetEnableTool(bool enable){ ui->toolButtonNormal->setEnabled(enable); ui->toolButtonBisector->setEnabled(enable); ui->toolButtonLineIntersect->setEnabled(enable); + ui->toolButtonSpline->setEnabled(enable); } MainWindow::~MainWindow(){ diff --git a/mainwindow.h b/mainwindow.h index b8fe64ed0..ed082b8e9 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -17,7 +17,8 @@ #include "dialogs/dialognormal.h" #include "dialogs/dialogbisector.h" #include "dialogs/dialoglineintersect.h" -#include "tools/vtoolsimplepoint.h" +#include "dialogs/dialogspline.h" +#include "tools/vtoolsinglepoint.h" #include "xml/vdomdocument.h" #include "container/vcontainer.h" @@ -36,7 +37,8 @@ namespace Tools{ ShoulderPointTool, NormalTool, BisectorTool, - LineIntersectTool + LineIntersectTool, + SplineTool }; } @@ -79,6 +81,8 @@ public slots: void ClosedDialogBisector(int result); void ToolLineIntersect(bool checked); void ClosedDialogLineIntersect(int result); + void ToolSpline(bool checked); + void ClosedDialogSpline(int result); protected: virtual void keyPressEvent ( QKeyEvent * event ); virtual void showEvent( QShowEvent *event ); @@ -98,6 +102,7 @@ private: DialogNormal *dialogNormal; DialogBisector *dialogBisector; DialogLineIntersect *dialogLineIntersect; + DialogSpline *dialogSpline; VDomDocument *doc; VContainer *data; QComboBox *comboBoxDraws; diff --git a/mainwindow.ui b/mainwindow.ui index 046190653..af25ed48c 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -57,7 +57,7 @@ - 1 + 2 @@ -297,7 +297,7 @@ 0 0 154 - 45 + 58 @@ -311,9 +311,25 @@ - + + + false + - PushButton + ... + + + + :/icon/32x32/spline.png:/icon/32x32/spline.png + + + + 32 + 32 + + + + true diff --git a/tools/vabstracttool.h b/tools/vabstracttool.h index e41a65583..17e71aa50 100644 --- a/tools/vabstracttool.h +++ b/tools/vabstracttool.h @@ -27,7 +27,7 @@ public slots: virtual void FullUpdateFromGui(int result)=0; signals: void haveLiteChange(); - void ChoosedPoint(qint64 id, Scene::Type type); + void ChoosedTool(qint64 id, Scene::Type type); void FullUpdateTree(); protected: VDomDocument *doc; diff --git a/tools/vtoolalongline.cpp b/tools/vtoolalongline.cpp index 77edbda41..c3a1ce6d0 100644 --- a/tools/vtoolalongline.cpp +++ b/tools/vtoolalongline.cpp @@ -52,7 +52,7 @@ void VToolAlongLine::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ dialogAlongLine = QSharedPointer(new DialogAlongLine(VAbstractTool::data)); connect(qobject_cast< VMainGraphicsScene * >(this->scene()), &VMainGraphicsScene::ChoosedObject, - dialogAlongLine.data(), &DialogAlongLine::ChoosedPoint); + dialogAlongLine.data(), &DialogAlongLine::ChoosedObject); connect(dialogAlongLine.data(), &DialogAlongLine::DialogClosed, this, &VToolAlongLine::FullUpdateFromGui); connect(doc, &VDomDocument::FullUpdateFromFile, dialogAlongLine.data(), diff --git a/tools/vtoolbisector.cpp b/tools/vtoolbisector.cpp index 085eb16f5..64548b5ac 100644 --- a/tools/vtoolbisector.cpp +++ b/tools/vtoolbisector.cpp @@ -63,7 +63,7 @@ void VToolBisector::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ dialogBisector = QSharedPointer(new DialogBisector(VAbstractTool::data)); connect(qobject_cast< VMainGraphicsScene * >(this->scene()), &VMainGraphicsScene::ChoosedObject, - dialogBisector.data(), &DialogBisector::ChoosedPoint); + dialogBisector.data(), &DialogBisector::ChoosedObject); connect(dialogBisector.data(), &DialogBisector::DialogClosed, this, &VToolBisector::FullUpdateFromGui); connect(doc, &VDomDocument::FullUpdateFromFile, dialogBisector.data(), diff --git a/tools/vtoolendline.cpp b/tools/vtoolendline.cpp index 47d8383ea..1ae9e5188 100644 --- a/tools/vtoolendline.cpp +++ b/tools/vtoolendline.cpp @@ -34,7 +34,7 @@ void VToolEndLine::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ dialogEndLine = QSharedPointer(new DialogEndLine(VAbstractTool::data)); connect(qobject_cast< VMainGraphicsScene * >(this->scene()), &VMainGraphicsScene::ChoosedObject, - dialogEndLine.data(), &DialogEndLine::ChoosedPoint); + dialogEndLine.data(), &DialogEndLine::ChoosedObject); connect(dialogEndLine.data(), &DialogEndLine::DialogClosed, this, &VToolEndLine::FullUpdateFromGui); connect(doc, &VDomDocument::FullUpdateFromFile, dialogEndLine.data(), &DialogEndLine::UpdateList); @@ -84,3 +84,4 @@ void VToolEndLine::AddToFile(){ AddToCalculation(domElement); } + diff --git a/tools/vtoolline.cpp b/tools/vtoolline.cpp index 61e4432e8..c3d174d50 100644 --- a/tools/vtoolline.cpp +++ b/tools/vtoolline.cpp @@ -65,7 +65,7 @@ void VToolLine::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ dialogLine = QSharedPointer(new DialogLine(VAbstractTool::data)); connect(qobject_cast< VMainGraphicsScene * >(this->scene()), &VMainGraphicsScene::ChoosedObject, - dialogLine.data(), &DialogLine::ChoosedPoint); + dialogLine.data(), &DialogLine::ChoosedObject); connect(dialogLine.data(), &DialogLine::DialogClosed, this, &VToolLine::FullUpdateFromGui); dialogLine->setFirstPoint(firstPoint); diff --git a/tools/vtoollineintersect.cpp b/tools/vtoollineintersect.cpp index a55872be6..3f201b6af 100644 --- a/tools/vtoollineintersect.cpp +++ b/tools/vtoollineintersect.cpp @@ -49,7 +49,7 @@ void VToolLineIntersect::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) dialogLineIntersect = QSharedPointer(new DialogLineIntersect(VAbstractTool::data)); connect(qobject_cast< VMainGraphicsScene * >(this->scene()), &VMainGraphicsScene::ChoosedObject, - dialogLineIntersect.data(), &DialogLineIntersect::ChoosedPoint); + dialogLineIntersect.data(), &DialogLineIntersect::ChoosedObject); connect(dialogLineIntersect.data(), &DialogLineIntersect::DialogClosed, this, &VToolLineIntersect::FullUpdateFromGui); diff --git a/tools/vtoolnormal.cpp b/tools/vtoolnormal.cpp index 6ef958ca7..2e97c0dba 100644 --- a/tools/vtoolnormal.cpp +++ b/tools/vtoolnormal.cpp @@ -59,7 +59,7 @@ void VToolNormal::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ dialogNormal = QSharedPointer(new DialogNormal(VAbstractTool::data)); connect(qobject_cast< VMainGraphicsScene * >(this->scene()), &VMainGraphicsScene::ChoosedObject, - dialogNormal.data(), &DialogNormal::ChoosedPoint); + dialogNormal.data(), &DialogNormal::ChoosedObject); connect(dialogNormal.data(), &DialogNormal::DialogClosed, this, &VToolNormal::FullUpdateFromGui); connect(doc, &VDomDocument::FullUpdateFromFile, dialogNormal.data(), &DialogNormal::UpdateList); diff --git a/tools/vtoolpoint.cpp b/tools/vtoolpoint.cpp index 1a8cf0cb2..66be4eba8 100644 --- a/tools/vtoolpoint.cpp +++ b/tools/vtoolpoint.cpp @@ -52,66 +52,6 @@ void VToolPoint::NameChangePosition(const QPointF pos){ VAbstractTool::data->UpdatePoint(id, point); } -/* - * Взято з сайту http://hardfire.ru/cross_line_circle - */ -qint32 VToolPoint::LineIntersectCircle(QPointF center, qreal radius, QLineF line, QPointF &p1, - QPointF &p2) const{ - const qreal eps = 1e-8; - //коефіцієнти для рівняння відрізку - qreal a = line.p2().y() - line.p1().y(); - qreal b = line.p1().x() - line.p2().x(); - // В даному випадку не використовується. - //qreal c = - a * line.p1().x() - b * line.p1().y(); - // проекция центра окружности на прямую - QPointF p = ClosestPoint (line, center); - // сколько всего решений? - qint32 flag = 0; - qreal d = QLineF (center, p).length(); - if (qAbs (d - radius) <= eps){ - flag = 1; - } else { - if (radius > d){ - flag = 2; - } else { - return 0; - } - } - // находим расстояние от проекции до точек пересечения - qreal k = sqrt (radius * radius - d * d); - qreal t = QLineF (QPointF (0, 0), QPointF (b, - a)).length(); - // добавляем к проекции векторы направленные к точкам пеерсечения - p1 = add_vector (p, QPointF (0, 0), QPointF (- b, a), k / t); - p2 = add_vector (p, QPointF (0, 0), QPointF (b, - a), k / t); - return flag; -} - -/* - * Добавление вектора к точке - * Взято з сайту http://hardfire.ru/add_vector - */ -QPointF VToolPoint::add_vector (QPointF p, QPointF p1, QPointF p2, qreal k) const{ - return QPointF (p.x() + (p2.x() - p1.x()) * k, p.y() + (p2.y() - p1.y()) * k); -} - -QPointF VToolPoint::ClosestPoint(QLineF line, QPointF p) const{ - QLineF lineP2pointFrom = QLineF(line.p2(), p); - qreal angle = 180-line.angleTo(lineP2pointFrom)-90; - QLineF pointFromlineP2 = QLineF(p, line.p2()); - pointFromlineP2.setAngle(pointFromlineP2.angle()+angle); - QPointF point; - QLineF::IntersectType type = pointFromlineP2.intersect(line,&point); - if ( type == QLineF::BoundedIntersection ){ - return point; - } else{ - if ( type == QLineF::NoIntersection || type == QLineF::UnboundedIntersection ){ - Q_ASSERT_X(type != QLineF::BoundedIntersection, Q_FUNC_INFO, "Немає точки перетину."); - return point; - } - } - return point; -} - QPointF VToolPoint::LineIntersectRect(QRectF rec, QLineF line) const{ qreal x1, y1, x2, y2; rec.getCoords(&x1, &y1, &x2, &y2); @@ -150,6 +90,59 @@ void VToolPoint::RefreshLine(){ } } +qint32 VToolPoint::LineIntersectCircle(QPointF center, qreal radius, QLineF line, QPointF &p1, + QPointF &p2) const{ + const qreal eps = 1e-8; + //коефіцієнти для рівняння відрізку + qreal a = line.p2().y() - line.p1().y(); + qreal b = line.p1().x() - line.p2().x(); + // В даному випадку не використовується. + //qreal c = - a * line.p1().x() - b * line.p1().y(); + // проекция центра окружности на прямую + QPointF p = ClosestPoint (line, center); + // сколько всего решений? + qint32 flag = 0; + qreal d = QLineF (center, p).length(); + if (qAbs (d - radius) <= eps){ + flag = 1; + } else { + if (radius > d){ + flag = 2; + } else { + return 0; + } + } + // находим расстояние от проекции до точек пересечения + qreal k = sqrt (radius * radius - d * d); + qreal t = QLineF (QPointF (0, 0), QPointF (b, - a)).length(); + // добавляем к проекции векторы направленные к точкам пеерсечения + p1 = addVector (p, QPointF (0, 0), QPointF (- b, a), k / t); + p2 = addVector (p, QPointF (0, 0), QPointF (b, - a), k / t); + return flag; +} + +QPointF VToolPoint::ClosestPoint(QLineF line, QPointF p) const{ + QLineF lineP2pointFrom = QLineF(line.p2(), p); + qreal angle = 180-line.angleTo(lineP2pointFrom)-90; + QLineF pointFromlineP2 = QLineF(p, line.p2()); + pointFromlineP2.setAngle(pointFromlineP2.angle()+angle); + QPointF point; + QLineF::IntersectType type = pointFromlineP2.intersect(line,&point); + if ( type == QLineF::BoundedIntersection ){ + return point; + } else{ + if ( type == QLineF::NoIntersection || type == QLineF::UnboundedIntersection ){ + Q_ASSERT_X(type != QLineF::BoundedIntersection, Q_FUNC_INFO, "Немає точки перетину."); + return point; + } + } + return point; +} + +QPointF VToolPoint::addVector(QPointF p, QPointF p1, QPointF p2, qreal k) const{ + return QPointF (p.x() + (p2.x() - p1.x()) * k, p.y() + (p2.y() - p1.y()) * k); +} + void VToolPoint::LiteUpdateFromGui(qreal mx, qreal my){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ @@ -163,35 +156,28 @@ void VToolPoint::ChangedActivDraw(const QString newName){ if(nameActivDraw == newName){ this->setPen(QPen(Qt::black, widthHairLine)); this->setFlag(QGraphicsItem::ItemIsSelectable, true); + this->setAcceptHoverEvents(true); namePoint->setFlag(QGraphicsItem::ItemIsMovable, true); namePoint->setFlag(QGraphicsItem::ItemIsSelectable, true); namePoint->setFlag(QGraphicsItem::ItemSendsGeometryChanges, true); namePoint->setBrush(QBrush(Qt::black)); namePoint->setAcceptHoverEvents(true); lineName->setPen(QPen(Qt::black, widthHairLine)); - this->setAcceptHoverEvents(true); VAbstractTool::ChangedActivDraw(newName); } else { this->setPen(QPen(Qt::gray, widthHairLine)); this->setFlag(QGraphicsItem::ItemIsSelectable, false); + this->setAcceptHoverEvents (false); namePoint->setFlag(QGraphicsItem::ItemIsMovable, false); namePoint->setFlag(QGraphicsItem::ItemIsSelectable, false); namePoint->setFlag(QGraphicsItem::ItemSendsGeometryChanges, false); namePoint->setBrush(QBrush(Qt::gray)); namePoint->setAcceptHoverEvents(false); lineName->setPen(QPen(Qt::gray, widthHairLine)); - this->setAcceptHoverEvents (false); VAbstractTool::ChangedActivDraw(newName); } } -void VToolPoint::mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ){ - if(event->button() == Qt::LeftButton){ - emit ChoosedPoint(id, Scene::Point); - } - QGraphicsItem::mouseReleaseEvent(event); -} - void VToolPoint::RefreshGeometry(){ VPointF point = VAbstractTool::data->GetPoint(id); QRectF rec = QRectF(point.x(), point.y(), radius*2, radius*2); @@ -205,6 +191,13 @@ void VToolPoint::RefreshGeometry(){ RefreshLine(); } +void VToolPoint::mouseReleaseEvent(QGraphicsSceneMouseEvent *event){ + if(event->button() == Qt::LeftButton){ + emit ChoosedTool(id, Scene::Point); + } + QGraphicsItem::mouseReleaseEvent(event); +} + void VToolPoint::hoverMoveEvent(QGraphicsSceneHoverEvent *event){ Q_UNUSED(event); this->setPen(QPen(Qt::black, widthMainLine)); diff --git a/tools/vtoolpoint.h b/tools/vtoolpoint.h index a4ef24ca7..0202139b5 100644 --- a/tools/vtoolpoint.h +++ b/tools/vtoolpoint.h @@ -1,9 +1,8 @@ #ifndef VTOOLPOINT_H #define VTOOLPOINT_H -#include #include - +#include #include "../widgets/vgraphicssimpletextitem.h" #include "../options.h" #include "vabstracttool.h" @@ -22,18 +21,18 @@ protected: qreal radius; VGraphicsSimpleTextItem *namePoint; QGraphicsLineItem *lineName; + virtual void RefreshGeometry(); virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ); - virtual void RefreshGeometry(); virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ); virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); private: - qint32 LineIntersectCircle(QPointF center, qreal radius, QLineF line, QPointF &p1, - QPointF &p2) const; QPointF LineIntersectRect(QRectF rec, QLineF line) const; - QPointF ClosestPoint(QLineF line, QPointF p) const; - QPointF add_vector (QPointF p, QPointF p1, QPointF p2, qreal k) const; void LiteUpdateFromGui(qreal mx, qreal my); void RefreshLine(); + qint32 LineIntersectCircle(QPointF center, qreal radius, QLineF line, QPointF &p1, + QPointF &p2) const; + QPointF ClosestPoint(QLineF line, QPointF p) const; + QPointF addVector (QPointF p, QPointF p1, QPointF p2, qreal k) const; }; #endif // VTOOLPOINT_H diff --git a/tools/vtoolshoulderpoint.cpp b/tools/vtoolshoulderpoint.cpp index 0257a1634..68777ce96 100644 --- a/tools/vtoolshoulderpoint.cpp +++ b/tools/vtoolshoulderpoint.cpp @@ -75,7 +75,7 @@ void VToolShoulderPoint::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) QSharedPointer(new DialogShoulderPoint(VAbstractTool::data)); connect(qobject_cast< VMainGraphicsScene * >(this->scene()), &VMainGraphicsScene::ChoosedObject, - dialogShoulderPoint.data(), &DialogShoulderPoint::ChoosedPoint); + dialogShoulderPoint.data(), &DialogShoulderPoint::ChoosedObject); connect(dialogShoulderPoint.data(), &DialogShoulderPoint::DialogClosed, this, &VToolShoulderPoint::FullUpdateFromGui); connect(doc, &VDomDocument::FullUpdateFromFile, dialogShoulderPoint.data(), diff --git a/tools/vtoolsimplepoint.cpp b/tools/vtoolsimplepoint.cpp index 4924bde89..b2d24ef91 100644 --- a/tools/vtoolsimplepoint.cpp +++ b/tools/vtoolsimplepoint.cpp @@ -1,67 +1,9 @@ #include "vtoolsimplepoint.h" -#include -#include -#include -#include -#include -#include -#include - -#include "../options.h" #include "../container/vpointf.h" -VToolSimplePoint::VToolSimplePoint (VDomDocument *doc, VContainer *data, qint64 id, Tool::Enum typeCreation, - QGraphicsItem * parent ):VToolPoint(doc, data, id, parent){ - if(typeCreation == Tool::FromGui){ - AddToFile(); - } +VToolSimplePoint::VToolSimplePoint(VDomDocument *doc, VContainer *data, qint64 id, + QGraphicsItem *parent):VAbstractTool(doc, data, id), + QGraphicsEllipseItem(parent){ + } -void VToolSimplePoint::AddToFile(){ - VPointF point = VAbstractTool::data->GetPoint(id); - QDomElement domElement = doc->createElement("point"); - - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "type", "simple"); - AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "x", point.x()/PrintDPI*25.4); - AddAttribute(domElement, "y", point.y()/PrintDPI*25.4); - AddAttribute(domElement, "mx", point.mx()/PrintDPI*25.4); - AddAttribute(domElement, "my", point.my()/PrintDPI*25.4); - - AddToCalculation(domElement); -} - -void VToolSimplePoint::FullUpdateFromGui(int result){ - if(result == QDialog::Accepted){ - QPointF p = dialogSinglePoint->getPoint(); - QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ - domElement.setAttribute("name", dialogSinglePoint->getName()); - domElement.setAttribute("x", QString().setNum(p.x()/PrintDPI*25.4)); - domElement.setAttribute("y", QString().setNum(p.y()/PrintDPI*25.4)); - emit FullUpdateTree(); - } - } - dialogSinglePoint.clear(); -} - -void VToolSimplePoint::contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ){ - if(!ignoreContextMenuEvent){ - QMenu menu; - QAction *actionOption = menu.addAction("Властивості"); - QAction *selectedAction = menu.exec(event->screenPos()); - if(selectedAction == actionOption){ - dialogSinglePoint = QSharedPointer(new DialogSinglePoint(VAbstractTool::data)); - connect(dialogSinglePoint.data(), &DialogSinglePoint::DialogClosed, this, - &VToolSimplePoint::FullUpdateFromGui); - VPointF p = VAbstractTool::data->GetPoint(id); - dialogSinglePoint->setData(p.name(), p.toQPointF()); - dialogSinglePoint->exec(); - } - } -} - -void VToolSimplePoint::FullUpdateFromFile(){ - RefreshGeometry(); -} diff --git a/tools/vtoolsimplepoint.h b/tools/vtoolsimplepoint.h index 11e1938bb..7b442f060 100644 --- a/tools/vtoolsimplepoint.h +++ b/tools/vtoolsimplepoint.h @@ -1,25 +1,21 @@ #ifndef VTOOLSIMPLEPOINT_H #define VTOOLSIMPLEPOINT_H -#include "../container/vcontainer.h" -#include "../xml/vdomdocument.h" -#include "vtoolpoint.h" -#include "../dialogs/dialogsinglepoint.h" +#include +#include -class VToolSimplePoint : public VToolPoint +#include "../options.h" +#include "vabstracttool.h" + +class VToolSimplePoint: public VAbstractTool, public QGraphicsEllipseItem { Q_OBJECT public: - VToolSimplePoint (VDomDocument *doc, VContainer *data, qint64 id, - Tool::Enum typeCreation, QGraphicsItem * parent = 0 ); + VToolSimplePoint(VDomDocument *doc, VContainer *data, qint64 id, QGraphicsItem * parent = 0); public slots: - virtual void FullUpdateFromFile(); - virtual void FullUpdateFromGui(int result); + virtual void ChangedActivDraw(const QString newName); protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void AddToFile(); -private: - QSharedPointer dialogSinglePoint; + virtual void RefreshGeometry(); }; #endif // VTOOLSIMPLEPOINT_H diff --git a/tools/vtoolsinglepoint.cpp b/tools/vtoolsinglepoint.cpp new file mode 100644 index 000000000..70de48bf7 --- /dev/null +++ b/tools/vtoolsinglepoint.cpp @@ -0,0 +1,68 @@ +#include "vtoolsinglepoint.h" +#include +#include +#include +#include +#include +#include +#include + +#include "../options.h" +#include "../container/vpointf.h" + +VToolSinglePoint::VToolSinglePoint (VDomDocument *doc, VContainer *data, qint64 id, Tool::Enum typeCreation, + QGraphicsItem * parent ):VToolPoint(doc, data, id, parent){ + if(typeCreation == Tool::FromGui){ + AddToFile(); + } +} + +void VToolSinglePoint::AddToFile(){ + VPointF point = VAbstractTool::data->GetPoint(id); + QDomElement domElement = doc->createElement("point"); + + AddAttribute(domElement, "id", id); + AddAttribute(domElement, "type", "single"); + AddAttribute(domElement, "name", point.name()); + AddAttribute(domElement, "x", point.x()/PrintDPI*25.4); + AddAttribute(domElement, "y", point.y()/PrintDPI*25.4); + AddAttribute(domElement, "mx", point.mx()/PrintDPI*25.4); + AddAttribute(domElement, "my", point.my()/PrintDPI*25.4); + + AddToCalculation(domElement); +} + +void VToolSinglePoint::contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ){ + if(!ignoreContextMenuEvent){ + QMenu menu; + QAction *actionOption = menu.addAction("Властивості"); + QAction *selectedAction = menu.exec(event->screenPos()); + if(selectedAction == actionOption){ + dialogSinglePoint = QSharedPointer(new DialogSinglePoint(VAbstractTool::data)); + VPointF p = VAbstractTool::data->GetPoint(id); + dialogSinglePoint->setData(p.name(), p.toQPointF()); + connect(dialogSinglePoint.data(), &DialogSinglePoint::DialogClosed, this, + &VToolSinglePoint::FullUpdateFromGui); + dialogSinglePoint->exec(); + } + } +} + +void VToolSinglePoint::FullUpdateFromFile(){ + RefreshGeometry(); +} + +void VToolSinglePoint::FullUpdateFromGui(int result){ + if(result == QDialog::Accepted){ + QPointF p = dialogSinglePoint->getPoint(); + QString name = dialogSinglePoint->getName(); + QDomElement domElement = doc->elementById(QString().setNum(id)); + if(domElement.isElement()){ + domElement.setAttribute("name", name); + domElement.setAttribute("x", QString().setNum(p.x()/PrintDPI*25.4)); + domElement.setAttribute("y", QString().setNum(p.y()/PrintDPI*25.4)); + emit FullUpdateTree(); + } + } + dialogSinglePoint.clear(); +} diff --git a/tools/vtoolsinglepoint.h b/tools/vtoolsinglepoint.h new file mode 100644 index 000000000..ec60e4448 --- /dev/null +++ b/tools/vtoolsinglepoint.h @@ -0,0 +1,27 @@ +#ifndef VTOOLSINGLEPOINT_H +#define VTOOLSINGLEPOINT_H + +#include "../container/vcontainer.h" +#include "../xml/vdomdocument.h" +#include "vtoolpoint.h" +#include "../dialogs/dialogsinglepoint.h" + +class VToolSinglePoint : public VToolPoint +{ + Q_OBJECT +public: + VToolSinglePoint (VDomDocument *doc, VContainer *data, qint64 id, + Tool::Enum typeCreation, QGraphicsItem * parent = 0 ); +public slots: + virtual void FullUpdateFromFile(); + virtual void FullUpdateFromGui(int result); +signals: + void FullUpdateTree(); +protected: + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile(); +private: + QSharedPointer dialogSinglePoint; +}; + +#endif // VTOOLSINGLEPOINT_H diff --git a/tools/vtoolspline.cpp b/tools/vtoolspline.cpp new file mode 100644 index 000000000..d159f980e --- /dev/null +++ b/tools/vtoolspline.cpp @@ -0,0 +1,202 @@ +#include "vtoolspline.h" +#include "../geometry/vspline.h" +#include +#include + +VToolSpline::VToolSpline(VDomDocument *doc, VContainer *data, qint64 id, Tool::Enum typeCreation, + QGraphicsItem *parent):VAbstractTool(doc, data, id), QGraphicsPathItem(parent){ + + VSpline spl = data->GetSpline(id); + QPainterPath path; + path.addPath(spl.GetPath()); + path.setFillRule( Qt::WindingFill ); + this->setPath(path); + this->setPen(QPen(Qt::black, widthHairLine)); + this->setFlag(QGraphicsItem::ItemIsSelectable, true); + this->setAcceptHoverEvents(true); + + controlPoint1 = new VControlPointSpline(spl.GetP2(), spl.GetPointP1(), this); + connect(controlPoint1, &VControlPointSpline::ControlPointChangePosition, this, + &VToolSpline::ControlPoint1ChangePosition); + + controlPoint2 = new VControlPointSpline(spl.GetP3(), spl.GetPointP4(), this); + connect(controlPoint2, &VControlPointSpline::ControlPointChangePosition, this, + &VToolSpline::ControlPoint2ChangePosition); + + if(typeCreation == Tool::FromGui){ + AddToFile(); + } +} + +void VToolSpline::FullUpdateFromFile(){ + RefreshGeometry(); +} + +void VToolSpline::FullUpdateFromGui(int result){ + if(result == QDialog::Accepted){ + VSpline spl = VSpline (VAbstractTool::data->DataPoints(), dialogSpline->getP1(), + dialogSpline->getP4(), dialogSpline->getAngle1(), dialogSpline->getAngle2(), + dialogSpline->getKAsm1(), dialogSpline->getKAsm2(), dialogSpline->getKCurve()); + + disconnect(controlPoint1, &VControlPointSpline::ControlPointChangePosition, this, + &VToolSpline::ControlPoint1ChangePosition); + disconnect(controlPoint2, &VControlPointSpline::ControlPointChangePosition, this, + &VToolSpline::ControlPoint2ChangePosition); + controlPoint1->setPos(spl.GetP2()); + controlPoint2->setPos(spl.GetP3()); + connect(controlPoint1, &VControlPointSpline::ControlPointChangePosition, this, + &VToolSpline::ControlPoint1ChangePosition); + connect(controlPoint2, &VControlPointSpline::ControlPointChangePosition, this, + &VToolSpline::ControlPoint2ChangePosition); + + spl = VSpline (VAbstractTool::data->DataPoints(), dialogSpline->getP1(), controlPoint1->pos(), + controlPoint2->pos(), dialogSpline->getP4(), dialogSpline->getKCurve()); + QDomElement domElement = doc->elementById(QString().setNum(id)); + if(domElement.isElement()){ + domElement.setAttribute("point1", QString().setNum(spl.GetP1())); + domElement.setAttribute("point4", QString().setNum(spl.GetP4())); + domElement.setAttribute("angle1", QString().setNum(spl.GetAngle1())); + domElement.setAttribute("angle2", QString().setNum(spl.GetAngle2())); + domElement.setAttribute("kAsm1", QString().setNum(spl.GetKasm1())); + domElement.setAttribute("kAsm2", QString().setNum(spl.GetKasm2())); + domElement.setAttribute("kCurve", QString().setNum(spl.GetKcurve())); + emit FullUpdateTree(); + } + } + dialogSpline.clear(); +} + +void VToolSpline::ControlPoint1ChangePosition(const QPointF pos){ + VSpline spl = VAbstractTool::data->GetSpline(id); + spl.ModifiSpl (spl.GetP1(), pos, spl.GetP3(), spl.GetP4(), spl.GetKcurve()); + QDomElement domElement = doc->elementById(QString().setNum(id)); + if(domElement.isElement()){ + domElement.setAttribute("angle1", QString().setNum(spl.GetAngle1())); + domElement.setAttribute("angle2", QString().setNum(spl.GetAngle2())); + domElement.setAttribute("kAsm1", QString().setNum(spl.GetKasm1())); + domElement.setAttribute("kAsm2", QString().setNum(spl.GetKasm2())); + domElement.setAttribute("kCurve", QString().setNum(spl.GetKcurve())); + emit FullUpdateTree(); + } +} + +void VToolSpline::ControlPoint2ChangePosition(const QPointF pos){ + VSpline spl = VAbstractTool::data->GetSpline(id); + spl.ModifiSpl (spl.GetP1(), spl.GetP2(), pos, spl.GetP4(), spl.GetKcurve()); + QDomElement domElement = doc->elementById(QString().setNum(id)); + if(domElement.isElement()){ + domElement.setAttribute("angle1", QString().setNum(spl.GetAngle1())); + domElement.setAttribute("angle2", QString().setNum(spl.GetAngle2())); + domElement.setAttribute("kAsm1", QString().setNum(spl.GetKasm1())); + domElement.setAttribute("kAsm2", QString().setNum(spl.GetKasm2())); + domElement.setAttribute("kCurve", QString().setNum(spl.GetKcurve())); + emit FullUpdateTree(); + } +} + +void VToolSpline::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ + if(!ignoreContextMenuEvent){ + QMenu menu; + QAction *actionOption = menu.addAction("Властивості"); + QAction *selectedAction = menu.exec(event->screenPos()); + if(selectedAction == actionOption){ + dialogSpline = QSharedPointer(new DialogSpline(VAbstractTool::data)); + + connect(qobject_cast< VMainGraphicsScene * >(this->scene()), &VMainGraphicsScene::ChoosedObject, + dialogSpline.data(), &DialogSpline::ChoosedObject); + connect(dialogSpline.data(), &DialogSpline::DialogClosed, this, + &VToolSpline::FullUpdateFromGui); + + VSpline spl = VAbstractTool::data->GetSpline(id); + + dialogSpline->setP1(spl.GetP1()); + dialogSpline->setP4(spl.GetP4()); + dialogSpline->setAngle1(spl.GetAngle1()); + dialogSpline->setAngle2(spl.GetAngle2()); + dialogSpline->setKAsm1(spl.GetKasm1()); + dialogSpline->setKAsm2(spl.GetKasm2()); + dialogSpline->setKCurve(spl.GetKcurve()); + + dialogSpline->show(); + } + } +} + +void VToolSpline::AddToFile(){ + VSpline spl = VAbstractTool::data->GetSpline(id); + QDomElement domElement = doc->createElement("spline"); + + AddAttribute(domElement, "id", id); + AddAttribute(domElement, "type", "simple"); + AddAttribute(domElement, "point1", spl.GetP1()); + AddAttribute(domElement, "point4", spl.GetP4()); + AddAttribute(domElement, "angle1", spl.GetAngle1()); + AddAttribute(domElement, "angle2", spl.GetAngle2()); + AddAttribute(domElement, "kAsm1", spl.GetKasm1()); + AddAttribute(domElement, "kAsm2", spl.GetKasm2()); + AddAttribute(domElement, "kCurve", spl.GetKcurve()); + + AddToCalculation(domElement); +} + +void VToolSpline::mouseReleaseEvent(QGraphicsSceneMouseEvent *event){ + if(event->button() == Qt::LeftButton){ + emit ChoosedTool(id, Scene::Spline); + } + QGraphicsItem::mouseReleaseEvent(event); +} + +void VToolSpline::hoverMoveEvent(QGraphicsSceneHoverEvent *event){ + Q_UNUSED(event); + this->setPen(QPen(Qt::black, widthMainLine)); +} + +void VToolSpline::hoverLeaveEvent(QGraphicsSceneHoverEvent *event){ + Q_UNUSED(event); + this->setPen(QPen(Qt::black, widthHairLine)); +} + +void VToolSpline::RefreshGeometry(){ + VSpline spl = VAbstractTool::data->GetSpline(id); + QPainterPath path; + path.addPath(spl.GetPath()); + path.setFillRule( Qt::WindingFill ); + this->setPath(path); + QPointF splinePoint = VAbstractTool::data->GetPoint(spl.GetP1()); + QPointF controlPoint = spl.GetP2(); + controlPoint1->RefreshLine(controlPoint, splinePoint); + splinePoint = VAbstractTool::data->GetPoint(spl.GetP4()); + controlPoint = spl.GetP3(); + controlPoint2->RefreshLine(controlPoint, splinePoint); +} + + +void VToolSpline::ChangedActivDraw(const QString newName){ + if(nameActivDraw == newName){ + this->setPen(QPen(Qt::black, widthHairLine)); + this->setFlag(QGraphicsItem::ItemIsSelectable, true); + this->setAcceptHoverEvents(true); + controlPoint1->setPen(QPen(Qt::black, widthHairLine)); + controlPoint1->setFlag(QGraphicsItem::ItemIsSelectable, true); + controlPoint1->setFlag(QGraphicsItem::ItemIsMovable, true); + controlPoint1->setAcceptHoverEvents(true); + controlPoint2->setPen(QPen(Qt::black, widthHairLine)); + controlPoint2->setFlag(QGraphicsItem::ItemIsSelectable, true); + controlPoint2->setFlag(QGraphicsItem::ItemIsMovable, true); + controlPoint2->setAcceptHoverEvents(true); + VAbstractTool::ChangedActivDraw(newName); + } else { + this->setPen(QPen(Qt::gray, widthHairLine)); + this->setFlag(QGraphicsItem::ItemIsSelectable, false); + this->setAcceptHoverEvents (false); + controlPoint1->setPen(QPen(Qt::gray, widthHairLine)); + controlPoint1->setFlag(QGraphicsItem::ItemIsSelectable, false); + controlPoint1->setFlag(QGraphicsItem::ItemIsMovable, false); + controlPoint1->setAcceptHoverEvents(false); + controlPoint2->setPen(QPen(Qt::gray, widthHairLine)); + controlPoint2->setFlag(QGraphicsItem::ItemIsSelectable, false); + controlPoint2->setFlag(QGraphicsItem::ItemIsMovable, false); + controlPoint2->setAcceptHoverEvents(false); + VAbstractTool::ChangedActivDraw(newName); + } +} diff --git a/tools/vtoolspline.h b/tools/vtoolspline.h new file mode 100644 index 000000000..471cd0aaf --- /dev/null +++ b/tools/vtoolspline.h @@ -0,0 +1,36 @@ +#ifndef VTOOLSPLINE_H +#define VTOOLSPLINE_H + +#include "vabstracttool.h" +#include "../container/vcontainer.h" +#include "../xml/vdomdocument.h" +#include +#include "../dialogs/dialogspline.h" +#include "../widgets/vcontrolpointspline.h" + +class VToolSpline:public VAbstractTool, public QGraphicsPathItem +{ + Q_OBJECT +public: + VToolSpline(VDomDocument *doc, VContainer *data, qint64 id, + Tool::Enum typeCreation, QGraphicsItem * parent = 0); +public slots: + virtual void FullUpdateFromFile(); + virtual void FullUpdateFromGui(int result); + void ControlPoint1ChangePosition(const QPointF pos); + void ControlPoint2ChangePosition(const QPointF pos); + virtual void ChangedActivDraw(const QString newName); +protected: + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile(); + virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ); + virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ); + virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); +private: + QSharedPointer dialogSpline; + VControlPointSpline *controlPoint1; + VControlPointSpline *controlPoint2; + void RefreshGeometry(); +}; + +#endif // VTOOLSPLINE_H diff --git a/widgets/vcontrolpointspline.cpp b/widgets/vcontrolpointspline.cpp new file mode 100644 index 000000000..ae55a588a --- /dev/null +++ b/widgets/vcontrolpointspline.cpp @@ -0,0 +1,119 @@ +#include "vcontrolpointspline.h" +#include +#include +#include +#include + +VControlPointSpline::VControlPointSpline(const QPointF &controlPoint, const QPointF &splinePoint, + QGraphicsItem *parent):QGraphicsEllipseItem(parent){ + radius = 1.5*PrintDPI/25.4; + //create circle + QRectF rec = QRectF(0, 0, radius*2, radius*2); + rec.translate(-rec.center().x(), -rec.center().y()); + this->setRect(rec); + this->setPen(QPen(Qt::black, widthHairLine)); + this->setBrush(QBrush(Qt::NoBrush)); + this->setFlag(QGraphicsItem::ItemIsSelectable, true); + this->setFlag(QGraphicsItem::ItemIsMovable, true); + this->setFlag(QGraphicsItem::ItemSendsGeometryChanges, true); + this->setAcceptHoverEvents(true); + this->setPos(controlPoint); + + //Лінія, що з'єднує дві точки + QPointF p1, p2; + LineIntersectCircle(QPointF(), radius, QLineF( QPointF(), splinePoint-controlPoint), p1, p2); + controlLine = new QGraphicsLineItem(QLineF(splinePoint-controlPoint, p1), this); + controlLine->setPen(QPen(Qt::red, widthHairLine)); + controlLine->setFlag(QGraphicsItem::ItemStacksBehindParent, true); +} + +void VControlPointSpline::hoverMoveEvent(QGraphicsSceneHoverEvent *event){ + Q_UNUSED(event); + this->setPen(QPen(Qt::black, widthMainLine)); +} + +void VControlPointSpline::hoverLeaveEvent(QGraphicsSceneHoverEvent *event){ + Q_UNUSED(event); + this->setPen(QPen(Qt::black, widthHairLine)); +} + +QVariant VControlPointSpline::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value){ + if (change == ItemPositionChange && scene()) { + // value - это новое положение. + QPointF newPos = value.toPointF(); + qDebug()<rect(); + QRectF rect = scene()->sceneRect(); + if (!rect.contains(newPos)) { + // Сохраняем элемент внутри прямоугольника сцены. + newPos.setX(qMin(rect.right(), qMax(newPos.x(), rect.left()))); + newPos.setY(qMin(rect.bottom(), qMax(newPos.y(), rect.top()))); + + emit ControlPointChangePosition(newPos); + return newPos; + } + emit ControlPointChangePosition(newPos); + } + return QGraphicsItem::itemChange(change, value); +} + +qint32 VControlPointSpline::LineIntersectCircle(QPointF center, qreal radius, QLineF line, QPointF &p1, + QPointF &p2) const{ + const qreal eps = 1e-8; + //коефіцієнти для рівняння відрізку + qreal a = line.p2().y() - line.p1().y(); + qreal b = line.p1().x() - line.p2().x(); + // В даному випадку не використовується. + //qreal c = - a * line.p1().x() - b * line.p1().y(); + // проекция центра окружности на прямую + QPointF p = ClosestPoint (line, center); + // сколько всего решений? + qint32 flag = 0; + qreal d = QLineF (center, p).length(); + if (qAbs (d - radius) <= eps){ + flag = 1; + } else { + if (radius > d){ + flag = 2; + } else { + return 0; + } + } + // находим расстояние от проекции до точек пересечения + qreal k = sqrt (radius * radius - d * d); + qreal t = QLineF (QPointF (0, 0), QPointF (b, - a)).length(); + // добавляем к проекции векторы направленные к точкам пеерсечения + p1 = addVector (p, QPointF (0, 0), QPointF (- b, a), k / t); + p2 = addVector (p, QPointF (0, 0), QPointF (b, - a), k / t); + return flag; +} + +QPointF VControlPointSpline::ClosestPoint(QLineF line, QPointF p) const{ + QLineF lineP2pointFrom = QLineF(line.p2(), p); + qreal angle = 180-line.angleTo(lineP2pointFrom)-90; + QLineF pointFromlineP2 = QLineF(p, line.p2()); + pointFromlineP2.setAngle(pointFromlineP2.angle()+angle); + QPointF point; + QLineF::IntersectType type = pointFromlineP2.intersect(line,&point); + if ( type == QLineF::BoundedIntersection ){ + return point; + } else{ + if ( type == QLineF::NoIntersection || type == QLineF::UnboundedIntersection ){ + Q_ASSERT_X(type != QLineF::BoundedIntersection, Q_FUNC_INFO, "Немає точки перетину."); + return point; + } + } + return point; +} + +QPointF VControlPointSpline::addVector(QPointF p, QPointF p1, QPointF p2, qreal k) const{ + return QPointF (p.x() + (p2.x() - p1.x()) * k, p.y() + (p2.y() - p1.y()) * k); +} + +void VControlPointSpline::RefreshLine(const QPointF &controlPoint, const QPointF &splinePoint){ +// QRectF rec = QRectF(0, 0, radius*2, radius*2); +// rec.translate(0-rec.center().x(), 0-rec.center().y()); +// this->setRect(rec); + QPointF p1, p2; + LineIntersectCircle(QPointF(), radius, QLineF( QPointF(), splinePoint-controlPoint), p1, p2); + controlLine->setLine(QLineF(splinePoint-controlPoint, p1)); +} diff --git a/widgets/vcontrolpointspline.h b/widgets/vcontrolpointspline.h new file mode 100644 index 000000000..9cf89fa03 --- /dev/null +++ b/widgets/vcontrolpointspline.h @@ -0,0 +1,30 @@ +#ifndef VCONTROLPOINTSPLINE_H +#define VCONTROLPOINTSPLINE_H + +#include +#include +#include +#include "../options.h" +class VControlPointSpline : public QObject, public QGraphicsEllipseItem +{ + Q_OBJECT +public: + VControlPointSpline(const QPointF &controlPoint, const QPointF &splinePoint, QGraphicsItem * parent = 0); + void RefreshLine(const QPointF &controlPoint, const QPointF &splinePoint); +signals: + void ControlPointChangePosition(const QPointF pos); +protected: + qreal radius; + QGraphicsLineItem *controlLine; + virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ); + virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); + QVariant itemChange ( GraphicsItemChange change, const QVariant &value ); +private: + qint32 LineIntersectCircle(QPointF center, qreal radius, QLineF line, QPointF &p1, + QPointF &p2) const; + QPointF ClosestPoint(QLineF line, QPointF p) const; + QPointF addVector (QPointF p, QPointF p1, QPointF p2, qreal k) const; + +}; + +#endif // VCONTROLPOINTSPLINE_H diff --git a/xml/vdomdocument.cpp b/xml/vdomdocument.cpp index fd5bf60c1..3815cec5e 100644 --- a/xml/vdomdocument.cpp +++ b/xml/vdomdocument.cpp @@ -1,7 +1,7 @@ #include "vdomdocument.h" #include -#include "../tools/vtoolsimplepoint.h" +#include "../tools/vtoolsinglepoint.h" #include "../tools/vtoolendline.h" #include "../tools/vtoolline.h" #include "../tools/vtoolalongline.h" @@ -9,6 +9,7 @@ #include "../tools/vtoolnormal.h" #include "../tools/vtoolbisector.h" #include "../tools/vtoollineintersect.h" +#include "../tools/vtoolspline.h" #include "../options.h" #include "../container/calculator.h" @@ -225,6 +226,8 @@ void VDomDocument::Parse(Document::Enum parse, VMainGraphicsScene *scene, QCombo comboBoxDraws->clear(); } else { data->ClearLengthLines(); + data->ClearLengthArcs(); + data->ClearLengthSplines(); } QDomElement rootElement = this->documentElement(); QDomNode domNode = rootElement.firstChild(); @@ -292,7 +295,7 @@ void VDomDocument::AddNewDraw(const QDomElement& node, QComboBox *comboBoxDraws) QDomElement domElementPoint = domCal.toElement(); if(!domElementPoint.isNull()){ if(domElementPoint.tagName() == "point"){ - if(domElementPoint.attribute("type","") == "simple"){ + if(domElementPoint.attribute("type","") == "single"){ comboBoxDraws->addItem(name, false); return; } else { @@ -345,13 +348,16 @@ void VDomDocument::ParseCalculationElement(VMainGraphicsScene *scene, const QDom if(domElement.tagName() == "line"){ ParseLineElement(scene, domElement, parse); } + if(domElement.tagName() == "spline"){ + ParseSplineElement(scene, domElement, parse, domElement.attribute("type", "")); + } } } } void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElement& domElement, Document::Enum parse, const QString& type){ - if(type == "simple"){ + if(type == "single"){ if(!domElement.isNull()){ QString name; qreal mx=5, my=10, x, y; @@ -366,9 +372,9 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen data->UpdatePoint(id, VPointF(x, y, name, mx, my)); if(parse == Document::FullParse){ - VToolSimplePoint *spoint = new VToolSimplePoint(this, data, id, Tool::FromFile); + VToolSinglePoint *spoint = new VToolSinglePoint(this, data, id, Tool::FromFile); scene->addItem(spoint); - connect(spoint, &VToolSimplePoint::ChoosedPoint, scene, &VMainGraphicsScene::ChoosedItem); + connect(spoint, &VToolSinglePoint::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); } } } @@ -405,7 +411,7 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen VToolEndLine *point = new VToolEndLine(this, data, id, typeLine, formula, angle, basePointId, Tool::FromFile); scene->addItem(point); - connect(point, &VToolPoint::ChoosedPoint, scene, &VMainGraphicsScene::ChoosedItem); + connect(point, &VToolPoint::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); } } } @@ -443,7 +449,7 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen VToolAlongLine *point = new VToolAlongLine(this, data, id, formula, firstPointId, secondPointId, typeLine, Tool::FromGui); scene->addItem(point); - connect(point, &VToolAlongLine::ChoosedPoint, scene, &VMainGraphicsScene::ChoosedItem); + connect(point, &VToolAlongLine::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); } } } @@ -485,7 +491,7 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen p1Line, p2Line, pShoulder, Tool::FromGui); scene->addItem(point); - connect(point, &VToolShoulderPoint::ChoosedPoint, scene, + connect(point, &VToolShoulderPoint::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); } } @@ -524,7 +530,7 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen VToolNormal *point = new VToolNormal(this, data, id, typeLine, formula, angle, firstPointId, secondPointId, Tool::FromFile); scene->addItem(point); - connect(point, &VToolNormal::ChoosedPoint, scene, &VMainGraphicsScene::ChoosedItem); + connect(point, &VToolNormal::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); } } } @@ -565,7 +571,7 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen firstPointId, secondPointId, thirdPointId, Tool::FromFile); scene->addItem(point); - connect(point, &VToolBisector::ChoosedPoint, scene, &VMainGraphicsScene::ChoosedItem); + connect(point, &VToolBisector::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); } } } @@ -606,9 +612,9 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen if(parse == Document::FullParse){ VToolLineIntersect *point = new VToolLineIntersect(this, data, id, p1Line1Id, p2Line1Id, p1Line2Id, - p2Line2Id, Tool::FromGui); + p2Line2Id, Tool::FromFile); scene->addItem(point); - connect(point, &VToolLineIntersect::ChoosedPoint, scene, + connect(point, &VToolLineIntersect::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); } } @@ -631,12 +637,42 @@ void VDomDocument::ParseLineElement(VMainGraphicsScene *scene, const QDomElement qint64 id = data->getNextId(); VToolLine *line = new VToolLine(this, data, id, firstPoint, secondPoint, Tool::FromFile); scene->addItem(line); - connect(line, &VToolLine::ChoosedPoint, scene, &VMainGraphicsScene::ChoosedItem); + connect(line, &VToolLine::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); } } } } +void VDomDocument::ParseSplineElement(VMainGraphicsScene *scene, const QDomElement &domElement, + Document::Enum parse, const QString &type){ + if(type == "simple"){ + if(!domElement.isNull()){ + qreal angle1, angle2, kAsm1, kAsm2, kCurve; + qint64 id, point1, point4; + if(!domElement.isNull()){ + id = domElement.attribute("id", "").toLongLong(); + point1 = domElement.attribute("point1", "").toLongLong(); + point4 = domElement.attribute("point4", "").toLongLong(); + angle1 = domElement.attribute("angle1","").toDouble(); + angle2 = domElement.attribute("angle2","").toDouble(); + kAsm1 = domElement.attribute("kAsm1","").toDouble(); + kAsm2 = domElement.attribute("kAsm2","").toDouble(); + kCurve = domElement.attribute("kCurve","").toDouble(); + + VSpline spline = VSpline(data->DataPoints(), point1, point4, angle1, angle2, kAsm1, kAsm2, kCurve); + data->UpdateSpline(id, spline); + data->AddLengthSpline(data->GetNameSpline(point1, point4), spline.GetLength()); + if(parse == Document::FullParse){ + VToolSpline *spl = new VToolSpline(this, data, id, Tool::FromFile); + scene->addItem(spl); + connect(spl, &VToolSpline::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); + } + } + } + return; + } +} + void VDomDocument::FullUpdateTree(){ VMainGraphicsScene *scene = new VMainGraphicsScene(); QComboBox *comboBoxDraws = new QComboBox(); diff --git a/xml/vdomdocument.h b/xml/vdomdocument.h index 07e713c9a..0675f3385 100644 --- a/xml/vdomdocument.h +++ b/xml/vdomdocument.h @@ -59,6 +59,8 @@ private: Document::Enum parse, const QString &type); void ParseLineElement(VMainGraphicsScene *scene, const QDomElement& domElement, Document::Enum parse); + void ParseSplineElement(VMainGraphicsScene *scene, const QDomElement& domElement, + Document::Enum parse, const QString& type); void ParseIncrementsElement(const QDomNode& node); void AddNewDraw(const QDomElement &node, QComboBox *comboBoxDraws)const; };