From c95b162c0dc6166f3fd943f214993e44257a069b Mon Sep 17 00:00:00 2001 From: Valentina Zhuravska Date: Mon, 11 Apr 2016 05:27:51 +0300 Subject: [PATCH 1/3] Fixed build in win7 --HG-- branch : feature --- src/libs/vgeometry/vabstractcubicbezier.cpp | 1 + src/libs/vtools/tools/drawTools/vdrawtool.h | 2 +- src/libs/vtools/tools/vabstracttool.h | 2 +- src/libs/vtools/tools/vdatatool.h | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/libs/vgeometry/vabstractcubicbezier.cpp b/src/libs/vgeometry/vabstractcubicbezier.cpp index 6a167bc1e..feb04cd51 100644 --- a/src/libs/vgeometry/vabstractcubicbezier.cpp +++ b/src/libs/vgeometry/vabstractcubicbezier.cpp @@ -31,6 +31,7 @@ #include #include +#include //--------------------------------------------------------------------------------------------------------------------- VAbstractCubicBezier::VAbstractCubicBezier(const GOType &type, const quint32 &idObject, const Draw &mode) diff --git a/src/libs/vtools/tools/drawTools/vdrawtool.h b/src/libs/vtools/tools/drawTools/vdrawtool.h index dcabb0288..76e8adfa3 100644 --- a/src/libs/vtools/tools/drawTools/vdrawtool.h +++ b/src/libs/vtools/tools/drawTools/vdrawtool.h @@ -30,7 +30,7 @@ #define VDRAWTOOL_H #include "../vabstracttool.h" -#include "../../dialogs/tools/dialogtool.h" +#include "dialogs/tools/dialogtool.h" #include "../vwidgets/vmaingraphicsview.h" #include diff --git a/src/libs/vtools/tools/vabstracttool.h b/src/libs/vtools/tools/vabstracttool.h index 8a86c7e90..8126fdfb8 100644 --- a/src/libs/vtools/tools/vabstracttool.h +++ b/src/libs/vtools/tools/vabstracttool.h @@ -33,7 +33,7 @@ #include "../ifc/xml/vabstractpattern.h" #include "../vmisc/vabstractapplication.h" #include "../vwidgets/vmaingraphicsscene.h" -#include "../visualization/visualization.h" +#include "visualization/visualization.h" class QDomElement; class QLineF; diff --git a/src/libs/vtools/tools/vdatatool.h b/src/libs/vtools/tools/vdatatool.h index 3b939b07e..6405e2a59 100644 --- a/src/libs/vtools/tools/vdatatool.h +++ b/src/libs/vtools/tools/vdatatool.h @@ -29,7 +29,7 @@ #ifndef VDATATOOL_H #define VDATATOOL_H -#include "../../vpatterndb/vcontainer.h" +#include "../vpatterndb/vcontainer.h" #include "../vmisc/logging.h" Q_DECLARE_LOGGING_CATEGORY(vTool) From 66fbcab64c4aa85e47d74508283f944067c8bc5d Mon Sep 17 00:00:00 2001 From: Valentina Zhuravska Date: Mon, 11 Apr 2016 05:52:32 +0300 Subject: [PATCH 2/3] Better to use qDegreesToRadians than M_PI/180 --HG-- branch : feature --- src/libs/vgeometry/varc.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/libs/vgeometry/varc.cpp b/src/libs/vgeometry/varc.cpp index 6637d3ad7..2936c1036 100644 --- a/src/libs/vgeometry/varc.cpp +++ b/src/libs/vgeometry/varc.cpp @@ -123,7 +123,7 @@ VArc::~VArc() */ qreal VArc::GetLength() const { - qreal length = (M_PI * d->radius)/180 * AngleArc(); + qreal length = d->radius * qDegreesToRadians(AngleArc()); if (d->isFlipped) { length *= -1; @@ -232,7 +232,7 @@ QVector VArc::GetPoints() const for (int i = 0; i < sectionAngle.size(); ++i) { - const qreal lDistance = GetRadius() * 4.0/3.0 * qTan(M_PI/180.0 * sectionAngle.at(i) * 0.25); + const qreal lDistance = GetRadius() * 4.0/3.0 * qTan(qDegreesToRadians(sectionAngle.at(i)) * 0.25); const QPointF center = GetCenter().toQPointF(); @@ -297,7 +297,8 @@ QPointF VArc::CutArc(const qreal &length, VArc &arc1, VArc &arc2) const len = length; } - qreal n = (len*180)/(M_PI*d->radius); // n - is angle in degrees + qreal n = qRadiansToDegrees(len/d->radius); // n - is angle in degrees + QLineF line(GetCenter().toQPointF(), GetP1()); line.setAngle(line.angle()+n); @@ -374,7 +375,7 @@ void VArc::FindF2(qreal length) length = MaxLength(); } - qreal arcAngle = (qAbs(length)*180)/(M_PI*d->radius); + qreal arcAngle = qAbs(qRadiansToDegrees(length/d->radius)); if (d->isFlipped) { From 86de5ba2748ca3cc232250ca34a5e5bda1f18af6 Mon Sep 17 00:00:00 2001 From: Valentina Zhuravska Date: Mon, 25 Apr 2016 20:00:03 +0300 Subject: [PATCH 3/3] Resolved Issue #471. Add a 'Show/Hide' button for measurement diagram in Tape --HG-- branch : develop --- src/app/tape/share/resources/tapeicon.qrc | 1 + .../share/resources/tapeicon/24x24/mannequin.png | Bin 0 -> 520 bytes src/app/tape/tmainwindow.cpp | 4 +++- 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 src/app/tape/share/resources/tapeicon/24x24/mannequin.png diff --git a/src/app/tape/share/resources/tapeicon.qrc b/src/app/tape/share/resources/tapeicon.qrc index ba2328ff5..026f42132 100644 --- a/src/app/tape/share/resources/tapeicon.qrc +++ b/src/app/tape/share/resources/tapeicon.qrc @@ -8,5 +8,6 @@ tapeicon/24x24/red_plus.png tapeicon/24x24/padlock_locked.png tapeicon/24x24/padlock_opened.png + tapeicon/24x24/mannequin.png diff --git a/src/app/tape/share/resources/tapeicon/24x24/mannequin.png b/src/app/tape/share/resources/tapeicon/24x24/mannequin.png new file mode 100644 index 0000000000000000000000000000000000000000..e1d3e554cae2c6aee017a822b5ec03c660424f78 GIT binary patch literal 520 zcmV+j0{8uiP)8aMfYp1hFHdwkdQc|%R!gZ^S^>#fgI#|8W1u+1>jP@tOo^Rp^6f6MT!^$ zZ~;h9!W94(Imi{;CPsq}BZqlY>v(3L)jD>D93e;QpjX4;NtcsrF9XQ@2C<`EQ$4;2 zRkR21z1C)_*pjbafD9jo+?;#gZEPE~GRVN@wBp;q;iNiv|4G%Ccrv*Xa)+D&t|4Yr z{Rx|qvezxL4N^v|w7SLO5oop-fhKENsdz-%z%}Rz2y_HG`NJ{DsgyWNDj~@JR`{Va z=^b*!vp2N_7}O;mySkfE65@B?q!wh=lrU)8j9TIbjBMt!^jX*duy76=;#Zs~Xc literal 0 HcmV?d00001 diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp index fe3fe9ce3..d739f4fd1 100644 --- a/src/app/tape/tmainwindow.cpp +++ b/src/app/tape/tmainwindow.cpp @@ -97,7 +97,7 @@ TMainWindow::TMainWindow(QWidget *parent) labelGradationSizes(nullptr), labelPatternUnit(nullptr), actionDockDiagram(nullptr), - dockDiagramVisible(false), + dockDiagramVisible(true), isInitialized(false), recentFileActs(), separatorAct(nullptr) @@ -1757,7 +1757,9 @@ void TMainWindow::SetupMenu() actionDockDiagram = ui->dockWidgetDiagram->toggleViewAction(); actionDockDiagram->setMenuRole(QAction::NoRole); ui->menuMeasurements->addAction(actionDockDiagram); + ui->mainToolBar->addAction(actionDockDiagram); actionDockDiagram->setEnabled(false); + actionDockDiagram->setIcon(QIcon("://tapeicon/24x24/mannequin.png")); // Window connect(ui->menuWindow, &QMenu::aboutToShow, this, &TMainWindow::AboutToShowWindowMenu);