Last Works On Correction HasObjectsFunctions till Market Session Objects ...

Classes/x-saherelm.x-chart-objects.class.mq5

@@ -46,6 +46,8 @@ enum ENUM_XCHARTOBJECTS
     X_DEMAND_ZONE,
     X_BULLISH_ORDERBLOCK,
     X_BEARISH_ORDERBLOCK,
+    X_BULLISH_FVG,
+    X_BEARISH_FVG,
 };
 
 enum ENUM_X_CHART_IDS
@@ -105,9 +107,51 @@ string ToString(ENUM_X_CHART_IDS value)
 //
 // Global Chart Objects ...
 
+//
+// Bas Chart Object ...
+class XCBaseObject : public CChartObject
+{
+    //
+  public:
+    //
+
+    //
+    // Getter(s) / Setter(s) ...
+
+    /**
+     * Get Object Specified Name ...
+     *
+     * @return ( string )
+     */
+    string ObjName()
+    {
+        return mObjName;
+    }
+
+    /**
+     * Set Object Specified Name ...
+     *
+     * @param  value: String ...
+     */
+    void ObjName(string value)
+    {
+        mObjName = value;
+    }
+
+    //
+  private:
+    //
+
+    //
+    // Props ...
+    string mObjName; // Object Specified Name ...
+
+    //
+};
+
 //
 // From To Chart Object ...
-class XCFromToObject : public CChartObject
+class XCFromToObject : public XCBaseObject
 {
     //
   public:
@@ -141,19 +185,15 @@ class XCFromToObject : public CChartObject
         const string name,
         const int window,
         const datetime from,
-        const datetime to,
-        const string objprefix = NULL //
+        const datetime to //
     )
     {
         //
         bool result = false;
 
-        //
-        string mPrefix = (IsValid(objprefix) ? objprefix + "_" : "");
-
         //
         string mFromVLineName =
-            mPrefix + ToString(X_FROM) + "_" + name;
+            ToString(X_FROM) + "_" + name;
         result = mFromVLine.Create(chart_id, mFromVLineName, window, from);
         if (!result)
         {
@@ -162,13 +202,17 @@ class XCFromToObject : public CChartObject
 
         //
         string mToVLineName =
-            mPrefix + ToString(X_TO) + "_" + name;
+            ToString(X_TO) + "_" + name;
         result = mToVLine.Create(chart_id, mToVLineName, window, to);
         if (!result)
         {
             return result;
         }
 
+        //
+        // Set Object Name ...
+        ObjName(name);
+
         //
         return result;
     }
@@ -246,7 +290,7 @@ class XCFromToObject : public CChartObject
 
 //
 // Zone Chart Object ...
-class XCZoneObject : public CChartObject
+class XCZoneObject : public XCBaseObject
 {
     //
   public:
@@ -321,6 +365,11 @@ class XCZoneObject : public CChartObject
             !IsValid(objprefix)
                 ? ""
                 : objprefix + "_";
+        result = Name(prefix);
+        if (!result)
+        {
+            return result;
+        }
 
         //
         // Check Params For Rectangle ...
@@ -393,6 +442,12 @@ class XCZoneObject : public CChartObject
             }
         }
 
+        //
+        if (result)
+        {
+            ObjName(name);
+        }
+
         //
         return result;
     }
@@ -570,8 +625,7 @@ class XCTardeDayObject : public XCFromToObject
             name,
             window,
             day.from,
-            day.to,
-            "XTDAY" //
+            day.to //
         );
 
         //
@@ -639,14 +693,12 @@ class XCMarketSessionObject : public XCFromToObject
         bool result = false;
 
         //
-        string sessionLabel = ToString(session.session);
         result = Create(
             chart_id,
             name,
             window,
             session.from,
-            session.to,
-            sessionLabel //
+            session.to //
         );
 
         //
@@ -982,3 +1034,71 @@ class XCBearishOrderBlockObject : public XCZoneObject
 };
 
 //
+// Bullish FVG ...
+
+class XCBullishFVGObject : public XCZoneObject
+{
+    //
+  public:
+    //
+
+    //
+    // Constructors ...
+    void XCBullishFVGObject()
+    {
+    }
+
+    //
+    // Deconstructors ...
+    void ~XCBullishFVGObject()
+    {
+    }
+
+    /**
+     * Retrieve Object Type ...
+     *
+     * @return ( ENUM_XCHARTOBJECTS )
+     */
+    virtual ENUM_XCHARTOBJECTS Type()
+    {
+        return X_BULLISH_FVG;
+    }
+
+    //
+};
+
+//
+// Bearish FVG ...
+
+class XCBearishFVGObject : public XCZoneObject
+{
+    //
+  public:
+    //
+
+    //
+    // Constructors ...
+    void XCBearishFVGObject()
+    {
+    }
+
+    //
+    // Deconstructors ...
+    void ~XCBearishFVGObject()
+    {
+    }
+
+    /**
+     * Retrieve Object Type ...
+     *
+     * @return ( ENUM_XCHARTOBJECTS )
+     */
+    virtual ENUM_XCHARTOBJECTS Type()
+    {
+        return X_BEARISH_FVG;
+    }
+
+    //
+};
+
+//