##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

minor code review fixes
sauimone -
r759:ea8e9f62638e
parent child
Show More
Show file before | Show file after | Hide comments
@@ -10,7 +10,7 static int label_padding = 5;
10 10
11 11 QTCOMMERCIALCHART_BEGIN_NAMESPACE
12 12
13 Axis::Axis(QChartAxis* axis,ChartPresenter* presenter,AxisType type) : Chart(presenter),
13 Axis::Axis(QChartAxis *axis,ChartPresenter *presenter,AxisType type) : Chart(presenter),
14 14 m_chartAxis(axis),
15 15 m_type(type),
16 16 m_labelsAngle(0),
@@ -42,13 +42,13 Axis::~Axis()
42 42 void Axis::createItems(int count)
43 43 {
44 44
45 if (m_axis.children().size()==0)
45 if (m_axis.children().size() == 0)
46 46 m_axis.addToGroup(new AxisItem(this));
47 47 for (int i = 0; i < count; ++i) {
48 48 m_grid.addToGroup(new QGraphicsLineItem());
49 49 m_labels.addToGroup(new QGraphicsSimpleTextItem());
50 50 m_axis.addToGroup(new QGraphicsLineItem());
51 if((m_grid.childItems().size())%2 && m_grid.childItems().size()>2) m_shades.addToGroup(new QGraphicsRectItem());
51 if ((m_grid.childItems().size())%2 && m_grid.childItems().size()>2) m_shades.addToGroup(new QGraphicsRectItem());
52 52 }
53 53 }
54 54
@@ -67,7 +67,7 void Axis::deleteItems(int count)
67 67 }
68 68 }
69 69
70 void Axis::updateLayout(QVector<qreal>& layout)
70 void Axis::updateLayout(QVector<qreal> &layout)
71 71 {
72 72 if (animator()) {
73 73 animator()->updateLayout(this,layout);
@@ -76,7 +76,7 void Axis::updateLayout(QVector<qreal>& layout)
76 76 }
77 77 }
78 78
79 bool Axis::createLabels(QStringList& labels,qreal min, qreal max,int ticks) const
79 bool Axis::createLabels(QStringList &labels,qreal min, qreal max,int ticks) const
80 80 {
81 81 Q_ASSERT(max>=min);
82 82 Q_ASSERT(ticks>1);
@@ -87,7 +87,7 bool Axis::createLabels(QStringList& labels,qreal min, qreal max,int ticks) cons
87 87
88 88 if (!category) {
89 89 int n = qMax(int(-floor(log10((max-min)/(ticks-1)))),0);
90 for(int i=0; i< ticks; i++) {
90 for (int i=0; i< ticks; i++) {
91 91 qreal value = min + (i * (max - min)/ (ticks-1));
92 92 labels << QString::number(value,'f',n);
93 93 }
@@ -239,18 +239,17 QVector<qreal> Axis::calculateLayout() const
239 239 return points;
240 240 }
241 241
242 void Axis::setLayout(QVector<qreal>& layout)
242 void Axis::setLayout(QVector<qreal> &layout)
243 243 {
244 244 int diff = m_layoutVector.size() - layout.size();
245 245
246 246 if (diff>0) {
247 247 deleteItems(diff);
248 }
249 else if(diff<0) {
248 } else if (diff<0) {
250 249 createItems(-diff);
251 250 }
252 251
253 if(diff!=0) handleAxisUpdated();
252 if( diff!=0) handleAxisUpdated();
254 253
255 254 QStringList ticksList;
256 255
@@ -275,19 +274,19 void Axis::setLayout(QVector<qreal>& layout)
275 274 QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem*>(lines.at(i));
276 275 lineItem->setLine(layout[i], m_rect.top(), layout[i], m_rect.bottom());
277 276 QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem*>(labels.at(i));
278 if(!categories){
277 if (!categories) {
279 278 labelItem->setText(ticksList.at(i));
280 279 QPointF center = labelItem->boundingRect().center();
281 280 labelItem->setTransformOriginPoint(center.x(), center.y());
282 281 labelItem->setPos(layout[i] - center.x(), m_rect.bottom() + label_padding);
283 }else if(i>0){
282 } else if(i>0) {
284 283 labelItem->setText(ticksList.at(i));
285 284 QPointF center = labelItem->boundingRect().center();
286 285 labelItem->setTransformOriginPoint(center.x(), center.y());
287 286 labelItem->setPos(layout[i] - (layout[i] - layout[i-1])/2 - center.x(), m_rect.bottom() + label_padding);
288 287 }
289 288
290 if((i+1)%2 && i>1) {
289 if ((i+1)%2 && i>1) {
291 290 QGraphicsRectItem *rectItem = static_cast<QGraphicsRectItem*>(shades.at(i/2-1));
292 291 rectItem->setRect(layout[i-1],m_rect.top(),layout[i]-layout[i-1],m_rect.height());
293 292 }
@@ -307,19 +306,19 void Axis::setLayout(QVector<qreal>& layout)
307 306 lineItem->setLine(m_rect.left() , layout[i], m_rect.right(), layout[i]);
308 307 QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem*>(labels.at(i));
309 308
310 if(!categories){
309 if (!categories) {
311 310 labelItem->setText(ticksList.at(i));
312 311 QPointF center = labelItem->boundingRect().center();
313 312 labelItem->setTransformOriginPoint(center.x(), center.y());
314 313 labelItem->setPos(m_rect.left() - labelItem->boundingRect().width() - label_padding , layout[i]-center.y());
315 } else if(i>0){
314 } else if (i>0) {
316 315 labelItem->setText(ticksList.at(i));
317 316 QPointF center = labelItem->boundingRect().center();
318 317 labelItem->setTransformOriginPoint(center.x(), center.y());
319 318 labelItem->setPos(m_rect.left() - labelItem->boundingRect().width() - label_padding , layout[i] - (layout[i] - layout[i-1])/2 -center.y());
320 319 }
321 320
322 if((i+1)%2 && i>1) {
321 if ((i+1)%2 && i>1) {
323 322 QGraphicsRectItem *rectItem = static_cast<QGraphicsRectItem*>(shades.at(i/2-1));
324 323 rectItem->setRect(m_rect.left(),layout[i],m_rect.width(),layout[i-1]-layout[i]);
325 324 }
@@ -329,7 +328,7 void Axis::setLayout(QVector<qreal>& layout)
329 328 }
330 329 break;
331 330 default:
332 qDebug()<<"Unknown axis type";
331 qDebug()<<"Unknown axis type";
333 332 break;
334 333 }
335 334
@@ -345,7 +344,7 bool Axis::isEmpty()
345 344
346 345 void Axis::handleAxisCategoriesUpdated()
347 346 {
348 if(isEmpty()) return;
347 if (isEmpty()) return;
349 348 updateLayout(m_layoutVector);
350 349 }
351 350
@@ -360,13 +359,13 void Axis::handleAxisUpdated()
360 359 setAxisOpacity(0);
361 360 }
362 361
363 if(m_chartAxis->isGridLineVisible()) {
362 if (m_chartAxis->isGridLineVisible()) {
364 363 setGridOpacity(100);
365 364 } else {
366 365 setGridOpacity(0);
367 366 }
368 367
369 if(m_chartAxis->labelsVisible()) {
368 if (m_chartAxis->labelsVisible()) {
370 369 setLabelsOpacity(100);
371 370 } else {
372 371 setLabelsOpacity(0);
@@ -391,7 +390,7 void Axis::handleAxisUpdated()
391 390
392 391 void Axis::handleRangeChanged(qreal min, qreal max,int tickCount)
393 392 {
394 if(min==max || tickCount<2) return;
393 if (min==max || tickCount<2) return;
395 394
396 395 m_min = min;
397 396 m_max = max;
@@ -403,7 +402,7 void Axis::handleRangeChanged(qreal min, qreal max,int tickCount)
403 402
404 403 }
405 404
406 void Axis::handleGeometryChanged(const QRectF& rect)
405 void Axis::handleGeometryChanged(const QRectF &rect)
407 406 {
408 407 m_rect = rect;
409 408 if (isEmpty()) return;
Show file before | Show file after | Hide comments
@@ -140,17 +140,17 QTCOMMERCIALCHART_BEGIN_NAMESPACE
140 140 QChatView or QChart when axis added.
141 141 */
142 142
143 QChartAxis::QChartAxis(QObject* parent):QObject(parent),
144 m_axisVisible(true),
145 m_gridLineVisible(true),
146 m_labelsVisible(true),
147 m_labelsAngle(0),
148 m_shadesVisible(false),
149 m_shadesOpacity(1.0),
150 m_min(0),
151 m_max(0),
152 m_ticksCount(5),
153 m_niceNumbers(false)
143 QChartAxis::QChartAxis(QObject *parent) : QObject(parent),
144 m_axisVisible(true),
145 m_gridLineVisible(true),
146 m_labelsVisible(true),
147 m_labelsAngle(0),
148 m_shadesVisible(false),
149 m_shadesOpacity(1.0),
150 m_min(0),
151 m_max(0),
152 m_ticksCount(5),
153 m_niceNumbers(false)
154 154 {
155 155
156 156 }
@@ -166,11 +166,11 QChartAxis::~QChartAxis()
166 166 /*!
167 167 Sets \a pen used to draw axis line and ticks.
168 168 */
169 void QChartAxis::setAxisPen(const QPen& pen)
169 void QChartAxis::setAxisPen(const QPen &pen)
170 170 {
171 171 if (pen != m_axisPen) {
172 m_axisPen=pen;
173 emit updated();
172 m_axisPen = pen;
173 emit updated();
174 174 }
175 175 }
176 176
@@ -179,9 +179,9 void QChartAxis::setAxisPen(const QPen& pen)
179 179 */
180 180 void QChartAxis::setAxisVisible(bool visible)
181 181 {
182 if (m_axisVisible!=visible) {
183 m_axisVisible=visible;
184 emit updated();
182 if (m_axisVisible != visible) {
183 m_axisVisible = visible;
184 emit updated();
185 185 }
186 186 }
187 187
@@ -190,20 +190,20 void QChartAxis::setAxisVisible(bool visible)
190 190 */
191 191 void QChartAxis::setGridLineVisible(bool visible)
192 192 {
193 if (m_gridLineVisible!=visible) {
194 m_gridLineVisible=visible;
195 emit updated();
193 if (m_gridLineVisible != visible) {
194 m_gridLineVisible = visible;
195 emit updated();
196 196 }
197 197 }
198 198
199 199 /*!
200 200 Sets \a pen used to draw grid line.
201 201 */
202 void QChartAxis::setGridLinePen(const QPen& pen)
202 void QChartAxis::setGridLinePen(const QPen &pen)
203 203 {
204 if (m_gridLinePen!=pen) {
205 m_gridLinePen=pen;
206 emit updated();
204 if (m_gridLinePen != pen) {
205 m_gridLinePen = pen;
206 emit updated();
207 207 }
208 208 }
209 209
@@ -212,42 +212,42 void QChartAxis::setGridLinePen(const QPen& pen)
212 212 */
213 213 void QChartAxis::setLabelsVisible(bool visible)
214 214 {
215 if(m_labelsVisible!=visible) {
216 m_labelsVisible=visible;
217 emit updated();
215 if (m_labelsVisible != visible) {
216 m_labelsVisible = visible;
217 emit updated();
218 218 }
219 219 }
220 220
221 221 /*!
222 222 Sets \a pen used to draw labels.
223 223 */
224 void QChartAxis::setLabelsPen(const QPen& pen)
224 void QChartAxis::setLabelsPen(const QPen &pen)
225 225 {
226 if(m_labelsPen!=pen) {
227 m_labelsPen=pen;
228 emit updated();
226 if (m_labelsPen != pen) {
227 m_labelsPen = pen;
228 emit updated();
229 229 }
230 230 }
231 231
232 232 /*!
233 233 Sets \a brush used to draw labels.
234 234 */
235 void QChartAxis::setLabelsBrush(const QBrush& brush)
235 void QChartAxis::setLabelsBrush(const QBrush &brush)
236 236 {
237 if(m_labelsBrush!=brush) {
238 m_labelsBrush=brush;
239 emit updated();
237 if (m_labelsBrush != brush) {
238 m_labelsBrush = brush;
239 emit updated();
240 240 }
241 241 }
242 242
243 243 /*!
244 244 Sets \a font used to draw labels.
245 245 */
246 void QChartAxis::setLabelsFont(const QFont& font)
246 void QChartAxis::setLabelsFont(const QFont &font)
247 247 {
248 if(m_labelsFont!=font) {
249 m_labelsFont=font;
250 emit updated();
248 if (m_labelsFont != font) {
249 m_labelsFont = font;
250 emit updated();
251 251 }
252 252 }
253 253
@@ -256,9 +256,9 void QChartAxis::setLabelsFont(const QFont& font)
256 256 */
257 257 void QChartAxis::setLabelsAngle(int angle)
258 258 {
259 if(m_labelsAngle!=angle) {
260 m_labelsAngle=angle;
261 emit updated();
259 if (m_labelsAngle != angle) {
260 m_labelsAngle = angle;
261 emit updated();
262 262 }
263 263 }
264 264
@@ -267,31 +267,31 void QChartAxis::setLabelsAngle(int angle)
267 267 */
268 268 void QChartAxis::setShadesVisible(bool visible)
269 269 {
270 if(m_shadesVisible!=visible) {
271 m_shadesVisible=visible;
272 emit updated();
270 if (m_shadesVisible != visible) {
271 m_shadesVisible = visible;
272 emit updated();
273 273 }
274 274 }
275 275
276 276 /*!
277 277 Sets \a pen used to draw shades.
278 278 */
279 void QChartAxis::setShadesPen(const QPen& pen)
279 void QChartAxis::setShadesPen(const QPen &pen)
280 280 {
281 if(m_shadesPen!=pen) {
282 m_shadesPen=pen;
283 emit updated();
281 if (m_shadesPen != pen) {
282 m_shadesPen = pen;
283 emit updated();
284 284 }
285 285 }
286 286
287 287 /*!
288 288 Sets \a brush used to draw shades.
289 289 */
290 void QChartAxis::setShadesBrush(const QBrush& brush)
290 void QChartAxis::setShadesBrush(const QBrush &brush)
291 291 {
292 if(m_shadesBrush!=brush) {
293 m_shadesBrush=brush;
294 emit updated();
292 if (m_shadesBrush != brush) {
293 m_shadesBrush = brush;
294 emit updated();
295 295 }
296 296 }
297 297
@@ -300,7 +300,7 void QChartAxis::setShadesBrush(const QBrush& brush)
300 300 */
301 301 void QChartAxis::setShadesOpacity(qreal opacity)
302 302 {
303 if(m_shadesOpacity!=opacity) {
303 if (m_shadesOpacity != opacity) {
304 304 m_shadesOpacity=opacity;
305 305 emit updated();
306 306 }
@@ -327,22 +327,20 void QChartAxis::setMax(qreal max)
327 327 */
328 328 void QChartAxis::setRange(qreal min, qreal max)
329 329 {
330
331
332 330 bool changed = false;
333 if(m_min!=min) {
334 m_min=min;
335 changed=true;
331 if (m_min != min) {
332 m_min = min;
333 changed = true;
336 334 emit minChanged(min);
337 335 }
338 336
339 if(m_max!=max) {
340 m_max=max;
341 changed=true;
337 if (m_max != max) {
338 m_max = max;
339 changed = true;
342 340 emit maxChanged(max);
343 341 }
344 342
345 if(changed) {
343 if (changed) {
346 344 emit rangeChanged(m_min,m_max);
347 345 emit this->changed(m_min, m_max, m_ticksCount, m_niceNumbers);
348 346 }
@@ -353,8 +351,8 void QChartAxis::setRange(qreal min, qreal max)
353 351 */
354 352 void QChartAxis::setTicksCount(int count)
355 353 {
356 if(m_ticksCount!=count) {
357 m_ticksCount=count;
354 if (m_ticksCount != count) {
355 m_ticksCount = count;
358 356 emit ticksCountChanged(count);
359 357 emit changed(m_min, m_max, m_ticksCount, m_niceNumbers);
360 358 }
@@ -377,10 +375,10 void QChartAxis::show()
377 375 */
378 376 void QChartAxis::hide()
379 377 {
380 m_axisVisible=false;
381 m_gridLineVisible=false;
382 m_labelsVisible=false;
383 m_shadesVisible=false;
378 m_axisVisible = false;
379 m_gridLineVisible = false;
380 m_labelsVisible = false;
381 m_shadesVisible = false;
384 382 emit updated();
385 383 }
386 384
@@ -392,8 +390,8 void QChartAxis::handleAxisRangeChanged(qreal min, qreal max,int count)
392 390
393 391 void QChartAxis::setNiceNumbers(bool enabled)
394 392 {
395 if(m_niceNumbers!=enabled){
396 m_niceNumbers=enabled;
393 if (m_niceNumbers != enabled){
394 m_niceNumbers = enabled;
397 395 emit changed(m_min, m_max, m_ticksCount, m_niceNumbers);
398 396 }
399 397 }
Show file before | Show file after | Hide comments
@@ -13,10 +13,10 QChartAxisCategories::~QChartAxisCategories()
13 13 // TODO Auto-generated destructor stub
14 14 }
15 15
16 void QChartAxisCategories::insert(const QBarCategories& categories)
16 void QChartAxisCategories::insert(const QBarCategories &categories)
17 17 {
18 18 int i=1;
19 foreach(QString string , categories){
19 foreach (QString string , categories) {
20 20 m_map.insert(i,string);
21 21 i++;
22 22 }
General Comments 0
You need to be logged in to leave comments. Login now