update EA
This commit is contained in:
@@ -38,6 +38,7 @@ enum ENUM_OI_SOURCE {
|
||||
};
|
||||
input ENUM_OI_SOURCE InpOISource = OI_SOURCE_MANUAL;
|
||||
input string InpOICsvPath = "\\Files\\oi_data.csv"; // Path to CSV file
|
||||
input int InpCSVReloadInterval = 60; // CSV reload interval (minutes, 0=disabled)
|
||||
input double InpManualFuturePrice = 0.0; // Manual future price input
|
||||
|
||||
// OI Levels (Manual Input - สามารถใส่ได้ถึง 3 ระดับ)
|
||||
@@ -170,6 +171,12 @@ bool NewsBlockActive = false;
|
||||
datetime NewsBlockStart = 0;
|
||||
datetime NewsBlockEnd = 0;
|
||||
|
||||
// CSV Cache Variables
|
||||
double CachedFuturePrice = -1;
|
||||
string LoadedCSVPath = "";
|
||||
bool CSVLoadLogged = false;
|
||||
datetime LastCSVReloadTime = 0;
|
||||
|
||||
//=== NEW: Control Panel Variables ===
|
||||
// Control Panel Position - Moved below dashboard
|
||||
int ControlPanelX = 10;
|
||||
@@ -372,6 +379,16 @@ void OnTimer()
|
||||
|
||||
//--- Reset daily statistics if new day
|
||||
CheckDailyReset();
|
||||
|
||||
//--- CSV reload check
|
||||
if(InpOISource == OI_SOURCE_CSV_FILE && InpCSVReloadInterval > 0) {
|
||||
if(TimeCurrent() - LastCSVReloadTime >= InpCSVReloadInterval * 60) {
|
||||
Print("CSV Reload: Scheduled reload triggered");
|
||||
LastCSVReloadTime = TimeCurrent();
|
||||
CachedFuturePrice = -1;
|
||||
LoadOIFromCSV();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//+------------------------------------------------------------------+
|
||||
@@ -1100,20 +1117,26 @@ void LoadOIFromCSV()
|
||||
if(filehandle == INVALID_HANDLE)
|
||||
{
|
||||
Print("Error opening CSV file: ", filename);
|
||||
// Fall back to manual levels
|
||||
InitializeOILevels();
|
||||
return;
|
||||
}
|
||||
|
||||
// Skip header if exists
|
||||
FileReadString(filehandle);
|
||||
|
||||
int callIndex = 0;
|
||||
int putIndex = 0;
|
||||
double futurePrice = 0.0;
|
||||
bool isFirstLine = true;
|
||||
|
||||
while(!FileIsEnding(filehandle) && (callIndex < 3 || putIndex < 3))
|
||||
{
|
||||
string row = FileReadString(filehandle);
|
||||
|
||||
if(isFirstLine) {
|
||||
isFirstLine = false;
|
||||
if(StringFind(row, "Type") >= 0 || StringFind(row, "Strike") >= 0 || StringFind(row, "OI") >= 0) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
string data[];
|
||||
int count = StringSplit(row, ',', data);
|
||||
|
||||
@@ -1123,7 +1146,14 @@ void LoadOIFromCSV()
|
||||
double strike = StringToDouble(data[1]);
|
||||
int oi = (int)StringToInteger(data[2]);
|
||||
|
||||
if(type == "CALL" && callIndex < 3)
|
||||
if(StringFind(type, "Future") >= 0)
|
||||
{
|
||||
futurePrice = strike;
|
||||
if(!CSVLoadLogged) {
|
||||
Print("DEBUG: Parsed Future price: ", futurePrice);
|
||||
}
|
||||
}
|
||||
else if(type == "CALL" && callIndex < 3)
|
||||
{
|
||||
CallLevels[callIndex] = strike;
|
||||
CallOI[callIndex] = oi;
|
||||
@@ -1140,7 +1170,6 @@ void LoadOIFromCSV()
|
||||
|
||||
FileClose(filehandle);
|
||||
|
||||
// Fill any missing levels with zeros
|
||||
for(int i = callIndex; i < 3; i++)
|
||||
{
|
||||
CallLevels[i] = 0;
|
||||
@@ -1152,6 +1181,21 @@ void LoadOIFromCSV()
|
||||
PutLevels[i] = 0;
|
||||
PutOI[i] = 0;
|
||||
}
|
||||
|
||||
if(futurePrice > 0) {
|
||||
CachedFuturePrice = futurePrice;
|
||||
DynamicFuturePrice = futurePrice;
|
||||
FuturePrice = futurePrice;
|
||||
LoadedCSVPath = filename;
|
||||
CSVLoadLogged = true;
|
||||
Print("CSV SUCCESS: FuturePrice=", futurePrice, ", CALL=[", CallLevels[0], ",", CallLevels[1], ",", CallLevels[2], "], PUT=[", PutLevels[0], ",", PutLevels[1], ",", PutLevels[2], "] loaded from ", filename);
|
||||
} else {
|
||||
if(!CSVLoadLogged) {
|
||||
Print("CSV ERROR: No valid price found in ", filename);
|
||||
CSVLoadLogged = true;
|
||||
}
|
||||
CachedFuturePrice = 0;
|
||||
}
|
||||
}
|
||||
|
||||
//+------------------------------------------------------------------+
|
||||
@@ -1218,8 +1262,12 @@ bool UpdateMarketData()
|
||||
SpotPrice = SymbolInfo.Bid();
|
||||
SymbolInfo.RefreshRates();
|
||||
|
||||
// Get future price (manual or from symbol)
|
||||
if(DynamicFuturePrice > 0)
|
||||
// Get future price (CSV cache, manual or from symbol)
|
||||
if(CachedFuturePrice > 0)
|
||||
{
|
||||
FuturePrice = CachedFuturePrice;
|
||||
}
|
||||
else if(DynamicFuturePrice > 0)
|
||||
{
|
||||
FuturePrice = DynamicFuturePrice;
|
||||
}
|
||||
|
||||
@@ -98,6 +98,7 @@ input int InpTrailingStepPoints = 50;
|
||||
input bool InpUseSoftStopLoss = true;
|
||||
input bool InpUseAutoRecovery = true;
|
||||
input bool InpEnableDashboard = true;
|
||||
input int InpCSVReloadInterval = 60;
|
||||
|
||||
CTrade Trade;
|
||||
CSymbolInfo SymbolInfo;
|
||||
@@ -199,6 +200,7 @@ double LastPrice = 0.0;
|
||||
double CachedFuturePrice = -1;
|
||||
string LoadedCSVPath = "";
|
||||
bool CSVLoadLogged = false;
|
||||
datetime LastCSVReloadTime = 0;
|
||||
|
||||
int OnInit() {
|
||||
Trade.SetExpertMagicNumber(InpMagicNumber);
|
||||
@@ -308,6 +310,15 @@ void OnTimer() {
|
||||
}
|
||||
|
||||
CheckDailyReset();
|
||||
|
||||
if(InpOISource == OI_SOURCE_CSV_FILE && InpCSVReloadInterval > 0) {
|
||||
if(TimeCurrent() - LastCSVReloadTime >= InpCSVReloadInterval * 60) {
|
||||
Print("CSV Reload: Scheduled reload triggered");
|
||||
LastCSVReloadTime = TimeCurrent();
|
||||
CachedFuturePrice = -1;
|
||||
LoadOIFromCSV();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void OnChartEvent(const int id, const long &lparam, const double &dparam, const string &sparam) {
|
||||
@@ -1007,51 +1018,30 @@ bool InitializeIndicators() {
|
||||
|
||||
void LoadOIFromCSV()
|
||||
{
|
||||
string paths[];
|
||||
int pathCount = 0;
|
||||
int filehandle = FileOpen(InpOICsvPath, FILE_READ | FILE_CSV | FILE_ANSI, ',');
|
||||
|
||||
ArrayResize(paths, 5);
|
||||
paths[pathCount++] = InpOICsvPath;
|
||||
paths[pathCount++] = "oi_data.csv";
|
||||
paths[pathCount++] = "\\Files\\oi_data.csv";
|
||||
paths[pathCount++] = "..\\oi_scraper\\oi_data.csv";
|
||||
paths[pathCount++] = "../oi_scraper/oi_data.csv";
|
||||
|
||||
int filehandle = INVALID_HANDLE;
|
||||
string foundPath = "";
|
||||
|
||||
for(int i = 0; i < pathCount; i++) {
|
||||
if(!CSVLoadLogged) {
|
||||
Print("Trying CSV path: ", paths[i]);
|
||||
}
|
||||
filehandle = FileOpen(paths[i], FILE_READ | FILE_CSV | FILE_ANSI, ',');
|
||||
if(filehandle != INVALID_HANDLE) {
|
||||
foundPath = paths[i];
|
||||
if(!CSVLoadLogged) {
|
||||
Print("Found CSV file at: ", foundPath);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if(filehandle == INVALID_HANDLE) {
|
||||
if(!CSVLoadLogged) {
|
||||
Print("CSV ERROR: File not found. Searched paths:");
|
||||
for(int i = 0; i < pathCount; i++) {
|
||||
Print(" - ", paths[i]);
|
||||
}
|
||||
CSVLoadLogged = true;
|
||||
}
|
||||
if(filehandle == INVALID_HANDLE)
|
||||
{
|
||||
Print("CSV ERROR: Cannot open ", InpOICsvPath);
|
||||
return;
|
||||
}
|
||||
|
||||
int callIndex = 0;
|
||||
int putIndex = 0;
|
||||
double futurePrice = 0.0;
|
||||
bool isFirstLine = true;
|
||||
|
||||
while(!FileIsEnding(filehandle) && (callIndex < 3 || putIndex < 3))
|
||||
{
|
||||
string row = FileReadString(filehandle);
|
||||
|
||||
if(isFirstLine) {
|
||||
isFirstLine = false;
|
||||
if(StringFind(row, "Type") >= 0 || StringFind(row, "Strike") >= 0 || StringFind(row, "OI") >= 0) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
string data[];
|
||||
int count = StringSplit(row, ',', data);
|
||||
|
||||
@@ -1064,9 +1054,6 @@ void LoadOIFromCSV()
|
||||
if(StringFind(type, "Future") >= 0)
|
||||
{
|
||||
futurePrice = strike;
|
||||
if(!CSVLoadLogged) {
|
||||
Print("DEBUG: Parsed Future price: ", futurePrice);
|
||||
}
|
||||
}
|
||||
else if(type == "CALL" && callIndex < 3)
|
||||
{
|
||||
@@ -1085,30 +1072,14 @@ void LoadOIFromCSV()
|
||||
|
||||
FileClose(filehandle);
|
||||
|
||||
for(int i = callIndex; i < 3; i++)
|
||||
{
|
||||
CallLevels[i] = 0;
|
||||
CallOI[i] = 0;
|
||||
}
|
||||
|
||||
for(int i = putIndex; i < 3; i++)
|
||||
{
|
||||
PutLevels[i] = 0;
|
||||
PutOI[i] = 0;
|
||||
}
|
||||
for(int i = callIndex; i < 3; i++) { CallLevels[i] = 0; CallOI[i] = 0; }
|
||||
for(int i = putIndex; i < 3; i++) { PutLevels[i] = 0; PutOI[i] = 0; }
|
||||
|
||||
if(futurePrice > 0) {
|
||||
CachedFuturePrice = futurePrice;
|
||||
DynamicFuturePrice = futurePrice;
|
||||
LoadedCSVPath = foundPath;
|
||||
CSVLoadLogged = true;
|
||||
Print("CSV SUCCESS: FuturePrice=", futurePrice, ", CALL=[", CallLevels[0], ",", CallLevels[1], ",", CallLevels[2], "], PUT=[", PutLevels[0], ",", PutLevels[1], ",", PutLevels[2], "] loaded from ", foundPath);
|
||||
} else {
|
||||
if(!CSVLoadLogged) {
|
||||
Print("CSV ERROR: No valid price found in ", foundPath);
|
||||
CSVLoadLogged = true;
|
||||
}
|
||||
CachedFuturePrice = 0;
|
||||
FuturePrice = futurePrice;
|
||||
Print("CSV SUCCESS: FuturePrice=", futurePrice);
|
||||
}
|
||||
|
||||
InitializeKeyLevels();
|
||||
@@ -1381,31 +1352,4 @@ void UpdateInputValues() {
|
||||
CachedFuturePrice = -1;
|
||||
LoadOIFromCSV();
|
||||
}
|
||||
}
|
||||
|
||||
if(ObjectGetString(chart_id, "CP_CallStrike1", OBJPROP_TEXT, 0, value)) {
|
||||
DynamicCallStrike1 = StringToDouble(value);
|
||||
}
|
||||
if(ObjectGetString(chart_id, "CP_CallStrike2", OBJPROP_TEXT, 0, value)) {
|
||||
DynamicCallStrike2 = StringToDouble(value);
|
||||
}
|
||||
if(ObjectGetString(chart_id, "CP_CallStrike3", OBJPROP_TEXT, 0, value)) {
|
||||
DynamicCallStrike3 = StringToDouble(value);
|
||||
}
|
||||
if(ObjectGetString(chart_id, "CP_PutStrike1", OBJPROP_TEXT, 0, value)) {
|
||||
DynamicPutStrike1 = StringToDouble(value);
|
||||
}
|
||||
if(ObjectGetString(chart_id, "CP_PutStrike2", OBJPROP_TEXT, 0, value)) {
|
||||
DynamicPutStrike2 = StringToDouble(value);
|
||||
}
|
||||
if(ObjectGetString(chart_id, "CP_PutStrike3", OBJPROP_TEXT, 0, value)) {
|
||||
DynamicPutStrike3 = StringToDouble(value);
|
||||
}
|
||||
|
||||
InitializeOILevels();
|
||||
InitializeKeyLevels();
|
||||
|
||||
if(InpOISource == OI_SOURCE_CSV_FILE) {
|
||||
LoadOIFromCSV();
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user