From 5a171d95ce270b2b5eb293299e2d4b0ac4f19934 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 12 Feb 2020 11:07:13 +0100 Subject: [PATCH] Cleaning Arrows --- Scales/RateScale.js | 106 +------------------------------------------ Scales/TimeScale.js | 108 +------------------------------------------- 2 files changed, 4 insertions(+), 210 deletions(-) diff --git a/Scales/RateScale.js b/Scales/RateScale.js index 26f470c05..c3793b8c7 100644 --- a/Scales/RateScale.js +++ b/Scales/RateScale.js @@ -167,8 +167,8 @@ function newRateScale () { scaleTimer = 0 } else { let factor - let morePower = 1 - if (event.buttons === 4) { morePower = 10 } // Mouse wheel pressed. + let morePower = 10 + if (event.buttons === 4) { morePower = 1 } // Mouse wheel pressed. let delta = event.wheelDelta if (delta < 0) { @@ -407,7 +407,6 @@ function newRateScale () { function drawForeground () { if (isMouseOver === true) { drawScaleBox() - drawArrows() } } @@ -446,105 +445,4 @@ function newRateScale () { drawScaleDisplay(label1, label2, label3, 0, 0, 0, icon1, icon2, thisObject.container, backgroundColor) } - - function drawArrows () { - if (visible === false || thisObject.rate === undefined) { return } - - const X_OFFSET = thisObject.container.frame.width / 2 - const Y_OFFSET = thisObject.container.frame.height / 2 - const HEIGHT = 6 - const WIDTH = 18 - const LINE_WIDTH = 3 - const OPACITY = 0.2 - const DISTANCE_BETWEEN_ARROWS = 10 - const MIN_DISTANCE_FROM_CENTER = 30 - const CURRENT_SCALE_DISTANCE = MIN_DISTANCE_FROM_CENTER + thisObject.scale - const MAX_DISTANCE_FROM_CENTER = MIN_DISTANCE_FROM_CENTER + 215 + DISTANCE_BETWEEN_ARROWS - - let ARROW_DIRECTION = 0 - - ARROW_DIRECTION = -1 - drawTwoArrows() - ARROW_DIRECTION = 1 - drawTwoArrows() - - function drawTwoArrows () { - point1 = { - x: X_OFFSET - WIDTH / 2, - y: Y_OFFSET + DISTANCE_BETWEEN_ARROWS / 2 * ARROW_DIRECTION + CURRENT_SCALE_DISTANCE * ARROW_DIRECTION - } - - point2 = { - x: X_OFFSET, - y: Y_OFFSET + HEIGHT * ARROW_DIRECTION + DISTANCE_BETWEEN_ARROWS / 2 * ARROW_DIRECTION + CURRENT_SCALE_DISTANCE * ARROW_DIRECTION - } - - point3 = { - x: X_OFFSET + WIDTH / 2, - y: Y_OFFSET + DISTANCE_BETWEEN_ARROWS / 2 * ARROW_DIRECTION + CURRENT_SCALE_DISTANCE * ARROW_DIRECTION - } - - point1 = thisObject.container.frame.frameThisPoint(point1) - point2 = thisObject.container.frame.frameThisPoint(point2) - point3 = thisObject.container.frame.frameThisPoint(point3) - - point4 = { - x: X_OFFSET - WIDTH / 2, - y: Y_OFFSET - DISTANCE_BETWEEN_ARROWS / 2 * ARROW_DIRECTION + CURRENT_SCALE_DISTANCE * ARROW_DIRECTION - } - - point5 = { - x: X_OFFSET, - y: Y_OFFSET + HEIGHT * ARROW_DIRECTION - DISTANCE_BETWEEN_ARROWS / 2 * ARROW_DIRECTION + CURRENT_SCALE_DISTANCE * ARROW_DIRECTION - } - - point6 = { - x: X_OFFSET + WIDTH / 2, - y: Y_OFFSET - DISTANCE_BETWEEN_ARROWS / 2 * ARROW_DIRECTION + CURRENT_SCALE_DISTANCE * ARROW_DIRECTION - } - - point4 = thisObject.container.frame.frameThisPoint(point4) - point5 = thisObject.container.frame.frameThisPoint(point5) - point6 = thisObject.container.frame.frameThisPoint(point6) - - point7 = { - x: X_OFFSET - WIDTH / 2, - y: Y_OFFSET - DISTANCE_BETWEEN_ARROWS / 2 * ARROW_DIRECTION + MAX_DISTANCE_FROM_CENTER * ARROW_DIRECTION - } - - point8 = { - x: X_OFFSET, - y: Y_OFFSET - HEIGHT * ARROW_DIRECTION - DISTANCE_BETWEEN_ARROWS / 2 * ARROW_DIRECTION + MAX_DISTANCE_FROM_CENTER * ARROW_DIRECTION - } - - point9 = { - x: X_OFFSET + WIDTH / 2, - y: Y_OFFSET - DISTANCE_BETWEEN_ARROWS / 2 * ARROW_DIRECTION + MAX_DISTANCE_FROM_CENTER * ARROW_DIRECTION - } - - point7 = thisObject.container.frame.frameThisPoint(point7) - point8 = thisObject.container.frame.frameThisPoint(point8) - point9 = thisObject.container.frame.frameThisPoint(point9) - - browserCanvasContext.setLineDash([0, 0]) - - browserCanvasContext.beginPath() - - browserCanvasContext.moveTo(point1.x, point1.y) - browserCanvasContext.lineTo(point2.x, point2.y) - browserCanvasContext.lineTo(point3.x, point3.y) - - browserCanvasContext.moveTo(point4.x, point4.y) - browserCanvasContext.lineTo(point5.x, point5.y) - browserCanvasContext.lineTo(point6.x, point6.y) - - browserCanvasContext.moveTo(point7.x, point7.y) - browserCanvasContext.lineTo(point8.x, point8.y) - browserCanvasContext.lineTo(point9.x, point9.y) - - browserCanvasContext.lineWidth = LINE_WIDTH - browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.DARK + ', ' + OPACITY + ')' - browserCanvasContext.stroke() - } - } } diff --git a/Scales/TimeScale.js b/Scales/TimeScale.js index 20aad59d8..e3a45b031 100644 --- a/Scales/TimeScale.js +++ b/Scales/TimeScale.js @@ -122,8 +122,8 @@ function newTimeScale () { function onMouseWheel (event) { let factor - let morePower = 1 - if (event.buttons === 4) { morePower = 10 } // Mouse wheel pressed. + let morePower = 10 + if (event.buttons === 4) { morePower = 1 } // Mouse wheel pressed. let delta = event.wheelDelta if (delta < 0) { @@ -287,7 +287,6 @@ function newTimeScale () { function drawForeground () { if (isMouseOver === true) { drawScaleBox() - drawArrows() } } @@ -312,107 +311,4 @@ function newTimeScale () { drawScaleDisplay(label1, label2, label3, 0, 0, 0, icon1, icon2, thisObject.container, backgroundColor) } - - function drawArrows () { - if (visible === false || thisObject.date === undefined) { return } - - const X_OFFSET = thisObject.container.frame.width / 2 - const Y_OFFSET = thisObject.container.frame.height / 2 - 10 - const HEIGHT = 18 - const WIDTH = 6 - const LINE_WIDTH = 3 - const OPACITY = 0.2 - const DISTANCE_BETWEEN_ARROWS = 10 - const MIN_DISTANCE_FROM_CENTER = 110 - const CURRENT_SCALE_DISTANCE = MIN_DISTANCE_FROM_CENTER + thisObject.scale - const MAX_DISTANCE_FROM_CENTER = MIN_DISTANCE_FROM_CENTER + MAX_SCALE + DISTANCE_BETWEEN_ARROWS - - let ARROW_DIRECTION = 0 - - ARROW_DIRECTION = -1 - drawTwoArrows() - ARROW_DIRECTION = 1 - drawTwoArrows() - - function drawTwoArrows () { - point1 = { - x: X_OFFSET - WIDTH / 2 * ARROW_DIRECTION + DISTANCE_BETWEEN_ARROWS / 2 * ARROW_DIRECTION + CURRENT_SCALE_DISTANCE * ARROW_DIRECTION, - y: Y_OFFSET - 0 - } - - point2 = { - x: X_OFFSET + WIDTH / 2 * ARROW_DIRECTION + DISTANCE_BETWEEN_ARROWS / 2 * ARROW_DIRECTION + CURRENT_SCALE_DISTANCE * ARROW_DIRECTION, - y: Y_OFFSET + HEIGHT / 2 - } - - point3 = { - x: X_OFFSET - WIDTH / 2 * ARROW_DIRECTION + DISTANCE_BETWEEN_ARROWS / 2 * ARROW_DIRECTION + CURRENT_SCALE_DISTANCE * ARROW_DIRECTION, - y: Y_OFFSET + HEIGHT - } - - point1 = thisObject.container.frame.frameThisPoint(point1) - point2 = thisObject.container.frame.frameThisPoint(point2) - point3 = thisObject.container.frame.frameThisPoint(point3) - - point4 = { - x: X_OFFSET - WIDTH / 2 * ARROW_DIRECTION - DISTANCE_BETWEEN_ARROWS / 2 * ARROW_DIRECTION + CURRENT_SCALE_DISTANCE * ARROW_DIRECTION, - y: Y_OFFSET - 0 - } - - point5 = { - x: X_OFFSET + WIDTH / 2 * ARROW_DIRECTION - DISTANCE_BETWEEN_ARROWS / 2 * ARROW_DIRECTION + CURRENT_SCALE_DISTANCE * ARROW_DIRECTION, - y: Y_OFFSET + HEIGHT / 2 - } - - point6 = { - x: X_OFFSET - WIDTH / 2 * ARROW_DIRECTION - DISTANCE_BETWEEN_ARROWS / 2 * ARROW_DIRECTION + CURRENT_SCALE_DISTANCE * ARROW_DIRECTION, - y: Y_OFFSET + HEIGHT - } - - point4 = thisObject.container.frame.frameThisPoint(point4) - point5 = thisObject.container.frame.frameThisPoint(point5) - point6 = thisObject.container.frame.frameThisPoint(point6) - - point7 = { - x: X_OFFSET + WIDTH / 2 * ARROW_DIRECTION + DISTANCE_BETWEEN_ARROWS / 2 * ARROW_DIRECTION + MAX_DISTANCE_FROM_CENTER * ARROW_DIRECTION, - y: Y_OFFSET - 0 - } - - point8 = { - x: X_OFFSET - WIDTH / 2 * ARROW_DIRECTION + DISTANCE_BETWEEN_ARROWS / 2 * ARROW_DIRECTION + MAX_DISTANCE_FROM_CENTER * ARROW_DIRECTION, - y: Y_OFFSET + HEIGHT / 2 - } - - point9 = { - x: X_OFFSET + WIDTH / 2 * ARROW_DIRECTION + DISTANCE_BETWEEN_ARROWS / 2 * ARROW_DIRECTION + MAX_DISTANCE_FROM_CENTER * ARROW_DIRECTION, - y: Y_OFFSET + HEIGHT - } - - point7 = thisObject.container.frame.frameThisPoint(point7) - point8 = thisObject.container.frame.frameThisPoint(point8) - point9 = thisObject.container.frame.frameThisPoint(point9) - - browserCanvasContext.setLineDash([0, 0]) - - browserCanvasContext.beginPath() - - browserCanvasContext.moveTo(point1.x, point1.y) - browserCanvasContext.lineTo(point2.x, point2.y) - browserCanvasContext.lineTo(point3.x, point3.y) - - browserCanvasContext.moveTo(point4.x, point4.y) - browserCanvasContext.lineTo(point5.x, point5.y) - browserCanvasContext.lineTo(point6.x, point6.y) - - browserCanvasContext.moveTo(point7.x, point7.y) - browserCanvasContext.lineTo(point8.x, point8.y) - browserCanvasContext.lineTo(point9.x, point9.y) - - browserCanvasContext.closePath() - - browserCanvasContext.lineWidth = LINE_WIDTH - browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.DARK + ', ' + OPACITY + ')' - browserCanvasContext.stroke() - } - } }