Scales totally working within container

This commit is contained in:
Luis Fernando Molina committed 2020-01-08 20:36:07 +01:00
1 parent 401077f99c
commit ef34ee96c9
5 files changed
+49 -3

No files matched your search

+27
View File
@@ -296,6 +296,21 @@ function newTimeMachine () {
chart.physics()
}
/* Container Limits */
let upCorner = {
x: 0,
y: 0
}
let bottonCorner = {
x: thisObject.container.frame.width,
y: thisObject.container.frame.height
}
upCorner = transformThisPoint(upCorner, thisObject.container)
bottonCorner = transformThisPoint(bottonCorner, thisObject.container)
/* Mouse Position Date Calculation */
let timePoint = {
@@ -329,6 +344,12 @@ function newTimeMachine () {
timePoint.x = mouse.position.x - thisObject.timeScale.container.frame.width / 2
timePoint = thisObject.container.fitFunction(timePoint)
/* Checking against the container limits. */
if (timePoint.x < upCorner.x) { timePoint.x = upCorner.x }
if (timePoint.x + thisObject.timeScale.container.frame.width > bottonCorner.x) { timePoint.x = bottonCorner.x - thisObject.timeScale.container.frame.width }
if (timePoint.y < upCorner.y) { timePoint.y = upCorner.y }
if (timePoint.y + thisObject.timeScale.container.frame.height > bottonCorner.y) { timePoint.y = bottonCorner.y - thisObject.timeScale.container.frame.height }
thisObject.timeScale.container.frame.position.x = timePoint.x
thisObject.timeScale.container.frame.position.y = timePoint.y
@@ -343,6 +364,12 @@ function newTimeMachine () {
ratePoint.y = mouse.position.y - thisObject.rateScale.container.frame.height / 2 + thisObject.rateScale.container.frame.height
ratePoint = thisObject.container.fitFunction(ratePoint, true)
/* Checking against the container limits. */
if (ratePoint.x < upCorner.x) { ratePoint.x = upCorner.x }
if (ratePoint.x + thisObject.rateScale.container.frame.width > bottonCorner.x) { ratePoint.x = bottonCorner.x }
if (ratePoint.y < upCorner.y + thisObject.rateScale.container.frame.height) { ratePoint.y = upCorner.y + thisObject.rateScale.container.frame.height }
if (ratePoint.y > bottonCorner.y) { ratePoint.y = bottonCorner.y }
thisObject.rateScale.container.frame.position.y = ratePoint.y - thisObject.rateScale.container.frame.height
thisObject.rateScale.container.frame.position.x = ratePoint.x - thisObject.rateScale.container.frame.width
}
+19
View File
@@ -286,6 +286,21 @@ function newTimelineChart () {
thisObject.timeFrameScale.physics()
/* Container Limits */
let upCorner = {
x: 0,
y: 0
}
let bottonCorner = {
x: thisObject.container.frame.width,
y: thisObject.container.frame.height
}
upCorner = transformThisPoint(upCorner, thisObject.container)
bottonCorner = transformThisPoint(bottonCorner, thisObject.container)
/* thisObject.timeFrameScale Positioning */
timePoint = {
@@ -297,6 +312,10 @@ function newTimelineChart () {
timePoint.x = mouse.position.x - thisObject.timeFrameScale.container.frame.width / 2
timePoint = thisObject.container.fitFunction(timePoint, true)
/* Checking against the container limits. */
if (timePoint.x < upCorner.x) { timePoint.x = upCorner.x }
if (timePoint.x + thisObject.timeFrameScale.container.frame.width > bottonCorner.x) { timePoint.x = bottonCorner.x - thisObject.timeFrameScale.container.frame.width }
thisObject.timeFrameScale.container.frame.position.x = timePoint.x
thisObject.timeFrameScale.container.frame.position.y = timePoint.y - thisObject.timeFrameScale.container.frame.height
}
+1 -1
View File
@@ -27,7 +27,7 @@ function newRateScale () {
thisObject.container.detectMouseOver = true
thisObject.container.frame.width = 190
thisObject.container.frame.height = 25
thisObject.container.frame.height = 30
let isMouseOver
+1 -1
View File
@@ -40,7 +40,7 @@ function newTimeFrameScale () {
thisObject.container.detectMouseOver = true
thisObject.container.frame.width = 190
thisObject.container.frame.height = 25
thisObject.container.frame.height = 30
}
function finalize () {
+1 -1
View File
@@ -27,7 +27,7 @@ function newTimeScale () {
thisObject.container.detectMouseOver = true
thisObject.container.frame.width = 190
thisObject.container.frame.height = 25
thisObject.container.frame.height = 30
let isMouseOver