Moves Indicator related files into Indicator/

.github/workflows/test-indicator.yml

@@ -50,7 +50,10 @@ jobs:
     strategy:
       matrix:
         test:
+          - Indicator.test
+          - IndicatorBase.test
           - IndicatorCandle.test
+          - IndicatorData.test
           - IndicatorTf.test
           - IndicatorTick.test
     steps:

.github/workflows/test.yml

@@ -60,7 +60,6 @@ jobs:
           - DatabaseTest
           - DrawIndicatorTest
           - EATest
-          - IndicatorTest
           - IndicatorsTest
           - MailTest
           - MarketTest

3D/Chart3D.h

@@ -26,7 +26,7 @@
  */
 
 #include "../Bar.struct.h"
-#include "../IndicatorData.mqh"
+#include "../Indicator/IndicatorData.h"
 #include "../Indicators/Indi_MA.mqh"
 #include "../Instances.h"
 #include "../Refs.mqh"

Account/AccountMt.h

@@ -30,10 +30,9 @@ class AccountMt;
 // Includes.
 #include "../Array.mqh"
 #include "../BufferStruct.mqh"
-#include "../Chart.mqh"
 #include "../Convert.mqh"
 #include "../Data.struct.h"
-#include "../Indicator.struct.h"
+#include "../Indicator/Indicator.struct.h"
 #include "../Order.struct.h"
 #include "../Orders.mqh"
 #include "../Serializer.mqh"

BufferFXT.mqh

@@ -25,9 +25,8 @@
 
 // Includes.
 #include "Account/AccountMt.h"
-#include "Chart.mqh"
 #include "DictStruct.mqh"
-#include "IndicatorBase.h"
+#include "Indicator/IndicatorData.h"
 #include "Object.mqh"
 
 // Defines.

Chart.mqh

@@ -29,10 +29,6 @@
  * - https://www.mql5.com/en/docs/series
  */
 
-// Class dependencies.
-class Chart;
-class Market;
-
 // Prevents processing this includes file for the second time.
 #ifndef CHART_MQH
 #define CHART_MQH
@@ -47,6 +43,10 @@ class Market;
 #include "Serializer.mqh"
 #include "Task/TaskCondition.enum.h"
 
+// Forward class declaration.
+class Chart;
+class Market;
+
 #ifndef __MQL4__
 // Defines structs (for MQL4 backward compatibility).
 // Struct arrays that contains given values of each bar of the current chart.

Chart.struct.h

@@ -32,6 +32,7 @@
 
 // Forward class declaration.
 class Class;
+struct ChartTf;
 
 // Includes.
 #include "Array.mqh"
@@ -41,6 +42,7 @@ class Class;
 #include "Chart.struct.static.h"
 #include "Chart.struct.tf.h"
 #include "Serializer.mqh"
+#include "SerializerNode.enum.h"
 #include "Terminal.define.h"
 
 /* Defines struct to store bar entries. */

Chart.struct.serialize.h

@@ -42,6 +42,6 @@ SerializerNodeType ChartEntry::Serialize(Serializer& _s) {
 SerializerNodeType ChartParams::Serialize(Serializer& s) {
   s.Pass(THIS_REF, "id", id);
   s.Pass(THIS_REF, "symbol", symbol);
-  s.PassStruct(THIS_REF, "tf", tf);
+  // s.PassStruct(THIS_REF, "tf", tf); // @fixme
   return SerializerNodeObject;
 }

Chart.struct.tf.h

@@ -30,9 +30,12 @@
 #pragma once
 #endif
 
+// Forward declarations.
+class Serializer;
+
 // Includes.
 #include "Chart.enum.h"
-#include "Serializer.mqh"
+#include "SerializerNode.enum.h"
 #include "Terminal.define.h"
 
 /* Defines struct for chart timeframe. */
@@ -348,6 +351,8 @@ struct ChartTf {
   SerializerNodeType Serialize(Serializer& s);
 };
 
+#include "Serializer.mqh"
+
 /* Method to serialize ChartTf structure. */
 SerializerNodeType ChartTf::Serialize(Serializer& s) {
   s.PassEnum(THIS_REF, "tf", tf);

ChartMt.h

@@ -31,6 +31,7 @@
 #endif
 
 // Includes.
+#include "Chart.struct.static.h"
 #include "Chart.symboltf.h"
 #include "Terminal.define.h"
 

DictBase.mqh

@@ -29,7 +29,6 @@
 #include "Dict.enum.h"
 #include "DictIteratorBase.mqh"
 #include "DictSlot.mqh"
-#include "Serializer.mqh"
 
 /**
  * Dictionary overflow listener. arguments are:

DictIteratorBase.mqh

@@ -25,13 +25,14 @@
 #pragma once
 #endif
 
+// Forward class declaration.
+template <typename K, typename V>
+class DictBase;
+
 #include "DictBase.mqh"
 #include "DictSlotsRef.h"
 #include "SerializerConversions.h"
 
-template <typename K, typename V>
-class DictBase;
-
 template <typename K, typename V>
 class DictIteratorBase {
  protected:

DictSlot.mqh

@@ -55,4 +55,4 @@ class DictSlot {
   void RemoveFlags(unsigned char flags) { _flags &= (unsigned char)~flags; }
 };
 
-#endif
+#endif  // DICT_SLOT_MQH

DictSlotsRef.h

@@ -37,6 +37,7 @@
 #include "Std.h"
 #include "Util.h"
 
+// Forward class declaration.
 template <typename K, typename V>
 class DictSlot;
 

DictStruct.mqh

@@ -24,10 +24,6 @@
 #ifndef DICT_STRUCT_MQH
 #define DICT_STRUCT_MQH
 
-// Forward declarations.
-class Dynamic;
-class Log;
-
 #include "DictBase.mqh"
 #include "DictIteratorBase.mqh"
 #include "Serializer.mqh"

Draw.mqh

@@ -75,7 +75,7 @@ void SetIndexStyle(int _index, int _type, int _style = EMPTY, int _width = EMPTY
 /**
  * Class to provide drawing methods working with graphic objects.
  */
-class Draw : public Chart {
+class Draw : public Object {
  protected:
   // Variables.
   long chart_id;

File.mqh

@@ -32,9 +32,10 @@
 // Includes.
 #include "File.define.h"
 #include "File.extern.h"
+#include "Std.h"
 #include "Terminal.define.h"
-#include "Terminal.extern.h"
 #include "Terminal.enum.h"
+#include "Terminal.extern.h"
 
 #ifndef __MQL__
 enum ENUM_FILE_PROPERTY_INTEGER {

Indicator.define.h → Indicator/Indicator.define.h

@@ -91,9 +91,6 @@
 #define LOWER_LINE 1  // Bottom line.
 #endif
 
-// Forward declarations.
-class DrawIndicator;
-
 #ifndef __MQL__
 //
 // Empty value in an indicator buffer.

Indicator.enum.h → Indicator/Indicator.enum.h

@@ -146,14 +146,6 @@ enum ENUM_INDI_ADX_LINE {
   FINAL_INDI_ADX_LINE_ENTRY,
 };
 
-/* Define indicator index. */
-enum ENUM_INDICATOR_INDEX {
-  CURR = 0,
-  PREV = 1,
-  PPREV = 2,
-  FINAL_ENUM_INDICATOR_INDEX = 3  // Should be the last one. Used to calculate the number of enum items.
-};
-
 /* Indicator line identifiers used in Envelopes and Fractals */
 enum ENUM_LO_UP_LINE {
 #ifdef __MQL4__
@@ -197,49 +189,6 @@ enum ENUM_SIGNAL_LINE {
 enum ENUM_APPLIED_VOLUME { VOLUME_TICK = 0, VOLUME_REAL = 1 };
 #endif
 
-/* Indicator entry flags. */
-enum INDICATOR_ENTRY_FLAGS {
-  INDI_ENTRY_FLAG_NONE = 0 << 0,
-  INDI_ENTRY_FLAG_IS_BITWISE = 1 << 0,
-  INDI_ENTRY_FLAG_IS_DOUBLED = 1 << 1,  // Type is doubled in size (e.g. double or long).
-  INDI_ENTRY_FLAG_IS_EXPIRED = 1 << 2,
-  INDI_ENTRY_FLAG_IS_REAL = 1 << 3,  // Type is real (float or double).
-  INDI_ENTRY_FLAG_IS_PRICE = 1 << 4,
-  INDI_ENTRY_FLAG_IS_UNSIGNED = 1 << 5,  // Type is unsigned (unsigned int or unsigned long).
-  INDI_ENTRY_FLAG_IS_VALID = 1 << 6,
-  INDI_ENTRY_FLAG_INSUFFICIENT_DATA = 1 << 7,  // Entry has missing value for that shift and probably won't ever have.
-};
-
-// Storage type for IndicatorBase::GetSpecificValueStorage().
-enum ENUM_INDI_VS_TYPE {
-  INDI_VS_TYPE_NONE,            // Not set.
-  INDI_VS_TYPE_TIME,            // Candle.
-  INDI_VS_TYPE_TICK_VOLUME,     // Candle.
-  INDI_VS_TYPE_VOLUME,          // Candle.
-  INDI_VS_TYPE_SPREAD,          // Candle.
-  INDI_VS_TYPE_PRICE_OPEN,      // Candle.
-  INDI_VS_TYPE_PRICE_HIGH,      // Candle.
-  INDI_VS_TYPE_PRICE_LOW,       // Candle.
-  INDI_VS_TYPE_PRICE_CLOSE,     // Candle.
-  INDI_VS_TYPE_PRICE_MEDIAN,    // Candle.
-  INDI_VS_TYPE_PRICE_TYPICAL,   // Candle.
-  INDI_VS_TYPE_PRICE_WEIGHTED,  // Candle.
-  INDI_VS_TYPE_PRICE_BID,       // Tick.
-  INDI_VS_TYPE_PRICE_ASK,       // Tick.
-                                // Indexed value storages, available if indicator have buffer at this index:
-  INDI_VS_TYPE_INDEX_0,
-  INDI_VS_TYPE_INDEX_1,
-  INDI_VS_TYPE_INDEX_2,
-  INDI_VS_TYPE_INDEX_4,
-  INDI_VS_TYPE_INDEX_5,
-  INDI_VS_TYPE_INDEX_6,
-  INDI_VS_TYPE_INDEX_7,
-  INDI_VS_TYPE_INDEX_8,
-  INDI_VS_TYPE_INDEX_9,
-  INDI_VS_TYPE_INDEX_FIRST = INDI_VS_TYPE_INDEX_0,
-  INDI_VS_TYPE_INDEX_LAST = INDI_VS_TYPE_INDEX_9
-};
-
 // Indicator flags.
 enum ENUM_INDI_FLAGS {
   INDI_FLAG_INDEXABLE_BY_SHIFT,                // Indicator supports indexation by shift.
@@ -269,4 +218,3 @@ enum ENUM_INDI_DS_MODE_KIND {
   INDI_DS_MODE_KIND_AP,  // Mode is a value from ENUM_APPLIED_PRICE enumeration. It is used to retrieve value storage
                          // based on ENUM_INDI_VS_TYPE enumeration, e.g., PRICE_OPEN becomes ENUM_INDI_VS_PRICE_OPEN.
 };
-//+------------------------------------------------------------------+

Indicator.mqh → Indicator/Indicator.h

@@ -24,27 +24,30 @@
 #ifndef INDICATOR_MQH
 #define INDICATOR_MQH
 
-// Includes.
-#include "Array.mqh"
-#include "BufferStruct.mqh"
-#include "DateTime.mqh"
-#include "DrawIndicator.mqh"
-#include "Flags.h"
+// Forward class declaration.
+struct IndicatorParams;
+
 #include "Indicator.define.h"
 #include "Indicator.enum.h"
-#include "Indicator.struct.cache.h"
 #include "Indicator.struct.h"
 #include "Indicator.struct.serialize.h"
-#include "IndicatorData.mqh"
-#include "Math.h"
-#include "Object.mqh"
-#include "Refs.mqh"
-#include "Serializer.mqh"
-#include "SerializerCsv.mqh"
-#include "SerializerJson.mqh"
-#include "Storage/ValueStorage.h"
-#include "Storage/ValueStorage.indicator.h"
-#include "Storage/ValueStorage.native.h"
+#include "IndicatorData.h"
+
+// Includes.
+#include "../Array.mqh"
+#include "../BufferStruct.mqh"
+#include "../DateTime.mqh"
+#include "../DrawIndicator.mqh"
+#include "../Flags.h"
+#include "../Math.h"
+#include "../Object.mqh"
+#include "../Refs.mqh"
+#include "../Serializer.mqh"
+#include "../SerializerCsv.mqh"
+#include "../SerializerJson.mqh"
+#include "../Storage/ValueStorage.h"
+#include "../Storage/ValueStorage.indicator.h"
+#include "../Storage/ValueStorage.native.h"
 
 #ifndef __MQL4__
 // Defines global functions (for MQL4 backward compatibility).
@@ -608,10 +611,10 @@ class Indicator : public IndicatorData {
       _entry.Resize(_max_modes);
       _entry.timestamp = GetBarTime(_ishift);
 #ifndef __MQL4__
-      if (IndicatorBase::Get<bool>(STRUCT_ENUM(IndicatorState, INDICATOR_STATE_PROP_IS_CHANGED))) {
+      if (IndicatorData::Get<bool>(STRUCT_ENUM(IndicatorState, INDICATOR_STATE_PROP_IS_CHANGED))) {
         // Resets the handle on any parameter changes.
-        IndicatorBase::Set<int>(STRUCT_ENUM(IndicatorState, INDICATOR_STATE_PROP_HANDLE), INVALID_HANDLE);
-        IndicatorBase::Set<int>(STRUCT_ENUM(IndicatorState, INDICATOR_STATE_PROP_IS_CHANGED), false);
+        IndicatorData::Set<int>(STRUCT_ENUM(IndicatorState, INDICATOR_STATE_PROP_HANDLE), INVALID_HANDLE);
+        IndicatorData::Set<int>(STRUCT_ENUM(IndicatorState, INDICATOR_STATE_PROP_IS_CHANGED), false);
       }
 #endif
       for (int _mode = 0; _mode < _max_modes; _mode++) {