From e5da034b1f48d852a94b494dc97667127c51a72b Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sun, 25 Feb 2018 20:13:37 +0100 Subject: [PATCH] Intro problems corrected --- .vs/AAWebPlatform/v15/.suo | Bin 66560 -> 65536 bytes DailyFileCursor.js | 6 -- SplashScreen.js | 4 +- TimelineChart.js | 160 ++++++++++++++++++++++--------------- 4 files changed, 98 insertions(+), 72 deletions(-) diff --git a/.vs/AAWebPlatform/v15/.suo b/.vs/AAWebPlatform/v15/.suo index 76b8d54e35210baa8d310b0a19d3ed9a0c00b581..30f85c86dc81bd15d2796d18468c8a0605f36fc5 100644 GIT binary patch delta 3139 zcmd5;du)?c6#vfGuch6((Qa(QHr92ZcB709a8Bh>wt*8E>;Vf3%uO~#?B*CPj}2H+ zi6fZ6dZNgDv7+*jN9kPvjm9E_2*!XKGbIQNkr*S3BK)x_tLMyisRoTvW4z6;=bU@* zckVgA@1FZzSF_@BDO)DQjgTZsCiDdY0TL1r(he5?1Q3a4*`%`_ztV2s|0&#sPPqwA z;SIS-W1%^EEjFkcqN+&s$I%}(ErMcdiXqKP7)=;Lh$M_7kpF>ZB6}2}kP!8|u}NX} zP|}TIc4ko5lQa|5ggXfw&`d(2BxOhuq}&WHr6YYTA(fCt;4JSTc{?G4Fa|$T#y}F@ zR7M$RkUf$ROPEEd#Cz2D8~KSEvO=-fwiJ)RcC~d_L$GsQ*dR~p!yYINl2>%IPcV7o zZ%Ll|aeCB`J%db5(WDIvb2Oav5P1ot-$qaf%ruk73q3%R$>V%e2!jYrUOFL}5F(Fr z=PZ~!10h5n`(W}&!~_aRA@&B+jBhEv&CE>ktWe7i+IN%8A=t1>o5<{GP3nH;(5y?; zEv1oSLK#lg<-sD{s7o9cV$n|hPY~u3*z1ax;zY|zGFAsW8iR5T$+d*0pzR{*j_@i+ zNMd`$JcT`?Au9UX!#9=fAd&2u&o62Cf6nLz;rUWxIz=Txb_mngvojk1*u0=ZbQDp!Ekh%5>hy-S-+1;LjxfO z!lM#_8987$aNvQO_lg%>@NDRcuoYZ9gIP&KaDL(Io^-`m(gAud6%H@t0k4;y#=P>0 zzO03S-It@qI&GA@qMJtkvE`iUgm2qN{Ru~Gt2hU>JHz!Yy0;c5;GJmKS zLJ5_~o(ipRUI#E0>V7Ij&!dB6&k`AT+M7g^eLeUb=Tso!LgxsNT@D&wuDlcNP6Os% zvMLw5ss79>6R><$D!LltFmZ(mGi8m2KRwMqpufSK)aB^&4eIw6)L0)Ic&mwskJ*TgRjA zc|Y+8t&`oYF7jjZya4EGwV`dBA6+l{(ckJv+e4;A%?{g3;C{uPSVdt>lvMpp z-zSYH$>(u@!)LP1XnFZ_^wWxeZED0m+913~bP~37)}on!gP8Tp#Jc^ zSbY3|IIy=Eux-y&>^(a!Y~;f_QRm&F#)DpmO3J@=*v7%(iDWEYo`aPW(hRri{B6oD z2d5dw1j(h7$v=hksbami42($w-M`*a=v?&HW1#bL9Dj>`Z3+Fiu6Q!?@#yKj;H zvMs8)(tY^ww{ZrG;e>PZ`@?g;=xQtLxhHj<*pgib{~KnqAw$6V0LYcgvHaj@;!1}# zpRf2Y_}V!fou7^Q>zr|<*8?igIT@!k#$(Zs@xprPtV(DupVL7-wwy0Dmr8Y#U8gZ#rN}ph8r9 pyB$z2S}eK)t$?{-Wr&RL+Tm|3a0&(-A8rQl1G>j%VE5ISUjSd~NfQ77 delta 3501 zcmd^BeNa@_72o^zExQX3*_97b6n25?vaIq^G)f^|grFe?LW3Emi4I#K6~mXX*oY=9 zQKOU?;r*PZnT`+_?bxVf=R++`oLnn|bW zlg2}kg;hkARY)?Lq*FIs#FaC^)vxd6>fuNhM%Mgv?hECQrs_7+Lc$$=QoEj{ zSp99$Pq6)fHq^x1NZvx&N_dX&0zoyF!+j#R!}0J+ag-D=MP#zONK@AMXTbE}tj)UBa(WZi!}er{9M!5|NA-J}+2)8owPjhSnMF>>b>m`M5#l zETA}x)~GHy(H*vq%&*KsTjGT7EfP0jbJ8PH8A;j@Ke{8d5R^OldO@C1ICT!UnLg)2 z;2bKKnPn0WAhbky5K&!&aVtfG+6+7dxaX8bGVbBqA)auH@8;7EzYNts+zDkE(Pl|I zX!BJ9ALy_}W8kA1iZ%C-Otx&DZJ|xxmb}eU2)rmibFvzox%5w|(d5U}POU#=rdW!|GQ}EhFxx!%HM*rDP;IX_&*a??$fnuugGdZ&m zg;{Hq*D9-+oV`X_Q`*l4myEDT#`}O*o0?D*Z-7?_!GWHO`TEN9ybUxczd8%ONQP(7 zrW_irWXR5qR-%`F%)Hrx!Dc$sy65eA%V8K_3eQjp(m#~&#zC7hJih$vWI@TZO3c9f zK#f^(C%?pG6A_b`50A;MODAO(?wCp|#VyHHz z5@q8Itg}cdDmldlZ4WS0-K(u9E+?YszLqX?s!d7*5?Y~i_^yS!Bf?*?IT(I^YV z#~)fM0}@ZAlfZ|!L6Gxq1^s!e#lfa=Eo1m_^8&p{>Zd8`p0UTVwk??&vH~|Yr=Th$ z-n#3?FLqx0^ZBwv_MhwsyA;2IyW-ui4iOi$R(Z=9R<#&`=2$`VEtuQm$g@?5f$)hv zqVCe)>22xO)M%Qqc6)|iW`&wu%~SBS#lqW?4u6{!se&oWMK({<1Fucf}!Yj~&i#zsT8zb6E}E+_Rb$psBOKE7JoPZ}u(@U$?%YcAcxPpuq(v{BZVo zWG?LW%X|I(o_!3?K0iFYb*Q=)!yf}gXCu8!>NPH+Rp}mWV*j4HonJA6h|BaM=0zN# z*@w)x>tQ->#6NvDJo|cs`oQ3_vADLbrm(KDwHnt?qzANp!xEgsQ3UFbz)DI=LrX69 z582I}jxX$r0g|k~vcMOZ8bL7$bI{>yM#f1ao;hH{XG4nFJ>9r=KS-98(ammv}h;X2%D8 z_J}M0Wi3SGjU%Pz7p8;LXu3&$j$*lqc_TfzaxoFE{wMJjDn@zs^-}hq6hSt9taltq z<26E$Q`fOg_Y_6o%kuxQC?u_STwn_oHa5xN8mbLafAvdBB_0J^<8b{S66O_{lOp g%@T&|*X)Y@(+}9-T|dK*+EVda+ng`pl6L050GIaECjbBd diff --git a/DailyFileCursor.js b/DailyFileCursor.js index 81f4c0d0c..ee16add4c 100644 --- a/DailyFileCursor.js +++ b/DailyFileCursor.js @@ -109,12 +109,6 @@ function newDailyFilesCursor() { callBackFunction(); - if (marketId === INITIAL_DEFAULT_MARKET) { // This is when we dont need a splash screen anymore! - - splashScreenNeeded = false; - - } - } } diff --git a/SplashScreen.js b/SplashScreen.js index 355a7de36..07711226e 100644 --- a/SplashScreen.js +++ b/SplashScreen.js @@ -62,8 +62,8 @@ function newSplashScreen() { splashScreen.container.frame.draw(false, false); - let label = '' + stepsInitializationCounter + ' %'; - stepsInitializationCounter++; + let label = '' + Math.trunc(stepsInitializationCounter) + ' %'; + stepsInitializationCounter = stepsInitializationCounter + 0.3; if (stepsInitializationCounter > 99) { stepsInitializationCounter = 99;} diff --git a/TimelineChart.js b/TimelineChart.js index 02c03631f..d2a578d1b 100644 --- a/TimelineChart.js +++ b/TimelineChart.js @@ -111,110 +111,134 @@ function newTimelineChart() { /* AAMasters AAOlivia Candlesticks */ - var layerAAMastersAAOliviaCandlesticks = newAAMastersAAOliviaCandles(); + let layerAAMastersAAOliviaCandlesticks = newAAMastersAAOliviaCandles(); - layerAAMastersAAOliviaCandlesticks.container.displacement.parentDisplacement = timelineChart.container.displacement; - layerAAMastersAAOliviaCandlesticks.container.zoom.parentZoom = timelineChart.container.zoom; - layerAAMastersAAOliviaCandlesticks.container.frame.parentFrame = timelineChart.container.frame; + loadCandles(); - layerAAMastersAAOliviaCandlesticks.container.parentContainer = timelineChart.container; + function loadCandles() { - layerAAMastersAAOliviaCandlesticks.container.frame.width = timelineChart.container.frame.width * 1; - layerAAMastersAAOliviaCandlesticks.container.frame.height = timelineChart.container.frame.height * 1; + layerAAMastersAAOliviaCandlesticks.container.displacement.parentDisplacement = timelineChart.container.displacement; + layerAAMastersAAOliviaCandlesticks.container.zoom.parentZoom = timelineChart.container.zoom; + layerAAMastersAAOliviaCandlesticks.container.frame.parentFrame = timelineChart.container.frame; - layerAAMastersAAOliviaCandlesticks.container.frame.position.x = timelineChart.container.frame.width / 2 - layerAAMastersAAOliviaCandlesticks.container.frame.width / 2; - layerAAMastersAAOliviaCandlesticks.container.frame.position.y = timelineChart.container.frame.height / 2 - layerAAMastersAAOliviaCandlesticks.container.frame.height / 2; + layerAAMastersAAOliviaCandlesticks.container.parentContainer = timelineChart.container; - layerStatus = chartLayersPanel.getLayerStatus(chartLayersPanel.layerNames.OLIVIA_CANDLES); + layerAAMastersAAOliviaCandlesticks.container.frame.width = timelineChart.container.frame.width * 1; + layerAAMastersAAOliviaCandlesticks.container.frame.height = timelineChart.container.frame.height * 1; - layerAAMastersAAOliviaCandlesticks.initialize(DEFAULT_EXCHANGE, DEFAULT_MARKET, INITIAL_DATE, INITIAL_TIME_PERIOD, layerStatus, onOliviaCandlesInitialized); + layerAAMastersAAOliviaCandlesticks.container.frame.position.x = timelineChart.container.frame.width / 2 - layerAAMastersAAOliviaCandlesticks.container.frame.width / 2; + layerAAMastersAAOliviaCandlesticks.container.frame.position.y = timelineChart.container.frame.height / 2 - layerAAMastersAAOliviaCandlesticks.container.frame.height / 2; - function onOliviaCandlesInitialized() { + layerStatus = chartLayersPanel.getLayerStatus(chartLayersPanel.layerNames.OLIVIA_CANDLES); - splashScreenNeeded = false; // This is when we dont need a splash screen anymore! + layerAAMastersAAOliviaCandlesticks.initialize(DEFAULT_EXCHANGE, DEFAULT_MARKET, INITIAL_DATE, INITIAL_TIME_PERIOD, layerStatus, onOliviaCandlesInitialized); + + function onOliviaCandlesInitialized() { + + layerAAMastersAAOliviaCandlesticks.positionAtDatetime(INITIAL_DATE); + loadVolumes(); + + } } /* AAMasters AAOlivia Volumes */ - var layerAAMastersAAOliviaVolumes = newAAMastersAAOliviaVolumes(); + let layerAAMastersAAOliviaVolumes = newAAMastersAAOliviaVolumes(); - layerAAMastersAAOliviaVolumes.container.displacement.parentDisplacement = timelineChart.container.displacement; - layerAAMastersAAOliviaVolumes.container.zoom.parentZoom = timelineChart.container.zoom; - layerAAMastersAAOliviaVolumes.container.frame.parentFrame = timelineChart.container.frame; + function loadVolumes() { - layerAAMastersAAOliviaVolumes.container.parentContainer = timelineChart.container; + layerAAMastersAAOliviaVolumes.container.displacement.parentDisplacement = timelineChart.container.displacement; + layerAAMastersAAOliviaVolumes.container.zoom.parentZoom = timelineChart.container.zoom; + layerAAMastersAAOliviaVolumes.container.frame.parentFrame = timelineChart.container.frame; - layerAAMastersAAOliviaVolumes.container.frame.width = timelineChart.container.frame.width * 1; - layerAAMastersAAOliviaVolumes.container.frame.height = timelineChart.container.frame.height * 1; + layerAAMastersAAOliviaVolumes.container.parentContainer = timelineChart.container; - layerAAMastersAAOliviaVolumes.container.frame.position.x = timelineChart.container.frame.width / 2 - layerAAMastersAAOliviaVolumes.container.frame.width / 2; - layerAAMastersAAOliviaVolumes.container.frame.position.y = timelineChart.container.frame.height / 2 - layerAAMastersAAOliviaVolumes.container.frame.height / 2; + layerAAMastersAAOliviaVolumes.container.frame.width = timelineChart.container.frame.width * 1; + layerAAMastersAAOliviaVolumes.container.frame.height = timelineChart.container.frame.height * 1; - layerStatus = chartLayersPanel.getLayerStatus(chartLayersPanel.layerNames.OLIVIA_VOLUMES); + layerAAMastersAAOliviaVolumes.container.frame.position.x = timelineChart.container.frame.width / 2 - layerAAMastersAAOliviaVolumes.container.frame.width / 2; + layerAAMastersAAOliviaVolumes.container.frame.position.y = timelineChart.container.frame.height / 2 - layerAAMastersAAOliviaVolumes.container.frame.height / 2; - layerAAMastersAAOliviaVolumes.initialize(DEFAULT_EXCHANGE, DEFAULT_MARKET, INITIAL_DATE, INITIAL_TIME_PERIOD, layerStatus, onOliviaVolumesInitialized); + layerStatus = chartLayersPanel.getLayerStatus(chartLayersPanel.layerNames.OLIVIA_VOLUMES); - function onOliviaVolumesInitialized() { + layerAAMastersAAOliviaVolumes.initialize(DEFAULT_EXCHANGE, DEFAULT_MARKET, INITIAL_DATE, INITIAL_TIME_PERIOD, layerStatus, onOliviaVolumesInitialized); - // nothing to do here... + function onOliviaVolumesInitialized() { + + loadCandleStairs(); + + } } + /* AAMasters AATom CandleStairs */ - var layerAAMastersAATomCandleStairs = newAAMastersAATomCandleStairs(); + let layerAAMastersAATomCandleStairs = newAAMastersAATomCandleStairs(); - layerAAMastersAATomCandleStairs.container.displacement.parentDisplacement = timelineChart.container.displacement; - layerAAMastersAATomCandleStairs.container.zoom.parentZoom = timelineChart.container.zoom; - layerAAMastersAATomCandleStairs.container.frame.parentFrame = timelineChart.container.frame; + function loadCandleStairs() { - layerAAMastersAATomCandleStairs.container.parentContainer = timelineChart.container; + layerAAMastersAATomCandleStairs.container.displacement.parentDisplacement = timelineChart.container.displacement; + layerAAMastersAATomCandleStairs.container.zoom.parentZoom = timelineChart.container.zoom; + layerAAMastersAATomCandleStairs.container.frame.parentFrame = timelineChart.container.frame; - layerAAMastersAATomCandleStairs.container.frame.width = timelineChart.container.frame.width * 1; - layerAAMastersAATomCandleStairs.container.frame.height = timelineChart.container.frame.height * 1; + layerAAMastersAATomCandleStairs.container.parentContainer = timelineChart.container; - layerAAMastersAATomCandleStairs.container.frame.position.x = timelineChart.container.frame.width / 2 - layerAAMastersAATomCandleStairs.container.frame.width / 2; - layerAAMastersAATomCandleStairs.container.frame.position.y = timelineChart.container.frame.height / 2 - layerAAMastersAATomCandleStairs.container.frame.height / 2; + layerAAMastersAATomCandleStairs.container.frame.width = timelineChart.container.frame.width * 1; + layerAAMastersAATomCandleStairs.container.frame.height = timelineChart.container.frame.height * 1; - layerStatus = chartLayersPanel.getLayerStatus(chartLayersPanel.layerNames.OLIVIA_CANDLES); + layerAAMastersAATomCandleStairs.container.frame.position.x = timelineChart.container.frame.width / 2 - layerAAMastersAATomCandleStairs.container.frame.width / 2; + layerAAMastersAATomCandleStairs.container.frame.position.y = timelineChart.container.frame.height / 2 - layerAAMastersAATomCandleStairs.container.frame.height / 2; - layerAAMastersAATomCandleStairs.initialize(DEFAULT_EXCHANGE, DEFAULT_MARKET, INITIAL_DATE, INITIAL_TIME_PERIOD, layerStatus, onOliviaCandlesInitialized); + layerStatus = chartLayersPanel.getLayerStatus(chartLayersPanel.layerNames.OLIVIA_CANDLES); - function onOliviaCandlesInitialized() { + layerAAMastersAATomCandleStairs.initialize(DEFAULT_EXCHANGE, DEFAULT_MARKET, INITIAL_DATE, INITIAL_TIME_PERIOD, layerStatus, onOliviaCandlesInitialized); - // nothing to do here... + function onOliviaCandlesInitialized() { + + loadVolumeStairs(); + + } } + + /* AAMasters AATom VolumeStairs */ - var layerAAMastersAATomVolumeStairs = newAAMastersAATomVolumeStairs(); + let layerAAMastersAATomVolumeStairs = newAAMastersAATomVolumeStairs(); - layerAAMastersAATomVolumeStairs.container.displacement.parentDisplacement = timelineChart.container.displacement; - layerAAMastersAATomVolumeStairs.container.zoom.parentZoom = timelineChart.container.zoom; - layerAAMastersAATomVolumeStairs.container.frame.parentFrame = timelineChart.container.frame; + function loadVolumeStairs() { - layerAAMastersAATomVolumeStairs.container.parentContainer = timelineChart.container; + layerAAMastersAATomVolumeStairs.container.displacement.parentDisplacement = timelineChart.container.displacement; + layerAAMastersAATomVolumeStairs.container.zoom.parentZoom = timelineChart.container.zoom; + layerAAMastersAATomVolumeStairs.container.frame.parentFrame = timelineChart.container.frame; - layerAAMastersAATomVolumeStairs.container.frame.width = timelineChart.container.frame.width * 1; - layerAAMastersAATomVolumeStairs.container.frame.height = timelineChart.container.frame.height * 1; + layerAAMastersAATomVolumeStairs.container.parentContainer = timelineChart.container; - layerAAMastersAATomVolumeStairs.container.frame.position.x = timelineChart.container.frame.width / 2 - layerAAMastersAATomVolumeStairs.container.frame.width / 2; - layerAAMastersAATomVolumeStairs.container.frame.position.y = timelineChart.container.frame.height / 2 - layerAAMastersAATomVolumeStairs.container.frame.height / 2; + layerAAMastersAATomVolumeStairs.container.frame.width = timelineChart.container.frame.width * 1; + layerAAMastersAATomVolumeStairs.container.frame.height = timelineChart.container.frame.height * 1; - layerStatus = chartLayersPanel.getLayerStatus(chartLayersPanel.layerNames.OLIVIA_VOLUMES); + layerAAMastersAATomVolumeStairs.container.frame.position.x = timelineChart.container.frame.width / 2 - layerAAMastersAATomVolumeStairs.container.frame.width / 2; + layerAAMastersAATomVolumeStairs.container.frame.position.y = timelineChart.container.frame.height / 2 - layerAAMastersAATomVolumeStairs.container.frame.height / 2; - layerAAMastersAATomVolumeStairs.initialize(DEFAULT_EXCHANGE, DEFAULT_MARKET, INITIAL_DATE, INITIAL_TIME_PERIOD, layerStatus, onOliviaVolumeStairsInitialized); + layerStatus = chartLayersPanel.getLayerStatus(chartLayersPanel.layerNames.OLIVIA_VOLUMES); - function onOliviaVolumeStairsInitialized() { + layerAAMastersAATomVolumeStairs.initialize(DEFAULT_EXCHANGE, DEFAULT_MARKET, INITIAL_DATE, INITIAL_TIME_PERIOD, layerStatus, onOliviaVolumeStairsInitialized); - // nothing to do here... + function onOliviaVolumeStairsInitialized() { + + addLayers(); + splashScreenNeeded = false; // This is when we dont need a splash screen anymore! + + } } + /* All Time Layer */ /* var allTimeChartLayer = newAllTimeChartLayer(); @@ -395,15 +419,29 @@ function newTimelineChart() { linearRegressionCurveChartLayer.initialize(exchangeId, marketId, marketIndex, dailyFilesCursor, chartLayersPanel); */ + + + function addLayers() { + + timelineChart.layers.push(layerAAMastersAATomCandleStairs); // This looks better if it goes below the candles layer. + timelineChart.layers.push(layerAAMastersAATomVolumeStairs); + + timelineChart.layers.push(layerAAMastersAAOliviaCandlesticks); + timelineChart.layers.push(layerAAMastersAAOliviaVolumes); + + /* Connecting all layers to the panel that provides a user interface to turn them on - visible - off */ + + chartLayersPanel.container.eventHandler.listenToEvent("Layer Status Changed", layerAAMastersAAOliviaCandlesticks.onLayerStatusChanged); + chartLayersPanel.container.eventHandler.listenToEvent("Layer Status Changed", layerAAMastersAAOliviaVolumes.onLayerStatusChanged); + + chartLayersPanel.container.eventHandler.listenToEvent("Layer Status Changed", layerAAMastersAATomCandleStairs.onLayerStatusChanged); + chartLayersPanel.container.eventHandler.listenToEvent("Layer Status Changed", layerAAMastersAATomVolumeStairs.onLayerStatusChanged); + + } + /* Add all layers to the internal array */ - timelineChart.layers.push(layerAAMastersAATomCandleStairs); // This looks better if it goes below the candles layer. - timelineChart.layers.push(layerAAMastersAATomVolumeStairs); - - - timelineChart.layers.push(layerAAMastersAAOliviaCandlesticks); - timelineChart.layers.push(layerAAMastersAAOliviaVolumes); /* @@ -426,13 +464,7 @@ function newTimelineChart() { //orderBooksChartLayer.container.eventHandler.listenToEvent("Current Order Book Changed", orderBookPanel.onCurrentOrderBookChanged); - /* Connecting all layers to the panel that provides a user interface to turn them on - visible - off */ - chartLayersPanel.container.eventHandler.listenToEvent("Layer Status Changed", layerAAMastersAAOliviaCandlesticks.onLayerStatusChanged); - chartLayersPanel.container.eventHandler.listenToEvent("Layer Status Changed", layerAAMastersAAOliviaVolumes.onLayerStatusChanged); - - chartLayersPanel.container.eventHandler.listenToEvent("Layer Status Changed", layerAAMastersAATomCandleStairs.onLayerStatusChanged); - chartLayersPanel.container.eventHandler.listenToEvent("Layer Status Changed", layerAAMastersAATomVolumeStairs.onLayerStatusChanged); /* chartLayersPanel.container.eventHandler.listenToEvent("Layer Status Changed", accumulatedVolumeChartLayer.onLayerStatusChanged);