oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify and clean up

Browse Source 
Remove the Undo code for deleting a clip and replace it with simpler
parent/child undo relationship.

Move block gathering code to seperate function. It's quite brute
force and might lead to issues further down the line with more
complex composited node setups.
This commit is contained in:
Thomas Wilshaw
2020-09-29 11:31:03 +01:00
parent aef9078598
commit 8e6b42a160
4 changed files with 32 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/projectexplorer/projectexplorer.cpp
+27 -23
View File
@@ -574,6 +574,31 @@ QMap<Node*, StreamPtr> ProjectExplorer::GetFootageNodes(Item* item)
return nodes;
}
QList<Block*> ProjectExplorer::GetFootageBlocks(QList<Node*> nodes)
{
// Get all sequences.
QList<ItemPtr> sequences = model_.project()->get_items_of_type(Item::kSequence);
QList<Block*> blocks;
foreach (ItemPtr seq, sequences) {
Sequence* s = static_cast<Sequence*>(seq.get());
// Loop through nodes in sequence
foreach (Node* node, s->nodes()) {
// For each Block see if it is linked to one of the Footage nodes add it to the delete list
if (node->IsBlock()) {
foreach (Node* input, nodes) {
if (node->GetExclusiveDependencies().contains(input)) {
blocks.append(static_cast<Block*>(node));
}
}
}
}
}
return blocks;
}
ProjectExplorer::FootageDeleteResponse ProjectExplorer::DeleteWarningMessage()
{
QMessageBox msgBox;
@@ -631,31 +656,10 @@ void ProjectExplorer::DeleteSelected()
new ProjectViewModel::OfflineFootageCommand(&model_, item_ptr, nodes, command);
}
if (response == kDelete) {
// Get all sequences.
QList<ItemPtr> sequences = model_.project()->get_items_of_type(Item::kSequence);
QList<Block*> blocks;
foreach(ItemPtr seq, sequences) {
Sequence* s = static_cast<Sequence*>(seq.get());
// Loop through nodes in sequence
foreach(Node* node, s->nodes()) {
// For each Block see if it is linked to one of the Footage nodes add it to the delete list
if (node->IsBlock()) {
foreach(Node* input, nodes.keys()) {
if(node->GetExclusiveDependencies().contains(input))
blocks.append(static_cast<Block*>(node));
}
}
}
}
//new ProjectViewModel::DeleteFootageCommand(&model_, item_ptr, blocks, command);
QUndoCommand* deleteCommand = new QUndoCommand(command);
TimelineWidget::ReplaceBlocksWithGaps(blocks, true, deleteCommand);
//Core::instance()->undo_stack()->pushIfHasChildren(deleteCommand);
TimelineWidget::ReplaceBlocksWithGaps(GetFootageBlocks(nodes.keys()), true, deleteCommand);
new ProjectViewModel::RemoveItemCommand(&model_, item_ptr, command);
}
if (response == kCancel) {
delete command;