diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp index df570a709..585381a15 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp @@ -169,11 +169,14 @@ QString VAbstractSpline::MakeToolTip() const const QSharedPointer curve = VAbstractTool::data.GeometricObject(m_id); const QString toolTip = QString("" + "" "" "
%4: %5
%1: %2 %3
") .arg(tr("Length")) .arg(qApp->fromPixel(curve->GetLength())) - .arg(UnitsToStr(qApp->patternUnit(), true)); + .arg(UnitsToStr(qApp->patternUnit(), true)) + .arg(tr("Label")) + .arg(curve->name()); return toolTip; } diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp index cd751f40f..f04aaf1ab 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp @@ -390,6 +390,7 @@ QString VToolArc::MakeToolTip() const const QSharedPointer arc = VAbstractTool::data.GeometricObject(m_id); const QString toolTip = QString("" + "" "" "" "" @@ -403,6 +404,8 @@ QString VToolArc::MakeToolTip() const .arg(tr("Start angle")) .arg(qApp->fromPixel(arc->GetStartAngle())) .arg(tr("End angle")) - .arg(qApp->fromPixel(arc->GetEndAngle())); + .arg(qApp->fromPixel(arc->GetEndAngle())) + .arg(tr("Label")) + .arg(arc->name()); return toolTip; } diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp index 58a6df7f1..d8493b20e 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp @@ -350,6 +350,7 @@ QString VToolArcWithLength::MakeToolTip() const const QSharedPointer arc = VAbstractTool::data.GeometricObject(m_id); const QString toolTip = QString("
%10: %11
%1: %2 %3
%4: %5 %3
%6: %7°
" + "" "" "" "" @@ -363,6 +364,8 @@ QString VToolArcWithLength::MakeToolTip() const .arg(tr("Start angle")) .arg(qApp->fromPixel(arc->GetStartAngle())) .arg(tr("End angle")) - .arg(qApp->fromPixel(arc->GetEndAngle())); + .arg(qApp->fromPixel(arc->GetEndAngle())) + .arg(tr("Label")) + .arg(arc->name()); return toolTip; } diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp index e1d8267cc..9f707d428 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp @@ -463,6 +463,7 @@ QString VToolEllipticalArc::MakeToolTip() const const QSharedPointer elArc = VAbstractTool::data.GeometricObject(m_id); const QString toolTip = QString("
%10: %11
%1: %2 %3
%4: %5 %3
%6: %7°
" + "" "" "" "" @@ -479,6 +480,8 @@ QString VToolEllipticalArc::MakeToolTip() const .arg(tr("Start angle")) .arg(elArc->GetStartAngle()) .arg(tr("End angle")) - .arg(elArc->GetEndAngle()); + .arg(elArc->GetEndAngle()) + .arg(tr("Label")) + .arg(elArc->name()); return toolTip; } diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp index b0f06284a..9e15e0665 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp @@ -74,23 +74,6 @@ void VToolCut::FullUpdateFromFile() SetVisualization(); } -//--------------------------------------------------------------------------------------------------------------------- -QString VToolCut::MakeToolTip() const -{ - const QSharedPointer curve = VAbstractTool::data.GeometricObject(curveCutId); - - const QString toolTip = QString("
%12: %13
%1: %2 %3
%4: %5 %3
%6: %7 %3
" - "" - "" - "" - "" - "
%1: %2 %3
%4: %5 %3
%6: %7°
%8: %9°
") - .arg(tr("Length")) - .arg(qApp->fromPixel(curve->GetLength())) - .arg(UnitsToStr(qApp->patternUnit(), true)); - return toolTip; -} - //--------------------------------------------------------------------------------------------------------------------- // cppcheck-suppress unusedFunction quint32 VToolCut::getCurveCutId() const diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h index 4b12c02ab..dfe251a80 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h @@ -66,7 +66,6 @@ public slots: virtual void Disable(bool disable, const QString &namePP) Q_DECL_OVERRIDE; virtual void DetailsMode(bool mode) Q_DECL_OVERRIDE; virtual void FullUpdateFromFile() Q_DECL_OVERRIDE; - virtual QString MakeToolTip() const Q_DECL_OVERRIDE; protected: /** @brief formula keep formula of length */ QString formula; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp index d350d6301..d16d97ebd 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp @@ -271,7 +271,8 @@ QString VToolCutArc::MakeToolTip() const auto ArcToolTip = [arcStr, lengthStr, startAngleStr, endAngleStr, radiusStr](QString toolTip, const VArc &arc, const QString &arcNumber) { - toolTip += QString(" %1: %2 %3 " + toolTip += QString(" %10: %11 " + " %1: %2 %3 " " %4: %5 %3 " " %6: %7° " " %8: %9° ") @@ -283,7 +284,9 @@ QString VToolCutArc::MakeToolTip() const .arg(arcStr + arcNumber + QLatin1String(" ") + startAngleStr) .arg(qApp->fromPixel(arc.GetStartAngle())) .arg(arcStr + arcNumber + QLatin1String(" ") + endAngleStr) - .arg(qApp->fromPixel(arc.GetEndAngle())); + .arg(qApp->fromPixel(arc.GetEndAngle())) + .arg(arcStr + arcNumber + QLatin1String(" ") + tr("label")) + .arg(arc.name()); return toolTip; }; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp index 812f18ac5..def45024c 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp @@ -268,14 +268,20 @@ QString VToolCutSpline::MakeToolTip() const const QString lengthStr = tr("length"); const QString toolTip = QString("" + "" "" + "" "" "
%6: %7
%1: %2 %3
%8: %9
%4: %5 %3
") .arg(curveStr + QLatin1String("1 ") + lengthStr) .arg(qApp->fromPixel(spline1.GetLength())) .arg(UnitsToStr(qApp->patternUnit(), true)) .arg(curveStr + QLatin1String("2 ") + lengthStr) - .arg(qApp->fromPixel(spline2.GetLength())); + .arg(qApp->fromPixel(spline2.GetLength())) + .arg(curveStr + QLatin1String(" 1") + tr("label")) + .arg(spline1.name()) + .arg(curveStr + QLatin1String(" 2") + tr("label")) + .arg(spline2.name()); return toolTip; } diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp index 16941aec7..3dadb1f31 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp @@ -354,14 +354,20 @@ QString VToolCutSplinePath::MakeToolTip() const const QString lengthStr = tr("length"); const QString toolTip = QString("" + "" "" + "" "" "
%6: %7
%1: %2 %3
%8: %9
%4: %5 %3
") .arg(curveStr + QLatin1String("1 ") + lengthStr) .arg(qApp->fromPixel(splPath1->GetLength())) .arg(UnitsToStr(qApp->patternUnit(), true)) .arg(curveStr + QLatin1String("2 ") + lengthStr) - .arg(qApp->fromPixel(splPath2->GetLength())); + .arg(qApp->fromPixel(splPath2->GetLength())) + .arg(curveStr + QLatin1String(" 1") + tr("label")) + .arg(splPath1->name()) + .arg(curveStr + QLatin1String(" 2") + tr("label")) + .arg(splPath2->name()); delete splPath1; delete splPath2; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp index c35c0a54e..250e4cca5 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp @@ -155,6 +155,7 @@ QString VToolAlongLine::MakeToolTip() const const QLineF curToSecond(static_cast(*current), static_cast(*secondPoint)); const QString toolTip = QString("" + "" "" "" "" @@ -167,7 +168,9 @@ QString VToolAlongLine::MakeToolTip() const .arg(curLine.angle()) .arg(QString("%1->%2").arg(basePoint->name(), current->name())) .arg(QString("%1->%2").arg(current->name(), secondPoint->name())) - .arg(qApp->fromPixel(curToSecond.length())); + .arg(qApp->fromPixel(curToSecond.length())) + .arg(tr("Label")) + .arg(current->name()); return toolTip; } diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp index 1c691abbc..f971340cd 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp @@ -280,6 +280,7 @@ QString VToolHeight::MakeToolTip() const const QLineF p2ToCur(static_cast(*p2Line), static_cast(*current)); const QString toolTip = QString("
%9: %10
%1: %2 %3
%4: %5°
%6: %2 %3
" + "" "" "" "" @@ -293,7 +294,9 @@ QString VToolHeight::MakeToolTip() const .arg(QString("%1->%2").arg(p1Line->name(), current->name())) .arg(qApp->fromPixel(p1ToCur.length())) .arg(QString("%1->%2").arg(p2Line->name(), current->name())) - .arg(qApp->fromPixel(p2ToCur.length())); + .arg(qApp->fromPixel(p2ToCur.length())) + .arg(tr("Label")) + .arg(current->name()); return toolTip; } diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp index d6e9771c5..8bb55fedb 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp @@ -345,6 +345,7 @@ QString VToolLineIntersectAxis::MakeToolTip() const const QLineF curToSecond(static_cast(*current), static_cast(*secondPoint)); const QString toolTip = QString("
%10: %11
%1: %2 %3
%4: %5°
%6: %7 %3
" + "" "" "" "" @@ -358,6 +359,8 @@ QString VToolLineIntersectAxis::MakeToolTip() const .arg(QString("%1->%2").arg(firstPoint->name(), current->name())) .arg(qApp->fromPixel(firstToCur.length())) .arg(QString("%1->%2").arg(current->name(), secondPoint->name())) - .arg(qApp->fromPixel(curToSecond.length())); + .arg(qApp->fromPixel(curToSecond.length())) + .arg(tr("Label")) + .arg(current->name()); return toolTip; } diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp index 5429d3918..b259978c6 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp @@ -152,6 +152,7 @@ QString VToolLinePoint::MakeToolTip() const const QLineF line(static_cast(*first), static_cast(*second)); const QString toolTip = QString("
%10: %11
%1: %2 %3
%4: %5°
%6: %7 %3
" + "" "" "" "
%6: %7
%1: %2 %3
%4: %5°
") @@ -159,7 +160,9 @@ QString VToolLinePoint::MakeToolTip() const .arg(qApp->fromPixel(line.length())) .arg(UnitsToStr(qApp->patternUnit(), true)) .arg(tr("Angle")) - .arg(line.angle()); + .arg(line.angle()) + .arg(tr("Label")) + .arg(second->name()); return toolTip; } diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp index a2dabea2a..76ca60a49 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp @@ -342,6 +342,7 @@ QString VToolShoulderPoint::MakeToolTip() const const QLineF secondToCur(static_cast(*second), static_cast(*current)); const QString toolTip = QString("" + "" "" "" "" @@ -352,7 +353,9 @@ QString VToolShoulderPoint::MakeToolTip() const .arg(tr("Angle")) .arg(firstToCur.angle()) .arg(QString("%1->%2").arg(second->name(), current->name())) - .arg(qApp->fromPixel(secondToCur.length())); + .arg(qApp->fromPixel(secondToCur.length())) + .arg(tr("Label")) + .arg(current->name()); return toolTip; } diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp index 1d2a89cd6..bb0792f0c 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp @@ -370,6 +370,19 @@ void VToolBasePoint::ReadToolAttributes(const QDomElement &domElement) // This tool doesn't need read attributes from file. } +//--------------------------------------------------------------------------------------------------------------------- +QString VToolBasePoint::MakeToolTip() const +{ + const QSharedPointer point = VAbstractTool::data.GeometricObject(m_id); + + const QString toolTip = QString("
%8: %9
%1: %2 %3
%4: %5°
%6: %7 %3
" + "" + "
%1: %2
") + .arg(tr("Label")) + .arg(point->name()); + return toolTip; +} + //--------------------------------------------------------------------------------------------------------------------- void VToolBasePoint::ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id) { diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h index 47f7cc351..893cbfab1 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h @@ -86,6 +86,7 @@ protected: virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE; virtual void SetVisualization() Q_DECL_OVERRIDE {} + virtual QString MakeToolTip() const Q_DECL_OVERRIDE; private slots: virtual void ShowContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 id=NULL_ID) Q_DECL_OVERRIDE; private: diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp index 22792bed0..8fc6a6f75 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp @@ -308,6 +308,7 @@ QString VToolLineIntersect::MakeToolTip() const const QLineF curToP2L2(static_cast(*current), static_cast(*p2L2)); const QString toolTip = QString("" + "" "" "" "" @@ -321,7 +322,9 @@ QString VToolLineIntersect::MakeToolTip() const .arg(QString("%1->%2").arg(p1L2->name(), current->name())) .arg(qApp->fromPixel(p1L2ToCur.length())) .arg(QString("%1->%2").arg(current->name(), p2L2->name())) - .arg(qApp->fromPixel(curToP2L2.length())); + .arg(qApp->fromPixel(curToP2L2.length())) + .arg(tr("Label")) + .arg(current->name()); return toolTip; } diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp index dc9397633..966b50da8 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp @@ -350,6 +350,7 @@ QString VToolPointOfContact::MakeToolTip() const const QLineF centerToCur(static_cast(*centerP), static_cast(*current)); const QString toolTip = QString("
%10: %11
%1: %2 %3
%4: %5 %3
%6: %7 %3
" + "" "" "" "" @@ -363,7 +364,9 @@ QString VToolPointOfContact::MakeToolTip() const .arg(QString("%1 %2->%3").arg(tr("Length"), centerP->name(), current->name())) .arg(qApp->fromPixel(centerToCur.length())) .arg(QString("%1 %2->%3").arg(tr("Angle"), centerP->name(), current->name())) - .arg(centerToCur.angle()); + .arg(centerToCur.angle()) + .arg(tr("Label")) + .arg(current->name()); return toolTip; }
%10: %11
%1: %2 %3
%4: %5 %3
%6: %7 %3