Merge tag 'v3.001' into dev-indi-no-chart4

EA31337 · Aug 12, 2022 · 434477e · 434477e
1 parent c27b9ec
commit 434477e
Show file tree

Hide file tree

Showing 112 changed files with 4,325 additions and 3,338 deletions.
diff --git a/3D/Chart3D.h b/3D/Chart3D.h
@@ -26,6 +26,7 @@
  */
 
 #include "../Bar.struct.h"
+#include "../IndicatorData.mqh"
 #include "../Indicators/Indi_MA.mqh"
 #include "../Instances.h"
 #include "../Refs.mqh"
@@ -82,13 +83,13 @@ class Chart3D : public Dynamic {
   Chart3DType* current_renderer;
 
   Instances<Chart3D> instances;
-  Ref<IndicatorBase> source;
+  Ref<IndicatorData> source;
 
  public:
   /**
    * Constructor.
    */
-  Chart3D(IndicatorBase* _source, ENUM_CHART3D_TYPE _type = CHART3D_TYPE_CANDLES) : instances(&this) {
+  Chart3D(IndicatorData* _source, ENUM_CHART3D_TYPE _type = CHART3D_TYPE_CANDLES) : instances(&this) {
     type = _type;
     offset.x = offset.y = 0.0f;
     offset.z = 25.0f;

diff --git a/BufferFXT.mqh b/BufferFXT.mqh
@@ -170,7 +170,7 @@ struct BufferFXTHeader {
   //----
   int reserved[60];  // Reserved - space for future use.
   // Struct constructor.
-  BufferFXTHeader(IndicatorBase *_source, AccountMt *_a)
+  BufferFXTHeader(IndicatorData *_source, AccountMt *_a)
       : version(405),
         period(_source PTR_DEREF GetTick() PTR_DEREF GetTf()),
         model(0),

diff --git a/EA.mqh b/EA.mqh
@@ -449,7 +449,7 @@ class EA : public Taskable<DataParamEntry> {
     if (eparams.CheckFlagDataStore(EA_DATA_STORE_INDICATOR)) {
       for (DictStructIterator<long, Ref<Strategy>> iter = strats.Begin(); iter.IsValid(); ++iter) {
         Strategy *_strati = iter.Value().Ptr();
-        IndicatorBase *_indi = _strati.GetIndicator();
+        IndicatorData *_indi = _strati.GetIndicator();
         if (_indi != NULL) {
           ENUM_TIMEFRAMES _itf = _indi PTR_DEREF GetTf();
           IndicatorDataEntry _ientry = _indi.GetEntry();

diff --git a/Indicator.enum.h b/Indicator.enum.h
@@ -132,28 +132,6 @@ enum ENUM_INDICATOR_TYPE {
   FINAL_INDICATOR_TYPE_ENTRY
 };
 
-/* Defines type of source data for. Also acts as flags for Indicator::GetPossibleDataModes(). */
-enum ENUM_IDATA_SOURCE_TYPE {
-  IDATA_BUILTIN = 1 << 0,         // Platform built-in
-  IDATA_CHART = 1 << 1,           // Chart calculation
-  IDATA_ICUSTOM = 1 << 2,         // iCustom: Custom indicator file
-  IDATA_ICUSTOM_LEGACY = 1 << 3,  // iCustom: Custom, legacy, provided by MT indicator file
-  IDATA_INDICATOR = 1 << 4,       // OnIndicator: Another indicator as a source of data
-  IDATA_ONCALCULATE = 1 << 5,     // OnCalculate: Custom calculation function
-  IDATA_MATH = 1 << 6             // Math-based indicator
-};
-
-/* Defines range value data type for indicator storage. */
-enum ENUM_IDATA_VALUE_RANGE {
-  IDATA_RANGE_ARROW,    // Value is non-zero on signal.
-  IDATA_RANGE_BINARY,   // E.g. 0 or 1.
-  IDATA_RANGE_BITWISE,  // Bitwise
-  IDATA_RANGE_MIXED,
-  IDATA_RANGE_PRICE,  // Values represent price.
-  IDATA_RANGE_RANGE,  // E.g. 0 to 100.
-  IDATA_RANGE_UNKNOWN
-};
-
 // Indicator line identifiers used in ADX and ADXW
 enum ENUM_INDI_ADX_LINE {
 #ifdef __MQL4__