diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-17 09:57:00 +0200 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-17 10:09:45 +0200 |
commit | cc80770a30f3dfa43b29e14f83bf47deb5b50a92 (patch) | |
tree | 205c608d650f8917354c2cc8da1953f6b2d6f762 /src/datavisualization/engine/bars3dcontroller.cpp | |
parent | b83dfb2537720492ebd62dfc9733035d5560dddd (diff) |
Adjust selection in item removal and insert
Implements item 1) in QTRD-2645
Task-number: QTRD-2645
Change-Id: I5c1cec438089520592a3526e1ff6095cc30afd34
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/engine/bars3dcontroller.cpp')
-rw-r--r-- | src/datavisualization/engine/bars3dcontroller.cpp | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/src/datavisualization/engine/bars3dcontroller.cpp b/src/datavisualization/engine/bars3dcontroller.cpp index f91a74cc..5542b69b 100644 --- a/src/datavisualization/engine/bars3dcontroller.cpp +++ b/src/datavisualization/engine/bars3dcontroller.cpp @@ -141,8 +141,18 @@ void Bars3DController::handleRowsRemoved(int startIndex, int count) m_isDataDirty = true; } - // Clear selection unless still valid - setSelectedBar(m_selectedBar, m_selectedBarSeries); + if (series == m_selectedBarSeries) { + // If rows removed from selected series before the selection, adjust the selection + int selectedRow = m_selectedBar.x(); + if (startIndex <= selectedRow) { + if ((startIndex + count) > selectedRow) + selectedRow = -1; // Selected row removed + else + selectedRow -= count; // Move selected row down by amount of rows removed + + setSelectedBar(QPoint(selectedRow, m_selectedBar.y()), m_selectedBarSeries); + } + } emitNeedRender(); } @@ -168,6 +178,16 @@ void Bars3DController::handleItemChanged(int rowIndex, int columnIndex) adjustAxisRanges(); m_isDataDirty = true; } + + if (series == m_selectedBarSeries) { + // If rows inserted to selected series before the selection, adjust the selection + int selectedRow = m_selectedBar.x(); + if (startIndex <= selectedRow) { + selectedRow += count; + setSelectedBar(QPoint(selectedRow, m_selectedBar.y()), m_selectedBarSeries); + } + } + emitNeedRender(); } |