[prev in list] [next in list] [prev in thread] [next in thread]
List: koffice-devel
Subject: Review Request: Fix Multi-Table Charts
From: "Johannes Simon" <johannes.simon () gmail ! com>
Date: 2010-09-17 9:17:32
Message-ID: 20100917091732.4517.26083 () vidsolbach ! de
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://svn.reviewboard.kde.org/r/5373/
-----------------------------------------------------------
Review request for KOffice and bjbreitm.
Summary
-------
I'm putting this up on reviewboard because this is a rather large and that =
touches (a minor part of) KSpread as well.
This is partly in reply to http://reviewboard.kde.org/r/4866/diff/ .
This patch:
- fixes charts with more than one table as data source
- fixes charts with a sheet as data source that's not the sheet the chart i=
s in (in KSpread)
- handles sheet renames
- allows a chart to reference both an internal table and an external table =
(e.g. sheet in KSpread), needed for OOXML bubble charts
Take, for instance, a workbook in KSpread with multiple tables. Right now a=
chart can take data only and exclusively from the sheet it was created in.=
Also it is limited to the very name the sheet had when the chart was creat=
ed. If you take data (e.g. Table2.A2:B3) from another sheet, the chart pret=
ends it's data from the current sheet (e.g. Table1). If you change the shee=
t name, the chart will use the old name when saved to ODF. All that is fixe=
d in this patch.
The patch does the following:
- Introduce a TableSource that is connected to KSpread's SheetAccessModel t=
o provide name/model pairs for all tables
- Bind a CellRegion to a Table* pointer ("handed out" by TableSource) inste=
ad of just a (fixed) table name
- changes a lot of the CellRegion(QRect) constructor calls to CellRegion(Ta=
ble*,QRect)
- makes sure CellRegion instances are used instead of their string represen=
tations so that sheet renames are trivially handled (CellRegion::table()->n=
ame() changes automatically)
- adds lots of test cases
I admit that I started this work while we weren't in feature freeze yet so =
it originally was a bit bigger and included also a refactoring of two class=
es, but I removed the irrelevant bits there much as possible to restrain th=
is patch to fix the original issues only. With that and the new test cases =
I think this patch should be compatible with us being in bug-fix mode.
Diffs
-----
trunk/koffice/interfaces/KoChartInterface.h 1175800 =
trunk/koffice/kspread/BindingModel.h 1175800 =
trunk/koffice/kspread/chart/ChartDatabaseSelector.cpp 1175800 =
trunk/koffice/plugins/chartshape/Axis.h 1175800 =
trunk/koffice/plugins/chartshape/Axis.cpp 1175800 =
trunk/koffice/plugins/chartshape/CMakeLists.txt 1175800 =
trunk/koffice/plugins/chartshape/CellRegion.h 1175800 =
trunk/koffice/plugins/chartshape/CellRegion.cpp 1175800 =
trunk/koffice/plugins/chartshape/ChartConfigWidget.h 1175800 =
trunk/koffice/plugins/chartshape/ChartConfigWidget.cpp 1175800 =
trunk/koffice/plugins/chartshape/ChartProxyModel.h 1175800 =
trunk/koffice/plugins/chartshape/ChartProxyModel.cpp 1175800 =
trunk/koffice/plugins/chartshape/ChartShape.h 1175800 =
trunk/koffice/plugins/chartshape/ChartShape.cpp 1175800 =
trunk/koffice/plugins/chartshape/ChartShapeFactory.cpp 1175800 =
trunk/koffice/plugins/chartshape/ChartTableModel.cpp 1175800 =
trunk/koffice/plugins/chartshape/ChartTool.h 1175800 =
trunk/koffice/plugins/chartshape/ChartTool.cpp 1175800 =
trunk/koffice/plugins/chartshape/DataSet.h 1175800 =
trunk/koffice/plugins/chartshape/DataSet.cpp 1175800 =
trunk/koffice/plugins/chartshape/OdfLoadingHelper.h PRE-CREATION =
trunk/koffice/plugins/chartshape/PlotArea.cpp 1175800 =
trunk/koffice/plugins/chartshape/TableSource.h PRE-CREATION =
trunk/koffice/plugins/chartshape/TableSource.cpp PRE-CREATION =
trunk/koffice/plugins/chartshape/dialogs/TableEditorDialog.h 1175800 =
trunk/koffice/plugins/chartshape/dialogs/TableEditorDialog.cpp 1175800 =
trunk/koffice/plugins/chartshape/kchart_global.h 1175800 =
trunk/koffice/plugins/chartshape/tests/CMakeLists.txt PRE-CREATION =
trunk/koffice/plugins/chartshape/tests/ModelObserver.h PRE-CREATION =
trunk/koffice/plugins/chartshape/tests/ModelObserver.cpp PRE-CREATION =
trunk/koffice/plugins/chartshape/tests/TestCellRegion.h PRE-CREATION =
trunk/koffice/plugins/chartshape/tests/TestCellRegion.cpp PRE-CREATION =
trunk/koffice/plugins/chartshape/tests/TestDataSet.h PRE-CREATION =
trunk/koffice/plugins/chartshape/tests/TestDataSet.cpp PRE-CREATION =
trunk/koffice/plugins/chartshape/tests/TestKDChartModel.h PRE-CREATION =
trunk/koffice/plugins/chartshape/tests/TestKDChartModel.cpp PRE-CREATION =
trunk/koffice/plugins/chartshape/tests/TestProxyModel.h PRE-CREATION =
trunk/koffice/plugins/chartshape/tests/TestProxyModel.cpp PRE-CREATION =
trunk/koffice/plugins/chartshape/tests/TestTableSource.h PRE-CREATION =
trunk/koffice/plugins/chartshape/tests/TestTableSource.cpp PRE-CREATION =
Diff: http://svn.reviewboard.kde.org/r/5373/diff
Testing
-------
5 sets of test cases for classes relevant in these changes (CellRegion, Cha=
rtProxyModel, TableSource, KDChartModel, DataSet) are added or adapted from=
/kchart/tests. TestDataSet demonstrates a simple test case that can only p=
ass after the change. =
Thanks,
Johannes
[Attachment #5 (text/html)]
<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 \
solid;"> <tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="http://svn.reviewboard.kde.org/r/5373/">http://svn.reviewboard.kde.org/r/5373/</a>
</td>
</tr>
</table>
<br />
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" \
style="background-image: \
url('http://svn.reviewboard.kde.orgrb/images/review_request_box_top_bg.png'); \
background-position: left top; background-repeat: repeat-x; border: 1px black \
solid;"> <tr>
<td>
<div>Review request for KOffice and bjbreitm.</div>
<div>By Johannes Simon.</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: \
1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">I'm putting this up on reviewboard because this is a rather large \
and that touches (a minor part of) KSpread as well. This is partly in reply to \
http://reviewboard.kde.org/r/4866/diff/ .
This patch:
- fixes charts with more than one table as data source
- fixes charts with a sheet as data source that's not the sheet the chart is in \
(in KSpread)
- handles sheet renames
- allows a chart to reference both an internal table and an external table (e.g. \
sheet in KSpread), needed for OOXML bubble charts
Take, for instance, a workbook in KSpread with multiple tables. Right now a chart can \
take data only and exclusively from the sheet it was created in. Also it is limited \
to the very name the sheet had when the chart was created. If you take data (e.g. \
Table2.A2:B3) from another sheet, the chart pretends it's data from the current \
sheet (e.g. Table1). If you change the sheet name, the chart will use the old name \
when saved to ODF. All that is fixed in this patch.
The patch does the following:
- Introduce a TableSource that is connected to KSpread's SheetAccessModel to \
provide name/model pairs for all tables
- Bind a CellRegion to a Table* pointer ("handed out" by TableSource) \
instead of just a (fixed) table name
- changes a lot of the CellRegion(QRect) constructor calls to \
CellRegion(Table*,QRect)
- makes sure CellRegion instances are used instead of their string representations so \
that sheet renames are trivially handled (CellRegion::table()->name() changes \
automatically)
- adds lots of test cases
I admit that I started this work while we weren't in feature freeze yet so it \
originally was a bit bigger and included also a refactoring of two classes, but I \
removed the irrelevant bits there much as possible to restrain this patch to fix the \
original issues only. With that and the new test cases I think this patch should be \
compatible with us being in bug-fix mode.</pre> </td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: \
1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">5 sets of test cases for classes relevant in these changes (CellRegion, \
ChartProxyModel, TableSource, KDChartModel, DataSet) are added or adapted from \
/kchart/tests. TestDataSet demonstrates a simple test case that can only pass after \
the change. </pre> </td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>trunk/koffice/interfaces/KoChartInterface.h <span style="color: \
grey">(1175800)</span></li>
<li>trunk/koffice/kspread/BindingModel.h <span style="color: \
grey">(1175800)</span></li>
<li>trunk/koffice/kspread/chart/ChartDatabaseSelector.cpp <span style="color: \
grey">(1175800)</span></li>
<li>trunk/koffice/plugins/chartshape/Axis.h <span style="color: \
grey">(1175800)</span></li>
<li>trunk/koffice/plugins/chartshape/Axis.cpp <span style="color: \
grey">(1175800)</span></li>
<li>trunk/koffice/plugins/chartshape/CMakeLists.txt <span style="color: \
grey">(1175800)</span></li>
<li>trunk/koffice/plugins/chartshape/CellRegion.h <span style="color: \
grey">(1175800)</span></li>
<li>trunk/koffice/plugins/chartshape/CellRegion.cpp <span style="color: \
grey">(1175800)</span></li>
<li>trunk/koffice/plugins/chartshape/ChartConfigWidget.h <span style="color: \
grey">(1175800)</span></li>
<li>trunk/koffice/plugins/chartshape/ChartConfigWidget.cpp <span style="color: \
grey">(1175800)</span></li>
<li>trunk/koffice/plugins/chartshape/ChartProxyModel.h <span style="color: \
grey">(1175800)</span></li>
<li>trunk/koffice/plugins/chartshape/ChartProxyModel.cpp <span style="color: \
grey">(1175800)</span></li>
<li>trunk/koffice/plugins/chartshape/ChartShape.h <span style="color: \
grey">(1175800)</span></li>
<li>trunk/koffice/plugins/chartshape/ChartShape.cpp <span style="color: \
grey">(1175800)</span></li>
<li>trunk/koffice/plugins/chartshape/ChartShapeFactory.cpp <span style="color: \
grey">(1175800)</span></li>
<li>trunk/koffice/plugins/chartshape/ChartTableModel.cpp <span style="color: \
grey">(1175800)</span></li>
<li>trunk/koffice/plugins/chartshape/ChartTool.h <span style="color: \
grey">(1175800)</span></li>
<li>trunk/koffice/plugins/chartshape/ChartTool.cpp <span style="color: \
grey">(1175800)</span></li>
<li>trunk/koffice/plugins/chartshape/DataSet.h <span style="color: \
grey">(1175800)</span></li>
<li>trunk/koffice/plugins/chartshape/DataSet.cpp <span style="color: \
grey">(1175800)</span></li>
<li>trunk/koffice/plugins/chartshape/OdfLoadingHelper.h <span style="color: \
grey">(PRE-CREATION)</span></li>
<li>trunk/koffice/plugins/chartshape/PlotArea.cpp <span style="color: \
grey">(1175800)</span></li>
<li>trunk/koffice/plugins/chartshape/TableSource.h <span style="color: \
grey">(PRE-CREATION)</span></li>
<li>trunk/koffice/plugins/chartshape/TableSource.cpp <span style="color: \
grey">(PRE-CREATION)</span></li>
<li>trunk/koffice/plugins/chartshape/dialogs/TableEditorDialog.h <span style="color: \
grey">(1175800)</span></li>
<li>trunk/koffice/plugins/chartshape/dialogs/TableEditorDialog.cpp <span \
style="color: grey">(1175800)</span></li>
<li>trunk/koffice/plugins/chartshape/kchart_global.h <span style="color: \
grey">(1175800)</span></li>
<li>trunk/koffice/plugins/chartshape/tests/CMakeLists.txt <span style="color: \
grey">(PRE-CREATION)</span></li>
<li>trunk/koffice/plugins/chartshape/tests/ModelObserver.h <span style="color: \
grey">(PRE-CREATION)</span></li>
<li>trunk/koffice/plugins/chartshape/tests/ModelObserver.cpp <span style="color: \
grey">(PRE-CREATION)</span></li>
<li>trunk/koffice/plugins/chartshape/tests/TestCellRegion.h <span style="color: \
grey">(PRE-CREATION)</span></li>
<li>trunk/koffice/plugins/chartshape/tests/TestCellRegion.cpp <span style="color: \
grey">(PRE-CREATION)</span></li>
<li>trunk/koffice/plugins/chartshape/tests/TestDataSet.h <span style="color: \
grey">(PRE-CREATION)</span></li>
<li>trunk/koffice/plugins/chartshape/tests/TestDataSet.cpp <span style="color: \
grey">(PRE-CREATION)</span></li>
<li>trunk/koffice/plugins/chartshape/tests/TestKDChartModel.h <span style="color: \
grey">(PRE-CREATION)</span></li>
<li>trunk/koffice/plugins/chartshape/tests/TestKDChartModel.cpp <span style="color: \
grey">(PRE-CREATION)</span></li>
<li>trunk/koffice/plugins/chartshape/tests/TestProxyModel.h <span style="color: \
grey">(PRE-CREATION)</span></li>
<li>trunk/koffice/plugins/chartshape/tests/TestProxyModel.cpp <span style="color: \
grey">(PRE-CREATION)</span></li>
<li>trunk/koffice/plugins/chartshape/tests/TestTableSource.h <span style="color: \
grey">(PRE-CREATION)</span></li>
<li>trunk/koffice/plugins/chartshape/tests/TestTableSource.cpp <span style="color: \
grey">(PRE-CREATION)</span></li>
</ul>
<p><a href="http://svn.reviewboard.kde.org/r/5373/diff/" style="margin-left: \
3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>
_______________________________________________
koffice-devel mailing list
koffice-devel@kde.org
https://mail.kde.org/mailman/listinfo/koffice-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic