From afab7d8ac7b797e9b7d8e8fb80bb5a1477eea21d Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 17 Jan 2020 17:49:18 +0100 Subject: [PATCH] Viewport Related Refactoring --- Conditions.js | 16 ++++++++-------- SimulationExecution.js | 4 ++-- Strategies.js | 16 ++++++++-------- Trades.js | 16 ++++++++-------- TradingSimulation.js | 12 ++++++------ 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Conditions.js b/Conditions.js index a3fbb5b45..520bcfb95 100644 --- a/Conditions.js +++ b/Conditions.js @@ -120,8 +120,8 @@ /* Listen to the necesary events. */ - zoomChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Zoom Changed", onZoomChanged); - offsetChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Offset Changed", onOffsetChanged); + zoomChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged); + offsetChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged); dragFinishedEventSubscriptionId = canvas.eventHandler.listenToEvent("Drag Finished", onDragFinished); marketFilesUpdatedEventSubscriptionId = marketFiles.eventHandler.listenToEvent("Files Updated", onMarketFilesUpdated); dailyFilesUpdatedEventSubscriptionId = dailyFiles.eventHandler.listenToEvent("Files Updated", onDailyFilesUpdated); @@ -966,25 +966,25 @@ - function onZoomChanged(event) { + function onViewportZoomChanged(event) { try { - if (INFO_LOG === true) { logger.write("[INFO] onZoomChanged -> Entering function."); } + if (INFO_LOG === true) { logger.write("[INFO] onViewportZoomChanged -> Entering function."); } recalculate(); } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] onZoomChanged -> err = " + err.stack); } + if (ERROR_LOG === true) { logger.write("[ERROR] onViewportZoomChanged -> err = " + err.stack); } } } - function onOffsetChanged(event) { + function onViewportPositionChanged(event) { try { - if (INFO_LOG === true) { logger.write("[INFO] onOffsetChanged -> Entering function."); } + if (INFO_LOG === true) { logger.write("[INFO] onViewportPositionChanged -> Entering function."); } if (event !== undefined) { if (event.recalculate === true) { @@ -998,7 +998,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] onOffsetChanged -> err = " + err.stack); } + if (ERROR_LOG === true) { logger.write("[ERROR] onViewportPositionChanged -> err = " + err.stack); } } } diff --git a/SimulationExecution.js b/SimulationExecution.js index fe1529508..72b543402 100644 --- a/SimulationExecution.js +++ b/SimulationExecution.js @@ -83,7 +83,7 @@ recalculateScale(); filesUpdatedEventSubscriptionId = fileSequence.eventHandler.listenToEvent("Files Updated", onFilesUpdated); // Only the first sequence is supported right now. - offsetChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Offset Changed", onOffsetChanged); + offsetChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged); /* Ready for when dimmension changes. */ @@ -127,7 +127,7 @@ datetime = newDatetime; } - function onOffsetChanged() { + function onViewportPositionChanged() { if (Math.random() * 100 > 95) { recalculate() } diff --git a/Strategies.js b/Strategies.js index b2327c23d..4883cb092 100644 --- a/Strategies.js +++ b/Strategies.js @@ -122,8 +122,8 @@ /* Listen to the necesary events. */ - zoomChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Zoom Changed", onZoomChanged); - offsetChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Offset Changed", onOffsetChanged); + zoomChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged); + offsetChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged); dragFinishedEventSubscriptionId = canvas.eventHandler.listenToEvent("Drag Finished", onDragFinished); marketFilesUpdatedEventSubscriptionId = marketFiles.eventHandler.listenToEvent("Files Updated", onMarketFilesUpdated); dailyFilesUpdatedEventSubscriptionId = dailyFiles.eventHandler.listenToEvent("Files Updated", onDailyFilesUpdated); @@ -616,25 +616,25 @@ } - function onZoomChanged(event) { + function onViewportZoomChanged(event) { try { - if (INFO_LOG === true) { logger.write("[INFO] onZoomChanged -> Entering function."); } + if (INFO_LOG === true) { logger.write("[INFO] onViewportZoomChanged -> Entering function."); } recalculate(); } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] onZoomChanged -> err = " + err.stack); } + if (ERROR_LOG === true) { logger.write("[ERROR] onViewportZoomChanged -> err = " + err.stack); } } } - function onOffsetChanged(event) { + function onViewportPositionChanged(event) { try { - if (INFO_LOG === true) { logger.write("[INFO] onOffsetChanged -> Entering function."); } + if (INFO_LOG === true) { logger.write("[INFO] onViewportPositionChanged -> Entering function."); } if (event !== undefined) { if (event.recalculate === true) { @@ -648,7 +648,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] onOffsetChanged -> err = " + err.stack); } + if (ERROR_LOG === true) { logger.write("[ERROR] onViewportPositionChanged -> err = " + err.stack); } } } diff --git a/Trades.js b/Trades.js index e2025ab73..121407b1e 100644 --- a/Trades.js +++ b/Trades.js @@ -120,8 +120,8 @@ /* Listen to the necesary events. */ - zoomChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Zoom Changed", onZoomChanged); - offsetChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Offset Changed", onOffsetChanged); + zoomChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged); + offsetChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged); dragFinishedEventSubscriptionId = canvas.eventHandler.listenToEvent("Drag Finished", onDragFinished); marketFilesUpdatedEventSubscriptionId = marketFiles.eventHandler.listenToEvent("Files Updated", onMarketFilesUpdated); dailyFilesUpdatedEventSubscriptionId = dailyFiles.eventHandler.listenToEvent("Files Updated", onDailyFilesUpdated); @@ -612,25 +612,25 @@ } - function onZoomChanged(event) { + function onViewportZoomChanged(event) { try { - if (INFO_LOG === true) { logger.write("[INFO] onZoomChanged -> Entering function."); } + if (INFO_LOG === true) { logger.write("[INFO] onViewportZoomChanged -> Entering function."); } recalculate(); } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] onZoomChanged -> err = " + err.stack); } + if (ERROR_LOG === true) { logger.write("[ERROR] onViewportZoomChanged -> err = " + err.stack); } } } - function onOffsetChanged(event) { + function onViewportPositionChanged(event) { try { - if (INFO_LOG === true) { logger.write("[INFO] onOffsetChanged -> Entering function."); } + if (INFO_LOG === true) { logger.write("[INFO] onViewportPositionChanged -> Entering function."); } if (event !== undefined) { if (event.recalculate === true) { @@ -644,7 +644,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] onOffsetChanged -> err = " + err.stack); } + if (ERROR_LOG === true) { logger.write("[ERROR] onViewportPositionChanged -> err = " + err.stack); } } } diff --git a/TradingSimulation.js b/TradingSimulation.js index 0e8fab00c..ae25640fe 100644 --- a/TradingSimulation.js +++ b/TradingSimulation.js @@ -124,8 +124,8 @@ /* Listen to the necesary events. */ - zoomChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Zoom Changed", onZoomChanged); - offsetChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Offset Changed", onOffsetChanged); + zoomChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged); + offsetChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged); dragFinishedEventSubscriptionId = canvas.eventHandler.listenToEvent("Drag Finished", onDragFinished); marketFilesUpdatedEventSubscriptionId = marketFiles.eventHandler.listenToEvent("Files Updated", onMarketFilesUpdated); dailyFilesUpdatedEventSubscriptionId = dailyFiles.eventHandler.listenToEvent("Files Updated", onDailyFilesUpdated); @@ -811,7 +811,7 @@ } - function onZoomChanged(event) { + function onViewportZoomChanged(event) { try { @@ -819,11 +819,11 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] onZoomChanged -> err = " + err.stack); } + if (ERROR_LOG === true) { logger.write("[ERROR] onViewportZoomChanged -> err = " + err.stack); } } } - function onOffsetChanged(event) { + function onViewportPositionChanged(event) { try { @@ -839,7 +839,7 @@ } catch (err) { - if (ERROR_LOG === true) { logger.write("[ERROR] onOffsetChanged -> err = " + err.stack); } + if (ERROR_LOG === true) { logger.write("[ERROR] onViewportPositionChanged -> err = " + err.stack); } } }