[prev in list] [next in list] [prev in thread] [next in thread]
List: koffice-devel
Subject: Re: Review Request: Fix Multi-Table Charts
From: "Johannes Simon" <johannes.simon () gmail ! com>
Date: 2010-09-17 14:12:00
Message-ID: 20100917141200.10158.72823 () vidsolbach ! de
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
> On 2010-09-17 13:04:38, Marijn Kruisselbrink wrote:
> > trunk/koffice/interfaces/KoChartInterface.h, line 24
> > <http://svn.reviewboard.kde.org/r/5373/diff/2/?file=36258#file36258line24>
> >
> > Uhm, please don't include all of Qt, especially not in a header file...
As far as I understand, this only defines various enums like Qt::Orientation. See \
http://doc.qt.nokia.com/4.6/qt.html
> On 2010-09-17 13:04:38, Marijn Kruisselbrink wrote:
> > trunk/koffice/kspread/BindingModel.h, line 23
> > <http://svn.reviewboard.kde.org/r/5373/diff/2/?file=36259#file36259line23>
> >
> > What's the point of this line? You didn't make any other changes to this header \
> > file, so there should be no reason to add include statements to it.
The point is that it didn't compile for me.
Binding is used in this header without a previous declaration or definition. A pure \
forward-declaration isn't enough either because m_region is a member and thus can't \
have an incomplete type.
But this should go into its own commit and I will do that.
- Johannes
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://svn.reviewboard.kde.org/r/5373/#review7656
-----------------------------------------------------------
On 2010-09-17 09:17:31, Johannes Simon wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://svn.reviewboard.kde.org/r/5373/
> -----------------------------------------------------------
>
> (Updated 2010-09-17 09:17:31)
>
>
> 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 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.
>
> 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, \
> ChartProxyModel, TableSource, KDChartModel, DataSet) are added or adapted from \
> /kchart/tests. TestDataSet demonstrates a simple test case that can only pass 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 />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: \
10px;"> <p style="margin-top: 0;">On September 17th, 2010, 1:04 p.m., <b>Marijn \
Kruisselbrink</b> wrote:</p> <blockquote style="margin-left: 1em; border-left: 2px \
solid #d0d0d0; padding-left: 10px;">
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="/r/5373/diff/2/?file=36258#file36258line24" style="color: black; font-weight: \
bold; text-decoration: underline;">trunk/koffice/interfaces/KoChartInterface.h</a> \
<span style="font-weight: normal;">
(Diff revision 2)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; \
"></pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2"></font></th> <td bgcolor="#c5ffc4" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">24</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span \
class="cp">#include <Qt></span></pre></td> </tr>
</tbody>
</table>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Uhm, please don't \
include all of Qt, especially not in a header file...</pre> </blockquote>
</blockquote>
<pre style="margin-left: 1em; white-space: pre-wrap; white-space: -moz-pre-wrap; \
white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">As far as I \
understand, this only defines various enums like Qt::Orientation. See \
http://doc.qt.nokia.com/4.6/qt.html</pre> <br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: \
10px;"> <p style="margin-top: 0;">On September 17th, 2010, 1:04 p.m., <b>Marijn \
Kruisselbrink</b> wrote:</p> <blockquote style="margin-left: 1em; border-left: 2px \
solid #d0d0d0; padding-left: 10px;">
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="/r/5373/diff/2/?file=36259#file36259line23" style="color: black; font-weight: \
bold; text-decoration: underline;">trunk/koffice/kspread/BindingModel.h</a> <span \
style="font-weight: normal;">
(Diff revision 2)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; \
"></pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">23</font></th> <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#f0f0f0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">23</font></th> <td bgcolor="#ffffff" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> \
</tr>
</tbody>
</table>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">What's the point of \
this line? You didn't make any other changes to this header file, so there should \
be no reason to add include statements to it.</pre> </blockquote>
</blockquote>
<pre style="margin-left: 1em; white-space: pre-wrap; white-space: -moz-pre-wrap; \
white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">The point \
is that it didn't compile for me.
Binding is used in this header without a previous declaration or definition. A pure \
forward-declaration isn't enough either because m_region is a member and thus \
can't have an incomplete type.
But this should go into its own commit and I will do that.</pre>
<br />
<p>- Johannes</p>
<br />
<p>On September 17th, 2010, 9:17 a.m., Johannes Simon wrote:</p>
<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>
<p style="color: grey;"><i>Updated 2010-09-17 09:17:31</i></p>
<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