DataField -> NamedField<FieldType>

TouchGFX/gui/include/gui/common/NamedField.hpp

@@ -1,5 +1,5 @@
-#ifndef DATAFIELD_HPP
-#define DATAFIELD_HPP
+#ifndef NAMEDFIELD_HPP
+#define NAMEDFIELD_HPP
 
 #include "touchgfx/TypedText.hpp"
 #include "touchgfx/Unicode.hpp"
@@ -21,10 +21,10 @@ CountedEnum(DataFieldType, size_t, DF_TSState, DF_ASState, DF_ActiveMission,
             DF_TSSoC, DF_LVSoC, DF_TSCurrent, DF_TSVoltageBat, DF_TSVoltageVeh,
             DF_Speed, DF_BBal);
 
-enum class DataFieldKind { Float, Bool, Text, Int };
+enum class NamedFieldKind { Float, Bool, Text, Int };
 
-struct DataFieldDescription {
-  DataFieldKind kind;
+struct NamedFieldDescription {
+  NamedFieldKind kind;
   const char *title;
   size_t int_digits;
   size_t decimal_digits;
@@ -32,23 +32,26 @@ struct DataFieldDescription {
   void *(*getValue)(void);
 };
 
-extern DataFieldDescription dataFieldDescs[];
+extern NamedFieldDescription dataFieldDescs[];
 
-class DataField {
+template <class T> class NamedField {
 public:
-  virtual ~DataField() {}
+  NamedField(const NamedFieldDescription *fieldDescs);
+  virtual ~NamedField() {}
 
-  void setType(DataFieldType type);
-  DataFieldType getType();
+  void setType(T type);
+  T getType();
 
   virtual void updateValue();
 
 protected:
+  const NamedFieldDescription *fieldDescs;
+
   touchgfx::Unicode::UnicodeChar titleBuffer[16];
   touchgfx::Unicode::UnicodeChar valueBuffer[16];
 
-  DataFieldType type;
-  const DataFieldDescription *desc;
+  T type;
+  const NamedFieldDescription *desc;
   union {
     float f;
     int b;
@@ -68,4 +71,4 @@ private:
   void updateValueBuffer();
 };
 
-#endif // DATAFIELD_HPP
+#endif // NAMEDFIELD_HPP

TouchGFX/gui/include/gui/containers/DebugViewItem.hpp

@@ -1,10 +1,11 @@
 #ifndef DEBUGVIEWITEM_HPP
 #define DEBUGVIEWITEM_HPP
 
-#include "gui/common/DataField.hpp"
+#include "gui/common/NamedField.hpp"
 #include <gui_generated/containers/DebugViewItemBase.hpp>
 
-class DebugViewItem : public DebugViewItemBase, public DataField {
+class DebugViewItem : public DebugViewItemBase,
+                      public NamedField<DataFieldType> {
 public:
   DebugViewItem();
   virtual ~DebugViewItem() {}

TouchGFX/gui/include/gui/containers/DebugViewLine.hpp

@@ -1,7 +1,7 @@
 #ifndef DEBUGVIEWLINE_HPP
 #define DEBUGVIEWLINE_HPP
 
-#include "gui/common/DataField.hpp"
+#include "gui/common/NamedField.hpp"
 #include "gui/containers/DebugViewItem.hpp"
 #include <gui_generated/containers/DebugViewLineBase.hpp>
 

TouchGFX/gui/include/gui/containers/DriverViewField.hpp

@@ -5,9 +5,10 @@
 #include "touchgfx/Unicode.hpp"
 #include <gui_generated/containers/DriverViewFieldBase.hpp>
 
-#include "gui/common/DataField.hpp"
+#include "gui/common/NamedField.hpp"
 
-class DriverViewField : public DriverViewFieldBase, public DataField {
+class DriverViewField : public DriverViewFieldBase,
+                        public NamedField<DataFieldType> {
 public:
   DriverViewField();
   virtual ~DriverViewField() {}

TouchGFX/gui/include/gui/driverview_screen/DriverViewPresenter.hpp

@@ -4,7 +4,7 @@
 #include <gui/model/ModelListener.hpp>
 #include <mvp/Presenter.hpp>
 
-#include "gui/common/DataField.hpp"
+#include "gui/common/NamedField.hpp"
 
 using namespace touchgfx;
 

TouchGFX/gui/include/gui/driverview_screen/DriverViewView.hpp

@@ -1,7 +1,7 @@
 #ifndef DRIVERVIEWVIEW_HPP
 #define DRIVERVIEWVIEW_HPP
 
-#include "gui/common/DataField.hpp"
+#include "gui/common/NamedField.hpp"
 #include "gui/containers/DriverViewFieldSelection.hpp"
 #include "touchgfx/containers/scrollers/DrawableList.hpp"
 #include "vehicle.h"