From 6b89f43e871c393ef8828b7e9a52f4c6045bdb35 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 22 Nov 2016 14:33:08 +0200 Subject: [PATCH] Tool button connected to tool dialog. --HG-- branch : feature --- .../core/vtooloptionspropertybrowser.cpp | 6 +- src/app/valentina/dialogs/dialoghistory.cpp | 3 +- src/app/valentina/mainwindow.cpp | 40 ++++++++- src/app/valentina/mainwindow.h | 2 + src/app/valentina/mainwindow.ui | 40 +++++++-- src/app/valentina/share/resources/cursor.qrc | 2 + .../share/resources/cursor/path_cursor.png | Bin 0 -> 572 bytes .../share/resources/cursor/path_cursor@2x.png | Bin 0 -> 1218 bytes .../valentina/share/resources/toolicon.qrc | 2 + .../share/resources/toolicon/32x32/path.png | Bin 0 -> 752 bytes .../resources/toolicon/32x32/path@2x.png | Bin 0 -> 1626 bytes .../share/resources/toolicon/svg/path.svg | 85 ++++++++++++++++++ src/app/valentina/xml/vpattern.cpp | 3 +- src/libs/ifc/xml/vabstractpattern.cpp | 8 +- src/libs/vmisc/def.h | 4 +- src/libs/vtools/dialogs/tooldialogs.h | 1 + .../vtools/dialogs/tools/dialogpiecepath.cpp | 2 + 17 files changed, 178 insertions(+), 20 deletions(-) create mode 100644 src/app/valentina/share/resources/cursor/path_cursor.png create mode 100644 src/app/valentina/share/resources/cursor/path_cursor@2x.png create mode 100644 src/app/valentina/share/resources/toolicon/32x32/path.png create mode 100644 src/app/valentina/share/resources/toolicon/32x32/path@2x.png create mode 100644 src/app/valentina/share/resources/toolicon/svg/path.svg diff --git a/src/app/valentina/core/vtooloptionspropertybrowser.cpp b/src/app/valentina/core/vtooloptionspropertybrowser.cpp index 99434e6d5..7c5dc3dcc 100644 --- a/src/app/valentina/core/vtooloptionspropertybrowser.cpp +++ b/src/app/valentina/core/vtooloptionspropertybrowser.cpp @@ -77,7 +77,7 @@ void VToolOptionsPropertyBrowser::ClearPropertyBrowser() void VToolOptionsPropertyBrowser::ShowItemOptions(QGraphicsItem *item) { // This check helps to find missed tools in the switch - Q_STATIC_ASSERT_X(static_cast(Tool::LAST_ONE_DO_NOT_USE) == 49, "Not all tools was used in switch."); + Q_STATIC_ASSERT_X(static_cast(Tool::LAST_ONE_DO_NOT_USE) == 50, "Not all tools were used in switch."); switch (item->type()) { @@ -210,7 +210,7 @@ void VToolOptionsPropertyBrowser::UpdateOptions() } // This check helps to find missed tools in the switch - Q_STATIC_ASSERT_X(static_cast(Tool::LAST_ONE_DO_NOT_USE) == 49, "Not all tools was used in switch."); + Q_STATIC_ASSERT_X(static_cast(Tool::LAST_ONE_DO_NOT_USE) == 50, "Not all tools were used in switch."); switch (currentItem->type()) { @@ -354,7 +354,7 @@ void VToolOptionsPropertyBrowser::userChangedData(VProperty *property) } // This check helps to find missed tools in the switch - Q_STATIC_ASSERT_X(static_cast(Tool::LAST_ONE_DO_NOT_USE) == 49, "Not all tools was used in switch."); + Q_STATIC_ASSERT_X(static_cast(Tool::LAST_ONE_DO_NOT_USE) == 50, "Not all tools were used in switch."); switch (currentItem->type()) { diff --git a/src/app/valentina/dialogs/dialoghistory.cpp b/src/app/valentina/dialogs/dialoghistory.cpp index 8b57fdadf..e394b31b3 100644 --- a/src/app/valentina/dialogs/dialoghistory.cpp +++ b/src/app/valentina/dialogs/dialoghistory.cpp @@ -208,7 +208,7 @@ QT_WARNING_DISABLE_GCC("-Wswitch-default") QString DialogHistory::Record(const VToolRecord &tool) { // This check helps to find missed tools in the switch - Q_STATIC_ASSERT_X(static_cast(Tool::LAST_ONE_DO_NOT_USE) == 49, "Not all tools was used in history."); + Q_STATIC_ASSERT_X(static_cast(Tool::LAST_ONE_DO_NOT_USE) == 50, "Not all tools was used in history."); const QDomElement domElem = doc->elementById(tool.getId()); if (domElem.isElement() == false) @@ -392,6 +392,7 @@ QString DialogHistory::Record(const VToolRecord &tool) case Tool::FlippingByLine: case Tool::FlippingByAxis: case Tool::Move: + case Tool::PiecePath: return QString(); } } diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index c8941b238..de188950a 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -952,6 +952,14 @@ void MainWindow::ToolDetail(bool checked) &MainWindow::ApplyDetailsDialog); } +//--------------------------------------------------------------------------------------------------------------------- +void MainWindow::ToolPiecePath(bool checked) +{ + ToolSelectAllDrawObjects(); + SetToolButton(checked, Tool::PiecePath, "://cursor/path_cursor.png", tr("Select path objects."), + &MainWindow::ClosedDialogPiecePath); +} + //--------------------------------------------------------------------------------------------------------------------- /** * @brief ClosedDialogDetail actions after closing DialogDetail. @@ -1104,6 +1112,19 @@ void MainWindow::ClosedDialogGroup(int result) ArrowTool(); } +//--------------------------------------------------------------------------------------------------------------------- +void MainWindow::ClosedDialogPiecePath(int result) +{ + SCASSERT(dialogTool != nullptr); + if (result == QDialog::Accepted) + { + DialogPiecePath *dialog = qobject_cast(dialogTool); + SCASSERT(dialog != nullptr); + + } + ArrowTool(); +} + //--------------------------------------------------------------------------------------------------------------------- /** * @brief ToolCutArc handler tool cutArc. @@ -1671,6 +1692,7 @@ void MainWindow::ToolBarDraws() }); } +//--------------------------------------------------------------------------------------------------------------------- void MainWindow::ToolBarTools() { /*First we will try use Standard Shortcuts from Qt, but because keypad "-" and "+" not the same keys like in main @@ -1717,6 +1739,9 @@ void MainWindow::InitToolButtons() connect(pointer, &QToolButton::clicked, this, &MainWindow::ArrowTool); } + // This check helps to find missed tools + Q_STATIC_ASSERT_X(static_cast(Tool::LAST_ONE_DO_NOT_USE) == 50, "Check if all tools were connected."); + connect(ui->toolButtonEndLine, &QToolButton::clicked, this, &MainWindow::ToolEndLine); connect(ui->toolButtonLine, &QToolButton::clicked, this, &MainWindow::ToolLine); connect(ui->toolButtonAlongLine, &QToolButton::clicked, this, &MainWindow::ToolAlongLine); @@ -1731,6 +1756,7 @@ void MainWindow::InitToolButtons() connect(ui->toolButtonCubicBezierPath, &QToolButton::clicked, this, &MainWindow::ToolCubicBezierPath); connect(ui->toolButtonPointOfContact, &QToolButton::clicked, this, &MainWindow::ToolPointOfContact); connect(ui->toolButtonNewDetail, &QToolButton::clicked, this, &MainWindow::ToolDetail); + connect(ui->toolButtonPiecePath, &QToolButton::clicked, this, &MainWindow::ToolPiecePath); connect(ui->toolButtonHeight, &QToolButton::clicked, this, &MainWindow::ToolHeight); connect(ui->toolButtonTriangle, &QToolButton::clicked, this, &MainWindow::ToolTriangle); connect(ui->toolButtonPointOfIntersection, &QToolButton::clicked, this, &MainWindow::ToolPointOfIntersection); @@ -1786,7 +1812,7 @@ QT_WARNING_DISABLE_GCC("-Wswitch-default") void MainWindow::CancelTool() { // This check helps to find missed tools in the switch - Q_STATIC_ASSERT_X(static_cast(Tool::LAST_ONE_DO_NOT_USE) == 49, "Not all tools was handled."); + Q_STATIC_ASSERT_X(static_cast(Tool::LAST_ONE_DO_NOT_USE) == 50, "Not all tools was handled."); qCDebug(vMainWindow, "Canceling tool."); delete dialogTool; @@ -1875,6 +1901,9 @@ void MainWindow::CancelTool() case Tool::Piece: ui->toolButtonNewDetail->setChecked(false); break; + case Tool::PiecePath: + ui->toolButtonPiecePath->setChecked(false); + break; case Tool::Height: ui->toolButtonHeight->setChecked(false); break; @@ -2987,7 +3016,7 @@ void MainWindow::SetEnableTool(bool enable) } // This check helps to find missed tools - Q_STATIC_ASSERT_X(static_cast(Tool::LAST_ONE_DO_NOT_USE) == 49, "Not all tools were handled."); + Q_STATIC_ASSERT_X(static_cast(Tool::LAST_ONE_DO_NOT_USE) == 50, "Not all tools were handled."); //Drawing Tools ui->toolButtonEndLine->setEnabled(drawTools); @@ -3004,6 +3033,7 @@ void MainWindow::SetEnableTool(bool enable) ui->toolButtonCubicBezierPath->setEnabled(drawTools); ui->toolButtonPointOfContact->setEnabled(drawTools); ui->toolButtonNewDetail->setEnabled(drawTools); + ui->toolButtonPiecePath->setEnabled(drawTools); ui->toolButtonHeight->setEnabled(drawTools); ui->toolButtonTriangle->setEnabled(drawTools); ui->toolButtonPointOfIntersection->setEnabled(drawTools); @@ -3307,7 +3337,7 @@ QT_WARNING_DISABLE_GCC("-Wswitch-default") void MainWindow::LastUsedTool() { // This check helps to find missed tools in the switch - Q_STATIC_ASSERT_X(static_cast(Tool::LAST_ONE_DO_NOT_USE) == 49, "Not all tools was handled."); + Q_STATIC_ASSERT_X(static_cast(Tool::LAST_ONE_DO_NOT_USE) == 50, "Not all tools were handled."); if (currentTool == lastUsedTool) { @@ -3401,6 +3431,10 @@ void MainWindow::LastUsedTool() ui->toolButtonNewDetail->setChecked(true); ToolDetail(true); break; + case Tool::PiecePath: + ui->toolButtonPiecePath->setChecked(true); + ToolPiecePath(true); + break; case Tool::Height: ui->toolButtonHeight->setChecked(true); ToolHeight(true); diff --git a/src/app/valentina/mainwindow.h b/src/app/valentina/mainwindow.h index 34851eaf5..aed7a8993 100644 --- a/src/app/valentina/mainwindow.h +++ b/src/app/valentina/mainwindow.h @@ -134,6 +134,7 @@ private slots: void ToolCutSplinePath(bool checked); void ToolPointOfContact(bool checked); void ToolDetail(bool checked); + void ToolPiecePath(bool checked); void ToolHeight(bool checked); void ToolTriangle(bool checked); void ToolPointOfIntersection(bool checked); @@ -167,6 +168,7 @@ private slots: void ClosedDialogDetail(int result); void ClosedDialogUnionDetails(int result); void ClosedDialogGroup(int result); + void ClosedDialogPiecePath(int result); void LoadIndividual(); void LoadStandard(); diff --git a/src/app/valentina/mainwindow.ui b/src/app/valentina/mainwindow.ui index 27f576e5e..cfad62823 100644 --- a/src/app/valentina/mainwindow.ui +++ b/src/app/valentina/mainwindow.ui @@ -48,7 +48,7 @@ Tools - 4 + 5 @@ -427,7 +427,7 @@ 0 0 - 117 + 130 110 @@ -536,7 +536,7 @@ 0 0 - 117 + 130 248 @@ -798,7 +798,7 @@ 0 0 - 117 + 130 248 @@ -1241,8 +1241,8 @@ 0 0 - 117 - 104 + 130 + 150 @@ -1343,6 +1343,32 @@ + + + + false + + + Piece path tool + + + ... + + + + :/toolicon/32x32/path.png:/toolicon/32x32/path.png + + + + 32 + 32 + + + + true + + + @@ -2480,8 +2506,8 @@ - + diff --git a/src/app/valentina/share/resources/cursor.qrc b/src/app/valentina/share/resources/cursor.qrc index b2631218b..56f67ddd5 100644 --- a/src/app/valentina/share/resources/cursor.qrc +++ b/src/app/valentina/share/resources/cursor.qrc @@ -76,5 +76,7 @@ cursor/flipping_axis_cursor@2x.png cursor/move_cursor.png cursor/move_cursor@2x.png + cursor/path_cursor.png + cursor/path_cursor@2x.png diff --git a/src/app/valentina/share/resources/cursor/path_cursor.png b/src/app/valentina/share/resources/cursor/path_cursor.png new file mode 100644 index 0000000000000000000000000000000000000000..2819f260a57881bc5ad48b72a56fd76290c3ac66 GIT binary patch literal 572 zcmV-C0>k}@P){%1Fzak-y>6u#B@IaeM7VY`hxh=1}Gho1t=BK2~Zm1cNah@h`j)X zBlZI*6tT5WKw*eHfI<*?0X;`-9stlbbw5Wy646TH5}=^_D{h^s^uzK@d5^L&%3 zZh(zL0x}U*?oP7shMNg5Vir(`@5ktK$-b~Ds8e?J0Sh{nq<0-Cd98wEO%BP6q zVcU3uhq$eAJ}4{!LusSO{^bL16Y^6WrWHq^JhrDvNE{)H~B_5O=X>M zgG$J=b*`LjdG&_|M68bTGUn}39=Eo2KrqbgAg5-yv&@h7^?v~kBOtSP)q-fuZYK1&QoyL2355iVDhU@A7BFfgbQ@T}sE{y}fV!7(!O#NgT0)m(0_s-6a0Jw) zguLMis5=Rf;R~oM2_qFyHxhD2E}$+XbhR3#e)d0aYpCwDJn5Iti5! zP%#Oq0^9z^v~ma1$In=aV@VHK$n*>kV_x9EbT;pZ+j@y;D6lOgJ-7tif?bkJNM(4w zhjraFHIhFaC%?s24#m+s<357r0|B)`Rt&%g~5|?H| zk~JX}T(0HRd{*Adj))Brt)Xz4U#40GkU+v$Tukxm3{K7`Kb;e;tZ!z2nnzRY@8Y$H z8x0|%KYyuw2_!Cu6^zTWJj>%*maHWcXz6BI#HSG#BKGE3mQ=urDoFajV{g*n`_swH zJTFIdMjVWoo#eRVRgiH1(T$HsB0zkCbe?-7{>br7o;jrw@IEGvG|*BKNat7^(G{^J zFk!I$j~RaQ8<8np3Rh2{Ibvs?jy(4dw(n8N6Ys%Or3}27bh0|4Jz{$pWVR+1ki&x| zkGhBi8gslG5k=g^$gcxViZ55U6*It6lcGDt4sqUhGO~MtAF&#TiW^>e=;gaK?J4F_ zcm@o{ZY))!$wT01pfhkC!z+QUSS4Fhkxl zUci%hv&3uP)xzh2JmB6@&JrSKTH`-OEuCo^+w zjL1i94NUF-e&Rk^saeeA6xRfz&*QJCB=;n;@!v3(V_JrNpYc6Hps9R-^QV-@jq}4$S*WL!Ghn&bl@g#p26-A&+OxPF~!@>{F)lzTvZ_e z6MEvdm6rJRwV{lm>&?482z10{Zmsu0l22jf{bmq`s=JjyHG zyl#l#yU6sg=>`_}kZIz~E}nUTuao}nsu0l4<_1nR$BWsY?Yz+%KdUq(Z9LY%Lk&y| g?4HH9!|9>_3-VR2WyLU;m;e9(07*qoM6N<$g2K=xqyPW_ literal 0 HcmV?d00001 diff --git a/src/app/valentina/share/resources/toolicon.qrc b/src/app/valentina/share/resources/toolicon.qrc index 675a47d40..e93851223 100644 --- a/src/app/valentina/share/resources/toolicon.qrc +++ b/src/app/valentina/share/resources/toolicon.qrc @@ -74,5 +74,7 @@ toolicon/32x32/flipping_axis@2x.png toolicon/32x32/move.png toolicon/32x32/move@2x.png + toolicon/32x32/path.png + toolicon/32x32/path@2x.png diff --git a/src/app/valentina/share/resources/toolicon/32x32/path.png b/src/app/valentina/share/resources/toolicon/32x32/path.png new file mode 100644 index 0000000000000000000000000000000000000000..a95d6e90d3bb87008cf90c2b194883bd641a9e68 GIT binary patch literal 752 zcmVSOlx{W?&@o>pCu;qq7)syRsoZsWZKecAYrP>7I#0 zotqoTtE55FcH(~4bn9PP1creYVFpc9S$3408DB&OpEy9^;&Ze%l3t>-lD}6I10UnJ z$f?9LPYj@+!xfGX@O9wCZCjI-BJJoFBa=xW!1or0^r9|)FW4mKG6G_ zFwK^t6OQ*>JQ3z*L6diT4v=xUxcciopN5eSBJIe(k+nS&PArLhR^)vuvh%_H0B`V0 z&aRxvr#L@Gqg#QktncG!n*9;|wvS`q5fgnGdnPUxP40000*prjQlq!tCKL<+5qmxKom za`6)5gGQnyQAABK8lyh=B+>XlG^rYhF`7o7nh2>0(L@^ou@<~k8!L!41v)@eQWJ?`BuXs!$)W=W9Sf5y|5R0VdQLZ z9q-QgdSpEY@pNQIA9wF2UnskaLV%6jh0mc8>63U(hvWqZBR4$8^9x}+TZlscA8h1i zd_FQT&60xQf}w)Zf)QMr@!f^8U%3E*PazZxPZIXyZ+H%o{>WhDh7GJ)2>X=_5ZMsv zM;Mbj`$;^DHUfhK46aX}GViEbfPmqd#K}_TiO&BFF!Uk5-(+tqb(dxHMWAW{qSV+0 zysj&wAERC(cs>GGN4B*XYbHTnf35_o7C_)vfvLds#kdTY;0lS{fF#8Fm%la|_-x=` zE$%+T^10ftT!4)4;Bdxd#)%cgl^9?;W3tV$E4g=&9ZvO%Qy7YTaftnGJ}?*ii)9{g zHNNMih7MBqI3D=s9)185tZc9)a3@yHQq=Y#?g%u`*7l+hfHVbuhMNjD;k>}!f}OKX zfFdI;wnn}ZPIv!(fe#PyWN(;Ph@+gBb8k+O6T5yUTD-Svemz5zkLFC2L}<3SscLRL zLz^pdo+yiu^UkWd^$ZhSn6sx_gcgU}yt!&_Jws$PXLrdH_QkZYst1m7e$L-ZBK)Xo zUOh#NwK*@AxiMabDw@`A@>nqAiiP3|vw!Pcrd^%Oam<+Qs*7>f*5&8w$qvaQq= zZmXJ8PmyzJ&QzBGzpt88&(UOOX)IXFBG?b;A%0v+*XxtmnIYy~UhqKGoO+I&Uv~-c zLL}6w3&5VPzgM(bTPpz~eycBd1 z7^sy1O_p}2BNMd}pf4RUotc*;r z5$Ver?^+8yNR5`mZLat7L2wr}5+HJGcRJ(eRdMM#CRtV582!ggUM)PJ!IyNM2ZR)i zQ4e%BL|a|0KOR%q(Q6-(Ea#!x9*nfuS~?Fn5K|!bYacCcES&{RHF-zXyn2F3-d39Q z#3tLS=G7B4+1%tv$@PC%3)j#2SZVJ+<{X${W!2mk6h~N|^TS!f0wu5I zs*Lvq))kCr{CN%c?O^&$??kc|AIG<_x|H`<+%m#5uVnX>0B>Y)MG8T^5tjtU3m(H= z3w2!u-on6Ws=z1FkY=YvCwpJu_C4(HekanO^TCX-My{Eq*q;sY>9Yx$4X}Y#4R&Ik zbZ@7DqH||wBIDLS@Y}go@|CcWZ{zkze~|(gvJSBm87(|Fz~+ZjywBS+-rrf+tS*-o zIU2ZgnC)k4KXgd^0`Dpq>D=C!LD5KC$>R;K-Ob^1sOxFCE_vGCnC=LTG;vfKu2-PJ z^dM8W@YL4y=z=p8RbWTt%dh70W%O<0$^qUpl`buX=Q|{ZaWPqgrK5~);fY-wn|pOn z$4-{s!}3Y8HXfHk#7Wm>R?}$E_&1lIp@^x#eSvQbvTrUN`Um?kta*2$QZ{PCic z%*K-XXKH~tp((jw(Xki1@+LaJ3%qdpt54ylk$Z+YbS@nFvaTg@EM<153-gbe%R<5F zv1@}}c|++-@DLs;xPO#C%@>D0?2i-~ag?x9>gXd?ZlWZSO7c1u-0bvunBG(j*cD?{JC>qIAkN30Tk#xanUa^s1VspXp zECX;ea58fJqv^Xo@5m4{?!bRDj(6_vv@)6vj-ws + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/src/app/valentina/xml/vpattern.cpp b/src/app/valentina/xml/vpattern.cpp index d397a3434..4f9fd1722 100644 --- a/src/app/valentina/xml/vpattern.cpp +++ b/src/app/valentina/xml/vpattern.cpp @@ -3478,7 +3478,7 @@ QT_WARNING_DISABLE_GCC("-Wswitch-default") QRectF VPattern::ActiveDrawBoundingRect() const { // This check helps to find missed tools in the switch - Q_STATIC_ASSERT_X(static_cast(Tool::LAST_ONE_DO_NOT_USE) == 49, "Not all tools was used."); + Q_STATIC_ASSERT_X(static_cast(Tool::LAST_ONE_DO_NOT_USE) == 50, "Not all tools were used."); QRectF rec; @@ -3608,6 +3608,7 @@ QRectF VPattern::ActiveDrawBoundingRect() const case Tool::NodeSpline: case Tool::NodeSplinePath: case Tool::Group: + case Tool::PiecePath: break; } } diff --git a/src/libs/ifc/xml/vabstractpattern.cpp b/src/libs/ifc/xml/vabstractpattern.cpp index 05076bd9f..974d9f9ce 100644 --- a/src/libs/ifc/xml/vabstractpattern.cpp +++ b/src/libs/ifc/xml/vabstractpattern.cpp @@ -1422,7 +1422,7 @@ QStringList VAbstractPattern::ListPointExpressions() const { // Check if new tool doesn't bring new attribute with a formula. // If no just increment number - Q_STATIC_ASSERT(static_cast(Tool::LAST_ONE_DO_NOT_USE) == 49); + Q_STATIC_ASSERT(static_cast(Tool::LAST_ONE_DO_NOT_USE) == 50); QStringList expressions; const QDomNodeList list = elementsByTagName(TagPoint); @@ -1493,7 +1493,7 @@ QStringList VAbstractPattern::ListArcExpressions() const { // Check if new tool doesn't bring new attribute with a formula. // If no just increment number - Q_STATIC_ASSERT(static_cast(Tool::LAST_ONE_DO_NOT_USE) == 49); + Q_STATIC_ASSERT(static_cast(Tool::LAST_ONE_DO_NOT_USE) == 50); QStringList expressions; const QDomNodeList list = elementsByTagName(TagArc); @@ -1554,7 +1554,7 @@ QStringList VAbstractPattern::ListPathPointExpressions() const { // Check if new tool doesn't bring new attribute with a formula. // If no just increment number - Q_STATIC_ASSERT(static_cast(Tool::LAST_ONE_DO_NOT_USE) == 49); + Q_STATIC_ASSERT(static_cast(Tool::LAST_ONE_DO_NOT_USE) == 50); QStringList expressions; const QDomNodeList list = elementsByTagName(AttrPathPoint); @@ -1620,7 +1620,7 @@ QStringList VAbstractPattern::ListOperationExpressions() const { // Check if new tool doesn't bring new attribute with a formula. // If no just increment number - Q_STATIC_ASSERT(static_cast(Tool::LAST_ONE_DO_NOT_USE) == 49); + Q_STATIC_ASSERT(static_cast(Tool::LAST_ONE_DO_NOT_USE) == 50); QStringList expressions; const QDomNodeList list = elementsByTagName(TagOperation); diff --git a/src/libs/vmisc/def.h b/src/libs/vmisc/def.h index f8e2655a3..7d680bd38 100644 --- a/src/libs/vmisc/def.h +++ b/src/libs/vmisc/def.h @@ -103,6 +103,7 @@ enum class Tool : ToolVisHolderType PointOfContact, Detail, Piece, + PiecePath, NodePoint, NodeArc, NodeSpline, @@ -170,7 +171,8 @@ enum class Vis : ToolVisHolderType ToolFlippingByLine, ToolFlippingByAxis, ToolMove, - ToolPiece + ToolPiece, + ToolPiecePath }; enum class VarType : char { Measurement, Increment, LineLength, CurveLength, CurveCLength, LineAngle, CurveAngle, diff --git a/src/libs/vtools/dialogs/tooldialogs.h b/src/libs/vtools/dialogs/tooldialogs.h index d7f859cc1..07259d6fc 100644 --- a/src/libs/vtools/dialogs/tooldialogs.h +++ b/src/libs/vtools/dialogs/tooldialogs.h @@ -66,6 +66,7 @@ #include "tools/dialogflippingbyline.h" #include "tools/dialogflippingbyaxis.h" #include "tools/dialogmove.h" +#include "tools/dialogpiecepath.h" #include "support/dialogeditwrongformula.h" #include "support/dialogundo.h" diff --git a/src/libs/vtools/dialogs/tools/dialogpiecepath.cpp b/src/libs/vtools/dialogs/tools/dialogpiecepath.cpp index d863f15c6..fa119d6bf 100644 --- a/src/libs/vtools/dialogs/tools/dialogpiecepath.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpiecepath.cpp @@ -56,6 +56,8 @@ DialogPiecePath::DialogPiecePath(const VContainer *data, quint32 toolId, QWidget ui->comboBoxType->setDisabled(true); ui->comboBoxPiece->setDisabled(true); } + + show();//temporary } //---------------------------------------------------------------------------------------------------------------------