From 10c42e276a19d18124fceae6b8bf89e77315d0b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Wed, 6 Sep 2017 11:51:08 +0200 Subject: [PATCH] [escher] Add a gauge view and a message table cell with gauge --- escher/Makefile | 2 + escher/include/escher.h | 2 + escher/include/escher/gauge_view.h | 21 +++++++ .../escher/message_table_cell_with_gauge.h | 16 +++++ escher/src/gauge_view.cpp | 60 +++++++++++++++++++ escher/src/message_table_cell_with_gauge.cpp | 18 ++++++ 6 files changed, 119 insertions(+) create mode 100644 escher/include/escher/gauge_view.h create mode 100644 escher/include/escher/message_table_cell_with_gauge.h create mode 100644 escher/src/gauge_view.cpp create mode 100644 escher/src/message_table_cell_with_gauge.cpp diff --git a/escher/Makefile b/escher/Makefile index 209d14478..4680a2178 100644 --- a/escher/Makefile +++ b/escher/Makefile @@ -20,6 +20,7 @@ objs += $(addprefix escher/src/,\ expression_table_cell_with_pointer.o\ expression_view.o\ highlight_cell.o\ + gauge_view.o\ image_view.o\ invocation.o\ input_view_controller.o\ @@ -31,6 +32,7 @@ objs += $(addprefix escher/src/,\ message_table_cell_with_chevron_and_message.o\ message_table_cell_with_chevron_and_expression.o\ message_table_cell_with_editable_text.o\ + message_table_cell_with_gauge.o\ message_table_cell_with_message.o\ message_table_cell_with_switch.o\ message_text_view.o\ diff --git a/escher/include/escher.h b/escher/include/escher.h index 81620c0d4..d76d27856 100644 --- a/escher/include/escher.h +++ b/escher/include/escher.h @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -34,6 +35,7 @@ #include #include #include +#include #include #include #include diff --git a/escher/include/escher/gauge_view.h b/escher/include/escher/gauge_view.h new file mode 100644 index 000000000..21ed0c057 --- /dev/null +++ b/escher/include/escher/gauge_view.h @@ -0,0 +1,21 @@ +#ifndef ESCHER_GAUGE_VIEW_H +#define ESCHER_GAUGE_VIEW_H + +#include + +class GaugeView : public View { +public: + GaugeView(); + float level(); + void setLevel(float level); + void setBackgroundColor(KDColor color); + void drawRect(KDContext * ctx, KDRect rect) const override; + KDSize minimalSizeForOptimalDisplay() const override; + constexpr static KDCoordinate k_indicatorDiameter = 10; +private: + constexpr static KDCoordinate k_thickness = 2; + float m_level; + KDColor m_backgroundColor; +}; + +#endif diff --git a/escher/include/escher/message_table_cell_with_gauge.h b/escher/include/escher/message_table_cell_with_gauge.h new file mode 100644 index 000000000..c1e9d530f --- /dev/null +++ b/escher/include/escher/message_table_cell_with_gauge.h @@ -0,0 +1,16 @@ +#ifndef ESCHER_MESSAGE_TABLE_CELL_WITH_GAUGE_H +#define ESCHER_MESSAGE_TABLE_CELL_WITH_GAUGE_H + +#include +#include + +class MessageTableCellWithGauge : public MessageTableCell { +public: + MessageTableCellWithGauge(I18n::Message message = (I18n::Message)0, KDText::FontSize size = KDText::FontSize::Small); + View * accessoryView() const override; + void setHighlighted(bool highlight) override; +private: + GaugeView m_accessoryView; +}; + +#endif diff --git a/escher/src/gauge_view.cpp b/escher/src/gauge_view.cpp new file mode 100644 index 000000000..d00ec57e6 --- /dev/null +++ b/escher/src/gauge_view.cpp @@ -0,0 +1,60 @@ +#include +#include + +const uint8_t gaugeIndicatorMask[GaugeView::k_indicatorDiameter][GaugeView::k_indicatorDiameter] = { + {0xFF, 0xFF, 0xE1, 0x0C, 0x00, 0x00, 0x0C, 0xE1, 0xFF, 0xFF}, + {0xFF, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0xFF}, + {0xE1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE1}, + {0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C}, + {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, + {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, + {0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C}, + {0xE1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE1}, + {0xFF, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0xFF}, + {0xFF, 0xFF, 0xE1, 0x0C, 0x00, 0x00, 0x0C, 0xE1, 0xFF, 0xFF}, +}; + +GaugeView::GaugeView() : + View(), + m_level(1), + m_backgroundColor(KDColorWhite) +{ +} + +float GaugeView::level() { + return m_level; +} + +void GaugeView::setLevel(float level) { + if (m_level != level) { + level = level < 0 ? 0 : level; + level = level > 1 ? 1 : level; + m_level = level; + markRectAsDirty(bounds()); + } +} + +void GaugeView::setBackgroundColor(KDColor color) { + if (m_backgroundColor != color) { + m_backgroundColor = color; + markRectAsDirty(bounds()); + } +} + +KDColor s_gaugeIndicatorWorkingBuffer[GaugeView::k_indicatorDiameter*GaugeView::k_indicatorDiameter]; + +void GaugeView::drawRect(KDContext * ctx, KDRect rect) const { + ctx->fillRect(bounds(), m_backgroundColor); + /* Draw the gauge centered vertically on all the width available */ + KDCoordinate width = bounds().width()-k_indicatorDiameter; + KDCoordinate height = bounds().height(); + + ctx->fillRect(KDRect(k_indicatorDiameter/2, (height-k_thickness)/2, width*m_level, k_thickness), Palette::YellowDark); + ctx->fillRect(KDRect(k_indicatorDiameter/2+width*m_level, (height-k_thickness)/2, width*(1.0f-m_level), k_thickness), Palette::GreyDark); + KDRect frame(width*m_level, (height-k_indicatorDiameter)/2, k_indicatorDiameter, k_indicatorDiameter); + ctx->blendRectWithMask(frame, Palette::YellowDark, (const uint8_t *)gaugeIndicatorMask, s_gaugeIndicatorWorkingBuffer); +} + +KDSize GaugeView::minimalSizeForOptimalDisplay() const { + return KDSize(12*k_indicatorDiameter, k_indicatorDiameter); +} diff --git a/escher/src/message_table_cell_with_gauge.cpp b/escher/src/message_table_cell_with_gauge.cpp new file mode 100644 index 000000000..366d6ecd9 --- /dev/null +++ b/escher/src/message_table_cell_with_gauge.cpp @@ -0,0 +1,18 @@ +#include +#include + +MessageTableCellWithGauge::MessageTableCellWithGauge(I18n::Message message, KDText::FontSize size) : + MessageTableCell(message, size), + m_accessoryView() +{ +} + +View * MessageTableCellWithGauge::accessoryView() const { + return (View *)&m_accessoryView; +} + +void MessageTableCellWithGauge::setHighlighted(bool highlight) { + MessageTableCell::setHighlighted(highlight); + KDColor backgroundColor = highlight? Palette::Select : KDColorWhite; + m_accessoryView.setBackgroundColor(backgroundColor); +}