| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|
|
|
|
|
|
|
|
| |
Added new property for legend which defines whether the markers in
legend are shown in reverse order or not.
Task-number: QTRD-2512
Change-Id: Ia6e6551be74a183c9f544d7cb9fff679150f4d7e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
| |
The newly created box item should take the brush and pen from the series
only if they are not explicitly set for the box item already.
Task-number: QTRD-2624
Change-Id: Iafcb02c46b10be32bc155ff00a543803627e2591
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
When changing model for PieSeries, there can be situtations where the
slice no longer exists. Therefore we need to check if the slices exist
when hover event comes. Also we don't need to propagate the
mousePressEvent for PieSliceItem to parent because it's already handled.
Task-number: QTRD-2949
Change-Id: I7787b381834ec8932ef154fab47aefe651b9dfe5
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
| |
No need go through truncation if there's no legends to truncate.
Task-number: QTRD-2747
Change-Id: Ia56ea05dd0ad668ac87133b2da6ca83398f35932
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
| |
Setting scatter series border color and color fixed. Setting color
on top of default pen and brush resulted wrong behavior.
Task-number: QTRD-2644
Change-Id: I34c022d2e49d78b80d7e5f347af993442156a57c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
| |
When QChart::setAxis(QAbstractAxis*) was called without
QAbstractSeries* parameter crash occurred in
ChartDataSet::attachAxis(QAbstractSeries *,QAbstractAxis *).
Change-Id: Ibbef83f7e05ab2ffc80f86eff09a178ac1c018ea
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
| |
Charts versions defined in qcharsglobal.h were still having 1.3.0.
Change-Id: I6892a4cd7e5abd23d140d4e9baad8b96ed37be68
Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
| |
When there's just one legend item visible on a chart it needs to be
truncated also.
Task-number: QTRD-2747
Change-Id: Iae8d9c38ad3a0591c6dc224d743bdb581926420b
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
|
|
|
|
|
|
|
|
| |
Only define the NOMINMAX if it's not yet defined.
Task-number: QTRD-2575
Change-Id: I99cca858031c39d9503fb7ae726d74802c52236a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
| |
The top and bottom edges are checked more closely so that the label is
not hidden too early.
Task-number: QTRD-2530
Change-Id: I768b0afead636f4f6fadec596e4f0ce0c7d03cf1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
| |
Right click zooming fixed for non-visible rubber band cases.
Task-number: QTRD-2531
Change-Id: Icb008e4d14e171f7037f3679c31e1e059b5990cd
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
| |
Hide the pie slice label if it's not inside the bounding rectangle of
the parent item.
Task-number: QTRD-2530
Change-Id: Ifa09f7ee9e35c301f3abfd3ddab1ac3a4545af3e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
The legend items are hidden when the font is changed to avoid flashing
on update. The correct visibility is set for legend items when new
geometry is set for LegendLayout.
Task-number: QTRD-2523
Change-Id: If5907a1c4d7fa538a08d628c30972f2d0fa3ed84
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
| |
Hide the labels in category axis that would be drawn on top of other
labels.
Task-number: QTRD-2525
Change-Id: Ic66a6b501821bbb14636229096d86d38301cf8b6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
| |
The paths for qdocinc files and for images has been fixed so that
creating the documentation works also for Mac.
Task-number: QTRD-2492
Change-Id: Ibfefd06dfb4d85bbdb10b400aadda204ad50c21a
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
|
|
|
|
|
|
|
|
|
| |
Visibility attribute is not supported for Android X86. Therefore it's
removed for android.
Replace the slashes for declarative directories to copy files correctly.
Change-Id: I4be8a70cb7ef8f89040e455a61d27c2bb08d0a4d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
| |
Adjust the pie label truncation so that the label is not divided into
several rows, instead it's truncated correctly.
Task-number: QTRD-2522
Change-Id: I6c0de83b5d7eef8af3a7caaee62bb2f4b674def6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
There's a problem with Creator parsing the headers defined in Charts
src.pro. This will cause the Creator (3.0.0-beta) to crash when trying
to open charts.pro. As a workaround the headers are defined using new
variables for each function and unsetting the variables after each
rotation.
Task-number: QTRD-2480
Change-Id: Ia77428dab61fa9fa57ca5501ad27f8c3f514f017
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
The documentation structure is changed so that it can be generated with
both Qt5 and Qt4.
Also the erroneous VBarModelMapper is removed from VBoxPlotModelMapper
documentation.
Task-number: QTRD-2492, QTRD-2495
Change-Id: I45028915ca55f6ff1170db58518a8f08ac4158fb
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
place, if INSTALL_ROOT is used.
MAC: make install INSTALL_ROOT=<path_to_install_dir> failed, because install_name_tool expects the libraries
to be in wrong place.
Change-Id: I0025a0cb22b9c394694ece977053516c91028895
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
| |
QML documentation does not show obsolete properties correctly. Removed
the obsolete key and added a deprecated comment. Related typos fixed.
Change-Id: I86c862e4f587541df0a08363834ad13efc14e1b4
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
| |
The QML Custom Model demo has been removed, remove the reference from
documentation.
Task-number: QTRD-1928
Change-Id: I0f16cfd4aad0727c21455cdffa523498462269ad
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
| |
Missing ChartTheme added. Example picture fixed.
Change-Id: I51df1a31e424088f7f280198968697d1c7bc7f19
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
| |
Make sure previously set rotation is reset when the label position is
changed to outside.
Task-number: QTRD-2186
Change-Id: Ida0913748aa8a3313a7754878bec1b8c4c69659e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
| |
Fixed the visibility of pie slice label when it's change. Also fixed the
position of label when changed to horizontal.
Task-number: QTRD-2186
Change-Id: I5697be28a99c7c7844b59b7a7059d9a4e131747a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
| |
Added possibility to use HTML tags with the pie slice labels.
Task-number: QTRD-2186
Change-Id: I987cc1bde8fe367b7fcf2cee7037643ad93c3061
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
| |
Added new theme template ChartThemeQt. The colors are the ones
used in official Qt documentation.
Task-number: QTRD-1924
Change-Id: I2bb2d33b0198cad6275244d2e815908a2db033a3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
QGraphicsDropShadowEffect class can't be used when QT_NO_GRAPHICSEFFECT
is defined. Therefore the ChartBackground::setDropShadowEnabled() does
nothing with the aforementioned definition. Also the
ChartBackground::isDropShadowEnabled() method then always returns false.
Task-number: QTRD-2356
Change-Id: I0ef2cec082e8b0dc15756312da61ce773b8d405f
Reviewed-by: Karim Pinter <karim.pinter@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
No rubber band is set for the QChartView if QT_NO_RUBBERBAND is defined.
A warning will be fired in case one tries to set the rubber band and Qt
is configured without the it.
Task-number: QTRD-2240
Change-Id: I6259726077e39f143e317e1b1b13a1daa2a0c1e0
Reviewed-by: Karim Pinter <karim.pinter@digia.com>
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
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 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>
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: Id5a7dcef60d6c51c20984e872c2ce80f3aca6136
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
|