last works ...

This commit is contained in:
2024-06-05 03:51:54 +03:30
parent e4840def0e
commit 1482b30d67
9 changed files with 454 additions and 2548 deletions
+18 -18
View File
@@ -2540,8 +2540,8 @@ public:
ENUM_XSIGNAL_PROVIDERS name;
//
bool enableLong;
bool enableShort;
bool allowLong;
bool allowShort;
//
double r2r;
@@ -2567,8 +2567,8 @@ public:
name = PROVIDER_NONE;
//
enableLong = false;
enableShort = false;
allowLong = false;
allowShort = false;
//
r2r = 0;
@@ -2590,10 +2590,10 @@ public:
//
name != PROVIDER_NONE &&
r2r > 0 &&
(enableLong
(allowLong
? staticVolumeLong > 0
: true) &&
(enableShort
(allowShort
? staticVolumeShort > 0
: true)
//
@@ -2642,8 +2642,8 @@ public:
//
// Validate Signal Type ...
result = isLong
? enableLong && staticVolumeLong > 0
: enableShort && staticVolumeShort > 0;
? allowLong && staticVolumeLong > 0
: allowShort && staticVolumeShort > 0;
if (!result)
{
return result;
@@ -2703,8 +2703,8 @@ public:
//
// Validate Signal Type ...
result = isLong
? enableLong && staticVolumeLong > 0
: enableShort && staticVolumeShort > 0;
? allowLong && staticVolumeLong > 0
: allowShort && staticVolumeShort > 0;
if (!result)
{
return result;
@@ -4434,14 +4434,14 @@ public:
conditions.isTenkanSenCrossedUnderKijunSen = isTenkanSenCrossedUnderKijunSen;
//
conditions.isSenkouSpanAOverB = isSenkouSpanACrossedOverB;
conditions.isSenkouSpanAUnderB = isSenkouSpanACrossedUnderB;
conditions.isSenkouSpanAOverLast = isSenkouSpanACrossedOverLast;
conditions.isSenkouSpanAUnderLast = isSenkouSpanACrossedUnderLast;
conditions.isFutureSenkouSpanAOverB = isFutureSenkouSpanACrossedOverB;
conditions.isFutureSenkouSpanAUnderB = isFutureSenkouSpanACrossedUnderB;
conditions.isFutureSenkouSpanAOverLast = isFutureSenkouSpanACrossedOverLast;
conditions.isFutureSenkouSpanAUnderLast = isFutureSenkouSpanACrossedUnderLast;
conditions.isSenkouSpanAOverB = isSenkouSpanAOverB;
conditions.isSenkouSpanAUnderB = isSenkouSpanAUnderB;
conditions.isSenkouSpanAOverLast = isSenkouSpanAOverLast;
conditions.isSenkouSpanAUnderLast = isSenkouSpanAUnderLast;
conditions.isFutureSenkouSpanAOverB = isFutureSenkouSpanAOverB;
conditions.isFutureSenkouSpanAUnderB = isFutureSenkouSpanAUnderB;
conditions.isFutureSenkouSpanAOverLast = isFutureSenkouSpanAOverLast;
conditions.isFutureSenkouSpanAUnderLast = isFutureSenkouSpanAUnderLast;
//
conditions.isSenkouSpanACrossedOverB = isSenkouSpanACrossedOverB;