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

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

make setAxisX setAxisY functionality compatible
Michal Klocek -
r2278:c185a1f604d6
parent child
Show More
Side by Side Unified
Context file:
r2278:c185a1f604d6 Loading diff...:
Show file before | Show file after | Hide comments
@@ -307,8 +307,6 QAbstractAxis *QChart::axisX(QAbstractSeries *series) const
307 307 {
308 308 if(!series && d_ptr->m_dataset->series().size()>0){
309 309 series = d_ptr->m_dataset->series().first();
310 }else{
311 return 0;
312 310 }
313 311
314 312 QList<QAbstractAxis*> axes = series->attachedAxes();
@@ -336,8 +334,6 QAbstractAxis *QChart::axisY(QAbstractSeries *series) const
336 334 {
337 335 if(!series && d_ptr->m_dataset->series().size()>0) {
338 336 series = d_ptr->m_dataset->series().first();
339 } else {
340 return 0;
341 337 }
342 338
343 339 QList<QAbstractAxis*> axes = series->attachedAxes();
@@ -536,11 +532,9 void QChart::setAxisX(QAbstractAxis *axis , QAbstractSeries *series)
536 532 QList<QAbstractAxis*> list = axes(Qt::Horizontal,series);
537 533
538 534 foreach(QAbstractAxis* a, list){
539 if(a->alignment()==axis->alignment()){
540 535 d_ptr->m_dataset->removeAxis(a);
541 536 delete a;
542 537 }
543 }
544 538
545 539 if(!d_ptr->m_dataset->axes().contains(axis))
546 540 d_ptr->m_dataset->addAxis(axis,Qt::AlignBottom);
@@ -557,11 +551,9 void QChart::setAxisY(QAbstractAxis *axis , QAbstractSeries *series)
557 551 QList<QAbstractAxis*> list = axes(Qt::Vertical,series);
558 552
559 553 foreach(QAbstractAxis* a, list) {
560 if(a->alignment()==axis->alignment()) {
561 554 d_ptr->m_dataset->removeAxis(a);
562 555 delete a;
563 556 }
564 }
565 557
566 558 if(!d_ptr->m_dataset->axes().contains(axis))
567 559 d_ptr->m_dataset->addAxis(axis,Qt::AlignLeft);
General Comments 0
You need to be logged in to leave comments. Login now