diff --git a/apps/shared/curve_view.cpp b/apps/shared/curve_view.cpp index 62e69b4f0..df2bf5868 100644 --- a/apps/shared/curve_view.cpp +++ b/apps/shared/curve_view.cpp @@ -19,8 +19,7 @@ CurveView::CurveView(CurveViewRange * curveViewRange, CurveViewCursor * curveVie m_okView(okView), m_forceOkDisplay(false), m_mainViewSelected(false), - m_drawnRangeVersion(0), - m_displayBanner(displayBanner) + m_drawnRangeVersion(0) { } @@ -29,7 +28,7 @@ void CurveView::reload() { if (m_drawnRangeVersion != rangeVersion) { // FIXME: This should also be called if the *curve* changed m_drawnRangeVersion = rangeVersion; - KDCoordinate bannerHeight = (m_bannerView != nullptr && m_displayBanner) ? m_bannerView->bounds().height() : 0; + KDCoordinate bannerHeight = (m_bannerView != nullptr) ? m_bannerView->bounds().height() : 0; markRectAsDirty(KDRect(0, 0, bounds().width(), bounds().height() - bannerHeight)); if (label(Axis::Horizontal, 0) != nullptr) { computeLabels(Axis::Horizontal); @@ -522,7 +521,7 @@ void CurveView::layoutSubviews() { if (m_curveViewCursor != nullptr && m_cursorView != nullptr) { m_cursorView->setFrame(cursorFrame()); } - if (m_bannerView != nullptr && m_displayBanner) { + if (m_bannerView != nullptr) { m_bannerView->setFrame(bannerFrame()); } if (m_okView != nullptr) { @@ -538,7 +537,7 @@ KDRect CurveView::cursorFrame() { KDCoordinate yCursorPixelPosition = std::round(floatToPixel(Axis::Vertical, m_curveViewCursor->y())); cursorFrame = KDRect(xCursorPixelPosition - (cursorSize.width()-1)/2, yCursorPixelPosition - (cursorSize.height()-1)/2, cursorSize.width(), cursorSize.height()); if (cursorSize.height() == 0) { - KDCoordinate bannerHeight = (m_bannerView != nullptr && m_displayBanner) ? m_bannerView->minimalSizeForOptimalDisplay().height() : 0; + KDCoordinate bannerHeight = (m_bannerView != nullptr) ? m_bannerView->minimalSizeForOptimalDisplay().height() : 0; cursorFrame = KDRect(xCursorPixelPosition - (cursorSize.width()-1)/2, 0, cursorSize.width(),bounds().height()-bannerHeight); } } @@ -547,7 +546,7 @@ KDRect CurveView::cursorFrame() { KDRect CurveView::bannerFrame() { KDRect bannerFrame = KDRectZero; - if (m_bannerView && m_displayBanner && m_mainViewSelected) { + if (m_bannerView && m_mainViewSelected) { KDCoordinate bannerHeight = m_bannerView->minimalSizeForOptimalDisplay().height(); bannerFrame = KDRect(0, bounds().height()- bannerHeight, bounds().width(), bannerHeight); } @@ -558,7 +557,7 @@ KDRect CurveView::okFrame() { KDRect okFrame = KDRectZero; if (m_okView && (m_mainViewSelected || m_forceOkDisplay)) { KDCoordinate bannerHeight = 0; - if (m_bannerView != nullptr && m_displayBanner) { + if (m_bannerView != nullptr) { bannerHeight = m_bannerView->minimalSizeForOptimalDisplay().height(); } KDSize okSize = m_okView->minimalSizeForOptimalDisplay(); @@ -568,7 +567,7 @@ KDRect CurveView::okFrame() { } int CurveView::numberOfSubviews() const { - return (m_bannerView != nullptr && m_displayBanner) + (m_cursorView != nullptr) + (m_okView != nullptr); + return (m_bannerView != nullptr) + (m_cursorView != nullptr) + (m_okView != nullptr); }; View * CurveView::subviewAtIndex(int index) { @@ -580,12 +579,12 @@ View * CurveView::subviewAtIndex(int index) { if (m_okView != nullptr) { return m_okView; } else { - if (m_bannerView != nullptr && m_displayBanner) { + if (m_bannerView != nullptr) { return m_bannerView; } } } - if (index == 1 && m_bannerView != nullptr && m_displayBanner && m_okView != nullptr) { + if (index == 1 && m_bannerView != nullptr && m_okView != nullptr) { return m_bannerView; } return m_cursorView; diff --git a/apps/shared/curve_view.h b/apps/shared/curve_view.h index a4a79cc9f..a41bfa81b 100644 --- a/apps/shared/curve_view.h +++ b/apps/shared/curve_view.h @@ -29,8 +29,6 @@ public: void selectMainView(bool mainViewSelected); void setCursorView(View * cursorView); void setBannerView(View * bannerView); - void setDisplayBannerView(bool display) { m_displayBanner = display; } - bool displayBannerView() const { return m_displayBanner; } void setOkView(View * okView); void setForceOkDisplay(bool force) { m_forceOkDisplay = force; } float resolution() const; @@ -95,7 +93,6 @@ private: bool m_forceOkDisplay; bool m_mainViewSelected; uint32_t m_drawnRangeVersion; - bool m_displayBanner; }; } diff --git a/apps/statistics/histogram_view.cpp b/apps/statistics/histogram_view.cpp index b48faf249..c50972cbc 100644 --- a/apps/statistics/histogram_view.cpp +++ b/apps/statistics/histogram_view.cpp @@ -24,10 +24,7 @@ HistogramView::HistogramView(HistogramController * controller, Store * store, in void HistogramView::reload() { CurveView::reload(); - /* We deliberately do not mark as dirty the frame of the banner view to avoid - *unpleasant blinking of the drawing of the banner view. */ - KDRect dirtyZone(KDRect(0, 0, bounds().width(), bounds().height() - (displayBannerView() ? m_bannerView->bounds().height() : 0))); - markRectAsDirty(dirtyZone); + markRectAsDirty(bounds()); } void HistogramView::reloadSelectedBar() { @@ -37,7 +34,7 @@ void HistogramView::reloadSelectedBar() { /* We deliberately do not mark as dirty the frame of the banner view to avoid *unpleasant blinking of the drawing of the banner view. */ KDRect dirtyZone(KDRect(pixelLowerBound, 0, pixelUpperBound-pixelLowerBound, - bounds().height() - (displayBannerView() ? m_bannerView->bounds().height() : 0))); + bounds().height())); markRectAsDirty(dirtyZone); } diff --git a/apps/statistics/multiple_boxes_view.cpp b/apps/statistics/multiple_boxes_view.cpp index dc4a8c24f..1582f81a0 100644 --- a/apps/statistics/multiple_boxes_view.cpp +++ b/apps/statistics/multiple_boxes_view.cpp @@ -13,10 +13,6 @@ MultipleBoxesView::MultipleBoxesView(BoxController * controller, Store * store, m_axisView(store), m_bannerView() { - for (int i = 0; i < Store::k_numberOfSeries; i++) { - BoxView * boxView = dataViewAtIndex(i); - boxView->setDisplayBannerView(false); - } } BoxView * MultipleBoxesView::dataViewAtIndex(int index) { diff --git a/apps/statistics/multiple_histograms_view.cpp b/apps/statistics/multiple_histograms_view.cpp index 2ac29e4b3..b96c2ade1 100644 --- a/apps/statistics/multiple_histograms_view.cpp +++ b/apps/statistics/multiple_histograms_view.cpp @@ -15,7 +15,6 @@ MultipleHistogramsView::MultipleHistogramsView(HistogramController * controller, { for (int i = 0; i < Store::k_numberOfSeries; i++) { HistogramView * histView = dataViewAtIndex(i); - histView->setDisplayBannerView(false); histView->setDisplayLabels(false); histView->setForceOkDisplay(true); }