HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1055:ab3fbe16ea33

src/barchart/qbarseries.cpp +1 -2

                 m_categories(categories),
                 m_mapCategories(-1),
                 m_mapBarBottom(-1),
-                m_mapBarTop(-1),
+                m_mapBarTop(-1)
-                m_mapOrientation(Qt::Vertical)
             {
             }

src/barchart/qbarseries_p.h 0 -1

                 int m_mapCategories;
                 int m_mapBarBottom;
                 int m_mapBarTop;
-                Qt::Orientation m_mapOrientation;
             private:
                 Q_DECLARE_PUBLIC(QBarSeries)
             };

src/piechart/qpieseries.cpp +1 -2

                 m_pieEndAngle(360),
                 m_sum(0),
                 m_mapValues(0),
-                m_mapLabels(0),
+                m_mapLabels(0)
-                m_mapOrientation(Qt::Vertical)
             {
             }

src/piechart/qpieseries_p.h 0 -1

                 // model map
                 int m_mapValues;
                 int m_mapLabels;
-                Qt::Orientation m_mapOrientation;
             private:
                 friend class QLegendPrivate;

src/qabstractseries.cpp +8 -1

             {
                 return d_ptr->m_mapFirst;
             }
             int QAbstractSeries::mapCount() const
             {
                 return d_ptr->m_mapCount;
             }
+            int QAbstractSeries::mapOrientation() const
+            {
+                return d_ptr->m_mapOrientation;
+            }
             void QAbstractSeries::setName(const QString& name)
             {
                 d_ptr->m_name = name;
                 q_ptr(q),
                 m_model(0),
                 m_mapFirst(0),
-                m_mapCount(-1)
+                m_mapCount(-1),
+                m_mapOrientation(Qt::Vertical)
             {
             }

src/qabstractseries.h +1 0

                 QAbstractItemModel* model() const;
                 int mapFirst() const;
                 int mapCount() const;
+                int mapOrientation() const;
                 void setName(const QString& name);
                 QString name() const;

src/qabstractseries_p.h +1 0

                 QAbstractItemModel *m_model;
                 int m_mapFirst;
                 int m_mapCount;
+                Qt::Orientation m_mapOrientation;
                 QString m_name;
                 friend class QAbstractSeries;

src/xychart/qxyseries.cpp 0 -1

             QXYSeriesPrivate::QXYSeriesPrivate(QXYSeries *q) : QAbstractSeriesPrivate(q),
                 m_mapX(-1),
                 m_mapY(-1),
-                m_mapOrientation( Qt::Vertical),
                 m_pointsVisible(false)
             {
             }

src/xychart/qxyseries_p.h 0 -1

                 int m_mapX;
                 int m_mapY;
-                Qt::Orientation m_mapOrientation;
                 bool m_pointsVisible;
             private:

src/xychart/xychartitem.cpp +62 0

@@ -25,6 +25,7
25	#include "chartanimator_p.h"	25	#include "chartanimator_p.h"
26	#include <QPainter>	26	#include <QPainter>
27	#include <QGraphicsSceneMouseEvent>	27	#include <QGraphicsSceneMouseEvent>
		28	#include <QAbstractItemModel>
28		29
29		30
30	QTCOMMERCIALCHART_BEGIN_NAMESPACE	31	QTCOMMERCIALCHART_BEGIN_NAMESPACE
@@ -189,6 +190,67 void XYChartItem::handlePointsRemoved(int start, int end)
189	{	190	{
190	Q_UNUSED(start)	191	Q_UNUSED(start)
191	Q_UNUSED(end)	192	Q_UNUSED(end)
		193	if (m_series->model() == 0) {
		194	for (int i = end; i >= start; i--)
		195	handlePointRemoved(i);
		196	} else {
		197	// series uses model as a data source
		198	int first = m_series->mapFirst();
		199	int count = m_series->mapCount();
		200	int removedCount = end - start + 1;
		201	if (count != -1 && start >= first + count) {
		202	return;
		203	}
		204
		205	// removing items from unlimited map
		206	else if (count == -1 && start >= first) {
		207	for (int i = end; i >= start; i--)
		208	handlePointRemoved(i - first);
		209	} else if (count == - 1 && start < first) {
		210	// not all removed items
		211	for (int i = first + removedCount - 1; i >= first; i--)
		212	handlePointRemoved(i - first);
		213	}
		214
		215	// removing items from limited map
		216	else if (start >= first) {
		217	//
		218	int lastExisting = qMin(first + m_points.size() - 1, end);
		219	for (int i = lastExisting; i >= start; i--) {
		220	handlePointRemoved(i - first);
		221	}
		222
		223	// the map is limited, so after removing the items some new items may have fall into the map
		224	int itemsAvailable;
		225	if (m_series->mapOrientation() == Qt::Vertical)
		226	itemsAvailable = m_series->model()->rowCount() - first - m_points.size();
		227	else
		228	itemsAvailable = m_series->model()->columnCount() - first - m_points.size();
		229	int toBeAdded = qMin(itemsAvailable, count - m_points.size());
		230	int currentSize = m_points.size();
		231	if (itemsAvailable > 0)
		232	for (int i = m_points.size(); i < currentSize + toBeAdded; i++)
		233	handlePointAdded(i);
		234	} else {
		235	// TODO:
		236	int toRemove = qMin(m_points.size() - 1, removedCount);
		237	for (int i = first; i < first + toRemove; i++)
		238	handlePointRemoved(0);
		239
		240	// the map is limited, so after removing the items some new items may have fall into the map
		241	int itemsAvailable;
		242	if (m_series->mapOrientation() == Qt::Vertical)
		243	itemsAvailable = m_series->model()->rowCount() - first - m_points.size();
		244	else
		245	itemsAvailable = m_series->model()->columnCount() - first - m_points.size();
		246	int toBeAdded = qMin(itemsAvailable, count - m_points.size());
		247	int currentSize = m_points.size();
		248	if (itemsAvailable > 0)
		249	for (int i = m_points.size(); i < currentSize + toBeAdded; i++)
		250	handlePointAdded(i);
		251	}
		252	}
		253
192	}	254	}
193		255
194	void XYChartItem::handlePointReplaced(int index)	256	void XYChartItem::handlePointReplaced(int index)

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages