aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

We need to connect ToolTip signal from splines that already exists to ShowToolTip slot.

Browse Source 
--HG--
branch : feature
This commit is contained in:
Valentina Zhuravska 2016-07-13 22:50:55 +03:00
parent d96c885e0d
commit e080d845f3
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/app/valentina/xml/vpattern.cpp
View File

@ -27,6 +27,7 @@
*************************************************************************/ *************************************************************************/
#include "vpattern.h" #include "vpattern.h"
#include "mainwindow.h"
#include "../vtools/tools/vdatatool.h" #include "../vtools/tools/vdatatool.h"
#include "../vtools/tools/vtooldetail.h" #include "../vtools/tools/vtooldetail.h"
#include "../vtools/tools/vtooluniondetails.h" #include "../vtools/tools/vtooluniondetails.h"
@ -1914,8 +1915,16 @@ void VPattern::ParseToolSpline(VMainGraphicsScene *scene, QDomElement &domElemen
const QString color = GetParametrString(domElement, AttrColor, ColorBlack); const QString color = GetParametrString(domElement, AttrColor, ColorBlack);
const quint32 duplicate = GetParametrUInt(domElement, AttrDuplicate, "0"); const quint32 duplicate = GetParametrUInt(domElement, AttrDuplicate, "0");
VToolSpline::Create(id, point1, point4, a1, a2, l1, l2, duplicate, color, scene, this, data, parse, VToolSpline *spl = VToolSpline::Create(id, point1, point4, a1, a2, l1, l2, duplicate, color, scene, this,
Source::FromFile); data, parse, Source::FromFile);
if (spl != nullptr)
{
MainWindow *window = qobject_cast<MainWindow *>(qApp->getMainWindow());
SCASSERT(window != nullptr);
connect(spl, &VToolSpline::ToolTip, window, &MainWindow::ShowToolTip);
}
//Rewrite attribute formula. Need for situation when we have wrong formula. //Rewrite attribute formula. Need for situation when we have wrong formula.
if (a1 != angle1 || a2 != angle2 || l1 != length1 || l2 != length2) if (a1 != angle1 || a2 != angle2 || l1 != length1 || l2 != length2)
{ {
@ -2095,7 +2104,16 @@ void VPattern::ParseToolSplinePath(VMainGraphicsScene *scene, const QDomElement
l1 = length1; l1 = length1;
l2 = length2; l2 = length2;
VToolSplinePath::Create(id, points, a1, a2, l1, l2, color, scene, this, data, parse, Source::FromFile); VToolSplinePath *spl = VToolSplinePath::Create(id, points, a1, a2, l1, l2, color, scene, this, data, parse,
Source::FromFile);
if (spl != nullptr)
{
MainWindow *window = qobject_cast<MainWindow *>(qApp->getMainWindow());
SCASSERT(window != nullptr);
connect(spl, &VToolSplinePath::ToolTip, window, &MainWindow::ShowToolTip);
}
//Rewrite attribute formula. Need for situation when we have wrong formula. //Rewrite attribute formula. Need for situation when we have wrong formula.
int count = 0; int count = 0;
for (qint32 i = 0; i < num; ++i) for (qint32 i = 0; i < num; ++i)