last ...

Libraries/x-saherelm.x-poi.lib.mq5

@@ -347,6 +347,229 @@ class XCZone : public XCBasePOI
     //
 };
 
+//
+// From To Zone ...
+class XCFromToZone : public XCBasePOI
+{
+    //
+  public:
+    //
+
+    //
+    // Constructor ...
+    void XCFromToZone()
+    {
+    }
+
+    //
+    // Deconstructor ...
+    void ~XCFromToZone()
+    {
+    }
+
+    //
+    // Tools ...
+
+    bool InitFromTo(
+        ENUM_XPOIS type,
+        string title,
+        datetime from //
+    )
+    {
+        //
+        bool result = false;
+
+        //
+        result = type != X_POI_NONE &&
+                 IsSpecifiedValid(from) &&
+                 IsSpecifiedValid(title);
+
+        //
+        mType = type;
+        mFrom = from;
+        mTitle = title;
+        mTo = TimeCurrent();
+
+        //
+        result = IsValid();
+
+        //
+        return result;
+    }
+
+    bool InitFromTo(
+        ENUM_XPOIS type,
+        string title,
+        datetime from,
+        datetime to //
+    )
+    {
+        //
+        bool result = false;
+
+        //
+        result = IsValid();
+
+        //
+        result = InitFromTo(
+            type,
+            title,
+            from //
+        );
+        if (!result)
+        {
+            return result;
+        }
+
+        //
+        to = NormalizeTime(to);
+        mTo = to;
+
+        //
+        result = IsValid();
+
+        //
+        return result;
+    }
+
+    //
+    // Getter(s) / Setter(s) ...
+
+    /**
+     * Get Zone Start Time ...
+     *
+     * @return ( datetime )
+     */
+    datetime From()
+    {
+        return mFrom;
+    }
+
+    /**
+     * Set Zone Start Time ...
+     *
+     * @param  value: Datetime
+     */
+    void From(datetime value)
+    {
+        //
+        value = NormalizeTime(value);
+
+        //
+        mFrom = value;
+    }
+
+    /**
+     * Get Zone End Time ...
+     *
+     * @return ( datetime )
+     */
+    datetime To()
+    {
+        return mTo;
+    }
+
+    /**
+     * Set Zone End Time ...
+     *
+     * @param  value: Datetime
+     */
+    void To(datetime value)
+    {
+        //
+        value = NormalizeTime(value);
+
+        //
+        mTo = value;
+    }
+
+    /**
+     * Get Title ...
+     *
+     * @return ( string )
+     */
+    string Title()
+    {
+        return mTitle;
+    }
+
+    /**
+     * Set Title ...
+     *
+     * @param  value: String ...
+     */
+    // void Title(string value)
+    // {
+    //     mTitle = value;
+    // }
+
+    //
+    // Overrides ...
+
+    void Clean() override
+    {
+        //
+        mTo = NULL;
+        mFrom = NULL;
+        mType = X_POI_NONE;
+    }
+
+    bool IsValid() override
+    {
+        //
+        bool result = false;
+
+        //
+        result =
+            //
+            mType != X_POI_NONE &&
+            IsSpecifiedValid(mTo) &&
+            IsSpecifiedValid(mFrom) &&
+            IsSpecifiedValid(mTitle)
+            //
+            ;
+
+        //
+        return result;
+    }
+
+    string GetTag() override
+    {
+        //
+        string result = NULL;
+
+        //
+        if (!IsValid())
+        {
+            return result;
+        }
+
+        //
+        string hash = TypeAsString() + mSep + ToString(From()) + mSep + Title();
+        hash = ToMD5(hash);
+
+        //
+        result = TypeAsString() + "[" + Title() + "]" + mSep + hash;
+
+        //
+        return result;
+    }
+
+    //
+  protected:
+    //
+
+    //
+  private:
+    //
+    // Props ...
+    datetime mFrom; // Start Date
+    datetime mTo;   // End Date
+    string mTitle;  // Zone Title
+
+    //
+};
+
 //
 // Bar Zone ...
 class XCBarZone : public XCZone
@@ -1820,7 +2043,7 @@ class XCFVG : public XCTwoBarZone
 
         //
         result = InitTwoBarZone(
-            firstBar,
+            startBar,
             endBar,
             mTT,
             useFistForUpper,
@@ -1887,7 +2110,7 @@ class XCFVG : public XCTwoBarZone
         bool result = false;
 
         //
-        result = IsValidBarZone() &&
+        result = IsValidTwoBarZone() &&
                  (mType == X_POI_BULLISH_ORDERBLOCK ||
                   mType == X_POI_BEARISH_ORDERBLOCK);
 
@@ -1906,6 +2129,18 @@ class XCFVG : public XCTwoBarZone
     //
 };
 
+//
+// TODO: Implement this ...
+class XCDay : public XCFromToZone
+{
+};
+
+//
+// TODO: Implement this ...
+class XCSession : public XCFromToZone
+{
+};
+
 //
 
 //