diff --git a/apps/Makefile b/apps/Makefile index 18d81110e..e82535894 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -9,6 +9,7 @@ include apps/statistics/Makefile app_objs += $(addprefix apps/,\ apps_container.o\ constant.o\ + banner_view.o\ cursor_view.o\ curve_view.o\ curve_view_with_banner.o\ diff --git a/apps/banner_view.cpp b/apps/banner_view.cpp new file mode 100644 index 000000000..0940b8004 --- /dev/null +++ b/apps/banner_view.cpp @@ -0,0 +1,5 @@ +#include "banner_view.h" + +void BannerView::drawRect(KDContext * ctx, KDRect rect) const { + ctx->fillRect(bounds(), KDColorWhite); +} diff --git a/apps/banner_view.h b/apps/banner_view.h new file mode 100644 index 000000000..151cf1b7c --- /dev/null +++ b/apps/banner_view.h @@ -0,0 +1,12 @@ +#ifndef APPS_BANNER_VIEW_H +#define APPS_BANNER_VIEW_H + +#include + +class BannerView : public View { +public: + virtual void reload() = 0; + void drawRect(KDContext * ctx, KDRect rect) const override; +}; + +#endif diff --git a/apps/graph/graph/banner_view.cpp b/apps/graph/graph/banner_view.cpp index 727860523..04f363b39 100644 --- a/apps/graph/graph/banner_view.cpp +++ b/apps/graph/graph/banner_view.cpp @@ -33,10 +33,6 @@ void BannerView::reload() { } } -void BannerView::drawRect(KDContext * ctx, KDRect rect) const { - ctx->fillRect(bounds(), KDColorWhite); -} - void BannerView::setDisplayDerivative(bool displayDerivative) { m_displayDerivative = displayDerivative; } diff --git a/apps/graph/graph/banner_view.h b/apps/graph/graph/banner_view.h index c33e2c10b..6dfd2170b 100644 --- a/apps/graph/graph/banner_view.h +++ b/apps/graph/graph/banner_view.h @@ -3,14 +3,14 @@ #include #include "graph_window.h" +#include "../../banner_view.h" namespace Graph { -class BannerView : public View { +class BannerView : public ::BannerView { public: BannerView(GraphWindow * graphWindow); - void reload(); - void drawRect(KDContext * ctx, KDRect rect) const override; + void reload() override; void setDisplayDerivative(bool displayDerivative); bool displayDerivative(); private: diff --git a/apps/regression/banner_view.cpp b/apps/regression/banner_view.cpp index 773c6f134..1ec0afbc8 100644 --- a/apps/regression/banner_view.cpp +++ b/apps/regression/banner_view.cpp @@ -48,10 +48,6 @@ void BannerView::reload() { m_yView.setText(buffer); } -void BannerView::drawRect(KDContext * ctx, KDRect rect) const { - ctx->fillRect(bounds(), KDColorWhite); -} - int BannerView::numberOfSubviews() const { return 5; } diff --git a/apps/regression/banner_view.h b/apps/regression/banner_view.h index 61cb725fa..f954b5af9 100644 --- a/apps/regression/banner_view.h +++ b/apps/regression/banner_view.h @@ -3,14 +3,14 @@ #include #include "data.h" +#include "../banner_view.h" namespace Regression { -class BannerView : public View { +class BannerView : public ::BannerView { public: BannerView(Data * data); - void reload(); - void drawRect(KDContext * ctx, KDRect rect) const override; + void reload() override; private: constexpr static int k_maxNumberOfCharacters = 50; int numberOfSubviews() const override; diff --git a/apps/statistics/box_banner_view.cpp b/apps/statistics/box_banner_view.cpp index 3b80fcc44..dcda91724 100644 --- a/apps/statistics/box_banner_view.cpp +++ b/apps/statistics/box_banner_view.cpp @@ -42,10 +42,6 @@ void BoxBannerView::reload() { m_calculationValue.setText(buffer); } -void BoxBannerView::drawRect(KDContext * ctx, KDRect rect) const { - ctx->fillRect(bounds(), KDColorWhite); -} - int BoxBannerView::numberOfSubviews() const { return 2; } diff --git a/apps/statistics/box_banner_view.h b/apps/statistics/box_banner_view.h index f5280593d..0a468a7e9 100644 --- a/apps/statistics/box_banner_view.h +++ b/apps/statistics/box_banner_view.h @@ -3,16 +3,16 @@ #include #include "data.h" +#include "../banner_view.h" namespace Statistics { class BoxView; -class BoxBannerView : public View { +class BoxBannerView : public ::BannerView { public: BoxBannerView(Data * data, BoxView * boxView); - void reload(); - void drawRect(KDContext * ctx, KDRect rect) const override; + void reload() override; private: constexpr static int k_maxNumberOfCharacters = 50; int numberOfSubviews() const override; diff --git a/apps/statistics/histogram_banner_view.cpp b/apps/statistics/histogram_banner_view.cpp index 3350ad294..1fc5ebb30 100644 --- a/apps/statistics/histogram_banner_view.cpp +++ b/apps/statistics/histogram_banner_view.cpp @@ -43,10 +43,6 @@ void HistogramBannerView::reload() { m_frequencyView.setText(buffer); } -void HistogramBannerView::drawRect(KDContext * ctx, KDRect rect) const { - ctx->fillRect(bounds(), KDColorWhite); -} - int HistogramBannerView::numberOfSubviews() const { return 3; } diff --git a/apps/statistics/histogram_banner_view.h b/apps/statistics/histogram_banner_view.h index 018e788c0..416a535ad 100644 --- a/apps/statistics/histogram_banner_view.h +++ b/apps/statistics/histogram_banner_view.h @@ -3,14 +3,14 @@ #include #include "data.h" +#include "../banner_view.h" namespace Statistics { -class HistogramBannerView : public View { +class HistogramBannerView : public ::BannerView { public: HistogramBannerView(Data * data); - void reload(); - void drawRect(KDContext * ctx, KDRect rect) const override; + void reload() override; private: constexpr static int k_maxNumberOfCharacters = 50; int numberOfSubviews() const override;