last works on XOBS ...
This commit is contained in:
@@ -105,7 +105,7 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
|
||||
{
|
||||
//
|
||||
Clean(mXConditionsCollection);
|
||||
Clean(mXOBSConditionsCollection);
|
||||
Clean(mX121SMCXOBSConditionsCollection);
|
||||
|
||||
//
|
||||
ZeroMemory(mTriggerCycleHelper);
|
||||
@@ -755,9 +755,9 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
|
||||
|
||||
//
|
||||
// Detect Setup Conditions ...
|
||||
datetime setupTime = mXOBSConditions.setupTime;
|
||||
bool isSetuped = mXOBSConditions.IsSetuped();
|
||||
ENUM_X_DIRECTION setupDir = mXOBSConditions.dir;
|
||||
datetime setupTime = mX121SMCXOBSConditions.setupTime;
|
||||
bool isSetuped = mX121SMCXOBSConditions.IsSetuped();
|
||||
ENUM_X_DIRECTION setupDir = mX121SMCXOBSConditions.dir;
|
||||
if (!isSetuped)
|
||||
{
|
||||
//
|
||||
@@ -765,7 +765,7 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
|
||||
isSetuped = DetectX121SMCXOBSSignalSetup(
|
||||
symbol,
|
||||
period,
|
||||
mXOBSConditions,
|
||||
mX121SMCXOBSConditions,
|
||||
mTriggerCycleHelper,
|
||||
mDecisionCycleHelper,
|
||||
mAnalyseCycleHelper,
|
||||
@@ -775,25 +775,25 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
|
||||
);
|
||||
|
||||
//
|
||||
setupDir = mXOBSConditions.dir;
|
||||
setupTime = mXOBSConditions.setupTime;
|
||||
setupDir = mX121SMCXOBSConditions.dir;
|
||||
setupTime = mX121SMCXOBSConditions.setupTime;
|
||||
|
||||
//
|
||||
if (isSetuped)
|
||||
{
|
||||
//
|
||||
int items = AddX121SMCXOBSConditionsIfNotExists(
|
||||
mXOBSConditions,
|
||||
mXOBSConditionsCollection //
|
||||
mX121SMCXOBSConditions,
|
||||
mX121SMCXOBSConditionsCollection //
|
||||
);
|
||||
|
||||
//
|
||||
mXOBSConditions.Clean();
|
||||
mX121SMCXOBSConditions.Clean();
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
int conditionsCount = ArraySize(mXOBSConditionsCollection);
|
||||
int conditionsCount = ArraySize(mX121SMCXOBSConditionsCollection);
|
||||
result = IsValidSize(conditionsCount);
|
||||
if (!result)
|
||||
{
|
||||
@@ -805,7 +805,7 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
|
||||
int selectedIndex = 0;
|
||||
X121SMCStrategyXOBSSignalConditions mTmpConditions[];
|
||||
Copy(
|
||||
mXOBSConditionsCollection,
|
||||
mX121SMCXOBSConditionsCollection,
|
||||
mTmpConditions //
|
||||
);
|
||||
X121SMCStrategyXOBSSignalConditions mConditions;
|
||||
@@ -841,7 +841,7 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
|
||||
{
|
||||
//
|
||||
ArrayRemove(
|
||||
mXOBSConditionsCollection,
|
||||
mX121SMCXOBSConditionsCollection,
|
||||
i,
|
||||
1 //
|
||||
);
|
||||
@@ -874,7 +874,7 @@ class XCX121SMCStrategy : public XCX121SMCBaseStrategy
|
||||
//
|
||||
// Remove Selected Index from Main Collection ...
|
||||
ArrayRemove(
|
||||
mXOBSConditionsCollection,
|
||||
mX121SMCXOBSConditionsCollection,
|
||||
selectedIndex,
|
||||
1 //
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user