From de4609690bcebe6701697ba41a50d5133d420734 Mon Sep 17 00:00:00 2001
From: Roberto Tena <robertotena@users.noreply.github.com>
Date: Tue, 15 Jul 2025 11:37:52 +0200
Subject: [PATCH] Add Quarterly and Yearly periods

---
 Technical/VWAP.cs | 38 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/Technical/VWAP.cs b/Technical/VWAP.cs
index f30f11a8c..3d85f07d1 100644
--- a/Technical/VWAP.cs
+++ b/Technical/VWAP.cs
@@ -30,6 +30,8 @@ public enum VWAPPeriodType
         Daily,
         Weekly,
         Monthly,
+        Quarterly,
+        Yearly,
         All,
         Custom
     }
@@ -619,7 +621,7 @@ protected override void OnCalculate(int bar, decimal value)
         }
 
         if (!ShowFirstPeriod && !AllowCustomStartPoint && !_calcStarted
-            && Type is VWAPPeriodType.Weekly or VWAPPeriodType.Monthly or VWAPPeriodType.Custom)
+            && Type is VWAPPeriodType.Weekly or VWAPPeriodType.Monthly or VWAPPeriodType.Quarterly or VWAPPeriodType.Yearly or VWAPPeriodType.Custom)
         {
 	        if (bar == 0 && Type is not VWAPPeriodType.Custom)
 		        return;
@@ -632,6 +634,12 @@ protected override void OnCalculate(int bar, decimal value)
 		        case VWAPPeriodType.Monthly:
 			        _calcStarted = IsNewMonth(bar);
 			        break;
+	   		case VWAPPeriodType.Quarterly:
+      				_calcStarted = IsNewQuarter(bar);
+	  			break;
+      			case VWAPPeriodType.Yearly:
+	 			_calcStarted = IsNewYear(bar);
+     				break;
 		        case VWAPPeriodType.Custom:
 			        _calcStarted = IsNewCustomSession(bar);
 			        break;
@@ -685,6 +693,8 @@ protected override void OnCalculate(int bar, decimal value)
             case VWAPPeriodType.Daily when IsNewSession(bar):
 			case VWAPPeriodType.Weekly when IsNewWeek(bar):
 			case VWAPPeriodType.Monthly when IsNewMonth(bar):
+			case VWAPPeriodType.Quarterly when IsNewQuarter(bar):
+			case VWAPPeriodType.Yearly when IsNewYear(bar):
 			case VWAPPeriodType.Custom when IsNewCustomSession(bar):
 				needReset = true;
                 break;
@@ -945,6 +955,30 @@ private int BarFromDate(DateTime date)
 		return bar;
 	}
 
+	private bool IsNewQuarter(int bar)
+	{
+		if (bar == 0)
+			return false;
+
+		var prevTime = GetCandle(bar - 1).Time;
+		var currTime = GetCandle(bar).Time;
+
+		int GetQuarter(DateTime dt) => (dt.Month - 1) / 3 + 1;
+
+		return prevTime.Year != currTime.Year || GetQuarter(currTime) != GetQuarter(prevTime);
+	}
+
+	private bool IsNewYear(int bar)
+	{
+		if (bar == 0)
+			return false;
+		
+		var prevTime = GetCandle(bar - 1).Time;
+		var currTime = GetCandle(bar).Time;
+
+		return prevTime.Year != currTime.Year;
+	}
+
 	private bool IsNewCustomSession(int bar)
 	{
 		var currentBar = GetCandle(bar);
@@ -1022,4 +1056,4 @@ private static CrossColor GetColorFromHex(string hexString)
     }
 
     #endregion
-}
\ No newline at end of file
+}