Merge pull request #543 from EA31337/dev

Development enhancements
EA31337 · Aug 18, 2021 · 550c858 · 550c858
2 parents 24d7652 + 73d8154
commit 550c858
Show file tree

Hide file tree

Showing 44 changed files with 150 additions and 80 deletions.
diff --git a/Bar.struct.h b/Bar.struct.h
@@ -44,7 +44,7 @@ class Serializer;
 /* Struct for storing OHLC values. */
 struct BarOHLC
 #ifndef __MQL__
-  : public ISerializable
+    : public ISerializable
 #endif
 {
   datetime time;
@@ -221,6 +221,7 @@ struct BarOHLC
   // State checkers.
   bool IsBear() const { return open > close; }
   bool IsBull() const { return open < close; }
+  bool IsValid() const { return high >= low && fmin(open, close) > 0; }
   // Serializers.
   SerializerNodeType Serialize(Serializer &s);
   // Converters.

diff --git a/Indicator.enum.h b/Indicator.enum.h
@@ -127,16 +127,17 @@ enum ENUM_INDICATOR_TYPE {
 
 /* Defines type of source data for indicator. */
 enum ENUM_IDATA_SOURCE_TYPE {
-  IDATA_BUILTIN,    // Use builtin function.
-  IDATA_ICUSTOM,    // Use custom indicator file (iCustom).
-  IDATA_INDICATOR,  // Use indicator class as source of data with custom calculation.
-  IDATA_MATH        // Use Math-based indicator over Price indicator.
+  IDATA_BUILTIN,    // Platform built-in
+  IDATA_ICUSTOM,    // Custom indicator file (iCustom)
+  IDATA_INDICATOR,  // Another indicator as a source of data
+  IDATA_MATH        // 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.

diff --git a/Indicator.mqh b/Indicator.mqh
@@ -522,6 +522,22 @@ class Indicator : public Chart {
 
   /* Getters */
 
+  /**
+   * Gets an indicator's chart parameter value.
+   */
+  template <typename T>
+  T Get(ENUM_CHART_PARAM _param) {
+    return Chart::Get<T>(_param);
+  }
+
+  /**
+   * Gets an indicator's state property value.
+   */
+  template <typename T>
+  T Get(STRUCT_ENUM(IndicatorState, ENUM_INDICATOR_STATE_PROP) _prop) {
+    return istate.Get<T>(_prop);
+  }
+
   /**
    * Gets an indicator property flag.
    */
@@ -856,11 +872,6 @@ class Indicator : public Chart {
     return name + ")";
   }
 
-  /**
-   * Get indicator's state.
-   */
-  IndicatorState GetState() { return istate; }
-
   /* Setters */
 
   /**

diff --git a/Indicator.struct.h b/Indicator.struct.h
@@ -573,13 +573,34 @@ struct IndicatorParams {
 
 /* Structure for indicator state. */
 struct IndicatorState {
+  enum ENUM_INDICATOR_STATE_PROP {
+    INDICATOR_STATE_PROP_HANDLE,
+    INDICATOR_STATE_PROP_IS_CHANGED,
+    INDICATOR_STATE_PROP_IS_READY,
+  };
   int handle;       // Indicator handle (MQL5 only).
   bool is_changed;  // Set when params has been recently changed.
   bool is_ready;    // Set when indicator is ready (has valid values).
   // Constructor.
   IndicatorState() : handle(INVALID_HANDLE), is_changed(true), is_ready(false) {}
   // Getters.
-  int GetHandle() { return handle; }
+  template <typename T>
+#ifdef __MQL4__
+  T Get(ENUM_INDICATOR_STATE_PROP _prop) {
+#else
+  T Get(IndicatorState::ENUM_INDICATOR_STATE_PROP _prop) {
+#endif
+    switch (_prop) {
+      case INDICATOR_STATE_PROP_HANDLE:
+        return (T)handle;
+      case INDICATOR_STATE_PROP_IS_CHANGED:
+        return (T)is_changed;
+      case INDICATOR_STATE_PROP_IS_READY:
+        return (T)is_ready;
+    }
+    SetUserError(ERR_INVALID_PARAMETER);
+    return (T)WRONG_VALUE;
+  }
   // State checkers.
   bool IsChanged() { return is_changed; }
   bool IsReady() { return is_ready; }

diff --git a/Indicators/Indi_AC.mqh b/Indicators/Indi_AC.mqh
@@ -73,7 +73,7 @@ class Indi_AC : public Indicator {
 #ifdef __MQL4__
     return ::iAC(_symbol, _tf, _shift);
 #else  // __MQL5__
-    int _handle = Object::IsValid(_obj) ? _obj.GetState().GetHandle() : NULL;
+    int _handle = Object::IsValid(_obj) ? _obj.Get<int>(IndicatorState::INDICATOR_STATE_PROP_HANDLE) : NULL;
     double _res[];
     ResetLastError();
     if (_handle == NULL || _handle == INVALID_HANDLE) {

diff --git a/Indicators/Indi_AD.mqh b/Indicators/Indi_AD.mqh
@@ -72,7 +72,7 @@ class Indi_AD : public Indicator {
 #ifdef __MQL4__
     return ::iAD(_symbol, _tf, _shift);
 #else  // __MQL5__
-    int _handle = Object::IsValid(_obj) ? _obj.GetState().GetHandle() : NULL;
+    int _handle = Object::IsValid(_obj) ? _obj.Get<int>(IndicatorState::INDICATOR_STATE_PROP_HANDLE) : NULL;
     double _res[];
     ResetLastError();
     if (_handle == NULL || _handle == INVALID_HANDLE) {

diff --git a/Indicators/Indi_ADX.mqh b/Indicators/Indi_ADX.mqh
@@ -93,7 +93,7 @@ class Indi_ADX : public Indicator {
 #ifdef __MQL4__
     return ::iADX(_symbol, _tf, _period, _applied_price, _mode, _shift);
 #else  // __MQL5__
-    int _handle = Object::IsValid(_obj) ? _obj.GetState().GetHandle() : NULL;
+    int _handle = Object::IsValid(_obj) ? _obj.Get<int>(IndicatorState::INDICATOR_STATE_PROP_HANDLE) : NULL;
     double _res[];
     ResetLastError();
     if (_handle == NULL || _handle == INVALID_HANDLE) {

diff --git a/Indicators/Indi_AO.mqh b/Indicators/Indi_AO.mqh
@@ -77,7 +77,7 @@ class Indi_AO : public Indicator {
     // Note: In MQL4 _mode is not supported.
     return ::iAO(_symbol, _tf, _shift);
 #else  // __MQL5__
-    int _handle = Object::IsValid(_obj) ? _obj.GetState().GetHandle() : NULL;
+    int _handle = Object::IsValid(_obj) ? _obj.Get<int>(IndicatorState::INDICATOR_STATE_PROP_HANDLE) : NULL;
     double _res[];
     ResetLastError();
     if (_handle == NULL || _handle == INVALID_HANDLE) {

diff --git a/Indicators/Indi_ATR.mqh b/Indicators/Indi_ATR.mqh
@@ -75,7 +75,7 @@ class Indi_ATR : public Indicator {
 #ifdef __MQL4__
     return ::iATR(_symbol, _tf, _period, _shift);
 #else  // __MQL5__
-    int _handle = Object::IsValid(_obj) ? _obj.GetState().GetHandle() : NULL;
+    int _handle = Object::IsValid(_obj) ? _obj.Get<int>(IndicatorState::INDICATOR_STATE_PROP_HANDLE) : NULL;
     double _res[];
     ResetLastError();
     if (_handle == NULL || _handle == INVALID_HANDLE) {

diff --git a/Indicators/Indi_Alligator.mqh b/Indicators/Indi_Alligator.mqh
@@ -133,7 +133,7 @@ class Indi_Alligator : public Indicator {
     return ::iAlligator(_symbol, _tf, _jaw_period, _jaw_shift, _teeth_period, _teeth_shift, _lips_period, _lips_shift,
                         _ma_method, _applied_price, _mode, _shift);
 #else  // __MQL5__
-    int _handle = Object::IsValid(_obj) ? _obj.GetState().GetHandle() : NULL;
+    int _handle = Object::IsValid(_obj) ? _obj.Get<int>(IndicatorState::INDICATOR_STATE_PROP_HANDLE) : NULL;
     double _res[];
     ResetLastError();
     if (_handle == NULL || _handle == INVALID_HANDLE) {

diff --git a/Indicators/Indi_BWMFI.mqh b/Indicators/Indi_BWMFI.mqh
@@ -86,7 +86,7 @@ class Indi_BWMFI : public Indicator {
     _shift++;
     return ::iBWMFI(_symbol, _tf, _shift);
 #else  // __MQL5__
-    int _handle = Object::IsValid(_obj) ? _obj.GetState().GetHandle() : NULL;
+    int _handle = Object::IsValid(_obj) ? _obj.Get<int>(IndicatorState::INDICATOR_STATE_PROP_HANDLE) : NULL;
     double _res[];
     ResetLastError();
     if (_handle == NULL || _handle == INVALID_HANDLE) {

diff --git a/Indicators/Indi_Bands.mqh b/Indicators/Indi_Bands.mqh
@@ -116,7 +116,7 @@ class Indi_Bands : public Indicator {
 #ifdef __MQL4__
     return ::iBands(_symbol, _tf, _period, _deviation, _bands_shift, _applied_price, _mode, _shift);
 #else  // __MQL5__
-    int _handle = Object::IsValid(_obj) ? _obj.GetState().GetHandle() : NULL;
+    int _handle = Object::IsValid(_obj) ? _obj.Get<int>(IndicatorState::INDICATOR_STATE_PROP_HANDLE) : NULL;
     double _res[];
     ResetLastError();
     if (_handle == NULL || _handle == INVALID_HANDLE) {

diff --git a/Indicators/Indi_BearsPower.mqh b/Indicators/Indi_BearsPower.mqh
@@ -81,7 +81,7 @@ class Indi_BearsPower : public Indicator {
 #ifdef __MQL4__
     return ::iBearsPower(_symbol, _tf, _period, _applied_price, _shift);
 #else  // __MQL5__
-    int _handle = Object::IsValid(_obj) ? _obj.GetState().GetHandle() : NULL;
+    int _handle = Object::IsValid(_obj) ? _obj.Get<int>(IndicatorState::INDICATOR_STATE_PROP_HANDLE) : NULL;
     double _res[];
     ResetLastError();
     if (_handle == NULL || _handle == INVALID_HANDLE) {

diff --git a/Indicators/Indi_BullsPower.mqh b/Indicators/Indi_BullsPower.mqh
@@ -83,7 +83,7 @@ class Indi_BullsPower : public Indicator {
 #ifdef __MQL4__
     return ::iBullsPower(_symbol, _tf, _period, _applied_price, _shift);
 #else  // __MQL5__
-    int _handle = Object::IsValid(_obj) ? _obj.GetState().GetHandle() : NULL;
+    int _handle = Object::IsValid(_obj) ? _obj.Get<int>(IndicatorState::INDICATOR_STATE_PROP_HANDLE) : NULL;
     double _res[];
     ResetLastError();
     if (_handle == NULL || _handle == INVALID_HANDLE) {

diff --git a/Indicators/Indi_CCI.mqh b/Indicators/Indi_CCI.mqh
@@ -86,7 +86,7 @@ class Indi_CCI : public Indicator {
 #ifdef __MQL4__
     return ::iCCI(_symbol, _tf, _period, _applied_price, _shift);
 #else  // __MQL5__
-    int _handle = Object::IsValid(_obj) ? _obj.GetState().GetHandle() : NULL;
+    int _handle = Object::IsValid(_obj) ? _obj.Get<int>(IndicatorState::INDICATOR_STATE_PROP_HANDLE) : NULL;
     double _res[];
     ResetLastError();
     if (_handle == NULL || _handle == INVALID_HANDLE) {

diff --git a/Indicators/Indi_DEMA.mqh b/Indicators/Indi_DEMA.mqh
@@ -82,7 +82,7 @@ class Indi_DEMA : public Indicator {
                       ENUM_APPLIED_PRICE _applied_price, int _shift = 0, int _mode = 0, Indicator *_obj = NULL) {
     ResetLastError();
 #ifdef __MQL5__
-    int _handle = Object::IsValid(_obj) ? _obj.GetState().GetHandle() : NULL;
+    int _handle = Object::IsValid(_obj) ? _obj.Get<int>(IndicatorState::INDICATOR_STATE_PROP_HANDLE) : NULL;
     double _res[];
     ResetLastError();
     if (_handle == NULL || _handle == INVALID_HANDLE) {

diff --git a/Indicators/Indi_DeMarker.mqh b/Indicators/Indi_DeMarker.mqh
@@ -75,7 +75,7 @@ class Indi_DeMarker : public Indicator {
 #ifdef __MQL4__
     return ::iDeMarker(_symbol, _tf, _period, _shift);
 #else  // __MQL5__
-    int _handle = Object::IsValid(_obj) ? _obj.GetState().GetHandle() : NULL;
+    int _handle = Object::IsValid(_obj) ? _obj.Get<int>(IndicatorState::INDICATOR_STATE_PROP_HANDLE) : NULL;
     double _res[];
     ResetLastError();
     if (_handle == NULL || _handle == INVALID_HANDLE) {

diff --git a/Indicators/Indi_Envelopes.mqh b/Indicators/Indi_Envelopes.mqh
@@ -116,7 +116,7 @@ class Indi_Envelopes : public Indicator {
         _mode = 1;
         break;
     }
-    int _handle = Object::IsValid(_obj) ? _obj.GetState().GetHandle() : NULL;
+    int _handle = Object::IsValid(_obj) ? _obj.Get<int>(IndicatorState::INDICATOR_STATE_PROP_HANDLE) : NULL;
     double _res[];
     ResetLastError();
     if (_handle == NULL || _handle == INVALID_HANDLE) {

diff --git a/Indicators/Indi_Force.mqh b/Indicators/Indi_Force.mqh
@@ -95,7 +95,7 @@ class Indi_Force : public Indicator {
 #ifdef __MQL4__
     return ::iForce(_symbol, _tf, _period, _ma_method, _applied_price, _shift);
 #else  // __MQL5__
-    int _handle = Object::IsValid(_obj) ? _obj.GetState().GetHandle() : NULL;
+    int _handle = Object::IsValid(_obj) ? _obj.Get<int>(IndicatorState::INDICATOR_STATE_PROP_HANDLE) : NULL;
     double _res[];
     ResetLastError();
     if (_handle == NULL || _handle == INVALID_HANDLE) {

diff --git a/Indicators/Indi_Fractals.mqh b/Indicators/Indi_Fractals.mqh
@@ -76,7 +76,7 @@ class Indi_Fractals : public Indicator {
 #ifdef __MQL4__
     return ::iFractals(_symbol, _tf, _mode, _shift);
 #else  // __MQL5__
-    int _handle = Object::IsValid(_obj) ? _obj.GetState().GetHandle() : NULL;
+    int _handle = Object::IsValid(_obj) ? _obj.Get<int>(IndicatorState::INDICATOR_STATE_PROP_HANDLE) : NULL;
     double _res[];
     ResetLastError();
     if (_handle == NULL || _handle == INVALID_HANDLE) {

diff --git a/Indicators/Indi_Gator.mqh b/Indicators/Indi_Gator.mqh
@@ -151,7 +151,7 @@ class Indi_Gator : public Indicator {
     return ::iGator(_symbol, _tf, _jaw_period, _jaw_shift, _teeth_period, _teeth_shift, _lips_period, _lips_shift,
                     _ma_method, _applied_price, _mode, _shift);
 #else  // __MQL5__
-    int _handle = Object::IsValid(_obj) ? _obj.GetState().GetHandle() : NULL;
+    int _handle = Object::IsValid(_obj) ? _obj.Get<int>(IndicatorState::INDICATOR_STATE_PROP_HANDLE) : NULL;
     double _res[];
     ResetLastError();
     if (_handle == NULL || _handle == INVALID_HANDLE) {

diff --git a/Indicators/Indi_HeikenAshi.mqh b/Indicators/Indi_HeikenAshi.mqh
@@ -99,7 +99,7 @@ class Indi_HeikenAshi : public Indicator {
     }
     return ::iCustom(_symbol, _tf, "Heiken Ashi", _mode, _shift);
 #else  // __MQL5__
-    int _handle = Object::IsValid(_obj) ? _obj.GetState().GetHandle() : NULL;
+    int _handle = Object::IsValid(_obj) ? _obj.Get<int>(IndicatorState::INDICATOR_STATE_PROP_HANDLE) : NULL;
     double _res[];
     ResetLastError();
     if (_handle == NULL || _handle == INVALID_HANDLE) {

diff --git a/Indicators/Indi_Ichimoku.mqh b/Indicators/Indi_Ichimoku.mqh
@@ -118,7 +118,7 @@ class Indi_Ichimoku : public Indicator {
 #ifdef __MQL4__
     return ::iIchimoku(_symbol, _tf, _tenkan_sen, _kijun_sen, _senkou_span_b, _mode, _shift);
 #else  // __MQL5__
-    int _handle = Object::IsValid(_obj) ? _obj.GetState().GetHandle() : NULL;
+    int _handle = Object::IsValid(_obj) ? _obj.Get<int>(IndicatorState::INDICATOR_STATE_PROP_HANDLE) : NULL;
     double _res[];
     ResetLastError();
     if (_handle == NULL || _handle == INVALID_HANDLE) {

diff --git a/Indicators/Indi_MA.mqh b/Indicators/Indi_MA.mqh
@@ -99,7 +99,7 @@ class Indi_MA : public Indicator {
 #ifdef __MQL4__
     return ::iMA(_symbol, _tf, _ma_period, _ma_shift, _ma_method, _applied_price, _shift);
 #else  // __MQL5__
-    int _handle = Object::IsValid(_obj) ? _obj.GetState().GetHandle() : NULL;
+    int _handle = Object::IsValid(_obj) ? _obj.Get<int>(IndicatorState::INDICATOR_STATE_PROP_HANDLE) : NULL;
     double _res[];
     ResetLastError();
     if (_handle == NULL || _handle == INVALID_HANDLE) {

diff --git a/Indicators/Indi_MACD.mqh b/Indicators/Indi_MACD.mqh
@@ -89,7 +89,7 @@ class Indi_MACD : public Indicator {
 #ifdef __MQL4__
     return ::iMACD(_symbol, _tf, _ema_fast_period, _ema_slow_period, _signal_period, _applied_price, _mode, _shift);
 #else  // __MQL5__
-    int _handle = Object::IsValid(_obj) ? _obj.GetState().GetHandle() : NULL;
+    int _handle = Object::IsValid(_obj) ? _obj.Get<int>(IndicatorState::INDICATOR_STATE_PROP_HANDLE) : NULL;
     double _res[];
     ResetLastError();
     if (_handle == NULL || _handle == INVALID_HANDLE) {

diff --git a/Indicators/Indi_MFI.mqh b/Indicators/Indi_MFI.mqh
@@ -87,7 +87,7 @@ class Indi_MFI : public Indicator {
 #ifdef __MQL4__
     return ::iMFI(_symbol, _tf, _period, _shift);
 #else  // __MQL5__
-    int _handle = Object::IsValid(_obj) ? _obj.GetState().GetHandle() : NULL;
+    int _handle = Object::IsValid(_obj) ? _obj.Get<int>(IndicatorState::INDICATOR_STATE_PROP_HANDLE) : NULL;
     double _res[];
     ResetLastError();
     if (_handle == NULL || _handle == INVALID_HANDLE) {

diff --git a/Indicators/Indi_Momentum.mqh b/Indicators/Indi_Momentum.mqh
@@ -91,7 +91,7 @@ class Indi_Momentum : public Indicator {
 #ifdef __MQL4__
     return ::iMomentum(_symbol, _tf, _period, _ap, _shift);
 #else  // __MQL5__
-    int _handle = Object::IsValid(_obj) ? _obj.GetState().GetHandle() : NULL;
+    int _handle = Object::IsValid(_obj) ? _obj.Get<int>(IndicatorState::INDICATOR_STATE_PROP_HANDLE) : NULL;
     double _res[];
     ResetLastError();
     if (_handle == NULL || _handle == INVALID_HANDLE) {

diff --git a/Indicators/Indi_OBV.mqh b/Indicators/Indi_OBV.mqh
@@ -110,7 +110,7 @@ class Indi_OBV : public Indicator {
 #ifdef __MQL4__
     return ::iOBV(_symbol, _tf, _applied, _shift);
 #else  // __MQL5__
-    int _handle = Object::IsValid(_obj) ? _obj.GetState().GetHandle() : NULL;
+    int _handle = Object::IsValid(_obj) ? _obj.Get<int>(IndicatorState::INDICATOR_STATE_PROP_HANDLE) : NULL;
     double _res[];
     ResetLastError();
     if (_handle == NULL || _handle == INVALID_HANDLE) {

diff --git a/Indicators/Indi_OsMA.mqh b/Indicators/Indi_OsMA.mqh
@@ -86,7 +86,7 @@ class Indi_OsMA : public Indicator {
 #ifdef __MQL4__
     return ::iOsMA(_symbol, _tf, _ema_fast_period, _ema_slow_period, _signal_period, _applied_price, _shift);
 #else  // __MQL5__
-    int _handle = Object::IsValid(_obj) ? _obj.GetState().GetHandle() : NULL;
+    int _handle = Object::IsValid(_obj) ? _obj.Get<int>(IndicatorState::INDICATOR_STATE_PROP_HANDLE) : NULL;
     double _res[];
     ResetLastError();
     if (_handle == NULL || _handle == INVALID_HANDLE) {