qwt.h   qwt.h 
skipping to change at line 20 skipping to change at line 20
#ifndef QWT_H #ifndef QWT_H
#define QWT_H #define QWT_H
#include "qwt_global.h" #include "qwt_global.h"
/*! /*!
Some constants for use within Qwt. Some constants for use within Qwt.
*/ */
namespace Qwt namespace Qwt
{ {
}; }
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 qwt_global.h   qwt_global.h 
skipping to change at line 17 skipping to change at line 17
* modify it under the terms of the Qwt License, Version 1.0 * modify it under the terms of the Qwt License, Version 1.0
************************************************************************** ***/ ************************************************************************** ***/
#ifndef QWT_GLOBAL_H #ifndef QWT_GLOBAL_H
#define QWT_GLOBAL_H #define QWT_GLOBAL_H
#include <qglobal.h> #include <qglobal.h>
// QWT_VERSION is (major << 16) + (minor << 8) + patch. // QWT_VERSION is (major << 16) + (minor << 8) + patch.
#define QWT_VERSION 0x060100 #define QWT_VERSION 0x060101
#define QWT_VERSION_STR "6.1.0" #define QWT_VERSION_STR "6.1.1"
#if defined(_MSC_VER) /* MSVC Compiler */ #if defined(_MSC_VER) /* MSVC Compiler */
/* template-class specialization 'identifier' is already instantiated */ /* template-class specialization 'identifier' is already instantiated */
#pragma warning(disable: 4660) #pragma warning(disable: 4660)
/* inherits via dominance */ /* inherits via dominance */
#pragma warning(disable: 4250) #pragma warning(disable: 4250)
#endif // _MSC_VER #endif // _MSC_VER
#ifdef QWT_DLL #ifdef QWT_DLL
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 qwt_graphic.h   qwt_graphic.h 
skipping to change at line 26 skipping to change at line 26
#include <qimage.h> #include <qimage.h>
#include <qpixmap.h> #include <qpixmap.h>
class QwtPainterCommand; class QwtPainterCommand;
/*! /*!
\brief A paint device for scalable graphics \brief A paint device for scalable graphics
QwtGraphic is the representation of a graphic that is tailored for QwtGraphic is the representation of a graphic that is tailored for
scalability. Like QPicture it will be initialized by QPainter scalability. Like QPicture it will be initialized by QPainter
operations and replayed later to any target paint device. operations and can be replayed later to any target paint device.
While the usual image representations QImage and QPixmap are not While the usual image representations QImage and QPixmap are not
scalable Qt offers two paint devices, that might be candidates scalable Qt offers two paint devices, that might be candidates
for representing a vector graphic: for representing a vector graphic:
- QPicture\n - QPicture\n
Unfortunately QPicture had been forgotten, when Qt4 Unfortunately QPicture had been forgotten, when Qt4
introduced floating point based render engines. Its API introduced floating point based render engines. Its API
is still on integers, what make it unusable for proper scaling. is still on integers, what make it unusable for proper scaling.
- QSvgRenderer/QSvgGenerator\n - QSvgRenderer/QSvgGenerator\n
Unfortunately QSvgRenderer hides to much information about Unfortunately QSvgRenderer hides to much information about
its nodes in internal APIs, that are necessary proper its nodes in internal APIs, that are necessary for proper
layout calculations. Also it is derived from QObject and layout calculations. Also it is derived from QObject and
can't be copied like QImage/QPixmap. can't be copied like QImage/QPixmap.
Also QSvgRenderer/QSvgGenerator are no complete SVG implementations
with a questionable future in Qt 5.
QwtGraphic maps all scalable drawing primitives to a QPainterPath QwtGraphic maps all scalable drawing primitives to a QPainterPath
and stores them together with the painter state changes and stores them together with the painter state changes
( pen, brush, transformation ... ) in a list of QwtPaintCommands. ( pen, brush, transformation ... ) in a list of QwtPaintCommands.
For being a complete QPaintDevice it also stores pixmaps or images, For being a complete QPaintDevice it also stores pixmaps or images,
what is somehow against the idea of the class, because these objects what is somehow against the idea of the class, because these objects
can be scaled without a loss in quality. can't be scaled without a loss in quality.
The main issue about scaling a QwtGraphic object are the pens used for The main issue about scaling a QwtGraphic object are the pens used for
drawing the outlines of the painter paths. While non cosmetic pens drawing the outlines of the painter paths. While non cosmetic pens
( QPen::isCosmetic() ) are scaled with the same ratio as the path, ( QPen::isCosmetic() ) are scaled with the same ratio as the path,
cosmetic pens have a fixed width. A graphic might have paths with cosmetic pens have a fixed width. A graphic might have paths with
different pens - cosmetic and non-cosmetic. different pens - cosmetic and non-cosmetic.
QwtGraphic caches 2 different rectangles: QwtGraphic caches 2 different rectangles:
- control point rectangle\n - control point rectangle\n
skipping to change at line 86 skipping to change at line 84
class QWT_EXPORT QwtGraphic: public QwtNullPaintDevice class QWT_EXPORT QwtGraphic: public QwtNullPaintDevice
{ {
public: public:
/*! /*!
Hint how to render a graphic Hint how to render a graphic
\sa setRenderHint(), testRenderHint() \sa setRenderHint(), testRenderHint()
*/ */
enum RenderHint enum RenderHint
{ {
/*! /*!
When RenderPensUnscaled is set non cosmetic pens are When rendering a QwtGraphic a specific scaling between
painted unscaled - like cosmetic pens. The difference to the controlPointRect() and the coordinates of the target rectang
using cosmetic pens is, when the graphic is rendered le
to a document in a scalable vector format ( PDF, SVG ): is set up internally in render().
the width of non cosmetic pens will be scaled by the
document viewer. When RenderPensUnscaled is set this specific scaling is applied
for the control points only, but not for the pens.
All other painter transformations ( set up by application code )
are supposed to work like usual.
\sa render();
*/ */
RenderPensUnscaled = 0x1 RenderPensUnscaled = 0x1
}; };
/*! /*!
\brief Render hints \brief Render hints
The default setting is to disable all hints The default setting is to disable all hints
*/ */
typedef QFlags<RenderHint> RenderHints; typedef QFlags<RenderHint> RenderHints;
 End of changes. 5 change blocks. 
11 lines changed or deleted 14 lines changed or added


 qwt_plot_abstract_barchart.h   qwt_plot_abstract_barchart.h 
skipping to change at line 37 skipping to change at line 37
public: public:
/*! /*!
\brief Mode how to calculate the bar width \brief Mode how to calculate the bar width
setLayoutPolicy(), setLayoutHint(), barWidthHint() setLayoutPolicy(), setLayoutHint(), barWidthHint()
*/ */
enum LayoutPolicy enum LayoutPolicy
{ {
/*! /*!
The sample width is calculated by dividing the bounding rectangle The sample width is calculated by dividing the bounding rectangle
by the number of samples. by the number of samples. The layoutHint() is used as a minimum w
idth
in paint device coordinates.
\sa boundingRectangle() \sa boundingRectangle()
\note The layoutHint() is ignored
*/ */
AutoAdjustSamples, AutoAdjustSamples,
/*! /*!
layoutHint() defines an interval in axis coordinates layoutHint() defines an interval in axis coordinates
*/ */
ScaleSamplesToAxes, ScaleSamplesToAxes,
/*! /*!
The bar width is calculated by multiplying layoutHint() The bar width is calculated by multiplying layoutHint()
 End of changes. 2 change blocks. 
2 lines changed or deleted 3 lines changed or added


 qwt_plot_multi_barchart.h   qwt_plot_multi_barchart.h 
/* -*- mode: C++ ; c-file-style: "stroustrup" -*- ************************* **** /* -*- mode: C++ ; c-file-style: "stroustrup" -*- ************************* ****
* Qwt Widget Library * Qwt Widget Library
* Copyright (C) 1997 Josef Wilgen * Copyright (C) 1997 Josef Wilgen
* Copyright (C) 2002 Uwe Rathmann * Copyright (C) 2002 Uwe Rathmann
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the Qwt License, Version 1.0 * modify it under the terms of the Qwt License, Version 1.0
************************************************************************** ***/ ************************************************************************** ***/
#ifndef QWT_PLOT_BAR_CHART_H #ifndef QWT_PLOT_MULTI_BAR_CHART_H
#define QWT_PLOT_BAR_CHART_H #define QWT_PLOT_MULTI_BAR_CHART_H
#include "qwt_global.h" #include "qwt_global.h"
#include "qwt_plot_abstract_barchart.h" #include "qwt_plot_abstract_barchart.h"
#include "qwt_series_data.h" #include "qwt_series_data.h"
class QwtColumnRect; class QwtColumnRect;
class QwtColumnSymbol; class QwtColumnSymbol;
/*! /*!
\brief QwtPlotMultiBarChart displays a series of a samples that consist \brief QwtPlotMultiBarChart displays a series of a samples that consist
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/