BUG fixed: when zoomed in timeScale not worked
This commit is contained in:
1 parent
439dd28ca1
commit
abe3c89c96
2 files changed
+16
-18
No files matched your search
@@ -76,10 +76,6 @@ function newTimeMachine () {
|
||||
|
||||
recalculateScale()
|
||||
|
||||
thisObject.container.eventHandler.listenToEvent('Dimmensions Changed', function (event) {
|
||||
recalculateScale()
|
||||
})
|
||||
|
||||
/* First, we initialize the market that we are going to show first on screen. Later all the other markets will be initialized on the background. */
|
||||
|
||||
let position = 0 // This defines the position of each chart respect to each other.
|
||||
@@ -113,8 +109,9 @@ function newTimeMachine () {
|
||||
|
||||
thisObject.timeScale.container.eventHandler.listenToEvent('Lenght Percentage Changed', function (event) {
|
||||
thisObject.container.frame.width = TIME_MACHINE_WIDTH * event.lenghtPercentage / 100
|
||||
thisObject.container.eventHandler.raiseEvent('Dimmensions Changed', event)
|
||||
recalculateScale()
|
||||
moveToUserPosition(thisObject.container, timeLineCoordinateSystem, false, true, event.mousePosition)
|
||||
thisObject.container.eventHandler.raiseEvent('Dimmensions Changed', event)
|
||||
})
|
||||
|
||||
thisObject.timeScale.initialize()
|
||||
@@ -123,8 +120,9 @@ function newTimeMachine () {
|
||||
|
||||
thisObject.rateScale.container.eventHandler.listenToEvent('Height Percentage Changed', function (event) {
|
||||
thisObject.container.frame.height = TIME_MACHINE_HEIGHT * event.heightPercentage / 100
|
||||
thisObject.container.eventHandler.raiseEvent('Dimmensions Changed', event)
|
||||
recalculateScale()
|
||||
moveToUserPosition(thisObject.container, timeLineCoordinateSystem, true, false, event.mousePosition)
|
||||
thisObject.container.eventHandler.raiseEvent('Dimmensions Changed', event)
|
||||
})
|
||||
|
||||
thisObject.rateScale.initialize(timeLineCoordinateSystem)
|
||||
@@ -353,4 +351,3 @@ function newTimeMachine () {
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
+12
-11
@@ -1,4 +1,4 @@
|
||||
|
||||
|
||||
function newViewPort () {
|
||||
const MODULE_NAME = 'Viewport'
|
||||
const INFO_LOG = false
|
||||
@@ -11,8 +11,8 @@ function newViewPort () {
|
||||
|
||||
let ANIMATION_INCREMENT = 0.25
|
||||
|
||||
let TOP_MARGIN = 15 + TOP_SPACE_HEIGHT
|
||||
let BOTTOM_MARGIN = 20 + COCKPIT_SPACE_HEIGHT
|
||||
let TOP_MARGIN = 30 + TOP_SPACE_HEIGHT
|
||||
let BOTTOM_MARGIN = 30 + COCKPIT_SPACE_HEIGHT
|
||||
let LEFT_MARGIN = 50
|
||||
let RIGHT_MARGIN = 50
|
||||
let MARGINS = {
|
||||
@@ -83,8 +83,8 @@ function newViewPort () {
|
||||
}
|
||||
|
||||
function resize () {
|
||||
TOP_MARGIN = 15 + TOP_SPACE_HEIGHT
|
||||
BOTTOM_MARGIN = 20 + browserCanvas.height - COCKPIT_SPACE_POSITION
|
||||
TOP_MARGIN = 30 + TOP_SPACE_HEIGHT
|
||||
BOTTOM_MARGIN = 30 + browserCanvas.height - COCKPIT_SPACE_POSITION
|
||||
LEFT_MARGIN = 50
|
||||
RIGHT_MARGIN = 50
|
||||
MARGINS = {
|
||||
@@ -142,7 +142,7 @@ function newViewPort () {
|
||||
if (Math.trunc(Math.abs(targetOffset.y - offset.y) * 1000) >= Math.trunc(Math.abs(offsetIncrement.y) * 1000)) {
|
||||
offset.y = offset.y + offsetIncrement.y
|
||||
|
||||
// console.log("offset.y changed to " + offset.y)
|
||||
// console.log("offset.y changed to " + offset.y)
|
||||
} else {
|
||||
offsetIncrement.y = 0
|
||||
}
|
||||
@@ -161,7 +161,7 @@ function newViewPort () {
|
||||
|
||||
thisObject.eventHandler.raiseEvent('Offset Changed', event)
|
||||
|
||||
// console.log("displace produced new Offset x = " + offset.x + " y = " + offset.y);
|
||||
// console.log("displace produced new Offset x = " + offset.x + " y = " + offset.y);
|
||||
}
|
||||
|
||||
function displaceTarget (displaceVector) {
|
||||
@@ -173,7 +173,7 @@ function newViewPort () {
|
||||
y: (targetOffset.y - offset.y) / 10
|
||||
}
|
||||
|
||||
// console.log("displaceTarget x = " + targetOffset.x + " y = " + targetOffset.y);
|
||||
// console.log("displaceTarget x = " + targetOffset.x + " y = " + targetOffset.y);
|
||||
}
|
||||
|
||||
function newZoomLevel (level) {
|
||||
@@ -196,13 +196,13 @@ function newViewPort () {
|
||||
}
|
||||
|
||||
function isMinZoom () {
|
||||
/* returns true is we are currently at the min zoom level. */
|
||||
/* returns true is we are currently at the min zoom level. */
|
||||
|
||||
if (thisObject.zoomTargetLevel === MIN_ZOOM_LEVEL) { return true } else { return false }
|
||||
}
|
||||
|
||||
function applyZoom (amount) {
|
||||
// console.log("applyZoom amount: " + amount);
|
||||
// console.log("applyZoom amount: " + amount);
|
||||
|
||||
if (amount > 0) {
|
||||
if (thisObject.zoomTargetLevel > -5) {
|
||||
@@ -300,7 +300,7 @@ function newViewPort () {
|
||||
}
|
||||
|
||||
function fitIntoVisibleArea (point) {
|
||||
/* Here we check the boundaries of the resulting points, so they dont go out of the visible area. */
|
||||
/* Here we check the boundaries of the resulting points, so they dont go out of the visible area. */
|
||||
|
||||
if (point.x > thisObject.visibleArea.bottomRight.x + 1) {
|
||||
point.x = thisObject.visibleArea.bottomRight.x + 1
|
||||
@@ -453,3 +453,4 @@ function newViewPort () {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user