fez5587/Superalgos
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Situation Names

Browse Source
This commit is contained in:
Luis Fernando Molina committed 2020-03-25 17:50:09 +01:00
1 parent beeba4bfbf
commit 34f6abf2db
2 files changed
+12 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Strategies.js
+8
View File
@@ -383,6 +383,7 @@
record.number = dailyFile[i][3];
record.beginRate = dailyFile[i][4];
record.endRate = dailyFile[i][5];
record.triggerOnSituation = dailyFile[i][6];
if (
(record.begin >= farLeftDate.valueOf() && record.end <= farRightDate.valueOf()) &&
@@ -454,6 +455,7 @@
record.number = marketFile[i][3];
record.beginRate = marketFile[i][4];
record.endRate = marketFile[i][5];
record.triggerOnSituation = marketFile[i][6];
if (record.begin >= leftDate.valueOf() && record.end <= rightDate.valueOf()) {
@@ -575,6 +577,12 @@
browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.LIGHT_GREY + ', ' + 0.5 + ')';
browserCanvasContext.fill();
*/
/* Situation Name */
let digit = record.begin.toFixed(0).substring(7,8)
let positionY = recordPoint3.y - (recordPoint3.y - recordPoint1.y) / 2 + (Number(digit) * 10 - 50)
printLabel(record.triggerOnSituation, recordPoint1.x + 5, positionY , '1', 9);
/* Draw the Sticks */
drawStick(recordPoint1, recordPoint3);
Trades.js
+4 -1
View File
@@ -370,6 +370,7 @@
record.beginRate = dailyFile[i][4];
record.endRate = dailyFile[i][5];
record.exitType = dailyFile[i][6];
record.takePositionSituation = dailyFile[i][7];
if (
(record.begin >= farLeftDate.valueOf() && record.end <= farRightDate.valueOf()) &&
@@ -435,6 +436,7 @@
record.beginRate = marketFile[i][4];
record.endRate = marketFile[i][5];
record.exitType = marketFile[i][6];
record.takePositionSituation = marketFile[i][7];
if (
(record.begin >= leftDate.valueOf() && record.end <= rightDate.valueOf()) &&
@@ -516,6 +518,7 @@
recordPoint2 = thisObject.fitFunction(recordPoint2);
recordPoint3 = thisObject.fitFunction(recordPoint3);
let line0 = record.takePositionSituation
let line1 = '';
let line2 = '';
@@ -595,7 +598,7 @@
// we do not write any text
} else {
printLabel(line0, recordPoint2.x - (recordPoint2.x - recordPoint1.x) / 2 - line1.length * FONT_ASPECT_RATIO, point.y - 15, '1', 12);
printLabel(line1, recordPoint2.x - (recordPoint2.x - recordPoint1.x) / 2 - line1.length * FONT_ASPECT_RATIO, point.y, '1', 12);
printLabel(line2, recordPoint2.x - (recordPoint2.x - recordPoint1.x) / 2 - line2.length * FONT_ASPECT_RATIO, point.y + 15, '1', 12);