← Back to branch summary

~ubuntu-branches/ubuntu/precise/koffice/precise

« back to all changes in this revision

Viewing changes to kchart/kdchart/src/KDChartLineDiagram_p.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2010-09-21 15:36:35 UTC
  • mfrom: (1.4.1 upstream) (60.2.11 maverick)
  • Revision ID: james.westby@ubuntu.com-20100921153635-6tejqkiro2u21ydi
Tags: 1:2.2.2-0ubuntu3
Add kubuntu_03_fix-crash-on-closing-sqlite-connection-2.2.2.diff and
kubuntu_04_support-large-memo-values-for-msaccess-2.2.2.diff as
recommended by upstream http://kexi-
project.org/wiki/wikiview/index.php@Kexi2.2_Patches.html#sqlite_stab
ility

Show diffs side-by-side

added added

removed removed

Lines of Context:
kchart/kdchart/src/KDChartLineDiagram_p.cpp
31
31
#include "KDChartLineDiagram_p.h"
32
32
 
33
33
using namespace KDChart;
 
34
using namespace std;
34
35
 
35
36
LineDiagram::Private::Private( const Private& rhs )
36
37
    : AbstractCartesianDiagram::Private( rhs )
43
44
    const QPolygonF& points ) const
44
45
{
45
46
    ctx->painter()->setBrush( brush );
46
 
    ctx->painter()->setPen( PrintingParameters::scalePen( 
 
47
    ctx->painter()->setPen( PrintingParameters::scalePen(
47
48
        QPen( pen.color(),
48
49
              pen.width(),
49
50
              pen.style(),
237
238
            AbstractDiagram * diagram,
238
239
            DataValueTextInfoList & list,
239
240
            const QModelIndex & index,
 
241
            const CartesianDiagramDataCompressor::CachePosition * position,
240
242
            const PositionPoints& points,
241
243
            const Position& autoPositionPositive,
242
244
            const Position& autoPositionNegative,
243
245
            const qreal value )
244
246
{
245
247
    Q_UNUSED( autoPositionNegative );
246
 
    m_private->appendDataValueTextInfoToList( diagram, list, index, points,
 
248
    m_private->appendDataValueTextInfoToList( diagram, list, index, position, points,
247
249
                                              autoPositionPositive, autoPositionPositive, value );
248
250
}
249
251
 
313
315
    double leftValue = std::numeric_limits< double >::quiet_NaN();
314
316
    double rightValue = std::numeric_limits< double >::quiet_NaN();
315
317
    int missingCount = 1;
316
 
    
 
318
 
317
319
    const int column = pos.second;
318
320
    const int row = pos.first;
319
321
    const int rowCount = compressor().modelDataRows();
320
 
    
 
322
 
321
323
    // iterate back and forth to find valid values
322
324
    for( int r1 = row - 1; r1 > 0; --r1 )
323
325
    {