Skip to content

OpenToonz - An open-source full-featured 2D animation creation software

C

fix removing entire cells in the column

shun-iwasawa0d01d8fa7d37
diff --git a/toonz/sources/toonz/cellselection.cpp b/toonz/sources/toonz/cellselection.cpp
index e0ed92126..a05078c56 100644
--- a/toonz/sources/toonz/cellselection.cpp
+++ b/toonz/sources/toonz/cellselection.cpp
@@ -14,6 +14,7 @@
#include "tapp.h"
#include "xsheetviewer.h"
#include "levelcommand.h"
+#include "columncommand.h"
// TnzTools includes
#include "tools/toolutils.h"
@@ -118,8 +119,13 @@ void deleteCellsWithoutUndo(int &r0, int &c0, int &r1, int &c1) {
TXsheet *xsh = TApp::instance()->getCurrentXsheet()->getXsheet();
int c;
for (c = c0; c <= c1; c++) {
+ if (xsh->isColumnEmpty(c)) continue;
xsh->clearCells(r0, c, r1 - r0 + 1);
- TXshColumn *column = xsh->getColumn(c);
+ // when the column becomes empty after deletion,
+ // ColumnCmd::DeleteColumn() will take care of column related operations
+ // like disconnecting from fx nodes etc.
+ /*
+ TXshColumn* column = xsh->getColumn(c);
if (column && column->isEmpty()) {
column->resetColumnProperties();
TFx *fx = column->getFx();
@@ -131,8 +137,8 @@ void deleteCellsWithoutUndo(int &r0, int &c0, int &r1, int &c1) {
}
}
}
+ */
}
- TApp::instance()->getCurrentXsheet()->notifyXsheetChanged();
} catch (...) {
DVGui::error(QObject::tr("It is not possible to delete the selection."));
}
@@ -145,24 +151,51 @@ void cutCellsWithoutUndo(int &r0, int &c0, int &r1, int &c1) {
int c;
for (c = c0; c <= c1; c++) {
xsh->removeCells(r0, c, r1 - r0 + 1);
- TXshColumn *column = xsh->getColumn(c);
+ // when the column becomes empty after deletion,
+ // ColumnCmd::DeleteColumn() will take care of column related operations
+ // like disconnecting from fx nodes etc.
+ /*
+ TXshColumn* column = xsh->getColumn(c);
if (column && column->isEmpty()) {
column->resetColumnProperties();
- TFx *fx = column->getFx();
+ TFx* fx = column->getFx();
if (!fx) continue;
int i;
for (i = fx->getOutputConnectionCount() - 1; i >= 0; i--) {
- TFxPort *port = fx->getOutputConnection(i);
+ TFxPort* port = fx->getOutputConnection(i);
port->setFx(0);
}
}
+ */
}
// Se la selezione corrente e' TCellSelection svuoto la selezione.
TCellSelection *cellSelection = dynamic_cast<TCellSelection *>(
TApp::instance()->getCurrentSelection()->getSelection());
if (cellSelection) cellSelection->selectNone();
- TApp::instance()->getCurrentXsheet()->notifyXsheetChanged();
+}
+
+//-----------------------------------------------------------------------------
+// check if the operation may remove expression reference as column becomes
+// empty and deleted after the operation. return true to continue the operation.
+
+bool checkColumnRemoval(const int r0, const int c0, const int r1, const int c1,
+ std::set<int> &removedColIds) {
+ TXsheet *xsh = TApp::instance()->getCurrentXsheet()->getXsheet();
+ // std::set<int> colIndicesToBeRemoved;
+ for (int c = c0; c <= c1; c++) {
+ TXshColumnP column = xsh->getColumn(c);
+ if (!column || column->isEmpty() || column->isLocked()) continue;
+ int tmp_r0, tmp_r1;
+ xsh->getCellRange(c, tmp_r0, tmp_r1);
+ if (r0 <= tmp_r0 && r1 >= tmp_r1) removedColIds.insert(c);
+ }
+
+ if (removedColIds.empty() ||
+ !Preferences::instance()->isModifyExpressionOnMovingReferencesEnabled())
+ return true;
+ std::set<TFx *> dummy_fxs;
+ return ColumnCmd::checkExpressionReferences(removedColIds, dummy_fxs, true);
}
//=============================================================================
@@ -234,13 +267,15 @@ public:
//=============================================================================
// DeleteCellsUndo
+// Recovering the column information (such as reconnecting nodes) when
+// undoing deletion of entire column will be done by DeleteColumnsUndo which
+// will be called in the same undo block. So here we only need to recover the
+// cell arrangement.
//-----------------------------------------------------------------------------
class DeleteCellsUndo final : public TUndo {
TCellSelection *m_selection;
QMimeData *m_data;
- QMap<int, QList<TFxPort *>> m_outputConnections;
- QMap<int, TXshColumn *> m_columns;
public:
DeleteCellsUndo(TCellSelection *selection, QMimeData *data) : m_data(data) {
@@ -249,63 +284,18 @@ public:
if (c0 < 0) c0 = 0; // Ignore camera column
m_selection = new TCellSelection();
m_selection->selectCells(r0, c0, r1, c1);
-
- TXsheet *xsh = TApp::instance()->getCurrentXsheet()->getXsheet();
- int i;
- for (i = c0; i <= c1; i++) {
- TXshColumn *col = xsh->getColumn(i);
- if (!col || col->isEmpty()) continue;
- int colr0, colr1;
- col->getRange(colr0, colr1);
- if (r0 <= colr0 && r1 >= colr1 && !col->getLevelColumn()) {
- // la colonna verra' rimossa dall'xsheet
- m_columns[i] = col;
- col->addRef();
- }
- TFx *fx = col->getFx();
- if (!fx) continue;
- int j;
- QList<TFxPort *> fxPorts;
- for (j = 0; j < fx->getOutputConnectionCount(); j++)
- fxPorts.append(fx->getOutputConnection(j));
- if (fxPorts.isEmpty()) continue;
- m_outputConnections[i] = fxPorts;
- }
}
- ~DeleteCellsUndo() {
- delete m_selection;
- QMap<int, TXshColumn *>::iterator it;
- for (it = m_columns.begin(); it != m_columns.end(); it++)
- it.value()->release();
- }
+ ~DeleteCellsUndo() { delete m_selection; }
void undo() const override {
TXsheet *xsh = TApp::instance()->getCurrentXsheet()->getXsheet();
- // devo rimettere le colonne che ho rimosso dall'xsheet
- QMap<int, TXshColumn *>::const_iterator colIt;
- for (colIt = m_columns.begin(); colIt != m_columns.end(); colIt++) {
- int index = colIt.key();
- TXshColumn *column = colIt.value();
- xsh->removeColumn(index);
- xsh->insertColumn(index, column);
- }
-
int r0, c0, r1, c1;
m_selection->getSelectedCells(r0, c0, r1, c1);
- QMap<int, QList<TFxPort *>>::const_iterator it;
- for (it = m_outputConnections.begin(); it != m_outputConnections.end();
- it++) {
- TXshColumn *col = xsh->getColumn(it.key());
- QList<TFxPort *> fxPorts = it.value();
- int i;
- for (i = 0; i < fxPorts.size(); i++) fxPorts[i]->setFx(col->getFx());
- }
const TCellData *cellData = dynamic_cast<const TCellData *>(m_data);
pasteCellsWithoutUndo(cellData, r0, c0, r1, c1, false, false);
-
TApp::instance()->getCurrentXsheet()->notifyXsheetChanged();
}
@@ -313,6 +303,7 @@ public:
int r0, c0, r1, c1;
m_selection->getSelectedCells(r0, c0, r1, c1);
deleteCellsWithoutUndo(r0, c0, r1, c1);
+ TApp::instance()->getCurrentXsheet()->notifyXsheetChanged();
}
int getSize() const override { return sizeof(*this); }
@@ -323,12 +314,14 @@ public:
//=============================================================================
// CutCellsUndo
+// Just like DeleteCellsUndo, recovering the column information (such as
+// reconnecting nodes) when undoing deletion of entire column will be done
+// by DeleteColumnsUndo which will be called in the same undo block.
//-----------------------------------------------------------------------------
class CutCellsUndo final : public TUndo {
TCellSelection *m_selection;
TCellData *m_data;
- QMap<int, QList<TFxPort *>> m_outputConnections;
public:
CutCellsUndo(TCellSelection *selection) : m_data() {
@@ -337,21 +330,6 @@ public:
if (c0 < 0) c0 = 0; // Ignore camera column
m_selection = new TCellSelection();
m_selection->selectCells(r0, c0, r1, c1);
-
- TXsheet *xsh = TApp::instance()->getCurrentXsheet()->getXsheet();
- int i;
- for (i = c0; i <= c1; i++) {
- TXshColumn *col = xsh->getColumn(i);
- if (!col || col->isEmpty()) continue;
- TFx *fx = col->getFx();
- if (!fx) continue;
- int j;
- QList<TFxPort *> fxPorts;
- for (j = 0; j < fx->getOutputConnectionCount(); j++)
- fxPorts.append(fx->getOutputConnection(j));
- if (fxPorts.isEmpty()) continue;
- m_outputConnections[i] = fxPorts;
- }
}
void setCurrentData(int r0, int c0, int r1, int c1) {
@@ -369,16 +347,6 @@ public:
int r0, c0, r1, c1;
m_selection->getSelectedCells(r0, c0, r1, c1);
- TXsheet *xsh = TApp::instance()->getCurrentXsheet()->getXsheet();
- QMap<int, QList<TFxPort *>>::const_iterator it;
- for (it = m_outputConnections.begin(); it != m_outputConnections.end();
- it++) {
- TXshColumn *col = xsh->getColumn(it.key());
- QList<TFxPort *> fxPorts = it.value();
- int i;
- for (i = 0; i < fxPorts.size(); i++) fxPorts[i]->setFx(col->getFx());
- }
-
pasteCellsWithoutUndo(m_data, r0, c0, r1, c1, true);
TApp::instance()->getCurrentXsheet()->notifyXsheetChanged();
}
@@ -392,6 +360,7 @@ public:
cutCellsWithoutUndo(r0, c0, r1, c1);
clipboard->setMimeData(currentData, QClipboard::Clipboard);
+ TApp::instance()->getCurrentXsheet()->notifyXsheetChanged();
}
int getSize() const override { return sizeof(*this); }
@@ -2267,12 +2236,36 @@ void TCellSelection::deleteCells() {
TXsheet *xsh = TApp::instance()->getCurrentXsheet()->getXsheet();
// if all the selected cells are already empty, then do nothing
if (xsh->isRectEmpty(CellPosition(r0, c0), CellPosition(r1, c1))) return;
+
+ std::set<int> removedColIds;
+ // check if the operation may remove expression reference as column becomes
+ // empty and deleted after the operation.
+ if (!checkColumnRemoval(r0, c0, r1, c1, removedColIds)) return;
+
TCellData *data = new TCellData();
data->setCells(xsh, r0, c0, r1, c1);
+
+ // clear empty column
+ if (!removedColIds.empty()) {
+ TUndoManager::manager()->beginBlock();
+ // remove, then insert empty column
+ for (auto colId : removedColIds) {
+ ColumnCmd::deleteColumn(colId, true);
+ ColumnCmd::insertEmptyColumn(colId);
+ }
+ }
+
DeleteCellsUndo *undo =
new DeleteCellsUndo(new TCellSelection(m_range), data);
deleteCellsWithoutUndo(r0, c0, r1, c1);
+
+ TUndoManager::manager()->add(undo);
+
+ if (!removedColIds.empty()) {
+ TUndoManager::manager()->endBlock();
+ }
+
// emit selectionChanged() signal so that the rename field will update
// accordingly
if (Preferences::instance()->isUseArrowKeyToShiftCellSelectionEnabled())
@@ -2280,8 +2273,8 @@ void TCellSelection::deleteCells() {
else
selectNone();
- TUndoManager::manager()->add(undo);
TApp::instance()->getCurrentScene()->setDirtyFlag(true);
+ TApp::instance()->getCurrentXsheet()->notifyXsheetChanged();
}
//-----------------------------------------------------------------------------
@@ -2299,11 +2292,32 @@ void TCellSelection::cutCells(bool withoutCopy) {
getSelectedCells(r0, c0, r1, c1);
if (c0 < 0) c0 = 0; // Ignore camera column
+ std::set<int> removedColIds;
+ // check if the operation may remove expression reference as column becomes
+ // empty and deleted after the operation.
+ if (!checkColumnRemoval(r0, c0, r1, c1, removedColIds)) return;
+
undo->setCurrentData(r0, c0, r1, c1);
if (!withoutCopy) copyCellsWithoutUndo(r0, c0, r1, c1);
+
+ // clear empty column
+ if (!removedColIds.empty()) {
+ TUndoManager::manager()->beginBlock();
+ // remove, then insert empty column
+ for (auto colId : removedColIds) {
+ ColumnCmd::deleteColumn(colId, true);
+ ColumnCmd::insertEmptyColumn(colId);
+ }
+ }
+
cutCellsWithoutUndo(r0, c0, r1, c1);
TUndoManager::manager()->add(undo);
+
+ if (!removedColIds.empty()) {
+ TUndoManager::manager()->endBlock();
+ }
+
// cutCellsWithoutUndo will clear the selection, so select cells again
if (Preferences::instance()->isUseArrowKeyToShiftCellSelectionEnabled()) {
selectCells(r0, c0, r1, c1);
diff --git a/toonz/sources/toonz/columncommand.cpp b/toonz/sources/toonz/columncommand.cpp
index c0e7f9521..504fb98aa 100644
--- a/toonz/sources/toonz/columncommand.cpp
+++ b/toonz/sources/toonz/columncommand.cpp
@@ -539,10 +539,13 @@ class DeleteColumnsUndo final : public TUndo {
QMap<TStageObjectId, TStageObjectId> m_columnObjParents;
mutable std::unique_ptr<StageObjectsData> m_data;
+ bool m_onlyColumns;
public:
- DeleteColumnsUndo(const std::set<int> &indices)
- : m_indices(indices), m_data(new StageObjectsData) {
+ DeleteColumnsUndo(const std::set<int> &indices, bool onlyColumns)
+ : m_indices(indices)
+ , m_data(new StageObjectsData)
+ , m_onlyColumns(onlyColumns) {
TApp *app = TApp::instance();
TXsheet *xsh = app->getCurrentXsheet()->getXsheet();
@@ -597,7 +600,7 @@ public:
m_data->storeColumnFxs(m_indices, xsh, 0);
std::set<int> indices = m_indices;
- deleteColumnsWithoutUndo(&indices);
+ deleteColumnsWithoutUndo(&indices, m_onlyColumns);
}
void undo() const override {
@@ -816,8 +819,8 @@ void ColumnCmd::deleteColumns(std::set<int> &indices, bool onlyColumns,
indices.erase(-1); // Ignore camera column
if (indices.empty()) return;
- if (!withoutUndo && !onlyColumns)
- TUndoManager::manager()->add(new DeleteColumnsUndo(indices));
+ if (!withoutUndo)
+ TUndoManager::manager()->add(new DeleteColumnsUndo(indices, onlyColumns));
deleteColumnsWithoutUndo(&indices, onlyColumns);
TApp::instance()->getCurrentScene()->setDirtyFlag(true);
@@ -827,10 +830,10 @@ void ColumnCmd::deleteColumns(std::set<int> &indices, bool onlyColumns,
// deleteColumn
//=============================================================================
-void ColumnCmd::deleteColumn(int index) {
+void ColumnCmd::deleteColumn(int index, bool onlyColumns) {
std::set<int> ii;
ii.insert(index);
- ColumnCmd::deleteColumns(ii, false, false);
+ ColumnCmd::deleteColumns(ii, onlyColumns, false);
}
//=============================================================================
@@ -845,7 +848,7 @@ static void cutColumnsWithoutUndo(std::set<int> *indices) {
void ColumnCmd::cutColumns(std::set<int> &indices) {
if (indices.empty()) return;
- TUndoManager::manager()->add(new DeleteColumnsUndo(indices));
+ TUndoManager::manager()->add(new DeleteColumnsUndo(indices, false));
cutColumnsWithoutUndo(&indices);
TApp::instance()->getCurrentScene()->setDirtyFlag(true);
diff --git a/toonz/sources/toonz/columncommand.h b/toonz/sources/toonz/columncommand.h
index e41ef0116..a0754c564 100644
--- a/toonz/sources/toonz/columncommand.h
+++ b/toonz/sources/toonz/columncommand.h
@@ -24,7 +24,7 @@ void cutColumns(std::set<int> &indices);
//! deleted
void deleteColumns(std::set<int> &indices, bool onlyColumns, bool withoutUndo);
//! helper function: deletes a single column, with undo
-void deleteColumn(int index);
+void deleteColumn(int index, bool onlyColumns = false);
//! if data==0 then uses clipboard
void pasteColumns(std::set<int> &indices, const StageObjectsData *data = 0);
//! helper function: copies srcIndex column and pastes it before dstIndex. Does
diff --git a/toonz/sources/toonzqt/treemodel.cpp b/toonz/sources/toonzqt/treemodel.cpp
index 336bedc76..60c54f59d 100644
--- a/toonz/sources/toonzqt/treemodel.cpp
+++ b/toonz/sources/toonzqt/treemodel.cpp
@@ -185,6 +185,10 @@ void TreeModel::endRefresh() {
int i;
QList<Item *>::iterator it;
+ // comment out as no subclass of TreeModel reimplement removeRows() for now
+ // and it causes assertion failure on calling beginRemoveRows() when deleting
+ // the last column in the xsheet
+ /*
for (i = m_itemsToDelete.size() - 1; i >= 0; i--) {
int row = m_itemsToDelete[i]->getRow();
Item *parentItem = m_itemsToDelete[i]->getParent();
@@ -192,10 +196,11 @@ void TreeModel::endRefresh() {
parentItem ? parentItem->createIndex() : QModelIndex();
beginRemoveRows(parentIndex, row, row);
- removeRow(row, parentIndex); // NOTE: This is currently doing NOTHING? (see
+ removeRows(row, 1, parentIndex); // NOTE: This is currently doing NOTHING?
+ (see
// Qt's manual)
endRemoveRows();
- }
+ }*/
qDeleteAll(m_itemsToDelete);
m_itemsToDelete.clear();