Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2024-11-17 07:47:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed timeline not deleting some items correctly.

Browse source
This commit is contained in:
leo 2015-07-29 15:03:50 +00:00
parent b53debf017
commit 2e8f566829
2 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/lc_global.cpp
View file

@ -1 +1 @@
#include "lc_global.h"
#include "common/lc_global.h"

32
common/lc_timelinewidget.cpp
View file

@ -81,9 +81,9 @@ void lcTimelineWidget::Update(bool Clear, bool UpdateItems)
clear();
}
int Steps = lcMax(Model->GetLastStep(), Model->GetCurrentStep());
lcStep LastStep = lcMax(Model->GetLastStep(), Model->GetCurrentStep());
for (int TopLevelItemIdx = Steps; TopLevelItemIdx < topLevelItemCount(); )
for (int TopLevelItemIdx = LastStep; TopLevelItemIdx < topLevelItemCount(); )
{
QTreeWidgetItem* StepItem = topLevelItem(TopLevelItemIdx);
@ -98,7 +98,7 @@ void lcTimelineWidget::Update(bool Clear, bool UpdateItems)
delete StepItem;
}
for (int TopLevelItemIdx = topLevelItemCount(); TopLevelItemIdx < Steps; TopLevelItemIdx++)
for (unsigned int TopLevelItemIdx = topLevelItemCount(); TopLevelItemIdx < LastStep; TopLevelItemIdx++)
{
QTreeWidgetItem* StepItem = new QTreeWidgetItem(this, QStringList(tr("Step %1").arg(TopLevelItemIdx + 1)));
StepItem->setFlags(Qt::ItemIsEnabled | Qt::ItemIsDropEnabled);
@ -201,16 +201,26 @@ void lcTimelineWidget::Update(bool Clear, bool UpdateItems)
PieceItemIndex++;
}
if (!StepItem)
StepItem = topLevelItem(0);
while (PieceItemIndex < StepItem->childCount())
if (Step == 0)
{
QTreeWidgetItem* PieceItem = StepItem->child(PieceItemIndex);
lcPiece* RemovePiece = (lcPiece*)PieceItem->data(0, Qt::UserRole).value<uintptr_t>();
Step = 1;
StepItem = topLevelItem(0);
}
mItems.remove(RemovePiece);
delete PieceItem;
while (Step <= LastStep)
{
while (PieceItemIndex < StepItem->childCount())
{
QTreeWidgetItem* PieceItem = StepItem->child(PieceItemIndex);
lcPiece* RemovePiece = (lcPiece*)PieceItem->data(0, Qt::UserRole).value<uintptr_t>();
mItems.remove(RemovePiece);
delete PieceItem;
}
Step++;
StepItem = topLevelItem(Step - 1);
PieceItemIndex = 0;
}
blockSignals(Blocked);