HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1662:1cbf106b76f3

category axis initialization

sauimone -

r1662:1cbf106b76f3

parent child

Context file:

r1662:1cbf106b76f3

Collapse all files

src/axis/qbarcategoriesaxis.cpp +51 -20

                 Q_D(QBarCategoriesAxis);
                 if (d->m_categories.isEmpty()) {
-                	d->m_categories.append(categories);
+                    d->m_categories.append(categories);
-                	setRange(categories.first(),categories.last());
+                    setRange(categories.first(),categories.last());
                 }else{
-                	d->m_categories.append(categories);
+                    d->m_categories.append(categories);
                 }
                 emit d->updated();
                 emit categoriesChanged();
             */
             void QBarCategoriesAxis::append(const QString &category)
             {
-            	Q_D(QBarCategoriesAxis);
+                Q_D(QBarCategoriesAxis);
-            	if (d->m_categories.isEmpty()) {
+                if (d->m_categories.isEmpty()) {
-            		d->m_categories.append(category);
+                    d->m_categories.append(category);
-            		setRange(category,category);
+                    setRange(category,category);
-            	}else{
+                }else{
-            		d->m_categories.append(category);
+                    d->m_categories.append(category);
+                }
-            	emit d->updated();
+                emit d->updated();
-            	emit categoriesChanged();
+                emit categoriesChanged();
             }
             /*!
             {
                 Q_D(QBarCategoriesAxis);
                 if (d->m_categories.isEmpty()) {
-                	d->m_categories.insert(index,category);
+                    d->m_categories.insert(index,category);
-                	setRange(category,category);
+                    setRange(category,category);
                 }else{
                     d->m_categories.insert(index,category);
                 }
                 bool changed = false;
                 if (!qFuzzyIsNull(d->m_min - (minIndex))||d->m_minCategory!=minCategory) {
-                	d->m_minCategory = minCategory;
+                    d->m_minCategory = minCategory;
                     d->m_min = minIndex;
                     emit minChanged(minCategory);
                     changed = true;
             void QBarCategoriesAxisPrivate::handleAxisRangeChanged(qreal min, qreal max,int count)
             {
+                Q_Q(QBarCategoriesAxis);
+                Q_UNUSED(count);
                 m_min = min;
                 m_max = max;
-                m_ticksCount = count;
+                int minIndex = qFloor(min);
-                //TODO:
+                int maxIndex = qFloor(max);
+                if (minIndex < 0) {
+                    minIndex = 0;
+                }
+                if (maxIndex > m_categories.count()-1){
+                    maxIndex = m_categories.count()-1;
+                }
+                bool changed = false;
+                if (m_minCategory != m_categories.at(minIndex)) {
+                    m_minCategory = m_categories.at(minIndex);
+                    emit q->minChanged(m_minCategory);
+                    changed = true;
+                }
+                if (m_maxCategory != m_categories.at(maxIndex)) {
+                    m_maxCategory = m_categories.at(maxIndex);
+                    emit q->maxChanged(m_maxCategory);
+                    changed = true;
+                }
+                if (changed) {
+                    emit q->rangeChanged(m_minCategory, m_maxCategory);
+                }
             }
             ChartAxis* QBarCategoriesAxisPrivate::createGraphics(ChartPresenter* presenter)
             void QBarCategoriesAxisPrivate::emitRange()
             {
-            	emit changed(m_min -0.5, m_max +0.5, qCeil(m_max + 0.5) -qCeil(m_min - 0.5) +1, false);
+                emit changed(m_min -0.5, m_max +0.5, qCeil(m_max + 0.5) -qCeil(m_min - 0.5) +1, false);
             }
             void QBarCategoriesAxisPrivate::initialize(Domain* domain)
             {
-                Q_UNUSED(domain);
+                if (qFuzzyCompare(m_max, m_min)) {
-                //TODO:
+                    if(m_orientation==Qt::Vertical){
+                        handleAxisRangeChanged(domain->minY(),domain->maxY(),domain->tickXCount());
+                    }else{
+                        handleAxisRangeChanged(domain->minX(),domain->maxX(),domain->tickYCount());
+                    }
+                }
             }
             #include "moc_qbarcategoriesaxis.cpp"

src/axis/qvaluesaxis.cpp +1 -1

             void QValuesAxisPrivate::initialize(Domain* domain)
             {
-                if(m_max==m_min){
+                if(qFuzzyCompare(m_max,m_min)) {
                     if(m_orientation==Qt::Vertical){
                         handleAxisRangeChanged(domain->minY(),domain->maxY(),domain->tickXCount());
                     }else{

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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