Changes in dialog: reverse and internal move update the visualization

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

View File

@ -52,6 +52,7 @@ DialogSeamAllowance::DialogSeamAllowance(const VContainer *data, const quint32 &
ui->listWidget->setContextMenuPolicy(Qt::CustomContextMenu); ui->listWidget->setContextMenuPolicy(Qt::CustomContextMenu);
connect(ui->listWidget, &QListWidget::customContextMenuRequested, this, &DialogSeamAllowance::ShowContextMenu); connect(ui->listWidget, &QListWidget::customContextMenuRequested, this, &DialogSeamAllowance::ShowContextMenu);
connect(ui->listWidget->model(), &QAbstractItemModel::rowsMoved, this, &DialogSeamAllowance::ListChanged);
vis = new VisToolPiece(data); vis = new VisToolPiece(data);
} }
@ -96,6 +97,8 @@ void DialogSeamAllowance::SetPiece(const VPiece &piece)
* @param type type of object * @param type type of object
*/ */
void DialogSeamAllowance::ChosenObject(quint32 id, const SceneObject &type) void DialogSeamAllowance::ChosenObject(quint32 id, const SceneObject &type)
{
if (not prepare)
{ {
bool reverse = false; bool reverse = false;
if (QGuiApplication::keyboardModifiers() == Qt::ShiftModifier) if (QGuiApplication::keyboardModifiers() == Qt::ShiftModifier)
@ -143,6 +146,7 @@ void DialogSeamAllowance::ChosenObject(quint32 id, const SceneObject &type)
visPath->RefreshGeometry(); visPath->RefreshGeometry();
} }
} }
}
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void DialogSeamAllowance::ShowDialog(bool click) void DialogSeamAllowance::ShowDialog(bool click)
@ -150,7 +154,15 @@ void DialogSeamAllowance::ShowDialog(bool click)
if (click == false) if (click == false)
{ {
emit ToolTip(""); 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(); show();
} }
} }
@ -211,6 +223,17 @@ void DialogSeamAllowance::ShowContextMenu(const QPoint &pos)
rowItem->setText(GetNodeName(rowNode)); rowItem->setText(GetNodeName(rowNode));
ValidObjects(MainPathIsValid()); ValidObjects(MainPathIsValid());
} }
ListChanged();
}
//---------------------------------------------------------------------------------------------------------------------
void DialogSeamAllowance::ListChanged()
{
auto visPath = qobject_cast<VisToolPiece *>(vis);
SCASSERT(visPath != nullptr);
visPath->SetPiece(CreatePiece());
visPath->RefreshGeometry();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

View File

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

View File

@ -47,6 +47,8 @@ VisToolPiece::~VisToolPiece()
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void VisToolPiece::RefreshGeometry() void VisToolPiece::RefreshGeometry()
{ {
HideAllItems();
if (m_piece.CountNode() > 0) if (m_piece.CountNode() > 0)
{ {
DrawPath(this, m_piece.MainPathPath(Visualization::data), mainColor, Qt::SolidLine, Qt::RoundCap); DrawPath(this, m_piece.MainPathPath(Visualization::data), mainColor, Qt::SolidLine, Qt::RoundCap);
@ -59,6 +61,8 @@ void VisToolPiece::RefreshGeometry()
DrawPoint(point, nodes.at(i), supportColor); DrawPoint(point, nodes.at(i), supportColor);
} }
if (mode == Mode::Creation)
{
const QVector<QPointF> points = m_piece.MainPathPoints(Visualization::data); const QVector<QPointF> points = m_piece.MainPathPoints(Visualization::data);
DrawLine(m_line1, QLineF(points.first(), Visualization::scenePos), supportColor, Qt::DashLine); DrawLine(m_line1, QLineF(points.first(), Visualization::scenePos), supportColor, Qt::DashLine);
@ -68,6 +72,7 @@ void VisToolPiece::RefreshGeometry()
} }
} }
} }
}
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void VisToolPiece::SetPiece(const VPiece &piece) void VisToolPiece::SetPiece(const VPiece &piece)
@ -80,3 +85,26 @@ QGraphicsEllipseItem *VisToolPiece::GetPoint(quint32 i, const QColor &color)
{ {
return GetPointItem(Visualization::data, factor, m_points, i, color, this); 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);
}
}
}

View File

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