Qwt 6.0.1 Support

Upgrade to QWT 6.0.1, but still uses a locally patched copy
since support for 8 axes has not been included, despite it
being a relatively simple patch.

Fixes #634.
Fixes #567.
This commit is contained in:
Damien
2012-02-06 13:40:52 +01:00
committed by Mark Liversedge
parent 8c9a5ab148
commit 2f9130cd76
406 changed files with 39317 additions and 25831 deletions

View File

@@ -7,103 +7,34 @@
* modify it under the terms of the Qwt License, Version 1.0
*****************************************************************************/
#include "qwt_plot_spectrogram.h"
#include "qwt_painter.h"
#include "qwt_interval.h"
#include "qwt_scale_map.h"
#include "qwt_color_map.h"
#include <qimage.h>
#include <qpen.h>
#include <qpainter.h>
#include "qwt_painter.h"
#include "qwt_double_interval.h"
#include "qwt_scale_map.h"
#include "qwt_color_map.h"
#include "qwt_plot_spectrogram.h"
#if QT_VERSION < 0x040000
typedef QValueVector<QRgb> QwtColorTable;
#else
typedef QVector<QRgb> QwtColorTable;
#include <qmath.h>
#include <qalgorithms.h>
#if QT_VERSION >= 0x040400
#include <qthread.h>
#include <qfuture.h>
#include <qtconcurrentrun.h>
#endif
class QwtPlotSpectrogramImage: public QImage
{
// This class hides some Qt3/Qt4 API differences
public:
QwtPlotSpectrogramImage(const QSize &size, QwtColorMap::Format format):
#if QT_VERSION < 0x040000
QImage(size, format == QwtColorMap::RGB ? 32 : 8)
#else
QImage(size, format == QwtColorMap::RGB
? QImage::Format_ARGB32 : QImage::Format_Indexed8 )
#endif
{
}
QwtPlotSpectrogramImage(const QImage &other):
QImage(other)
{
}
void initColorTable(const QImage& other)
{
#if QT_VERSION < 0x040000
const unsigned int numColors = other.numColors();
setNumColors(numColors);
for ( unsigned int i = 0; i < numColors; i++ )
setColor(i, other.color(i));
#else
setColorTable(other.colorTable());
#endif
}
#if QT_VERSION < 0x040000
void setColorTable(const QwtColorTable &colorTable)
{
setNumColors(colorTable.size());
for ( unsigned int i = 0; i < colorTable.size(); i++ )
setColor(i, colorTable[i]);
}
QwtColorTable colorTable() const
{
QwtColorTable table(numColors());
for ( int i = 0; i < numColors(); i++ )
table[i] = color(i);
return table;
}
#endif
};
class QwtPlotSpectrogram::PrivateData
{
public:
class DummyData: public QwtRasterData
PrivateData():
data( NULL ),
renderThreadCount( 1 )
{
public:
virtual QwtRasterData *copy() const
{
return new DummyData();
}
virtual double value(double, double) const
{
return 0.0;
}
virtual QwtDoubleInterval range() const
{
return QwtDoubleInterval(0.0, 1.0);
}
};
PrivateData()
{
data = new DummyData();
colorMap = new QwtLinearColorMap();
displayMode = ImageMode;
conrecAttributes = QwtRasterData::IgnoreAllVerticesOnLevel;
conrecAttributes |= QwtRasterData::IgnoreOutOfRange;
conrecFlags = QwtRasterData::IgnoreAllVerticesOnLevel;
conrecFlags |= QwtRasterData::IgnoreOutOfRange;
}
~PrivateData()
{
@@ -113,11 +44,13 @@ public:
QwtRasterData *data;
QwtColorMap *colorMap;
int displayMode;
DisplayModes displayMode;
QwtValueList contourLevels;
uint renderThreadCount;
QList<double> contourLevels;
QPen defaultContourPen;
int conrecAttributes;
QwtRasterData::ConrecFlags conrecFlags;
};
/*!
@@ -126,20 +59,20 @@ public:
- QwtPlotItem::Legend: false
The z value is initialized by 8.0.
\param title Title
\sa QwtPlotItem::setItemAttribute(), QwtPlotItem::setZ()
*/
QwtPlotSpectrogram::QwtPlotSpectrogram(const QString &title):
QwtPlotRasterItem(title)
QwtPlotSpectrogram::QwtPlotSpectrogram( const QString &title ):
QwtPlotRasterItem( title )
{
d_data = new PrivateData();
setItemAttribute(QwtPlotItem::AutoScale, true);
setItemAttribute(QwtPlotItem::Legend, false);
setItemAttribute( QwtPlotItem::AutoScale, true );
setItemAttribute( QwtPlotItem::Legend, false );
setZ(8.0);
setZ( 8.0 );
}
//! Destructor
@@ -164,9 +97,9 @@ int QwtPlotSpectrogram::rtti() const
\sa DisplayMode, displayMode()
*/
void QwtPlotSpectrogram::setDisplayMode(DisplayMode mode, bool on)
void QwtPlotSpectrogram::setDisplayMode( DisplayMode mode, bool on )
{
if ( on != bool(mode & d_data->displayMode) )
if ( on != bool( mode & d_data->displayMode ) )
{
if ( on )
d_data->displayMode |= mode;
@@ -183,9 +116,40 @@ void QwtPlotSpectrogram::setDisplayMode(DisplayMode mode, bool on)
\param mode Display mode
\return true if mode is enabled
*/
bool QwtPlotSpectrogram::testDisplayMode(DisplayMode mode) const
bool QwtPlotSpectrogram::testDisplayMode( DisplayMode mode ) const
{
return (d_data->displayMode & mode);
return ( d_data->displayMode & mode );
}
/*!
Rendering an image from the raster data can often be done
parallel on a multicore system.
\param numThreads Number of threads to be used for rendering.
If numThreads is set to 0, the system specific
ideal thread count is used.
The default thread count is 1 ( = no additional threads )
\warning Rendering in multiple threads is only supported for Qt >= 4.4
\sa renderThreadCount(), renderImage(), renderTile()
*/
void QwtPlotSpectrogram::setRenderThreadCount( uint numThreads )
{
d_data->renderThreadCount = numThreads;
}
/*!
\return Number of threads to be used for rendering.
If numThreads is set to 0, the system specific
ideal thread count is used.
\warning Rendering in multiple threads is only supported for Qt >= 4.4
\sa setRenderThreadCount(), renderImage(), renderTile()
*/
uint QwtPlotSpectrogram::renderThreadCount() const
{
return d_data->renderThreadCount;
}
/*!
@@ -199,10 +163,13 @@ bool QwtPlotSpectrogram::testDisplayMode(DisplayMode mode) const
\sa colorMap(), QwtScaleWidget::setColorBarEnabled(),
QwtScaleWidget::setColorMap()
*/
void QwtPlotSpectrogram::setColorMap(const QwtColorMap &colorMap)
void QwtPlotSpectrogram::setColorMap( QwtColorMap *colorMap )
{
delete d_data->colorMap;
d_data->colorMap = colorMap.copy();
if ( d_data->colorMap != colorMap )
{
delete d_data->colorMap;
d_data->colorMap = colorMap;
}
invalidateCache();
itemChanged();
@@ -212,22 +179,22 @@ void QwtPlotSpectrogram::setColorMap(const QwtColorMap &colorMap)
\return Color Map used for mapping the intensity values to colors
\sa setColorMap()
*/
const QwtColorMap &QwtPlotSpectrogram::colorMap() const
const QwtColorMap *QwtPlotSpectrogram::colorMap() const
{
return *d_data->colorMap;
return d_data->colorMap;
}
/*!
\brief Set the default pen for the contour lines
If the spectrogram has a valid default contour pen
If the spectrogram has a valid default contour pen
a contour line is painted using the default contour pen.
Otherwise (pen.style() == Qt::NoPen) the pen is calculated
for each contour level using contourPen().
\sa defaultContourPen(), contourPen()
*/
void QwtPlotSpectrogram::setDefaultContourPen(const QPen &pen)
void QwtPlotSpectrogram::setDefaultContourPen( const QPen &pen )
{
if ( pen != d_data->defaultContourPen )
{
@@ -247,43 +214,46 @@ QPen QwtPlotSpectrogram::defaultContourPen() const
/*!
\brief Calculate the pen for a contour line
The color of the pen is the color for level calculated by the color map
\param level Contour level
\return Pen for the contour line
\note contourPen is only used if defaultContourPen().style() == Qt::NoPen
\sa setDefaultContourPen(), setColorMap(), setContourLevels()
*/
QPen QwtPlotSpectrogram::contourPen(double level) const
QPen QwtPlotSpectrogram::contourPen( double level ) const
{
const QwtDoubleInterval intensityRange = d_data->data->range();
const QColor c(d_data->colorMap->rgb(intensityRange, level));
if ( d_data->data == NULL || d_data->colorMap == NULL )
return QPen();
return QPen(c);
const QwtInterval intensityRange = d_data->data->interval(Qt::ZAxis);
const QColor c( d_data->colorMap->rgb( intensityRange, level ) );
return QPen( c );
}
/*!
Modify an attribute of the CONREC algorithm, used to calculate
the contour lines.
\param attribute CONREC attribute
\param flag CONREC flag
\param on On/Off
\sa testConrecAttribute(), renderContourLines(),
\sa testConrecFlag(), renderContourLines(),
QwtRasterData::contourLines()
*/
void QwtPlotSpectrogram::setConrecAttribute(
QwtRasterData::ConrecAttribute attribute, bool on)
void QwtPlotSpectrogram::setConrecFlag(
QwtRasterData::ConrecFlag flag, bool on )
{
if ( bool(d_data->conrecAttributes & attribute) == on )
if ( bool( d_data->conrecFlags & flag ) == on )
return;
if ( on )
d_data->conrecAttributes |= attribute;
d_data->conrecFlags |= flag;
else
d_data->conrecAttributes &= ~attribute;
d_data->conrecFlags &= ~flag;
itemChanged();
}
@@ -292,47 +262,43 @@ void QwtPlotSpectrogram::setConrecAttribute(
Test an attribute of the CONREC algorithm, used to calculate
the contour lines.
\param attribute CONREC attribute
\param flag CONREC flag
\return true, is enabled
\sa setConrecAttribute(), renderContourLines(),
\sa setConrecClag(), renderContourLines(),
QwtRasterData::contourLines()
*/
bool QwtPlotSpectrogram::testConrecAttribute(
QwtRasterData::ConrecAttribute attribute) const
{
return d_data->conrecAttributes & attribute;
bool QwtPlotSpectrogram::testConrecFlag(
QwtRasterData::ConrecFlag flag ) const
{
return d_data->conrecFlags & flag;
}
/*!
Set the levels of the contour lines
\param levels Values of the contour levels
\sa contourLevels(), renderContourLines(),
\sa contourLevels(), renderContourLines(),
QwtRasterData::contourLines()
\note contourLevels returns the same levels but sorted.
*/
void QwtPlotSpectrogram::setContourLevels(const QwtValueList &levels)
void QwtPlotSpectrogram::setContourLevels( const QList<double> &levels )
{
d_data->contourLevels = levels;
#if QT_VERSION >= 0x040000
qSort(d_data->contourLevels);
#else
qHeapSort(d_data->contourLevels);
#endif
qSort( d_data->contourLevels );
itemChanged();
}
/*!
\brief Return the levels of the contour lines.
\brief Return the levels of the contour lines.
The levels are sorted in increasing order.
\sa contourLevels(), renderContourLines(),
\sa contourLevels(), renderContourLines(),
QwtRasterData::contourLines()
*/
QwtValueList QwtPlotSpectrogram::contourLevels() const
QList<double> QwtPlotSpectrogram::contourLevels() const
{
return d_data->contourLevels;
}
@@ -343,175 +309,212 @@ QwtValueList QwtPlotSpectrogram::contourLevels() const
\param data Spectrogram Data
\sa data()
*/
void QwtPlotSpectrogram::setData(const QwtRasterData &data)
void QwtPlotSpectrogram::setData( QwtRasterData *data )
{
delete d_data->data;
d_data->data = data.copy();
if ( data != d_data->data )
{
delete d_data->data;
d_data->data = data;
invalidateCache();
itemChanged();
invalidateCache();
itemChanged();
}
}
/*!
\return Spectrogram data
\sa setData()
*/
const QwtRasterData &QwtPlotSpectrogram::data() const
const QwtRasterData *QwtPlotSpectrogram::data() const
{
return *d_data->data;
return d_data->data;
}
/*!
\return Bounding rect of the data
\sa QwtRasterData::boundingRect()
\return Spectrogram data
\sa setData()
*/
QwtDoubleRect QwtPlotSpectrogram::boundingRect() const
QwtRasterData *QwtPlotSpectrogram::data()
{
return d_data->data->boundingRect();
return d_data->data;
}
/*!
\brief Returns the recommended raster for a given rect.
\return Bounding interval for an axis
F.e the raster hint is used to limit the resolution of
the image that is rendered.
The default implementation returns the interval of the
associated raster data object.
\param rect Rect for the raster hint
\return data().rasterHint(rect)
\param axis X, Y, or Z axis
\sa QwtRasterData::interval()
*/
QSize QwtPlotSpectrogram::rasterHint(const QwtDoubleRect &rect) const
QwtInterval QwtPlotSpectrogram::interval(Qt::Axis axis) const
{
return d_data->data->rasterHint(rect);
if ( d_data->data == NULL )
return QwtInterval();
return d_data->data->interval( axis );
}
/*!
\brief Render an image from the data and color map.
\brief Pixel hint
The area is translated into a rect of the paint device.
For each pixel of this rect the intensity is mapped
into a color.
The geometry of a pixel is used to calculated the resolution and
alignment of the rendered image.
The default implementation returns data()->pixelHint( rect );
\param area In most implementations the resolution of the data doesn't
depend on the requested area.
\return Bounding rectangle of a pixel
\sa QwtPlotRasterItem::pixelHint(), QwtRasterData::pixelHint(),
render(), renderImage()
*/
QRectF QwtPlotSpectrogram::pixelHint( const QRectF &area ) const
{
if ( d_data->data == NULL )
return QRectF();
return d_data->data->pixelHint( area );
}
/*!
\brief Render an image from data and color map.
For each pixel of rect the value is mapped into a color.
\param xMap X-Scale Map
\param yMap Y-Scale Map
\param area Area that should be rendered in scale coordinates.
\param area Requested area for the image in scale coordinates
\param imageSize Size of the requested image
\return A QImage::Format_Indexed8 or QImage::Format_ARGB32 depending
\return A QImage::Format_Indexed8 or QImage::Format_ARGB32 depending
on the color map.
\sa QwtRasterData::intensity(), QwtColorMap::rgb(),
\sa QwtRasterData::value(), QwtColorMap::rgb(),
QwtColorMap::colorIndex()
*/
QImage QwtPlotSpectrogram::renderImage(
const QwtScaleMap &xMap, const QwtScaleMap &yMap,
const QwtDoubleRect &area) const
const QwtScaleMap &xMap, const QwtScaleMap &yMap,
const QRectF &area, const QSize &imageSize ) const
{
if ( area.isEmpty() )
return QImage();
QRect rect = transform(xMap, yMap, area);
QwtScaleMap xxMap = xMap;
QwtScaleMap yyMap = yMap;
const QSize res = d_data->data->rasterHint(area);
if ( res.isValid() )
if ( imageSize.isEmpty() || d_data->data == NULL
|| d_data->colorMap == NULL )
{
/*
It is useless to render an image with a higher resolution
than the data offers. Of course someone will have to
scale this image later into the size of the given rect, but f.e.
in case of postscript this will done on the printer.
*/
rect.setSize(rect.size().boundedTo(res));
int px1 = rect.x();
int px2 = rect.x() + rect.width();
if ( xMap.p1() > xMap.p2() )
qSwap(px1, px2);
double sx1 = area.x();
double sx2 = area.x() + area.width();
if ( xMap.s1() > xMap.s2() )
qSwap(sx1, sx2);
int py1 = rect.y();
int py2 = rect.y() + rect.height();
if ( yMap.p1() > yMap.p2() )
qSwap(py1, py2);
double sy1 = area.y();
double sy2 = area.y() + area.height();
if ( yMap.s1() > yMap.s2() )
qSwap(sy1, sy2);
xxMap.setPaintInterval(px1, px2);
xxMap.setScaleInterval(sx1, sx2);
yyMap.setPaintInterval(py1, py2);
yyMap.setScaleInterval(sy1, sy2);
return QImage();
}
QwtPlotSpectrogramImage image(rect.size(), d_data->colorMap->format());
const QwtDoubleInterval intensityRange = d_data->data->range();
const QwtInterval intensityRange = d_data->data->interval( Qt::ZAxis );
if ( !intensityRange.isValid() )
return image;
return QImage();
d_data->data->initRaster(area, rect.size());
QImage::Format format = ( d_data->colorMap->format() == QwtColorMap::RGB )
? QImage::Format_ARGB32 : QImage::Format_Indexed8;
QImage image( imageSize, format );
if ( d_data->colorMap->format() == QwtColorMap::Indexed )
image.setColorTable( d_data->colorMap->colorTable( intensityRange ) );
d_data->data->initRaster( area, image.size() );
#if QT_VERSION >= 0x040400 && !defined(QT_NO_QFUTURE)
uint numThreads = d_data->renderThreadCount;
if ( numThreads <= 0 )
numThreads = QThread::idealThreadCount();
if ( numThreads <= 0 )
numThreads = 1;
const int numRows = imageSize.height() / numThreads;
QList< QFuture<void> > futures;
for ( uint i = 0; i < numThreads; i++ )
{
QRect tile( 0, i * numRows, image.width(), numRows );
if ( i == numThreads - 1 )
{
tile.setHeight( image.height() - i * numRows );
renderTile( xMap, yMap, tile, &image );
}
else
{
futures += QtConcurrent::run(
this, &QwtPlotSpectrogram::renderTile,
xMap, yMap, tile, &image );
}
}
for ( int i = 0; i < futures.size(); i++ )
futures[i].waitForFinished();
#else // QT_VERSION < 0x040400
const QRect tile( 0, 0, image.width(), image.height() );
renderTile( xMap, yMap, tile, &image );
#endif
d_data->data->discardRaster();
return image;
}
/*!
\brief Render a tile of an image.
Rendering in tiles can be used to composite an image in parallel
threads.
\param xMap X-Scale Map
\param yMap Y-Scale Map
\param tile Geometry of the tile in image coordinates
\param image Image to be rendered
*/
void QwtPlotSpectrogram::renderTile(
const QwtScaleMap &xMap, const QwtScaleMap &yMap,
const QRect &tile, QImage *image ) const
{
const QwtInterval range = d_data->data->interval( Qt::ZAxis );
if ( !range.isValid() )
return;
if ( d_data->colorMap->format() == QwtColorMap::RGB )
{
for ( int y = rect.top(); y <= rect.bottom(); y++ )
for ( int y = tile.top(); y <= tile.bottom(); y++ )
{
const double ty = yyMap.invTransform(y);
const double ty = yMap.invTransform( y );
QRgb *line = (QRgb *)image.scanLine(y - rect.top());
for ( int x = rect.left(); x <= rect.right(); x++ )
QRgb *line = ( QRgb * )image->scanLine( y );
line += tile.left();
for ( int x = tile.left(); x <= tile.right(); x++ )
{
const double tx = xxMap.invTransform(x);
const double tx = xMap.invTransform( x );
*line++ = d_data->colorMap->rgb(intensityRange,
d_data->data->value(tx, ty));
*line++ = d_data->colorMap->rgb( range,
d_data->data->value( tx, ty ) );
}
}
}
else if ( d_data->colorMap->format() == QwtColorMap::Indexed )
{
image.setColorTable(d_data->colorMap->colorTable(intensityRange));
for ( int y = rect.top(); y <= rect.bottom(); y++ )
for ( int y = tile.top(); y <= tile.bottom(); y++ )
{
const double ty = yyMap.invTransform(y);
const double ty = yMap.invTransform( y );
unsigned char *line = image.scanLine(y - rect.top());
for ( int x = rect.left(); x <= rect.right(); x++ )
unsigned char *line = image->scanLine( y );
line += tile.left();
for ( int x = tile.left(); x <= tile.right(); x++ )
{
const double tx = xxMap.invTransform(x);
const double tx = xMap.invTransform( x );
*line++ = d_data->colorMap->colorIndex(intensityRange,
d_data->data->value(tx, ty));
*line++ = d_data->colorMap->colorIndex( range,
d_data->data->value( tx, ty ) );
}
}
}
d_data->data->discardRaster();
// Mirror the image in case of inverted maps
const bool hInvert = xxMap.p1() > xxMap.p2();
const bool vInvert = yyMap.p1() < yyMap.p2();
if ( hInvert || vInvert )
{
#ifdef __GNUC__
#warning Better invert the for loops above
#endif
#if QT_VERSION < 0x040000
image = image.mirror(hInvert, vInvert);
#else
image = image.mirrored(hInvert, vInvert);
#endif
}
return image;
}
/*!
@@ -521,24 +524,28 @@ QImage QwtPlotSpectrogram::renderImage(
but will slow down the time that is needed to calculate the lines.
The default implementation returns rect.size() / 2 bounded to
data().rasterHint().
the resolution depending on pixelSize().
\param area Rect, where to calculate the contour lines
\param rect Rect in pixel coordinates, where to paint the contour lines
\return Raster to be used by the CONREC contour algorithm.
\note The size will be bounded to rect.size().
\sa drawContourLines(), QwtRasterData::contourLines()
*/
QSize QwtPlotSpectrogram::contourRasterSize(const QwtDoubleRect &area,
const QRect &rect) const
QSize QwtPlotSpectrogram::contourRasterSize(
const QRectF &area, const QRect &rect ) const
{
QSize raster = rect.size() / 2;
const QSize rasterHint = d_data->data->rasterHint(area);
if ( rasterHint.isValid() )
raster = raster.boundedTo(rasterHint);
const QRectF pixelRect = pixelHint( area );
if ( !pixelRect.isEmpty() )
{
const QSize res( qCeil( rect.width() / pixelRect.width() ),
qCeil( rect.height() / pixelRect.height() ) );
raster = raster.boundedTo( res );
}
return raster;
}
@@ -549,14 +556,17 @@ QSize QwtPlotSpectrogram::contourRasterSize(const QwtDoubleRect &area,
\param rect Rectangle, where to calculate the contour lines
\param raster Raster, used by the CONREC algorithm
\sa contourLevels(), setConrecAttribute(),
\sa contourLevels(), setConrecFlag(),
QwtRasterData::contourLines()
*/
QwtRasterData::ContourLines QwtPlotSpectrogram::renderContourLines(
const QwtDoubleRect &rect, const QSize &raster) const
const QRectF &rect, const QSize &raster ) const
{
return d_data->data->contourLines(rect, raster,
d_data->contourLevels, d_data->conrecAttributes );
if ( d_data->data == NULL )
return QwtRasterData::ContourLines();
return d_data->data->contourLines( rect, raster,
d_data->contourLevels, d_data->conrecFlags );
}
/*!
@@ -569,39 +579,38 @@ QwtRasterData::ContourLines QwtPlotSpectrogram::renderContourLines(
\sa renderContourLines(), defaultContourPen(), contourPen()
*/
void QwtPlotSpectrogram::drawContourLines(QPainter *painter,
void QwtPlotSpectrogram::drawContourLines( QPainter *painter,
const QwtScaleMap &xMap, const QwtScaleMap &yMap,
const QwtRasterData::ContourLines &contourLines) const
const QwtRasterData::ContourLines &contourLines ) const
{
const QwtDoubleInterval intensityRange = d_data->data->range();
if ( d_data->data == NULL )
return;
const int numLevels = (int)d_data->contourLevels.size();
for (int l = 0; l < numLevels; l++)
const QwtInterval intensityRange = d_data->data->interval( Qt::ZAxis );
const int numLevels = d_data->contourLevels.size();
for ( int l = 0; l < numLevels; l++ )
{
const double level = d_data->contourLevels[l];
QPen pen = defaultContourPen();
if ( pen.style() == Qt::NoPen )
pen = contourPen(level);
pen = contourPen( level );
if ( pen.style() == Qt::NoPen )
continue;
painter->setPen(QwtPainter::scaledPen(pen));
painter->setPen( pen );
#if QT_VERSION >= 0x040000
const QPolygonF &lines = contourLines[level];
#else
const QwtArray<QwtDoublePoint> &lines = contourLines[level];
#endif
for ( int i = 0; i < (int)lines.size(); i += 2 )
for ( int i = 0; i < lines.size(); i += 2 )
{
const QPoint p1( xMap.transform(lines[i].x()),
yMap.transform(lines[i].y()) );
const QPoint p2( xMap.transform(lines[i+1].x()),
yMap.transform(lines[i+1].y()) );
const QPointF p1( xMap.transform( lines[i].x() ),
yMap.transform( lines[i].y() ) );
const QPointF p2( xMap.transform( lines[i+1].x() ),
yMap.transform( lines[i+1].y() ) );
QwtPainter::drawLine(painter, p1, p2);
QwtPainter::drawLine( painter, p1, p2 );
}
}
}
@@ -612,47 +621,45 @@ void QwtPlotSpectrogram::drawContourLines(QPainter *painter,
\param painter Painter
\param xMap Maps x-values into pixel coordinates.
\param yMap Maps y-values into pixel coordinates.
\param canvasRect Contents rect of the canvas in painter coordinates
\param canvasRect Contents rect of the canvas in painter coordinates
\sa setDisplayMode(), renderImage(),
\sa setDisplayMode(), renderImage(),
QwtPlotRasterItem::draw(), drawContourLines()
*/
void QwtPlotSpectrogram::draw(QPainter *painter,
void QwtPlotSpectrogram::draw( QPainter *painter,
const QwtScaleMap &xMap, const QwtScaleMap &yMap,
const QRect &canvasRect) const
const QRectF &canvasRect ) const
{
if ( d_data->displayMode & ImageMode )
QwtPlotRasterItem::draw(painter, xMap, yMap, canvasRect);
QwtPlotRasterItem::draw( painter, xMap, yMap, canvasRect );
if ( d_data->displayMode & ContourMode )
{
// Add some pixels at the borders, so that
// Add some pixels at the borders
const int margin = 2;
QRect rasterRect(canvasRect.x() - margin, canvasRect.y() - margin,
canvasRect.width() + 2 * margin, canvasRect.height() + 2 * margin);
QRectF rasterRect( canvasRect.x() - margin, canvasRect.y() - margin,
canvasRect.width() + 2 * margin, canvasRect.height() + 2 * margin );
QwtDoubleRect area = invTransform(xMap, yMap, rasterRect);
QRectF area = QwtScaleMap::invTransform( xMap, yMap, rasterRect );
const QwtDoubleRect br = boundingRect();
if ( br.isValid() )
const QRectF br = boundingRect();
if ( br.isValid() )
{
area &= br;
if ( area.isEmpty() )
return;
rasterRect = transform(xMap, yMap, area);
rasterRect = QwtScaleMap::transform( xMap, yMap, area );
}
QSize raster = contourRasterSize(area, rasterRect);
raster = raster.boundedTo(rasterRect.size());
QSize raster = contourRasterSize( area, rasterRect.toRect() );
raster = raster.boundedTo( rasterRect.toRect().size() );
if ( raster.isValid() )
{
const QwtRasterData::ContourLines lines =
renderContourLines(area, raster);
renderContourLines( area, raster );
drawContourLines(painter, xMap, yMap, lines);
drawContourLines( painter, xMap, yMap, lines );
}
}
}