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

Changes in dialog: reverse and internal move update the visualization

Browse Source 
automatically.

--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2016-11-05 15:27:19 +02:00
parent b7def444ef
commit bff5462ef3
4 changed files with 99 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
src/libs/vtools/dialogs/tools/dialogseamallowance.cpp
View File

@ -52,6 +52,7 @@ DialogSeamAllowance::DialogSeamAllowance(const VContainer *data, const quint32 &
ui->listWidget->setContextMenuPolicy(Qt::CustomContextMenu);
connect(ui->listWidget, &QListWidget::customContextMenuRequested, this, &DialogSeamAllowance::ShowContextMenu);
connect(ui->listWidget->model(), &QAbstractItemModel::rowsMoved, this, &DialogSeamAllowance::ListChanged);
vis = new VisToolPiece(data);
}
@ -97,50 +98,53 @@ void DialogSeamAllowance::SetPiece(const VPiece &piece)
*/
void DialogSeamAllowance::ChosenObject(quint32 id, const SceneObject &type)
{
bool reverse = false;
if (QGuiApplication::keyboardModifiers() == Qt::ShiftModifier)
if (not prepare)
{
reverse = true;
}
switch (type)
{
case SceneObject::Arc:
NewItem(VPieceNode(id, Tool::NodeArc, reverse));
break;
case SceneObject::Point:
NewItem(VPieceNode(id, Tool::NodePoint));
break;
case SceneObject::Spline:
NewItem(VPieceNode(id, Tool::NodeSpline, reverse));
break;
case SceneObject::SplinePath:
NewItem(VPieceNode(id, Tool::NodeSplinePath, reverse));
break;
case (SceneObject::Line):
case (SceneObject::Detail):
case (SceneObject::Unknown):
default:
qDebug() << "Got wrong scene object. Ignore.";
break;
}
bool reverse = false;
if (QGuiApplication::keyboardModifiers() == Qt::ShiftModifier)
{
reverse = true;
}
switch (type)
{
case SceneObject::Arc:
NewItem(VPieceNode(id, Tool::NodeArc, reverse));
break;
case SceneObject::Point:
NewItem(VPieceNode(id, Tool::NodePoint));
break;
case SceneObject::Spline:
NewItem(VPieceNode(id, Tool::NodeSpline, reverse));
break;
case SceneObject::SplinePath:
NewItem(VPieceNode(id, Tool::NodeSplinePath, reverse));
break;
case (SceneObject::Line):
case (SceneObject::Detail):
case (SceneObject::Unknown):
default:
qDebug() << "Got wrong scene object. Ignore.";
break;
}
ValidObjects(MainPathIsValid());
ValidObjects(MainPathIsValid());
auto visPath = qobject_cast<VisToolPiece *>(vis);
SCASSERT(visPath != nullptr);
const VPiece p = CreatePiece();
visPath->SetPiece(p);
auto visPath = qobject_cast<VisToolPiece *>(vis);
SCASSERT(visPath != nullptr);
const VPiece p = CreatePiece();
visPath->SetPiece(p);
if (p.CountNode() == 1)
{
emit ToolTip(tr("Select main path objects clockwise, <b>Shift</b> - reverse direction curve, "
"<b>Enter</b> - finish creation"));
if (p.CountNode() == 1)
{
emit ToolTip(tr("Select main path objects clockwise, <b>Shift</b> - reverse direction curve, "
"<b>Enter</b> - finish creation"));
visPath->VisualMode(NULL_ID);
}
else
{
visPath->RefreshGeometry();
visPath->VisualMode(NULL_ID);
}
else
{
visPath->RefreshGeometry();
}
}
}
@ -150,7 +154,15 @@ void DialogSeamAllowance::ShowDialog(bool click)
if (click == false)
{
emit ToolTip("");
setModal(true);
prepare = true;
auto visPath = qobject_cast<VisToolPiece *>(vis);
SCASSERT(visPath != nullptr);
visPath->SetMode(Mode::Show);
visPath->RefreshGeometry();
// Fix issue #526. Dialog Detail is not on top after selection second object on Mac.
setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
show();
}
}
@ -211,6 +223,17 @@ void DialogSeamAllowance::ShowContextMenu(const QPoint &pos)
rowItem->setText(GetNodeName(rowNode));
ValidObjects(MainPathIsValid());
}
ListChanged();
}
//---------------------------------------------------------------------------------------------------------------------
void DialogSeamAllowance::ListChanged()
{
auto visPath = qobject_cast<VisToolPiece *>(vis);
SCASSERT(visPath != nullptr);
visPath->SetPiece(CreatePiece());
visPath->RefreshGeometry();
}
//---------------------------------------------------------------------------------------------------------------------

1
src/libs/vtools/dialogs/tools/dialogseamallowance.h
View File

@ -61,6 +61,7 @@ protected:
private slots:
void ShowContextMenu(const QPoint &pos);
void ListChanged();
private:
Q_DISABLE_COPY(DialogSeamAllowance)

38
src/libs/vtools/visualization/path/vistoolpiece.cpp
View File

@ -47,6 +47,8 @@ VisToolPiece::~VisToolPiece()
//---------------------------------------------------------------------------------------------------------------------
void VisToolPiece::RefreshGeometry()
{
HideAllItems();
if (m_piece.CountNode() > 0)
{
DrawPath(this, m_piece.MainPathPath(Visualization::data), mainColor, Qt::SolidLine, Qt::RoundCap);
@ -59,12 +61,15 @@ void VisToolPiece::RefreshGeometry()
DrawPoint(point, nodes.at(i), supportColor);
}
const QVector<QPointF> points = m_piece.MainPathPoints(Visualization::data);
DrawLine(m_line1, QLineF(points.first(), Visualization::scenePos), supportColor, Qt::DashLine);
if (points.size() > 1)
if (mode == Mode::Creation)
{
DrawLine(m_line2, QLineF(points.last(), Visualization::scenePos), supportColor, Qt::DashLine);
const QVector<QPointF> points = m_piece.MainPathPoints(Visualization::data);
DrawLine(m_line1, QLineF(points.first(), Visualization::scenePos), supportColor, Qt::DashLine);
if (points.size() > 1)
{
DrawLine(m_line2, QLineF(points.last(), Visualization::scenePos), supportColor, Qt::DashLine);
}
}
}
}
@ -80,3 +85,26 @@ QGraphicsEllipseItem *VisToolPiece::GetPoint(quint32 i, const QColor &color)
{
return GetPointItem(Visualization::data, factor, m_points, i, color, this);
}
//---------------------------------------------------------------------------------------------------------------------
void VisToolPiece::HideAllItems()
{
if (m_line1)
{
m_line1->setVisible(false);
}
if (m_line2)
{
m_line2->setVisible(false);
}
QVector<QGraphicsEllipseItem *> m_points;
for (int i=0; i < m_points.size(); ++i)
{
if (QGraphicsEllipseItem *item = m_points.at(i))
{
item->setVisible(false);
}
}
}

2
src/libs/vtools/visualization/path/vistoolpiece.h
View File

@ -55,6 +55,8 @@ private:
VPiece m_piece;
QGraphicsEllipseItem* GetPoint(quint32 i, const QColor &color);
void HideAllItems();
};
#endif // VISTOOLPIECE_H