remove commented unused codes for Cleaning up workSpace ...
This commit is contained in:
@@ -1814,10 +1814,10 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
|
|||||||
|
|
||||||
//
|
//
|
||||||
// Cycle X121Conditions ...
|
// Cycle X121Conditions ...
|
||||||
// X121Conditions decisionXConditions = decisionConditions.x121Conditions;
|
X121Conditions decisionXConditions = decisionConditions.x121Conditions;
|
||||||
// X121Conditions analyseXConditions = analyseConditions.x121Conditions;
|
X121Conditions analyseXConditions = analyseConditions.x121Conditions;
|
||||||
// X121Conditions consolidationXConditions = consolidationConditions.x121Conditions;
|
X121Conditions consolidationXConditions = consolidationConditions.x121Conditions;
|
||||||
// X121Conditions visionXConditions = visionConditions.x121Conditions;
|
X121Conditions visionXConditions = visionConditions.x121Conditions;
|
||||||
|
|
||||||
//
|
//
|
||||||
// Setup Conditions ...
|
// Setup Conditions ...
|
||||||
@@ -1838,41 +1838,31 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
|
|||||||
if (!result)
|
if (!result)
|
||||||
{
|
{
|
||||||
//
|
//
|
||||||
// Clean(triggerPoiEvents);
|
Clean(visionPoiEvents);
|
||||||
// Clean(triggerCycleEvents);
|
|
||||||
Clean(decisionPoiEvents);
|
|
||||||
Clean(decisionCycleEvents);
|
|
||||||
Clean(analysePoiEvents);
|
Clean(analysePoiEvents);
|
||||||
|
Clean(decisionPoiEvents);
|
||||||
|
Clean(visionCycleEvents);
|
||||||
Clean(analyseCycleEvents);
|
Clean(analyseCycleEvents);
|
||||||
// Clean(verificationPoiEvents);
|
Clean(decisionCycleEvents);
|
||||||
// Clean(verificationCycleEvents);
|
|
||||||
Clean(consolidationPoiEvents);
|
Clean(consolidationPoiEvents);
|
||||||
Clean(consolidationCycleEvents);
|
Clean(consolidationCycleEvents);
|
||||||
Clean(visionPoiEvents);
|
|
||||||
Clean(visionCycleEvents);
|
|
||||||
|
|
||||||
//
|
//
|
||||||
visionState.Clean();
|
visionState.Clean();
|
||||||
// triggerState.Clean();
|
|
||||||
analyseState.Clean();
|
analyseState.Clean();
|
||||||
decisionZBar.Clean();
|
decisionZBar.Clean();
|
||||||
decisionCBar.Clean();
|
decisionCBar.Clean();
|
||||||
decisionPBar.Clean();
|
decisionPBar.Clean();
|
||||||
decisionState.Clean();
|
decisionState.Clean();
|
||||||
visionConditions.Clean();
|
visionConditions.Clean();
|
||||||
// visionXConditions.Clean();
|
|
||||||
// verificationState.Clean();
|
|
||||||
// triggerConditions.Clean();
|
|
||||||
analyseConditions.Clean();
|
analyseConditions.Clean();
|
||||||
|
visionXConditions.Clean();
|
||||||
consolidationState.Clean();
|
consolidationState.Clean();
|
||||||
// triggerXConditions.Clean();
|
|
||||||
// analyseXConditions.Clean();
|
|
||||||
decisionConditions.Clean();
|
decisionConditions.Clean();
|
||||||
// decisionXConditions.Clean();
|
analyseXConditions.Clean();
|
||||||
// verificationConditions.Clean();
|
decisionXConditions.Clean();
|
||||||
// verificationXConditions.Clean();
|
|
||||||
consolidationConditions.Clean();
|
consolidationConditions.Clean();
|
||||||
// consolidationXConditions.Clean();
|
consolidationXConditions.Clean();
|
||||||
|
|
||||||
//
|
//
|
||||||
return result;
|
return result;
|
||||||
@@ -1884,41 +1874,31 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
|
|||||||
if (!result)
|
if (!result)
|
||||||
{
|
{
|
||||||
//
|
//
|
||||||
// Clean(triggerPoiEvents);
|
Clean(visionPoiEvents);
|
||||||
// Clean(triggerCycleEvents);
|
|
||||||
Clean(decisionPoiEvents);
|
|
||||||
Clean(decisionCycleEvents);
|
|
||||||
Clean(analysePoiEvents);
|
Clean(analysePoiEvents);
|
||||||
|
Clean(decisionPoiEvents);
|
||||||
|
Clean(visionCycleEvents);
|
||||||
Clean(analyseCycleEvents);
|
Clean(analyseCycleEvents);
|
||||||
// Clean(verificationPoiEvents);
|
Clean(decisionCycleEvents);
|
||||||
// Clean(verificationCycleEvents);
|
|
||||||
Clean(consolidationPoiEvents);
|
Clean(consolidationPoiEvents);
|
||||||
Clean(consolidationCycleEvents);
|
Clean(consolidationCycleEvents);
|
||||||
Clean(visionPoiEvents);
|
|
||||||
Clean(visionCycleEvents);
|
|
||||||
|
|
||||||
//
|
//
|
||||||
visionState.Clean();
|
visionState.Clean();
|
||||||
// triggerState.Clean();
|
|
||||||
analyseState.Clean();
|
analyseState.Clean();
|
||||||
decisionZBar.Clean();
|
decisionZBar.Clean();
|
||||||
decisionCBar.Clean();
|
decisionCBar.Clean();
|
||||||
decisionPBar.Clean();
|
decisionPBar.Clean();
|
||||||
decisionState.Clean();
|
decisionState.Clean();
|
||||||
visionConditions.Clean();
|
visionConditions.Clean();
|
||||||
// visionXConditions.Clean();
|
|
||||||
// verificationState.Clean();
|
|
||||||
// triggerConditions.Clean();
|
|
||||||
analyseConditions.Clean();
|
analyseConditions.Clean();
|
||||||
|
visionXConditions.Clean();
|
||||||
consolidationState.Clean();
|
consolidationState.Clean();
|
||||||
// triggerXConditions.Clean();
|
|
||||||
// analyseXConditions.Clean();
|
|
||||||
decisionConditions.Clean();
|
decisionConditions.Clean();
|
||||||
// decisionXConditions.Clean();
|
analyseXConditions.Clean();
|
||||||
// verificationConditions.Clean();
|
decisionXConditions.Clean();
|
||||||
// verificationXConditions.Clean();
|
|
||||||
consolidationConditions.Clean();
|
consolidationConditions.Clean();
|
||||||
// consolidationXConditions.Clean();
|
consolidationXConditions.Clean();
|
||||||
|
|
||||||
//
|
//
|
||||||
return result;
|
return result;
|
||||||
@@ -1930,41 +1910,31 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
|
|||||||
if (!result)
|
if (!result)
|
||||||
{
|
{
|
||||||
//
|
//
|
||||||
// Clean(triggerPoiEvents);
|
Clean(visionPoiEvents);
|
||||||
// Clean(triggerCycleEvents);
|
|
||||||
Clean(decisionPoiEvents);
|
|
||||||
Clean(decisionCycleEvents);
|
|
||||||
Clean(analysePoiEvents);
|
Clean(analysePoiEvents);
|
||||||
|
Clean(decisionPoiEvents);
|
||||||
|
Clean(visionCycleEvents);
|
||||||
Clean(analyseCycleEvents);
|
Clean(analyseCycleEvents);
|
||||||
// Clean(verificationPoiEvents);
|
Clean(decisionCycleEvents);
|
||||||
// Clean(verificationCycleEvents);
|
|
||||||
Clean(consolidationPoiEvents);
|
Clean(consolidationPoiEvents);
|
||||||
Clean(consolidationCycleEvents);
|
Clean(consolidationCycleEvents);
|
||||||
Clean(visionPoiEvents);
|
|
||||||
Clean(visionCycleEvents);
|
|
||||||
|
|
||||||
//
|
//
|
||||||
visionState.Clean();
|
visionState.Clean();
|
||||||
// triggerState.Clean();
|
|
||||||
analyseState.Clean();
|
analyseState.Clean();
|
||||||
decisionZBar.Clean();
|
decisionZBar.Clean();
|
||||||
decisionCBar.Clean();
|
decisionCBar.Clean();
|
||||||
decisionPBar.Clean();
|
decisionPBar.Clean();
|
||||||
decisionState.Clean();
|
decisionState.Clean();
|
||||||
visionConditions.Clean();
|
visionConditions.Clean();
|
||||||
// visionXConditions.Clean();
|
|
||||||
// verificationState.Clean();
|
|
||||||
// triggerConditions.Clean();
|
|
||||||
analyseConditions.Clean();
|
analyseConditions.Clean();
|
||||||
|
visionXConditions.Clean();
|
||||||
consolidationState.Clean();
|
consolidationState.Clean();
|
||||||
// triggerXConditions.Clean();
|
|
||||||
// analyseXConditions.Clean();
|
|
||||||
decisionConditions.Clean();
|
decisionConditions.Clean();
|
||||||
// decisionXConditions.Clean();
|
analyseXConditions.Clean();
|
||||||
// verificationConditions.Clean();
|
decisionXConditions.Clean();
|
||||||
// verificationXConditions.Clean();
|
|
||||||
consolidationConditions.Clean();
|
consolidationConditions.Clean();
|
||||||
// consolidationXConditions.Clean();
|
consolidationXConditions.Clean();
|
||||||
|
|
||||||
//
|
//
|
||||||
return result;
|
return result;
|
||||||
@@ -2175,41 +2145,31 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
|
|||||||
if (isDestroyed)
|
if (isDestroyed)
|
||||||
{
|
{
|
||||||
//
|
//
|
||||||
// Clean(triggerPoiEvents);
|
Clean(visionPoiEvents);
|
||||||
// Clean(triggerCycleEvents);
|
|
||||||
Clean(decisionPoiEvents);
|
|
||||||
Clean(decisionCycleEvents);
|
|
||||||
Clean(analysePoiEvents);
|
Clean(analysePoiEvents);
|
||||||
|
Clean(decisionPoiEvents);
|
||||||
|
Clean(visionCycleEvents);
|
||||||
Clean(analyseCycleEvents);
|
Clean(analyseCycleEvents);
|
||||||
// Clean(verificationPoiEvents);
|
Clean(decisionCycleEvents);
|
||||||
// Clean(verificationCycleEvents);
|
|
||||||
Clean(consolidationPoiEvents);
|
Clean(consolidationPoiEvents);
|
||||||
Clean(consolidationCycleEvents);
|
Clean(consolidationCycleEvents);
|
||||||
Clean(visionPoiEvents);
|
|
||||||
Clean(visionCycleEvents);
|
|
||||||
|
|
||||||
//
|
//
|
||||||
visionState.Clean();
|
visionState.Clean();
|
||||||
// triggerState.Clean();
|
|
||||||
analyseState.Clean();
|
analyseState.Clean();
|
||||||
decisionZBar.Clean();
|
decisionZBar.Clean();
|
||||||
decisionCBar.Clean();
|
decisionCBar.Clean();
|
||||||
decisionPBar.Clean();
|
decisionPBar.Clean();
|
||||||
decisionState.Clean();
|
decisionState.Clean();
|
||||||
visionConditions.Clean();
|
visionConditions.Clean();
|
||||||
// visionXConditions.Clean();
|
|
||||||
// verificationState.Clean();
|
|
||||||
// triggerConditions.Clean();
|
|
||||||
analyseConditions.Clean();
|
analyseConditions.Clean();
|
||||||
|
visionXConditions.Clean();
|
||||||
consolidationState.Clean();
|
consolidationState.Clean();
|
||||||
// triggerXConditions.Clean();
|
|
||||||
// analyseXConditions.Clean();
|
|
||||||
decisionConditions.Clean();
|
decisionConditions.Clean();
|
||||||
// decisionXConditions.Clean();
|
analyseXConditions.Clean();
|
||||||
// verificationConditions.Clean();
|
decisionXConditions.Clean();
|
||||||
// verificationXConditions.Clean();
|
|
||||||
consolidationConditions.Clean();
|
consolidationConditions.Clean();
|
||||||
// consolidationXConditions.Clean();
|
consolidationXConditions.Clean();
|
||||||
|
|
||||||
//
|
//
|
||||||
result = false;
|
result = false;
|
||||||
@@ -2233,41 +2193,31 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
|
|||||||
if (!result)
|
if (!result)
|
||||||
{
|
{
|
||||||
//
|
//
|
||||||
// Clean(triggerPoiEvents);
|
Clean(visionPoiEvents);
|
||||||
// Clean(triggerCycleEvents);
|
|
||||||
Clean(decisionPoiEvents);
|
|
||||||
Clean(decisionCycleEvents);
|
|
||||||
Clean(analysePoiEvents);
|
Clean(analysePoiEvents);
|
||||||
|
Clean(decisionPoiEvents);
|
||||||
|
Clean(visionCycleEvents);
|
||||||
Clean(analyseCycleEvents);
|
Clean(analyseCycleEvents);
|
||||||
// Clean(verificationPoiEvents);
|
Clean(decisionCycleEvents);
|
||||||
// Clean(verificationCycleEvents);
|
|
||||||
Clean(consolidationPoiEvents);
|
Clean(consolidationPoiEvents);
|
||||||
Clean(consolidationCycleEvents);
|
Clean(consolidationCycleEvents);
|
||||||
Clean(visionPoiEvents);
|
|
||||||
Clean(visionCycleEvents);
|
|
||||||
|
|
||||||
//
|
//
|
||||||
visionState.Clean();
|
visionState.Clean();
|
||||||
// triggerState.Clean();
|
|
||||||
analyseState.Clean();
|
analyseState.Clean();
|
||||||
decisionZBar.Clean();
|
decisionZBar.Clean();
|
||||||
decisionCBar.Clean();
|
decisionCBar.Clean();
|
||||||
decisionPBar.Clean();
|
decisionPBar.Clean();
|
||||||
decisionState.Clean();
|
decisionState.Clean();
|
||||||
visionConditions.Clean();
|
visionConditions.Clean();
|
||||||
// visionXConditions.Clean();
|
|
||||||
// verificationState.Clean();
|
|
||||||
// triggerConditions.Clean();
|
|
||||||
analyseConditions.Clean();
|
analyseConditions.Clean();
|
||||||
|
visionXConditions.Clean();
|
||||||
consolidationState.Clean();
|
consolidationState.Clean();
|
||||||
// triggerXConditions.Clean();
|
|
||||||
// analyseXConditions.Clean();
|
|
||||||
decisionConditions.Clean();
|
decisionConditions.Clean();
|
||||||
// decisionXConditions.Clean();
|
analyseXConditions.Clean();
|
||||||
// verificationConditions.Clean();
|
decisionXConditions.Clean();
|
||||||
// verificationXConditions.Clean();
|
|
||||||
consolidationConditions.Clean();
|
consolidationConditions.Clean();
|
||||||
// consolidationXConditions.Clean();
|
consolidationXConditions.Clean();
|
||||||
|
|
||||||
//
|
//
|
||||||
RemoveX121SMCXSupDemOBSDraws();
|
RemoveX121SMCXSupDemOBSDraws();
|
||||||
@@ -2419,41 +2369,31 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
|
|||||||
if (!result)
|
if (!result)
|
||||||
{
|
{
|
||||||
//
|
//
|
||||||
// Clean(triggerPoiEvents);
|
Clean(visionPoiEvents);
|
||||||
// Clean(triggerCycleEvents);
|
|
||||||
Clean(decisionPoiEvents);
|
|
||||||
Clean(decisionCycleEvents);
|
|
||||||
Clean(analysePoiEvents);
|
Clean(analysePoiEvents);
|
||||||
|
Clean(visionCycleEvents);
|
||||||
|
Clean(decisionPoiEvents);
|
||||||
Clean(analyseCycleEvents);
|
Clean(analyseCycleEvents);
|
||||||
// Clean(verificationPoiEvents);
|
Clean(decisionCycleEvents);
|
||||||
// Clean(verificationCycleEvents);
|
|
||||||
Clean(consolidationPoiEvents);
|
Clean(consolidationPoiEvents);
|
||||||
Clean(consolidationCycleEvents);
|
Clean(consolidationCycleEvents);
|
||||||
Clean(visionPoiEvents);
|
|
||||||
Clean(visionCycleEvents);
|
|
||||||
|
|
||||||
//
|
//
|
||||||
visionState.Clean();
|
visionState.Clean();
|
||||||
// triggerState.Clean();
|
|
||||||
analyseState.Clean();
|
analyseState.Clean();
|
||||||
decisionZBar.Clean();
|
decisionZBar.Clean();
|
||||||
decisionCBar.Clean();
|
decisionCBar.Clean();
|
||||||
decisionPBar.Clean();
|
decisionPBar.Clean();
|
||||||
decisionState.Clean();
|
decisionState.Clean();
|
||||||
visionConditions.Clean();
|
visionConditions.Clean();
|
||||||
// visionXConditions.Clean();
|
|
||||||
// verificationState.Clean();
|
|
||||||
// triggerConditions.Clean();
|
|
||||||
analyseConditions.Clean();
|
analyseConditions.Clean();
|
||||||
|
visionXConditions.Clean();
|
||||||
consolidationState.Clean();
|
consolidationState.Clean();
|
||||||
// triggerXConditions.Clean();
|
|
||||||
// analyseXConditions.Clean();
|
|
||||||
decisionConditions.Clean();
|
decisionConditions.Clean();
|
||||||
// decisionXConditions.Clean();
|
analyseXConditions.Clean();
|
||||||
// verificationConditions.Clean();
|
decisionXConditions.Clean();
|
||||||
// verificationXConditions.Clean();
|
|
||||||
consolidationConditions.Clean();
|
consolidationConditions.Clean();
|
||||||
// consolidationXConditions.Clean();
|
consolidationXConditions.Clean();
|
||||||
|
|
||||||
//
|
//
|
||||||
RemoveX121SMCXSupDemOBSDraws();
|
RemoveX121SMCXSupDemOBSDraws();
|
||||||
@@ -2563,7 +2503,7 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
|
|||||||
//
|
//
|
||||||
iOBFVG.ob = iOB;
|
iOBFVG.ob = iOB;
|
||||||
iOBFVG.fvg = jFVG;
|
iOBFVG.fvg = jFVG;
|
||||||
|
|
||||||
//
|
//
|
||||||
bool isValidOBFVG = iOBFVG.IsValid();
|
bool isValidOBFVG = iOBFVG.IsValid();
|
||||||
if (isValidOBFVG)
|
if (isValidOBFVG)
|
||||||
@@ -2601,41 +2541,31 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
|
|||||||
Clean(fvgs);
|
Clean(fvgs);
|
||||||
|
|
||||||
//
|
//
|
||||||
// Clean(triggerPoiEvents);
|
Clean(visionPoiEvents);
|
||||||
// Clean(triggerCycleEvents);
|
|
||||||
Clean(decisionPoiEvents);
|
|
||||||
Clean(decisionCycleEvents);
|
|
||||||
Clean(analysePoiEvents);
|
Clean(analysePoiEvents);
|
||||||
|
Clean(decisionPoiEvents);
|
||||||
|
Clean(visionCycleEvents);
|
||||||
Clean(analyseCycleEvents);
|
Clean(analyseCycleEvents);
|
||||||
// Clean(verificationPoiEvents);
|
Clean(decisionCycleEvents);
|
||||||
// Clean(verificationCycleEvents);
|
|
||||||
Clean(consolidationPoiEvents);
|
Clean(consolidationPoiEvents);
|
||||||
Clean(consolidationCycleEvents);
|
Clean(consolidationCycleEvents);
|
||||||
Clean(visionPoiEvents);
|
|
||||||
Clean(visionCycleEvents);
|
|
||||||
|
|
||||||
//
|
//
|
||||||
visionState.Clean();
|
visionState.Clean();
|
||||||
// triggerState.Clean();
|
|
||||||
analyseState.Clean();
|
analyseState.Clean();
|
||||||
decisionZBar.Clean();
|
decisionZBar.Clean();
|
||||||
decisionCBar.Clean();
|
decisionCBar.Clean();
|
||||||
decisionPBar.Clean();
|
decisionPBar.Clean();
|
||||||
decisionState.Clean();
|
decisionState.Clean();
|
||||||
visionConditions.Clean();
|
visionConditions.Clean();
|
||||||
// visionXConditions.Clean();
|
|
||||||
// verificationState.Clean();
|
|
||||||
// triggerConditions.Clean();
|
|
||||||
analyseConditions.Clean();
|
analyseConditions.Clean();
|
||||||
|
visionXConditions.Clean();
|
||||||
consolidationState.Clean();
|
consolidationState.Clean();
|
||||||
// triggerXConditions.Clean();
|
|
||||||
// analyseXConditions.Clean();
|
|
||||||
decisionConditions.Clean();
|
decisionConditions.Clean();
|
||||||
// decisionXConditions.Clean();
|
analyseXConditions.Clean();
|
||||||
// verificationConditions.Clean();
|
decisionXConditions.Clean();
|
||||||
// verificationXConditions.Clean();
|
|
||||||
consolidationConditions.Clean();
|
consolidationConditions.Clean();
|
||||||
// consolidationXConditions.Clean();
|
consolidationXConditions.Clean();
|
||||||
|
|
||||||
//
|
//
|
||||||
RemoveX121SMCXSupDemOBSDraws();
|
RemoveX121SMCXSupDemOBSDraws();
|
||||||
@@ -2716,41 +2646,31 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
|
|||||||
Clean(fvgs);
|
Clean(fvgs);
|
||||||
|
|
||||||
//
|
//
|
||||||
// Clean(triggerPoiEvents);
|
Clean(visionPoiEvents);
|
||||||
// Clean(triggerCycleEvents);
|
|
||||||
Clean(decisionPoiEvents);
|
|
||||||
Clean(decisionCycleEvents);
|
|
||||||
Clean(analysePoiEvents);
|
Clean(analysePoiEvents);
|
||||||
|
Clean(visionCycleEvents);
|
||||||
|
Clean(decisionPoiEvents);
|
||||||
Clean(analyseCycleEvents);
|
Clean(analyseCycleEvents);
|
||||||
// Clean(verificationPoiEvents);
|
Clean(decisionCycleEvents);
|
||||||
// Clean(verificationCycleEvents);
|
|
||||||
Clean(consolidationPoiEvents);
|
Clean(consolidationPoiEvents);
|
||||||
Clean(consolidationCycleEvents);
|
Clean(consolidationCycleEvents);
|
||||||
Clean(visionPoiEvents);
|
|
||||||
Clean(visionCycleEvents);
|
|
||||||
|
|
||||||
//
|
//
|
||||||
visionState.Clean();
|
visionState.Clean();
|
||||||
// triggerState.Clean();
|
|
||||||
analyseState.Clean();
|
analyseState.Clean();
|
||||||
decisionZBar.Clean();
|
decisionZBar.Clean();
|
||||||
decisionCBar.Clean();
|
decisionCBar.Clean();
|
||||||
decisionPBar.Clean();
|
decisionPBar.Clean();
|
||||||
decisionState.Clean();
|
decisionState.Clean();
|
||||||
visionConditions.Clean();
|
visionConditions.Clean();
|
||||||
// visionXConditions.Clean();
|
|
||||||
// verificationState.Clean();
|
|
||||||
// triggerConditions.Clean();
|
|
||||||
analyseConditions.Clean();
|
analyseConditions.Clean();
|
||||||
|
visionXConditions.Clean();
|
||||||
consolidationState.Clean();
|
consolidationState.Clean();
|
||||||
// triggerXConditions.Clean();
|
|
||||||
// analyseXConditions.Clean();
|
|
||||||
decisionConditions.Clean();
|
decisionConditions.Clean();
|
||||||
// decisionXConditions.Clean();
|
analyseXConditions.Clean();
|
||||||
// verificationConditions.Clean();
|
decisionXConditions.Clean();
|
||||||
// verificationXConditions.Clean();
|
|
||||||
consolidationConditions.Clean();
|
consolidationConditions.Clean();
|
||||||
// consolidationXConditions.Clean();
|
consolidationXConditions.Clean();
|
||||||
|
|
||||||
//
|
//
|
||||||
RemoveX121SMCXSupDemOBSDraws();
|
RemoveX121SMCXSupDemOBSDraws();
|
||||||
@@ -2764,38 +2684,28 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
|
|||||||
Clean(fvgs);
|
Clean(fvgs);
|
||||||
|
|
||||||
//
|
//
|
||||||
// Clean(triggerPoiEvents);
|
Clean(visionPoiEvents);
|
||||||
// Clean(triggerCycleEvents);
|
|
||||||
Clean(decisionPoiEvents);
|
|
||||||
Clean(decisionCycleEvents);
|
|
||||||
Clean(analysePoiEvents);
|
Clean(analysePoiEvents);
|
||||||
|
Clean(visionCycleEvents);
|
||||||
|
Clean(decisionPoiEvents);
|
||||||
Clean(analyseCycleEvents);
|
Clean(analyseCycleEvents);
|
||||||
// Clean(verificationPoiEvents);
|
Clean(decisionCycleEvents);
|
||||||
// Clean(verificationCycleEvents);
|
|
||||||
Clean(consolidationPoiEvents);
|
Clean(consolidationPoiEvents);
|
||||||
Clean(consolidationCycleEvents);
|
Clean(consolidationCycleEvents);
|
||||||
Clean(visionPoiEvents);
|
|
||||||
Clean(visionCycleEvents);
|
|
||||||
|
|
||||||
//
|
//
|
||||||
visionState.Clean();
|
visionState.Clean();
|
||||||
// triggerState.Clean();
|
|
||||||
analyseState.Clean();
|
analyseState.Clean();
|
||||||
decisionState.Clean();
|
decisionState.Clean();
|
||||||
visionConditions.Clean();
|
visionConditions.Clean();
|
||||||
// visionXConditions.Clean();
|
|
||||||
// verificationState.Clean();
|
|
||||||
// triggerConditions.Clean();
|
|
||||||
analyseConditions.Clean();
|
analyseConditions.Clean();
|
||||||
|
visionXConditions.Clean();
|
||||||
consolidationState.Clean();
|
consolidationState.Clean();
|
||||||
// triggerXConditions.Clean();
|
|
||||||
// analyseXConditions.Clean();
|
|
||||||
decisionConditions.Clean();
|
decisionConditions.Clean();
|
||||||
// decisionXConditions.Clean();
|
analyseXConditions.Clean();
|
||||||
// verificationConditions.Clean();
|
decisionXConditions.Clean();
|
||||||
// verificationXConditions.Clean();
|
|
||||||
consolidationConditions.Clean();
|
consolidationConditions.Clean();
|
||||||
// consolidationXConditions.Clean();
|
consolidationXConditions.Clean();
|
||||||
|
|
||||||
//
|
//
|
||||||
// Now We Have to Wait for Price Inside Box ...
|
// Now We Have to Wait for Price Inside Box ...
|
||||||
@@ -3001,41 +2911,31 @@ bool DetectX121SMCXSupDemOBSSignalSetup(
|
|||||||
ZeroMemory(insideFVG);
|
ZeroMemory(insideFVG);
|
||||||
|
|
||||||
//
|
//
|
||||||
// Clean(triggerPoiEvents);
|
Clean(visionPoiEvents);
|
||||||
// Clean(triggerCycleEvents);
|
|
||||||
Clean(decisionPoiEvents);
|
|
||||||
Clean(decisionCycleEvents);
|
|
||||||
Clean(analysePoiEvents);
|
Clean(analysePoiEvents);
|
||||||
|
Clean(visionCycleEvents);
|
||||||
|
Clean(decisionPoiEvents);
|
||||||
Clean(analyseCycleEvents);
|
Clean(analyseCycleEvents);
|
||||||
// Clean(verificationPoiEvents);
|
Clean(decisionCycleEvents);
|
||||||
// Clean(verificationCycleEvents);
|
|
||||||
Clean(consolidationPoiEvents);
|
Clean(consolidationPoiEvents);
|
||||||
Clean(consolidationCycleEvents);
|
Clean(consolidationCycleEvents);
|
||||||
Clean(visionPoiEvents);
|
|
||||||
Clean(visionCycleEvents);
|
|
||||||
|
|
||||||
//
|
//
|
||||||
visionState.Clean();
|
visionState.Clean();
|
||||||
// triggerState.Clean();
|
|
||||||
analyseState.Clean();
|
analyseState.Clean();
|
||||||
decisionZBar.Clean();
|
decisionZBar.Clean();
|
||||||
decisionCBar.Clean();
|
decisionCBar.Clean();
|
||||||
decisionPBar.Clean();
|
decisionPBar.Clean();
|
||||||
decisionState.Clean();
|
decisionState.Clean();
|
||||||
visionConditions.Clean();
|
visionConditions.Clean();
|
||||||
// visionXConditions.Clean();
|
|
||||||
// verificationState.Clean();
|
|
||||||
// triggerConditions.Clean();
|
|
||||||
analyseConditions.Clean();
|
analyseConditions.Clean();
|
||||||
|
visionXConditions.Clean();
|
||||||
consolidationState.Clean();
|
consolidationState.Clean();
|
||||||
// triggerXConditions.Clean();
|
|
||||||
// analyseXConditions.Clean();
|
|
||||||
decisionConditions.Clean();
|
decisionConditions.Clean();
|
||||||
// decisionXConditions.Clean();
|
analyseXConditions.Clean();
|
||||||
// verificationConditions.Clean();
|
decisionXConditions.Clean();
|
||||||
// verificationXConditions.Clean();
|
|
||||||
consolidationConditions.Clean();
|
consolidationConditions.Clean();
|
||||||
// consolidationXConditions.Clean();
|
consolidationXConditions.Clean();
|
||||||
|
|
||||||
//
|
//
|
||||||
// Summarize Conditions ...
|
// Summarize Conditions ...
|
||||||
@@ -3149,10 +3049,8 @@ bool DetectX121SMCXSupDemOBSSignalTrigger(
|
|||||||
string _symbol,
|
string _symbol,
|
||||||
ENUM_TIMEFRAMES _period,
|
ENUM_TIMEFRAMES _period,
|
||||||
//
|
//
|
||||||
// XC121SMCCycleHelper *triggerCycleHelper,
|
|
||||||
XC121SMCCycleHelper *decisionCycleHelper,
|
XC121SMCCycleHelper *decisionCycleHelper,
|
||||||
XC121SMCCycleHelper *analyseCycleHelper,
|
XC121SMCCycleHelper *analyseCycleHelper,
|
||||||
// XC121SMCCycleHelper *verificationCycleHelper,
|
|
||||||
XC121SMCCycleHelper *consolidationCycleHelper,
|
XC121SMCCycleHelper *consolidationCycleHelper,
|
||||||
XC121SMCCycleHelper *visionCycleHelper,
|
XC121SMCCycleHelper *visionCycleHelper,
|
||||||
//
|
//
|
||||||
@@ -3163,6 +3061,20 @@ bool DetectX121SMCXSupDemOBSSignalTrigger(
|
|||||||
//
|
//
|
||||||
bool result = false;
|
bool result = false;
|
||||||
|
|
||||||
|
//
|
||||||
|
result =
|
||||||
|
//
|
||||||
|
visionCycleHelper != NULL &&
|
||||||
|
analyseCycleHelper != NULL &&
|
||||||
|
decisionCycleHelper != NULL &&
|
||||||
|
consolidationCycleHelper != NULL
|
||||||
|
//
|
||||||
|
;
|
||||||
|
if (!result)
|
||||||
|
{
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
result = conditions.IsSetuped();
|
result = conditions.IsSetuped();
|
||||||
if (!result)
|
if (!result)
|
||||||
@@ -3277,7 +3189,7 @@ bool DetectX121SMCXSupDemOBSSignalTrigger(
|
|||||||
|
|
||||||
//
|
//
|
||||||
// Cycle X121Conditions ...
|
// Cycle X121Conditions ...
|
||||||
// X121Conditions decisionXConditions = decisionConditions.x121Conditions;
|
X121Conditions decisionXConditions = decisionConditions.x121Conditions;
|
||||||
|
|
||||||
//
|
//
|
||||||
// Trigger Conditions ...
|
// Trigger Conditions ...
|
||||||
@@ -3285,43 +3197,43 @@ bool DetectX121SMCXSupDemOBSSignalTrigger(
|
|||||||
//
|
//
|
||||||
// Slopes ...
|
// Slopes ...
|
||||||
|
|
||||||
// //
|
//
|
||||||
// bool isRsiSlopeBullish = decisionXConditions.isRsiSlopeBullish;
|
bool isRsiSlopeBullish = decisionXConditions.isRsiSlopeBullish;
|
||||||
// bool isStrSlopeBullish = decisionXConditions.isStrSlopeBullish;
|
bool isStrSlopeBullish = decisionXConditions.isStrSlopeBullish;
|
||||||
// bool isAtrUpperSlopeBullish = decisionXConditions.isAtrUpperSlopeBullish;
|
bool isAtrUpperSlopeBullish = decisionXConditions.isAtrUpperSlopeBullish;
|
||||||
// bool isAtrLowerSlopeBullish = decisionXConditions.isAtrLowerSlopeBullish;
|
bool isAtrLowerSlopeBullish = decisionXConditions.isAtrLowerSlopeBullish;
|
||||||
// bool isVwapFastSlopeBullish = decisionXConditions.isVwapFastSlopeBullish;
|
bool isVwapFastSlopeBullish = decisionXConditions.isVwapFastSlopeBullish;
|
||||||
// bool isVwapMidSlopeBullish = decisionXConditions.isVwapMidSlopeBullish;
|
bool isVwapMidSlopeBullish = decisionXConditions.isVwapMidSlopeBullish;
|
||||||
// bool isVwapSlowSlopeBullish = decisionXConditions.isVwapSlowSlopeBullish;
|
bool isVwapSlowSlopeBullish = decisionXConditions.isVwapSlowSlopeBullish;
|
||||||
|
|
||||||
// //
|
//
|
||||||
// bool isRsiSlopeBearish = decisionXConditions.isRsiSlopeBearish;
|
bool isRsiSlopeBearish = decisionXConditions.isRsiSlopeBearish;
|
||||||
// bool isStrSlopeBearish = decisionXConditions.isStrSlopeBearish;
|
bool isStrSlopeBearish = decisionXConditions.isStrSlopeBearish;
|
||||||
// bool isAtrUpperSlopeBearish = decisionXConditions.isAtrUpperSlopeBearish;
|
bool isAtrUpperSlopeBearish = decisionXConditions.isAtrUpperSlopeBearish;
|
||||||
// bool isAtrLowerSlopeBearish = decisionXConditions.isAtrLowerSlopeBearish;
|
bool isAtrLowerSlopeBearish = decisionXConditions.isAtrLowerSlopeBearish;
|
||||||
// bool isVwapFastSlopeBearish = decisionXConditions.isVwapFastSlopeBearish;
|
bool isVwapFastSlopeBearish = decisionXConditions.isVwapFastSlopeBearish;
|
||||||
// bool isVwapMidSlopeBearish = decisionXConditions.isVwapMidSlopeBearish;
|
bool isVwapMidSlopeBearish = decisionXConditions.isVwapMidSlopeBearish;
|
||||||
// bool isVwapSlowSlopeBearish = decisionXConditions.isVwapSlowSlopeBearish;
|
bool isVwapSlowSlopeBearish = decisionXConditions.isVwapSlowSlopeBearish;
|
||||||
|
|
||||||
// //
|
//
|
||||||
// bool isSlopesBullish =
|
bool isSlopesBullish =
|
||||||
// isRsiSlopeBullish &&
|
isRsiSlopeBullish &&
|
||||||
// isStrSlopeBullish &&
|
isStrSlopeBullish &&
|
||||||
// isAtrUpperSlopeBullish &&
|
isAtrUpperSlopeBullish &&
|
||||||
// isAtrLowerSlopeBullish &&
|
isAtrLowerSlopeBullish &&
|
||||||
// isVwapFastSlopeBullish &&
|
isVwapFastSlopeBullish &&
|
||||||
// isVwapMidSlopeBullish &&
|
isVwapMidSlopeBullish &&
|
||||||
// isVwapSlowSlopeBullish;
|
isVwapSlowSlopeBullish;
|
||||||
|
|
||||||
// //
|
//
|
||||||
// bool isSlopesBearish =
|
bool isSlopesBearish =
|
||||||
// isRsiSlopeBearish &&
|
isRsiSlopeBearish &&
|
||||||
// isStrSlopeBearish &&
|
isStrSlopeBearish &&
|
||||||
// isAtrUpperSlopeBearish &&
|
isAtrUpperSlopeBearish &&
|
||||||
// isAtrLowerSlopeBearish &&
|
isAtrLowerSlopeBearish &&
|
||||||
// isVwapFastSlopeBearish &&
|
isVwapFastSlopeBearish &&
|
||||||
// isVwapMidSlopeBearish &&
|
isVwapMidSlopeBearish &&
|
||||||
// isVwapSlowSlopeBearish;
|
isVwapSlowSlopeBearish;
|
||||||
|
|
||||||
//
|
//
|
||||||
double point = conditions.point;
|
double point = conditions.point;
|
||||||
@@ -3378,7 +3290,7 @@ bool DetectX121SMCXSupDemOBSSignalTrigger(
|
|||||||
//
|
//
|
||||||
decisionState.Clean();
|
decisionState.Clean();
|
||||||
decisionConditions.Clean();
|
decisionConditions.Clean();
|
||||||
// decisionXConditions.Clean();
|
decisionXConditions.Clean();
|
||||||
|
|
||||||
//
|
//
|
||||||
return result;
|
return result;
|
||||||
@@ -3401,8 +3313,8 @@ bool DetectX121SMCXSupDemOBSSignalTrigger(
|
|||||||
);
|
);
|
||||||
|
|
||||||
//
|
//
|
||||||
double iAtr = 0; // decisionConditions.x121Conditions.atrBuffer[1];
|
double iAtr = decisionXConditions.atrBuffer[1];
|
||||||
// iAtr *= 1.5;
|
iAtr *= 2;
|
||||||
|
|
||||||
//
|
//
|
||||||
double slsMin = GetMin(sls);
|
double slsMin = GetMin(sls);
|
||||||
@@ -3436,7 +3348,7 @@ bool DetectX121SMCXSupDemOBSSignalTrigger(
|
|||||||
//
|
//
|
||||||
decisionState.Clean();
|
decisionState.Clean();
|
||||||
decisionConditions.Clean();
|
decisionConditions.Clean();
|
||||||
// decisionXConditions.Clean();
|
decisionXConditions.Clean();
|
||||||
|
|
||||||
//
|
//
|
||||||
return result;
|
return result;
|
||||||
@@ -3447,17 +3359,31 @@ bool DetectX121SMCXSupDemOBSSignalTrigger(
|
|||||||
bool DetectX121SMCXSupDemOBSGuards(
|
bool DetectX121SMCXSupDemOBSGuards(
|
||||||
X121SMCGuard &guards[],
|
X121SMCGuard &guards[],
|
||||||
const XPosition &positions[],
|
const XPosition &positions[],
|
||||||
// XC121SMCCycleHelper *triggerCycleHelper,
|
//
|
||||||
XC121SMCCycleHelper *decisionCycleHelper,
|
XC121SMCCycleHelper *decisionCycleHelper,
|
||||||
XC121SMCCycleHelper *analyseCycleHelper,
|
XC121SMCCycleHelper *analyseCycleHelper,
|
||||||
// XC121SMCCycleHelper *verificationCycleHelper,
|
|
||||||
XC121SMCCycleHelper *consolidationCycleHelper,
|
XC121SMCCycleHelper *consolidationCycleHelper,
|
||||||
XC121SMCCycleHelper *visionCycleHelper //
|
XC121SMCCycleHelper *visionCycleHelper
|
||||||
|
//
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
//
|
//
|
||||||
bool result = false;
|
bool result = false;
|
||||||
|
|
||||||
|
//
|
||||||
|
result =
|
||||||
|
//
|
||||||
|
visionCycleHelper != NULL &&
|
||||||
|
analyseCycleHelper != NULL &&
|
||||||
|
decisionCycleHelper != NULL &&
|
||||||
|
consolidationCycleHelper != NULL
|
||||||
|
//
|
||||||
|
;
|
||||||
|
if (!result)
|
||||||
|
{
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
string provider = ToString(X_121_SMC_PROVIDER_XSUPDEMOBS);
|
string provider = ToString(X_121_SMC_PROVIDER_XSUPDEMOBS);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user