Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-24 02:42:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

libs: remove unused KGraphicsSignalPlotter class

Browse source 
note: plasma already has a signal plotter

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-06-11 20:43:16 +03:00
parent 0b7caf6071
commit 60ede0ddb7
9 changed files with 15 additions and 689 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libs/ksysguard/signalplotter/CMakeLists.txt
View file

@ -1,6 +1,5 @@
set(ksignalplotter_LIB_SRCS
ksignalplotter.cpp
kgraphicssignalplotter.cpp
)
add_library(ksignalplotter SHARED ${ksignalplotter_LIB_SRCS})

24
libs/ksysguard/signalplotter/kgraphicssignalplotter.cpp
View file

@ -1,24 +0,0 @@
/*
This file is part of the KDE project
Copyright (c) 2006 - 2009 John Tapsell <tapsell@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
License version 2 or at your option version 3 as published by
the Free Software Foundation.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#define GRAPHICS_SIGNAL_PLOTTER
#include "ksignalplotter.cpp"
#undef GRAPHICS_SIGNAL_PLOTTER

464
libs/ksysguard/signalplotter/kgraphicssignalplotter.h
View file

@ -1,464 +0,0 @@
/*
This file is part of the KDE project
Copyright (c) 2006 - 2009 John Tapsell <tapsell@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
License version 2 or at your option version 3 as published by
the Free Software Foundation.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef KGRAPHICSSIGNALPLOTTER_H
#define KGRAPHICSSIGNALPLOTTER_H
#include <QtCore/QList>
#include <QtCore/QString>
#include <QtGui/QColor>
#include <QtGui/QFont>
#include <QtGui/QGraphicsWidget>
#include <klocalizedstring.h>
#include <kcomponentdata.h>
#include <kdemacros.h>
#include <QPaintEvent>
#include <QResizeEvent>
#include <QGraphicsSceneResizeEvent>
class KGraphicsSignalPlotterPrivate;
//Make sure only declare KLocalizedString once
#ifndef KSIGNALPLOTTER_H
Q_DECLARE_METATYPE(KLocalizedString)
#endif
/** \class KGraphicsSignalPlotter
* \brief The KGraphicsSignalPlotter graphics widget draws a real time graph of data that updates continually.
*
* Features include:
* \li Points are joined by a bezier curve.
* \li Lines are anti-aliased
* \li Background can be set as a specified SVG
* \li The lines can be reordered
* \li Uses as little memory and CPU as possible
* \li Graph can be smoothed using the formula (value * 2 + last_value)/3
* \li Can cope with positive/negative infinity and NaN values.
*
* Example usage:
* \code
* KGraphicsSignalPlotter *s = KGraphicsSignalPlotter(parent);
* s->addBeam(Qt::blue);
* s->addBeam(Qt::green);
* QList<qreal> data;
* data << 4.0 << 5.0;
* s->addSample(data);
* \endcode
*
* Note that the number of horizontal lines is calculated automatically based on the axis font size, even if the axis labels are not shown.
*
* Smoothing looks very nice visually and is enabled by default. It can be disabled with setSmoothGraph().
*
* \image KSignalPlotter.png Example KGraphicsSignalPlotter with two beams
*/
class KDE_EXPORT KGraphicsSignalPlotter : public QGraphicsWidget
{
Q_OBJECT
Q_PROPERTY(qreal minimumValue READ minimumValue WRITE setMinimumValue)
Q_PROPERTY(qreal maximumValue READ maximumValue WRITE setMaximumValue)
Q_PROPERTY(bool useAutoRange READ useAutoRange WRITE setUseAutoRange)
Q_PROPERTY(KLocalizedString unit READ unit WRITE setUnit)
Q_PROPERTY(qreal scaleDownBy READ scaleDownBy WRITE setScaleDownBy)
Q_PROPERTY(uint horizontalScale READ horizontalScale WRITE setHorizontalScale)
Q_PROPERTY(bool showHorizontalLines READ showHorizontalLines WRITE setShowHorizontalLines)
Q_PROPERTY(bool showVerticalLines READ showVerticalLines WRITE setShowVerticalLines)
Q_PROPERTY(bool verticalLinesScroll READ verticalLinesScroll WRITE setVerticalLinesScroll)
Q_PROPERTY(uint verticalLinesDistance READ verticalLinesDistance WRITE setVerticalLinesDistance)
Q_PROPERTY(bool showAxis READ showAxis WRITE setShowAxis)
Q_PROPERTY(QString svgBackground READ svgBackground WRITE setSvgBackground)
Q_PROPERTY(bool thinFrame READ thinFrame WRITE setThinFrame)
Q_PROPERTY(int maxAxisTextWidth READ maxAxisTextWidth WRITE setMaxAxisTextWidth)
Q_PROPERTY(bool smoothGraph READ smoothGraph WRITE setSmoothGraph)
Q_PROPERTY(bool stackGraph READ stackGraph WRITE setStackGraph)
Q_PROPERTY(int fillOpacity READ fillOpacity WRITE setFillOpacity)
public:
KGraphicsSignalPlotter( QGraphicsItem *parent = 0);
virtual ~KGraphicsSignalPlotter();
/** \brief Add a new line to the graph plotter, with the specified color.
*
* Note that the order you add the beams in must be the same order that
* the beam data is given in (Unless you reorder the beams).
*
* \param color Color of beam - does not have to be unique.
*/
void addBeam( const QColor &color );
/** \brief Add data to the graph, and advance the graph by one time period.
*
* The data must be given as a list in the same order that the beams were
* added (or consequently reordered). If samples.count() != numBeams(),
* a warning is printed and the data discarded.
*
* To indicate that no data is available for a given beam, set its value to
* (non-signalling) NaN.
*
* For example:
*
* \code
* KSignalPlotter *s = KSignalPlotter(parent);
* s->addBeam(Qt::red);
* s->addBeam(Qt::green);
* s->addBeam(Qt::blue);
* signalPlotter->addSample( QList<qreal>() << std::numeric_limits<qreal>::quiet_NaN() << 1.0/0 << 10.0 );
* \endcode
*
* This indicates that no data is available yet for red (so the beam will not be drawn for this section),
* that's it positive infinity for green, and 10 for blue.
*
* Infinity is handled by drawing a straight line up to the top or bottom of the display, and does not affect the range.
* For the above example, the displayed range would now be 0 to 10.
*/
void addSample( const QList<qreal> &samples );
/** \brief Reorder the beams into the order given.
*
* For example:
* \code
* KSignalPlotter *s = KSignalPlotter(parent);
* s->addBeam(Qt::blue);
* s->addBeam(Qt::green);
* s->addBeam(Qt::red);
* QList<int> neworder;
* neworder << 2 << 0 << 1;
* s->reorderBeams( newOrder);
* //Now the order is red, blue then green
* \endcode
*
* The size of the \p newOrder list must be equal to the result of numBeams().
* \param newOrder New order of beams.
*/
void reorderBeams( const QList<int>& newOrder );
/** \brief Removes the beam at the specified index.
*
* This causes the graph to be redrawn with the specified beam completely
* removed.
*/
void removeBeam( int index );
/** \brief Get the color of the beam at the specified index.
*
* For example:
* \code
* KSignalPlotter *s = KSignalPlotter(parent);
* s->addBeam(Qt::blue);
* s->addBeam(Qt::green);
* s->addBeam(Qt::red);
*
* QColor color = s->beamColor(0); //returns blue
* \endcode
*
* \sa setBeamColor()
*/
QColor beamColor( int index ) const;
/** \brief Set the color of the beam at the specified index.
*
* \sa beamColor()
*/
void setBeamColor( int index, const QColor &color );
/** \brief Returns the number of beams. */
int numBeams() const;
/** \brief Set the axis units with a localized string.
*
* The localized string must contain a placeholder "%1" which is substituted for the value.
* The plural form (ki18np) can be used if the unit string changes depending on the number (for example
* "1 second", "2 seconds").
*
* For example:
*
* \code
* KSignalPlotter plotter;
* plotter.setUnit( ki18ncp("Units", "%1 second", "%1 seconds") );
* QString formattedString = plotter.valueAsString(3.4); //returns "3.4 seconds"
* \endcode
*
* Typically a new unit would be set when setScaleDownBy is called.
* Note that even the singular should use "%1 second" instead of "1 second", so that a value of -1 works correctly.
*
* \see unit(), setScaleDownBy()
*/
void setUnit( const KLocalizedString &unit );
/** \brief The localizable units used on the vertical axis of the graph.
*
* The returns the localizable string set with setUnit().
*
* Default is the string "%1" - i.e. to just display the number.
*
* \see setUnit
*/
KLocalizedString unit() const;
/** \brief Scale all the values down by the given amount.
*
* This is useful when the data is given in, say, kilobytes, but you set
* the units as megabytes. Thus you would have to call this with @p value
* set to 1024. This affects all the data already entered.
*
* Typically this is followed by calling setUnit() to set the display axis
* units. Default value is 1.
*/
void setScaleDownBy( qreal value );
/** \brief Amount scaled down by.
*
* \sa setScaleDownBy */
qreal scaleDownBy() const;
/** \brief Set whether to scale the graph automatically beyond the given range.
*
* If true, the range on vertical axis is automatically expanded from the
* data available, expanding beyond the range set by changeRange() if data
* values are outside of this range.
*
* Regardless whether this is set of not, the range of the vertical axis
* will never be less than the range given by maximumValue() and minimumvalue().
*
* \param value Whether to scale beyond the given range. Default is true.
*
* \sa useAutoRange
*/
void setUseAutoRange( bool value );
/** \brief Whether the vertical axis range is set automatically.
*/
bool useAutoRange() const;
/** \brief Change the minimum and maximum values drawn on the graph.
*
* Note that these values are sanitised. For example, if you
* set the minimum as 3, and the maximum as 97, then the graph
* would be drawn between 0 and 100. The algorithm to determine
* this "nice range" attempts to minimize the number of non-zero
* digits.
*
* If autoRange() is true, then this range is taking as a 'hint'.
* The range will never be smaller than the given range, but can grow
* if there are values larger than the given range.
*
* This is equivalent to calling
* \code
* setMinimumValue(min);
* setMaximumValue(max);
* \endcode
*
* \sa setMinimumValue(), setMaximumValue(), minimumValue(), maximumValue()
*/
void changeRange( qreal min, qreal max );
/** \brief Set the min value hint for the vertical axis.
*
* \sa changeRange(), minimumValue(), setMaximumValue(), maximumValue() */
void setMinimumValue( qreal min );
/** \brief Get the min value hint for the vertical axis.
*
* \sa changeRange(), minimumValue(), setMaximumValue(), maximumValue() */
qreal minimumValue() const;
/** \brief Set the max value hint for the vertical axis. *
*
* \sa changeRange(), minimumValue(), setMaximumValue(), maximumValue() */
void setMaximumValue( qreal max );
/** \brief Get the maximum value hint for the vertical axis.
*
* \sa changeRange(), minimumValue(), setMaximumValue(), maximumValue() */
qreal maximumValue() const;
/** \brief Get the current maximum value on the y-axis.
*
* This will never be lower than maximumValue(), and if autoRange() is true,
* it will be equal or larger (due to rounding up to make it a nice number)
* than the highest value being shown.
*/
qreal currentMaximumRangeValue() const;
/** \brief Get the current minimum value on the y-axis.
*
* This will never be lower than minimumValue(), and if autoRange() is true,
* it will be equal or larger (due to rounding up to make it a nice number)
* than the highest value being shown.
*/
qreal currentMinimumRangeValue() const;
/** \brief Set the number of pixels horizontally between data points.
* Default is 6. */
void setHorizontalScale( uint scale );
/** \brief The number of pixels horizontally between data points.
* Default is 6. */
int horizontalScale() const;
/** \brief Set whether to draw the vertical grid lines.
* Default is false. */
void setShowVerticalLines( bool value );
/** \brief Whether to draw the vertical grid lines.
* Default is false. */
bool showVerticalLines() const;
/** \brief Set the horizontal distance, in pixels, between the vertical grid lines.
* Must be a distance of 1 or more.
* Default is 30 pixels. */
void setVerticalLinesDistance( uint distance );
/** \brief The horizontal distance, in pixels, between the vertical grid lines.
* Default is 30 pixels. */
uint verticalLinesDistance() const;
/** \brief Set whether the vertical lines move with the data.
* Default is true. This has no effect is showVerticalLines is false. */
void setVerticalLinesScroll( bool value );
/** \brief Whether the vertical lines move with the data.
* Default is true. This has no effect is showVerticalLines is false. */
bool verticalLinesScroll() const;
/** \brief Set whether to draw the horizontal grid lines.
* Default is true. */
void setShowHorizontalLines( bool value );
/** \brief Whether to draw the horizontal grid lines.
* Default is true. */
bool showHorizontalLines() const;
/** \brief The number of decimal places used for the axis labels
*
* This is calculated based on the current range */
int currentAxisPrecision() const;
/** \brief Set whether to show the vertical axis labels.
*
* Default is true.
* \sa showAxis(), setAxisFont(), setAxisFontColor(), setMaxAxisTextWidth() */
void setShowAxis( bool show );
/** \brief Whether to show the vertical axis labels.
*
* Default is true.
* \sa setShowAxis(), axisFont(), axisFontColor(), maxAxisTextWidth() */
bool showAxis() const;
/** \brief Set the filename of the SVG background.
*
* Set to empty (default) to disable again. */
void setSvgBackground( const QString &filename );
/** \brief The filename of the SVG background. */
QString svgBackground() const;
/** \brief Return the last value that we have for the given beam index.
*
* \return last value, or 0 if not known. */
qreal lastValue( int index) const;
/** \brief Return a translated string for the last value at the given index.
*
* Returns, for example, "34 %" or "100 KB" for the given beam index,
* using the last value set for the beam, using the given precision.
*
* If precision is -1 (the default) then if @p value is greater than 99.5, no decimal figures are shown,
* otherwise if @p value is greater than 0.995, 1 decimal figure is used, otherwise 2.
*/
QString lastValueAsString( int index, int precision = -1) const;
/** \brief Return a translated string for the given value.
*
* Returns, for example, "34 %" or "100 KB" for the given value in unscaled units.
*
* If precision is -1 (the default) then if @p value is greater than 99.5, no decimal figures are shown,
* otherwise if @p value is greater than 0.995, 1 decimal figure is used, otherwise 2.
*
* For example:
* \code
* KSignalPlotter plotter;
* plotter.setUnit( ki18ncp("Units", "1 hour", "%1 hours") );
* plotter.scaleDownBy( 60 ); //The input will be in seconds, and there's 60 seconds in an hour
* QString formattedString = plotter.valueAsString(150); //returns "2.5 hours"
* \endcode
*
*/
QString valueAsString( qreal value, int precision = -1) const;
/** \brief Set the distance between the left of the widget and the left of the plotting region.
*
* For example:
* \code
* int axisTextWidth = fontMetrics().width(i18nc("Largest axis title", "99999 XXXX"));
* plotter->setMaxAxisTextWidth(axisTextWidth);
* \endcode
*
* If this is 0, the default, then the text will be shown inside the plotting area.
*/
void setMaxAxisTextWidth(int maxAxisTextWidth);
/** \brief Get the distance between the left of the widget and the left of the plotting region. */
int maxAxisTextWidth() const;
/** \brief Set whether to smooth the graph by averaging the points.
*
* This uses the formula: (value*2 + last_value)/3.
* Default is true. */
void setSmoothGraph(bool smooth);
/** \brief Whether to smooth the graph by averaging the points.
*
* This uses the formula: (value*2 + last_value)/3.
* Default is true. */
bool smoothGraph() const;
/** \brief Set whether to stack the beams on top of each other.
*
* Default is false */
void setStackGraph(bool stack);
/** \brief Whether to stack the beams on top of each other.
*
* Default is false */
bool stackGraph() const;
/** \brief Alpha value for filling the area underneath the graph lines.
*
* Set to 0 to disable filling the graph, and 255 for a solid fill. Default is 20*/
void setFillOpacity(int fill);
/** \brief Alpha value for filling the area underneath the graph lines. */
int fillOpacity() const;
/* Whether to show a thin line on the left and bottom of the widget, for a slight 3D effect */
bool thinFrame() const;
/* Set whether to show a thin line on the left and bottom of the widget, for a slight 3D effect */
void setThinFrame(bool thinFrame);
Q_SIGNALS:
/** When the axis has changed this signal is emitted. */
void axisScaleChanged();
protected:
/* Reimplemented */
virtual void resizeEvent( QGraphicsSceneResizeEvent* event );
virtual void paint( QPainter * p, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 );
virtual QSizeF sizeHint( Qt::SizeHint which, const QSizeF & constraint = QSizeF() ) const;
virtual void changeEvent ( QEvent * event );
virtual QPainterPath opaqueArea() const;
private:
KGraphicsSignalPlotterPrivate * const d;
friend class KGraphicsSignalPlotterPrivate;
};
#endif

85
libs/ksysguard/signalplotter/ksignalplotter.cpp
View file

@ -19,16 +19,7 @@
*/
#ifdef GRAPHICS_SIGNAL_PLOTTER
#define KSignalPlotter KGraphicsSignalPlotter
#define KSignalPlotterPrivate KGraphicsSignalPlotterPrivate
#include "kgraphicssignalplotter.h"
#else
#undef KSignalPlotter
#undef KSignalPlotterPrivate
#include "ksignalplotter.h"
#endif
#include "ksignalplotter_p.h"
#include <QtGui/QPainter>
@ -38,12 +29,6 @@
#include <QtGui/qevent.h>
#include <QEvent>
#ifdef GRAPHICS_SIGNAL_PLOTTER
#include <QtGui/qgraphicssceneevent.h>
#include <QtGui/qstyleoption.h>
#include <plasma/theme.h>
#endif
#include <kdebug.h>
#include <kglobal.h>
#include <klocale.h>
@ -61,13 +46,8 @@
//Never store less 1000 samples if not visible. This is kinda arbituary
#define NUM_SAMPLES_WHEN_INVISIBLE ((uint)1000)
#ifdef GRAPHICS_SIGNAL_PLOTTER
KGraphicsSignalPlotter::KGraphicsSignalPlotter( QGraphicsItem *parent)
: QGraphicsWidget(parent), d(new KGraphicsSignalPlotterPrivate(this))
#else
KSignalPlotter::KSignalPlotter( QWidget *parent)
: QWidget(parent), d(new KSignalPlotterPrivate(this))
#endif
{
qRegisterMetaType<KLocalizedString>("KLocalizedString");
// Anything smaller than this does not make sense.
@ -75,10 +55,6 @@ KSignalPlotter::KSignalPlotter( QWidget *parent)
QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
sizePolicy.setHeightForWidth(false);
setSizePolicy( sizePolicy );
#ifdef GRAPHICS_SIGNAL_PLOTTER
setFlag(QGraphicsItem::ItemClipsToShape);
#endif
}
KSignalPlotter::~KSignalPlotter()
@ -131,11 +107,7 @@ int KSignalPlotter::numBeams() const {
void KSignalPlotter::addSample( const QList<qreal>& sampleBuf )
{
d->addSample(sampleBuf);
#ifdef USE_SEPERATE_WIDGET
d->mGraphWidget->update();
#else
update(d->mPlottingArea);
#endif
}
void KSignalPlotter::reorderBeams( const QList<int>& newOrder )
{
@ -388,17 +360,11 @@ void KSignalPlotter::changeEvent ( QEvent * event )
break;
}
}
#ifdef GRAPHICS_SIGNAL_PLOTTER
void KGraphicsSignalPlotter::resizeEvent( QGraphicsSceneResizeEvent* event )
{
QRect boundingBox(QPoint(0,0), event->newSize().toSize());
int fontHeight = QFontMetrics(font()).height();
#else
void KSignalPlotter::resizeEvent( QResizeEvent* event )
{
QRect boundingBox(QPoint(0,0), event->size());
int fontHeight = fontMetrics().height();
#endif
if( d->mShowAxis && d->mAxisTextWidth != 0 && boundingBox.width() > (d->mAxisTextWidth*1.10+2) && boundingBox.height() > fontHeight ) { //if there's room to draw the labels, then draw them!
//We want to adjust the size of plotter bit inside so that the axis text aligns nicely at the top and bottom
//but we don't want to sacrifice too much of the available room, so don't use it if it will take more than 20% of the available space
@ -436,10 +402,8 @@ void KSignalPlotter::resizeEvent( QResizeEvent* event )
d->mScrollableImage = QPixmap();
#endif
#ifdef USE_SEPERATE_WIDGET
d->mGraphWidget->setVisible(true);
d->mGraphWidget->setGeometry(boundingBox);
#endif
d->updateDataBuffers();
}
@ -472,11 +436,9 @@ KSignalPlotterPrivate::KSignalPlotterPrivate(KSignalPlotter *q_ptr_) : q(q_ptr_)
mUnit = ki18n("%1");
mAxisTextOverlapsPlotter = false;
mActualAxisTextWidth = 0;
#ifdef USE_SEPERATE_WIDGET
mGraphWidget = new GraphWidget(q); ///< This is the widget that draws the actual graph
mGraphWidget->signalPlotterPrivate = this;
mGraphWidget->setVisible(false);
#endif
}
void KSignalPlotterPrivate::recalculateMaxMinValueForSample(const QList<qreal>&sampleBuf, int time )
@ -591,18 +553,12 @@ void KSignalPlotterPrivate::updateDataBuffers()
mMaxSamples = qMin((uint)(q->size().width() / mHorizontalScale + 4), NUM_SAMPLES_WHEN_INVISIBLE);
}
#ifdef GRAPHICS_SIGNAL_PLOTTER
void KGraphicsSignalPlotter::paint( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget)
{
Q_UNUSED(widget);
#else
void KSignalPlotter::paintEvent( QPaintEvent* event)
{
if (testAttribute(Qt::WA_PendingResizeEvent))
return; // lets not do this more than necessary, shall we?
QPainter p(this);
QPainter *painter = &p;
#endif
uint w = size().width();
uint h = size().height();
@ -610,36 +566,21 @@ void KSignalPlotter::paintEvent( QPaintEvent* event)
if ( w <= 2 || h <= 2 )
return;
#ifdef GRAPHICS_SIGNAL_PLOTTER
bool onlyDrawPlotter = option && d->mPlottingArea.contains(option->exposedRect.toRect());
#else
bool onlyDrawPlotter = event && d->mPlottingArea.contains(event->rect());
#endif
#ifdef USE_SEPERATE_WIDGET
if(onlyDrawPlotter)
return; //The painting will be handled entirely by GraphWidget::paintEvent
#endif
if(!onlyDrawPlotter && d->mShowThinFrame)
d->drawThinFrame(painter, d->mPlottingArea.adjusted(0,0,1,1)); //We have a 'frame' in the bottom and right - so subtract them from the view
#ifndef USE_SEPERATE_WIDGET
d->drawWidget(painter, d->mPlottingArea); //Draw the widget only if we don't have a GraphWidget to draw it for us
#endif
if(d->mShowAxis) {
#ifdef GRAPHICS_SIGNAL_PLOTTER
int fontheight = QFontMetrics(font()).height();
#else
int fontheight = fontMetrics().height();
#endif
if( d->mPlottingArea.height() > fontheight ) { //if there's room to draw the labels, then draw them!
d->drawAxisText(painter, QRect(0,0,w,h));
}
}
}
#ifdef USE_SEPERATE_WIDGET
void GraphWidget::paintEvent( QPaintEvent*)
{
if (testAttribute(Qt::WA_PendingResizeEvent))
@ -662,7 +603,7 @@ void GraphWidget::paintEvent( QPaintEvent*)
}
}
}
#endif
void KSignalPlotterPrivate::drawWidget(QPainter *p, const QRect &boundingBox)
{
#ifdef SVG_SUPPORT
@ -1123,33 +1064,13 @@ void KSignalPlotter::setFillOpacity(int fill)
}
#ifdef GRAPHICS_SIGNAL_PLOTTER
QPainterPath KGraphicsSignalPlotter::opaqueArea() const
{
return shape(); //The whole thing is opaque
}
QSizeF KGraphicsSignalPlotter::sizeHint( Qt::SizeHint which, const QSizeF & constraint ) const
{
Q_UNUSED(constraint);
if(which == Qt::PreferredSize)
return QSizeF(200,200);
return QGraphicsWidget::sizeHint(which, constraint);
}
#else
QSize KSignalPlotter::sizeHint() const
{
return QSize(200,200); //Just a random size which would usually look okay
}
#endif
#ifdef USE_SEPERATE_WIDGET
GraphWidget::GraphWidget(QWidget *parent) : QWidget(parent)
{
setAttribute(Qt::WA_NoSystemBackground);
setAttribute(Qt::WA_OpaquePaintEvent);
}
#endif
#undef KSignalPlotter
#undef KSignalPlotterPrivate

19
libs/ksysguard/signalplotter/ksignalplotter.h
View file

@ -22,24 +22,21 @@
#ifndef KSIGNALPLOTTER_H
#define KSIGNALPLOTTER_H
#include <QtCore/QList>
#include <QtCore/QString>
#include <QtGui/QColor>
#include <QtGui/QFont>
#include <QtGui/QWidget>
#include <QList>
#include <QString>
#include <QColor>
#include <QFont>
#include <QWidget>
#include <QPaintEvent>
#include <QResizeEvent>
#include <QGraphicsSceneResizeEvent>
#include <klocalizedstring.h>
#include <kcomponentdata.h>
#include <kdemacros.h>
#include <QPaintEvent>
#include <QResizeEvent>
#include <QGraphicsSceneResizeEvent>
class KSignalPlotterPrivate;
//Make sure only declare KLocalizedString once
#ifndef KGRAPHICSSIGNALPLOTTER_H
Q_DECLARE_METATYPE(KLocalizedString)
#endif
/** \class KSignalPlotter
* \brief The KSignalPlotter widget draws a real time graph of data that updates continually.

17
libs/ksysguard/signalplotter/ksignalplotter_p.h
View file

@ -19,17 +19,17 @@
*/
#ifndef KSIGNALPLOTTER_P_H
#define KSIGNALPLOTTER_P_H
//#define USE_QIMAGE
// SVG support causes it to crash at the moment :(
//#define SVG_SUPPORT
// Use a seperate child widget to draw the graph in
#ifndef GRAPHICS_SIGNAL_PLOTTER
#define USE_SEPERATE_WIDGET
#include <QWidget>
#include <QtGui/qevent.h>
#endif
#ifdef SVG_SUPPORT
namespace Plasma
@ -38,10 +38,7 @@ namespace Plasma
}
#endif
#ifdef USE_SEPERATE_WIDGET
class GraphWidget;
#endif
class KSignalPlotter;
class KSignalPlotterPrivate {
@ -64,9 +61,6 @@ public:
void rescale();
void updateDataBuffers();
void setupStyle();
#ifdef GRAPHICS_SIGNAL_PLOTTER
void themeChanged();
#endif
/** Return the given value as a string, with the given precision */
QString scaledValueAsString( qreal value, int precision) const;
@ -132,12 +126,9 @@ public:
bool mSmoothGraph; /// Whether to smooth the graph by averaging using the formula (value*2 + last_value)/3.
KSignalPlotter *q;
bool mAxisTextOverlapsPlotter; // Whether we need to redraw the axis text on every update
#ifdef USE_SEPERATE_WIDGET
GraphWidget *mGraphWidget; ///< This is the widget that draws the actual graph
#endif
};
#ifdef USE_SEPERATE_WIDGET
/* A class to draw the actual widget. This is used for the QWidget version of KSignalPlotter in order to speed up redraws */
class GraphWidget : public QWidget {
public:
@ -146,5 +137,5 @@ class GraphWidget : public QWidget {
KSignalPlotterPrivate *signalPlotterPrivate;
};
#endif
#endif // KSIGNALPLOTTER_P_H

13
libs/ksysguard/tests/CMakeLists.txt
View file

@ -2,29 +2,16 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_SOURCE_DIR}/../processcore/
${CMAKE_CURRENT_SOURCE_DIR}/../processui/ )
# Process unit test
kde4_add_test(ksysguard-processtest processtest.cpp)
target_link_libraries(ksysguard-processtest processui ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
# KSignalPlotter benchmark
set(signalplotterbenchmark_SRCS signalplotterbenchmark.cpp ../signalplotter/ksignalplotter.cpp)
kde4_add_test(ksysguard-signalplotterbenchmark ${signalplotterbenchmark_SRCS})
target_link_libraries(ksysguard-signalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY})
# KGraphicsSignalPlotter benchmark
set(graphicssignalplotterbenchmark_SRCS graphicssignalplotterbenchmark.cpp ../signalplotter/kgraphicssignalplotter.cpp)
kde4_add_test(ksysguard-graphicssignalplotterbenchmark ${graphicssignalplotterbenchmark_SRCS})
target_link_libraries(ksysguard-graphicssignalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY})
# KSignalPlotter unit test
set( signalplottertest_SRCS signalplottertest.cpp ../signalplotter/ksignalplotter.cpp)
kde4_add_test(ksysguard-signalplottertest ${signalplottertest_SRCS} )
target_link_libraries(ksysguard-signalplottertest ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY})

59
libs/ksysguard/tests/graphicssignalplotterbenchmark.cpp
View file

@ -1,59 +0,0 @@
#include "graphicssignalplotterbenchmark.h"
#include "../../../libs/ksysguard/signalplotter/kgraphicssignalplotter.h"
#include <qtest_kde.h>
#include <KRandom>
#include <QtTest>
#include <QGraphicsView>
#include <QGraphicsScene>
#include <limits>
void BenchmarkGraphicsSignalPlotter::init()
{
scene = new QGraphicsScene;
view = new QGraphicsView(scene);
s = new KGraphicsSignalPlotter;
scene->addItem(s);
}
void BenchmarkGraphicsSignalPlotter::cleanup()
{
delete view;
delete scene;
}
void BenchmarkGraphicsSignalPlotter::addData()
{
s->addBeam(Qt::blue);
s->addBeam(Qt::green);
s->addBeam(Qt::red);
s->addBeam(Qt::yellow);
s->resize(1000,500);
view->resize(1010,510);
view->show();
s->setMaxAxisTextWidth(5);
QTest::qWaitForWindowShown(view);
QBENCHMARK {
s->addSample(QList<qreal>() << KRandom::randomMax(10) << KRandom::randomMax(10) << KRandom::randomMax(10) << KRandom::randomMax(10));
qApp->processEvents();
}
}
void BenchmarkGraphicsSignalPlotter::addDataWhenHidden()
{
s->addBeam(Qt::blue);
s->addBeam(Qt::green);
s->addBeam(Qt::red);
s->addBeam(Qt::yellow);
QBENCHMARK {
s->addSample(QList<qreal>() << KRandom::randomMax(10) << KRandom::randomMax(10) << KRandom::randomMax(10) << KRandom::randomMax(10));
qApp->processEvents();
}
}
QTEST_KDEMAIN(BenchmarkGraphicsSignalPlotter, GUI)

22
libs/ksysguard/tests/graphicssignalplotterbenchmark.h
View file

@ -1,22 +0,0 @@
#include <QtTest>
#include <QtCore/qnamespace.h>
class KGraphicsSignalPlotter;
#include <QGraphicsView>
#include <QGraphicsScene>
class BenchmarkGraphicsSignalPlotter : public QObject
{
Q_OBJECT
private slots:
void init();
void cleanup();
void addData();
void addDataWhenHidden();
private:
KGraphicsSignalPlotter *s;
QGraphicsView *view;
QGraphicsScene *scene;
};