HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2721:cc2d0eaf2462

Fix shades for log and category axes....

Miikka Heikkinen -

r2721:cc2d0eaf2462

parent child

Context file:

r2721:cc2d0eaf2462

Collapse all files

src/charts/axis/cartesianchartaxis.cpp +6 -3

                         QGraphicsLineItem *item = new QGraphicsLineItem(this);
                         item->setPen(axis()->gridLinePen());
                         gridGroup()->addToGroup(item);
+                        QGraphicsRectItem *shades = new QGraphicsRectItem(this);
+                        shades->setPen(axis()->shadesPen());
+                        shades->setBrush(axis()->shadesBrush());
+                        shadeGroup()->addToGroup(shades);
                     }
                 }
                     gridGroup()->addToGroup(grid);
                     labelGroup()->addToGroup(label);
-                    if ((gridItems().size()) % 2 && gridItems().size() > 2) {
+                    if (gridItems().size() == 1 || (((gridItems().size() + 1) % 2) && gridItems().size() > 0)) {
                         QGraphicsRectItem *shades = new QGraphicsRectItem(this);
                         shades->setPen(axis()->shadesPen());
                         shades->setBrush(axis()->shadesBrush());
                         shadeGroup()->addToGroup(shades);
                     }
                 }
             }
             void CartesianChartAxis::deleteItems(int count)
                 QList<QGraphicsItem *> axis = arrowItems();
                 for (int i = 0; i < count; ++i) {
-                    if (lines.size() % 2 && lines.size() > 1)
+                    if (lines.size() == 1 || (((lines.size() + 1) % 2) && lines.size() > 0))
                         delete(shades.takeLast());
                     delete(lines.takeLast());
                     delete(labels.takeLast());

src/charts/axis/horizontalaxis.cpp +23 -8

@@ -161,15 +161,30 void HorizontalAxis::updateGeometry()
161	}	161	}
162		162
163	//shades	163	//shades
164	if ((i + 1) % 2 && i > 1) {	164	QGraphicsRectItem *shadeItem = 0;
165	QGraphicsRectItem rectItem = static_cast<QGraphicsRectItem >(shades.at(i / 2 - 1));	165	if (i == 0)
166	qreal leftBound = qMax(layout[i - 1], gridRect.left());	166	shadeItem = static_cast<QGraphicsRectItem *>(shades.at(0));
167	qreal rightBound = qMin(layout[i], gridRect.right());	167	else if (i % 2)
168	rectItem->setRect(leftBound, gridRect.top(), rightBound - leftBound, gridRect.height());	168	shadeItem = static_cast<QGraphicsRectItem *>(shades.at((i / 2) + 1));
169	if (rectItem->rect().width() <= 0.0)	169	if (shadeItem) {
170	rectItem->setVisible(false);	170	qreal leftBound;
		171	qreal rightBound;
		172	if (i == 0) {
		173	leftBound = gridRect.left();
		174	rightBound = layout[0];
		175	} else {
		176	leftBound = layout[i];
		177	if (i == layout.size() - 1)
		178	rightBound = gridRect.right();
		179	else
		180	rightBound = qMin(layout[i + 1], gridRect.right());
		181	}
		182	shadeItem->setRect(leftBound, gridRect.top(), rightBound - leftBound,
		183	gridRect.height());
		184	if (shadeItem->rect().width() <= 0.0)
		185	shadeItem->setVisible(false);
171	else	186	else
172	~~rect~~Item->setVisible(true);	187	shadeItem->setVisible(true);
173	}	188	}
174		189
175	// check if the grid line and the axis tick should be shown	190	// check if the grid line and the axis tick should be shown

src/charts/axis/verticalaxis.cpp +24 -8

@@ -165,15 +165,31 void VerticalAxis::updateGeometry()
165	}	165	}
166		166
167	//shades	167	//shades
168	if ((i + 1) % 2 && i > 1) {	168	QGraphicsRectItem *shadeItem = 0;
169	QGraphicsRectItem rectItem = static_cast<QGraphicsRectItem >(shades.at(i / 2 - 1));	169	if (i == 0)
170	qreal lowerBound = qMin(layout[i - 1], gridRect.bottom());	170	shadeItem = static_cast<QGraphicsRectItem *>(shades.at(0));
171	qreal upperBound = qMax(layout[i], gridRect.top());	171	else if (i % 2)
172	rectItem->setRect(gridRect.left(), upperBound, gridRect.width(), lowerBound - upperBound);	172	shadeItem = static_cast<QGraphicsRectItem *>(shades.at((i / 2) + 1));
173	if (rectItem->rect().height() <= 0.0)	173	if (shadeItem) {
174	rectItem->setVisible(false);	174	qreal lowerBound;
		175	qreal upperBound;
		176	if (i == 0) {
		177	lowerBound = gridRect.bottom();
		178	upperBound = layout[0];
		179	} else {
		180	lowerBound = layout[i];
		181	if (i == layout.size() - 1)
		182	upperBound = gridRect.top();
		183	else
		184	upperBound = qMax(layout[i + 1], gridRect.top());
		185
		186	}
		187	shadeItem->setRect(gridRect.left(), upperBound, gridRect.width(),
		188	lowerBound - upperBound);
		189	if (shadeItem->rect().height() <= 0.0)
		190	shadeItem->setVisible(false);
175	else	191	else
176	~~rect~~Item->setVisible(true);	192	shadeItem->setVisible(true);
177	}	193	}
178		194
179	// check if the grid line and the axis tick should be shown	195	// check if the grid line and the axis tick should be shown

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