kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Spreadsheet: fix cell span synchronization with SheetTableView

Browse Source 
Also, allow merge cell with overlaps, by auto split overlapped cells
first
This commit is contained in:
Zheng, Lei
2022-10-15 06:47:45 +08:00
committed by Chris Hennes
parent 9ba9599629
commit 05e0aba701
6 changed files with 60 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/Mod/Spreadsheet/Gui/SheetTableView.cpp
View File

@@ -210,6 +210,9 @@ SheetTableView::SheetTableView(QWidget *parent)
connect(actionDel,SIGNAL(triggered()), this, SLOT(deleteSelection()));
setTabKeyNavigation(false);
timer.setSingleShot(true);
QObject::connect(&timer, &QTimer::timeout, [this](){updateCellSpan();});
}
void SheetTableView::onRecompute() {
@@ -456,20 +459,31 @@ SheetTableView::~SheetTableView()
}
void SheetTableView::updateCellSpan(CellAddress address)
void SheetTableView::updateCellSpan()
{
int rows, cols;
sheet->getSpans(address, rows, cols);
// Unspan first to avoid overlap
for (const auto &addr : spanChanges) {
if (rowSpan(addr.row(), addr.col()) > 1 || columnSpan(addr.row(), addr.col()) > 1)
setSpan(addr.row(), addr.col(), 1, 1);
}
if (rows != rowSpan(address.row(), address.col()) || cols != columnSpan(address.row(), address.col()))
setSpan(address.row(), address.col(), rows, cols);
for (const auto &addr : spanChanges) {
sheet->getSpans(addr, rows, cols);
if (rows > 1 || cols > 1)
setSpan(addr.row(), addr.col(), rows, cols);
}
spanChanges.clear();
}
void SheetTableView::setSheet(Sheet* _sheet)
{
sheet = _sheet;
cellSpanChangedConnection = sheet->cellSpanChanged.connect(bind(&SheetTableView::updateCellSpan, this, bp::_1));
cellSpanChangedConnection = sheet->cellSpanChanged.connect([&](const CellAddress &addr) {
spanChanges.insert(addr);
timer.start(10);
});
// Update row and column spans
std::vector<std::string> usedCells = sheet->getUsedCells();
@@ -477,8 +491,11 @@ void SheetTableView::setSheet(Sheet* _sheet)
for (std::vector<std::string>::const_iterator i = usedCells.begin(); i != usedCells.end(); ++i) {
CellAddress address(*i);
if (sheet->isMergedCell(address))
updateCellSpan(address);
if (sheet->isMergedCell(address)) {
int rows, cols;
sheet->getSpans(address, rows, cols);
setSpan(address.row(), address.col(), rows, cols);
}
}
// Update column widths and row height