diff --git a/src/chartpresenter.cpp b/src/chartpresenter.cpp index e431ac7..db9a014 100644 --- a/src/chartpresenter.cpp +++ b/src/chartpresenter.cpp @@ -63,7 +63,6 @@ void ChartPresenter::handleAxisAdded(QAbstractAxis *axis, Domain *domain) item->setAnimation(new AxisAnimation(item)); QObject::connect(domain, SIGNAL(updated()), item, SLOT(handleDomainUpdated())); - QObject::connect(axis, SIGNAL(visibleChanged(bool)), this, SLOT(handleAxisVisibleChanged(bool))); //initialize domain->emitUpdated(); @@ -72,7 +71,6 @@ void ChartPresenter::handleAxisAdded(QAbstractAxis *axis, Domain *domain) axis->d_ptr->emitUpdated(); m_axisItems.insert(axis, item); - selectVisibleAxis(); m_layout->invalidate(); } @@ -80,11 +78,11 @@ void ChartPresenter::handleAxisRemoved(QAbstractAxis *axis) { ChartAxis *item = m_axisItems.take(axis); Q_ASSERT(item); - selectVisibleAxis(); item->hide(); item->disconnect(); QObject::disconnect(this, 0, item, 0); item->deleteLater(); + m_layout->invalidate(); } @@ -109,54 +107,6 @@ void ChartPresenter::handleSeriesRemoved(QAbstractSeries *series) item->deleteLater(); } -void ChartPresenter::selectVisibleAxis() -{ - QMapIterator i(m_axisItems); - - while (i.hasNext()) { - i.next(); -// i.key()->hide(); - i.key()->show(); - } - -// i.toFront(); - -// bool axisX=false; -// bool axisY=false; - -// while (i.hasNext()) { -// i.next(); -// if(i.key()->orientation()==Qt::Vertical && !axisY) { -// axisY=true; -// i.key()->show(); -// } -// if(i.key()->orientation()==Qt::Horizontal && !axisX) { -// axisX=true; -// i.key()->show(); -// } - -// } -} - - -void ChartPresenter::handleAxisVisibleChanged(bool visible) -{ - QAbstractAxis *axis = static_cast(sender()); - Q_ASSERT(axis); - if (visible) { - - QMapIterator i(m_axisItems); - - while (i.hasNext()) { - i.next(); - if (i.key() == axis) - continue; - if (i.key()->orientation() == axis->orientation()) - i.key()->setVisible(false); - } - } -} - void ChartPresenter::setTheme(QChart::ChartTheme theme, bool force) { if (m_chartTheme && m_chartTheme->id() == theme) diff --git a/src/chartpresenter_p.h b/src/chartpresenter_p.h index eb99084..7383b36 100644 --- a/src/chartpresenter_p.h +++ b/src/chartpresenter_p.h @@ -136,14 +136,12 @@ public: private: void createBackgroundItem(); void createTitleItem(); - void selectVisibleAxis(); public Q_SLOTS: void handleSeriesAdded(QAbstractSeries *series, Domain *domain); void handleSeriesRemoved(QAbstractSeries *series); void handleAxisAdded(QAbstractAxis *axis, Domain *domain); void handleAxisRemoved(QAbstractAxis *axis); - void handleAxisVisibleChanged(bool visible); private Q_SLOTS: void handleAnimationFinished();