The .gitattributes, .gitignore, .commit-template files do not need to be
present in packaged sources, as they are for people using the Git
repository. People who download tarballs usually don't reimport into
Git -- they should just download the actual repositories.
Meanwhile, the .tag file is quite useful. Instead of making Git extract
to the useless SHA-1 of the "$Id$\n" string, ask git-archive to store
the SHA-1 of the commit being packaged.
Also removing 'tests' and 'tools' directories from the source package.
Change-Id: I6823bad4ee4a5a666532e972a66da075856d5fee
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
If QT_NO_TEXTSTREAM is defined the operator<< can't be used. It's safe
to flag out the streaming operator debug information because the
function itself can't be used when QT_NO_TEXTSTREAM is defined.
Task-number: QTRD-2336
Change-Id: I2d64f4dd03bf65e7ae0e07f4916f245bc71a7458
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Remove the qmlcustommodel also from demos.pro
Task-number: QTRD-1928
Change-Id: Ifd0764ff2381452054005743935910dee2451520
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Qml Custom Model demo removed for now. If there's need for similar demo
in the future a better one should be created.
Task-number: QTRD-1928
Change-Id: I1766dfca4e2a7358f47c40f0e0b7258768c16b22
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Legend marker items that are on a legend which is positioned on the top
or on the bottom of a chart are truncated to fit the space available.
The truncation starts at the longest legend marker item.
Task-number: QTRD-2092
Change-Id: I22581b4447591fda11adab3873553cd5ee3dc001
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
The Windef.h (included by Windows.h) defines min and max macros. These
conflict with QBarCategoryAxis::min() and max() functions. Defining
NOMINMAX suppresses the min and max definitions in Windef.h.
Task-number: QTRD-2285
Change-Id: Iff797f8c3ff00a582e600db281f0f79930d7b49a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Debug information is drawn with a gray pen so that it can be seen with
all current chart themes.
Task-number: QTRD-2326
Change-Id: I32da226e5ae834ff9b3088ef5fac72e85610508f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
QAbstractAxis::AxisType enum values are currently sequential so it's not
possible to OR them correctly. Therefore createDefaultAxes() needs to
check whether there are series with different types present. For
multiple series types the QAbstractAxis::AxisTypeNoAxis type is used to
indicate the need for several axes.
The createDefaultAxis() methods have been corrected to return proper
values.
Task-number: QTRD-1999
Change-Id: I3408bd3043b147f9e2b7662fb4d9ca43e7a72da6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
The sine and the square root methods in demos and examples have been
replaced with the ones provided by Qt. This ensures that the code
compiles also on Solaris.
Task-number: QTRD-2262
Change-Id: I776341bac0e623f803b4cad771a02cefc6db1b15
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Milla Pohjanheimo <milla.pohjanheimo@digia.com>
The ScatterChart Example is modified so that it shows how to use an
image as a brush for scatter series. The image is a star and it's
created using QPainterPath.
Task-number: QTRD-2078
Change-Id: Ie92ad56efafaf12af2efe4424be63060f812f9e2
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
For logarithmic axis the geometry point is set even if the point value
is zero or negative. For zero and negative values the x-point is set to
zero and the y-point is set to chart height. This way the bar chart
items can ignore the return value from calculateGeometryPoint() method
and not draw the bar for a value that does not have logarithm defined.
Task-number: QTRD-2065
Change-Id: I7ba4efed6a0678eb487377e3e88bdee9c849a9a3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
The mousePressEvent handles the event differently for rubber band only
if the mouse press occurs on the plot area. This way pressing the mouse
outside plot area will handle the event according to the pressed item
(like legend marker). For the same reason the mouseRelease event handles
the event differently for rubber band only if the rubber band is
displayed.
Task-number: QTRD-2260
Change-Id: Ibedcd2d13a7c2229352074a4df326cd73e9cf80f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
The axis title text needs to be set in the ChartAxisElement only if the
new title is empty or the title is hidden. In other cases the title will
be set in updateGeometry() of the axis.
Removed redundancy of setting title information. The title information
needs to be set only once when creating items for axis.
Task-number: QTRD-2104
Change-Id: Ie29c94215bdbab412a3dbb8368309abbd15aa4d1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
For multiline texts the alignment can be set in the following way:
- title:
axisY->setTitleText("<p align=\"center\">Sunspots<br\>count<p\>");
- label format:
axisX->setFormat("<p align=\"right\">dd-MM-yyyy<br\>h:mm</p>");
Task-number: QTRD-2058
Change-Id: Ic7afd29ed3b1f9d1cd2f424888196ce743acd8eb
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
The 'nomake_demos_examples' value can be used with CONFIG variable when
running qmake for charts in order to build Charts without demos and
examples.
Task-number: QTRD-2234
Change-Id: I88a76b168db3b045cd26081a439c3a656ae3a6e6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
New geometry for the ChartPresenter is calculated only when the chart is
visible. The geometry is set for the layout always.
If the visibility of a series changes then the layout of the legend is
only invalidated in case the chart is visible. This removes unnecessary
delay of the legend drawing when the chart is set visible.
Task-number: QTRD-2064
Change-Id: I78e6da3b859af9becf4f5059e9c02981c79f6d64
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Long labels are truncated vertically and horizontally so that they fit
into the space available. There's no need to hide the labels explicitly
as they are already truncated to the space available.
The truncatedText() method now takes into account also the height of
the space available.
Task-number: QTRD-1929
Change-Id: Ibe2b996e514ddb44c96ce040fc729a605d24c8ab
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
The bounding rect has to fit inside int limits when zooming in, meaning
that the height and width both have to be within the int limits
(INT_MAX). QWidget::update() uses a region (based on bounding rect)
that has to be compatible with QRect. The geometry change is only done
if the bounding rect fulfills this requirement.
Task-number: QTRD-1907
Change-Id: I4e874de355390c5fc983ac1e0976bf0d21e2d10c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Hiding the legend items makes it impossible to print the chart with the
legend when the chart is not shown. There's no need to hide the legend
itmes before invalidating the layout.
Task-number: QTRD-2164
Change-Id: Idad23eead869bf2f54328d35c5137326ac895c15
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
It's checked that the upper series is set for the AreaChartItem before
usint the series.
Task-number: QTRD-1808
Change-Id: Ied59991b355525f7b203625851c81aa2b9935ec6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Added hovered signal for bar charts including the hovered bar inside the
set. The hovered bar is identified by the index.
Documentation and tests are updated accordingly.
Task-number: QTRD-2161
Change-Id: I96c9d86975441274a697dec794b22e906fb44243
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
OpenGL was unnecessarily added to the project. This caused the build to
fail for VxWorks. The 'opengl' is removed from the project.
Task-number: QTRD-2159
Change-Id: Ic330f7e65661affd024c5204ae425812aea42c41
Reviewed-by: Karim Pinter <karim.pinter@digia.com>
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
The bar series are not updated while the theme is initialized. The
update will be done after the theme is ready. This reduces the time
spent to initialize the theme from seconds to milliseconds.
Task-number: QTRD-2163
Change-Id: Ie111d8b42e017d0a514ca773bc8a714295d1eaa2
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
The axis is set so that previously attached axes are deleted.
Task-number: QTRD-1936
Change-Id: I4fc486b3f2552eea168ba5fb44c1b82f1c5ebad0
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
The text rectangle for a label in a pie chart is adjusted so that it
fits into the chart. The text is also truncated if there's not enough
space for a label when the label is positioned outside the slice.
Task-number: QTRD-1929
Change-Id: I86b722fbb0c8f7047bca8611b88871a8f7464ec1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
No explicit initialization resulted in this sometimes
initializing to true, which caused chart to never draw
in multithreaded rendering environments (linux/mac)
Change-Id: I5c9a4eb54c0a4aef7c1df171aa04d4b8c4c7fe05
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Also fixes the vertical axis title truncation issue.
Change-Id: I3436705719946118e7c06dcf0fd2a1ada880e200
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Related to this, also increase size of qmlpolarchart demo.
Change-Id: Ic8d88bcdc69607dcee813fe650219e2286ae7092
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Removed "QCharts" from the image and added "Qt Charts" as text
below it. Easier to maintain when the text is not part of the image.
Change-Id: I5410e61ef4d16271c777f5206a549643de588990
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Also fix bounding rect to get rid of some pen width related
drawing artifacts.
Change-Id: Ib498545cecd497d845031a3ccba572a9cba8e91d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
It looked like the signal was connected to wrong slot. Probably copy&paste
bug.
Change-Id: Ie4887970891f3b902b71fb0b686c4adbbc1d48b1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
No need to bring these back after release, tasks were created in
JIRA for relevant TODOs.
Change-Id: I4cf5fb09276ee720000329b9ac2a48021cfe0830
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
ChartAxisElement::setGeometry(QRectF, QRectF) hided virtual function with
the same name from QGraphicsLayoutItem. Causes around 400 warnings.
Change-Id: I4474e4879058e2b785e72897ed47dea0f2b24cd1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Sergio Ahumada
Titta Heikkala
Nico Vertriest
Miikka Heikkinen
Mika Salmela