Fixed issue #836. Change Detail Name - Update List of Details.
--HG-- branch : develop
This commit is contained in:
parent
188db90050
commit
cc4768ff77
|
@ -1458,13 +1458,22 @@ void MainWindow::ShowToolTip(const QString &toolTip)
|
|||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
/**
|
||||
* @brief triggers the update of the groups
|
||||
* @brief triggers the update of the visibility groups
|
||||
*/
|
||||
void MainWindow::UpdateGroups()
|
||||
void MainWindow::UpdateVisibilityGroups()
|
||||
{
|
||||
groupsWidget->UpdateGroups();
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
/**
|
||||
* @brief triggers the update of the details list
|
||||
*/
|
||||
void MainWindow::UpdateDetailsList()
|
||||
{
|
||||
detailsWidget->UpdateList();
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
/**
|
||||
* @brief showEvent handle after show window.
|
||||
|
@ -4155,7 +4164,7 @@ void MainWindow::InitDocksContain()
|
|||
qCDebug(vMainWindow, "Initialization groups dock.");
|
||||
groupsWidget = new VWidgetGroups(doc, this);
|
||||
ui->dockWidgetGroups->setWidget(groupsWidget);
|
||||
connect(doc,&VAbstractPattern::UpdateGroups , this, &MainWindow::UpdateGroups);
|
||||
connect(doc,&VAbstractPattern::UpdateGroups , this, &MainWindow::UpdateVisibilityGroups);
|
||||
|
||||
detailsWidget = new VWidgetDetails(pattern, doc, this);
|
||||
connect(doc, &VPattern::FullUpdateFromFile, detailsWidget, &VWidgetDetails::UpdateList);
|
||||
|
|
|
@ -69,7 +69,8 @@ public:
|
|||
public slots:
|
||||
void ProcessCMD();
|
||||
virtual void ShowToolTip(const QString &toolTip) Q_DECL_OVERRIDE;
|
||||
virtual void UpdateGroups() Q_DECL_OVERRIDE;
|
||||
virtual void UpdateVisibilityGroups() Q_DECL_OVERRIDE;
|
||||
virtual void UpdateDetailsList() Q_DECL_OVERRIDE;
|
||||
|
||||
signals:
|
||||
void RefreshHistory();
|
||||
|
|
|
@ -293,7 +293,7 @@ void VDrawTool::ContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 itemI
|
|||
SCASSERT(window != nullptr)
|
||||
{
|
||||
AddItemToGroup *addItemToGroup = new AddItemToGroup(item, doc, groupId);
|
||||
connect(addItemToGroup, &AddItemToGroup::UpdateGroups, window, &VAbstractMainWindow::UpdateGroups);
|
||||
connect(addItemToGroup, &AddItemToGroup::UpdateGroups, window, &VAbstractMainWindow::UpdateVisibilityGroups);
|
||||
qApp->getUndoStack()->push(addItemToGroup);
|
||||
}
|
||||
}
|
||||
|
@ -306,7 +306,7 @@ void VDrawTool::ContextMenu(QGraphicsSceneContextMenuEvent *event, quint32 itemI
|
|||
SCASSERT(window != nullptr)
|
||||
{
|
||||
RemoveItemFromGroup *removeItemFromGroup = new RemoveItemFromGroup(item, doc, groupId);
|
||||
connect(removeItemFromGroup, &RemoveItemFromGroup::UpdateGroups, window, &VAbstractMainWindow::UpdateGroups);
|
||||
connect(removeItemFromGroup, &RemoveItemFromGroup::UpdateGroups, window, &VAbstractMainWindow::UpdateVisibilityGroups);
|
||||
qApp->getUndoStack()->push(removeItemFromGroup);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -51,6 +51,7 @@
|
|||
#include "../undocommands/togglepiecestate.h"
|
||||
#include "../vwidgets/vmaingraphicsview.h"
|
||||
#include "../vwidgets/vnobrushscalepathitem.h"
|
||||
#include "../vwidgets/vabstractmainwindow.h"
|
||||
#include "../qmuparser/qmutokenparser.h"
|
||||
|
||||
#include <QFuture>
|
||||
|
@ -1437,6 +1438,10 @@ void VToolSeamAllowance::SaveDialogChange(const QString &undoText)
|
|||
const bool groupChange = not undocommands.isEmpty();
|
||||
|
||||
SavePieceOptions *saveCommand = new SavePieceOptions(oldDet, newDet, doc, m_id);
|
||||
if (VAbstractMainWindow *window = qobject_cast<VAbstractMainWindow *>(qApp->getMainWindow()))
|
||||
{ // Better not to crash here, just silently do not update list.
|
||||
connect(saveCommand, &SavePieceOptions::UpdateGroups, window, &VAbstractMainWindow::UpdateDetailsList);
|
||||
}
|
||||
|
||||
if (groupChange)
|
||||
{
|
||||
|
|
|
@ -93,6 +93,8 @@ void SavePieceOptions::undo()
|
|||
{
|
||||
tool->Update(m_oldDet);
|
||||
}
|
||||
|
||||
emit UpdateGroups();
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -138,6 +140,8 @@ void SavePieceOptions::redo()
|
|||
{
|
||||
tool->Update(m_newDet);
|
||||
}
|
||||
|
||||
emit UpdateGroups();
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -36,6 +36,7 @@
|
|||
|
||||
class SavePieceOptions : public VUndoCommand
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
SavePieceOptions(const VPiece &oldDet, const VPiece &newDet, VAbstractPattern *doc, quint32 id,
|
||||
QUndoCommand *parent = nullptr);
|
||||
|
@ -47,6 +48,8 @@ public:
|
|||
virtual int id() const Q_DECL_OVERRIDE;
|
||||
quint32 DetId() const;
|
||||
VPiece NewDet() const;
|
||||
signals:
|
||||
void UpdateGroups();
|
||||
private:
|
||||
Q_DISABLE_COPY(SavePieceOptions)
|
||||
|
||||
|
|
|
@ -158,6 +158,13 @@ void VAbstractMainWindow::ExportDataToCSV()
|
|||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
void VAbstractMainWindow::UpdateGroups()
|
||||
void VAbstractMainWindow::UpdateVisibilityGroups()
|
||||
{
|
||||
// do nothing
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
void VAbstractMainWindow::UpdateDetailsList()
|
||||
{
|
||||
// do nothing
|
||||
}
|
||||
|
|
|
@ -46,7 +46,8 @@ public:
|
|||
|
||||
public slots:
|
||||
virtual void ShowToolTip(const QString &toolTip)=0;
|
||||
virtual void UpdateGroups();
|
||||
virtual void UpdateVisibilityGroups();
|
||||
virtual void UpdateDetailsList();
|
||||
|
||||
protected slots:
|
||||
void WindowsLocale();
|
||||
|
|
Loading…
Reference in New Issue
Block a user