From a77b89ed1cd139d4c463cac5a1456de577380713 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 20 Feb 2018 19:54:43 +0100 Subject: [PATCH] File Cache and FileCursorCache working --- .vs/AAWebPlatform/v15/.suo | Bin 49152 -> 56320 bytes ChartUtilities.js | 80 +++++++++++++++++++++++++++++-------- Dashboard.js | 13 +++++- Ecosystem.js | 8 ++-- FileCloud.js | 4 +- FileCursor.js | 9 +++-- FileCursorCache.js | 4 +- Utilities.js | 2 - ViewPort.js | 4 +- index.html | 1 + 10 files changed, 93 insertions(+), 32 deletions(-) diff --git a/.vs/AAWebPlatform/v15/.suo b/.vs/AAWebPlatform/v15/.suo index 60c996b15d1cccbd9427a847459acc4c91dfaf45..752d890c9987e833e3c5a30080e1dc0aedc9719a 100644 GIT binary patch delta 3653 zcmeH~drVVj6u|FyfdZwJ7HR<%EDsf-JS{MhLQ9zse1SqiWy-7a80Aq~-;M^OVfX;< zaeqj3YTXbqX0bPBONR3*$zr0JGXFALGPf-LVcfztAJI(N`D!a@#LOiwF4>p-IOjXx zx!>b_=bl^ab}#!EUOm}Fd`6qhN{^1E3)=>-lNk&)Eo^1Cl5=p6-AQi27O!ohT(oYM z!XvL)?NU_3kTGoDC_~+P5Xul_8nOYIibNpP&(r*{ACAZn2@;G%B2Uo4gi?h>A<;-I zG98(T%tB@(6%3Qd%t0j{NkG&{GU8bv1@$y{e=f>&x1NDA6L|-D(pwZl@ZgkG)=(Ia_?0eKf$ij*P?kwwU2qySlhEJId7YDj3h z5w&8Z1bGjkGnb)UjjTb|BA$5CvGv%m!`;Tn8&E^T*!w6O5qBh2oOslSdg4WW8Sx7a z{EAS6r~QuoKd7y@Xf7wQk{qx}+KCqK;oofD7PyVP#`CfX&&%+6um$en)GA)3`iTIm zu!!PtrCnjLRq=?Vfo)2=4~;Mj59PxWnr^P0;?Cewu!_uw-^3yOpTXXQ3m%$uc&fLT zQ)%!DB=kTuO{s*U&{(jBuYh4T74FVZgGwC}=(=xDLO=CT7fNXI(2Vvx#@|&-h%;Ix z;#Jld0>h$Iu-f)I!wh8dC4A`3Ug006hO)dYdz3ihyq!rhZ(gQBJ&WaZ7=etN1d5l- zA!ko4pPqA>I5vtLg{&iwg^__=KDYP~OYXz>#=WEt^fOmZG2**oVm2{__+D5TE0e@D zFm1q<8d-*cV_o5(FU#e1WgA&V#*XcJeW|IckY2m1YWSi@PljLFRWY?NP_#b<%sqZw zM;rw04>~GYN)HUSWB$+jrG=gQya8$3FHVJ5E<)D zn+lsj-=7F$-AxeGtKrAGWyJq^-><0eY}X`9E4P>|ZRPsvYMa^CSZOuY7@HeyX4Ci} zo!vFrwGA3Lysn=Q*h>~f8EW7I^zs1Z^%DKfRrm#k*_#fQbXG+&{xb!7(eYRL*enC_4oWCrD>sZ)N>#v zUI@mB(UPA3;$;N}JiR!J6_?P^ElFN9c&>JI`y%DpXLB;lRkxl$S!RUDUAujj0k}dI zT_O18<`;7-wJFW9h=n<<6jDxz$z0^x6d1x|6}Xb_J)fiWZ=8y!tF@m$<5r`za_oXqHRd9V+Oz zQ3JhopTPsO79N{-`zz2wKezc%w0;0I%~$9PG@-3TJ)IwMRACB3hNXbp*8(luFU49t z8I9w+P^ZVCD|sQF#vkmYlfZWjNko} zYGEfJ?9@5C1eB}q|6e)U;9sd63IEYzG2^(vvr7E1R9ZJQTg>HePw80j#_Pq<8z}|V z$Az;#+-U*0P92Q&n_jmvK;DWlke-zC{T*uv*R`26z(~ic@R$Brz`_y zmXyEcyv_1LB_S|!_B`0D1?U-whl_p1YzYHGO|9&4_4OM+Up`sf*L7#m;y)trnWn`A zj3G3Jsli!V*n$HR*|(v^d$2uo^F$Oa W`f#Q*D!{rI~^z0E>h zhJ@;F3_C)$Jc8hdg9s1`o&cl40MH*qg7Lr#EP&U9!9IYEg^l*-M)~bvzfJI4p3mcH z#6u;i+Pgs#f?*&T3QH;aMgis=Vn`?xM=-91Q{UHH>EoZ zcCz2khJD8G^U5jkr-Er-YKz;)*5g|IWhEHE3)0mXoy>7x`e*K{81Vm^Xr!2+-l z@T3x7Wz*du?c!sa9T{GI2v3^9r{FL+0zLyr!RO!@I1WyLli(CM4bFhG;0tgLdDM2e=RZ1iY5vku8yIt`HhknyW<<-NoO7YNchp_`f*5;#dQU zV?}YO(o*A&Y&7ddWo zo)I$5&9%{nns_xW^SE$lICyK}nI?M{%ARc5vsl(|y{+fgFZJ9yEm)?O9J^}Iy<_mC z%Vc{yOU=sLA&UmOlD}CbQC)r#oh>M$_JV;zq8kO_6jm5Pt(yj@uEI4k+S){K&zX#x z`o0ap(r&W8SV1x67FxSJQS9_bM(QdXMm41#dZU#H-g^YowRtOg<{w|uXye}M8%Y}XT8UicMXI)62$IVNlfGT1vz%NXXtc*!U}F{d zMv}&TZ3&jdlGd=)dMxMaf?GR6mrpr$_=M$V)C=mk52p(fr9~84l0tPm8%aB<+4||r zVH4P=4P|>tY0^9ya=oSr8osPKBpCT{kQ;b`4)=KtNmiadSXV~XRlZ1wXlh%Lr@C5P zqCQa<&d|*s#YDE^bV_cp(g76d&6P)E?D}e0hu=5D8hk#zUNw|mI$M#}KSy#(&r20j z>1qBXNEEzjyyw**Re2c)Rq7PlT050)Z=6df^G4IDe9I&K-dMV*C7M>$X489W2<2b8 zL!+vatclhmm0J!)Wna9pv$%77>;`hJQs_)Ys;X?lihZg=hYA&P%~}(nmTf(1c?Y$_@uJcnc!7jrgNoNCVQPT{#7RNeaU2gA+?tob*YGc z)O27n&8ZooM!)Y7TnG0-7p2M}MqM;@s?y|=DP`IINd7G9qa02g=p~(dkdCbn;pBUT zLo18M>Lp~Qh*Da0c?fN3ky4|$_h{65UU?{v|NJYf`&27>Qf+&{elAiP OwOxxY2#UR+=>A{-XP&75 diff --git a/ChartUtilities.js b/ChartUtilities.js index 48496e01e..27bb78841 100644 --- a/ChartUtilities.js +++ b/ChartUtilities.js @@ -9,21 +9,37 @@ function getSideDays(timePeriod) { } if (timePeriod === _1_HOUR_IN_MILISECONDS) { - daysOnSides = 2; + daysOnSides = 9; } - if (timePeriod === _3_HOURS_IN_MILISECONDS) { - daysOnSides = 6; - } - - if (timePeriod === _6_HOURS_IN_MILISECONDS) { + if (timePeriod === _2_HOURS_IN_MILISECONDS) { daysOnSides = 10; } - if (timePeriod === _12_HOURS_IN_MILISECONDS) { + if (timePeriod === _3_HOURS_IN_MILISECONDS) { daysOnSides = 12; } + if (timePeriod === _4_HOURS_IN_MILISECONDS) { + daysOnSides = 20; + } + + if (timePeriod === _6_HOURS_IN_MILISECONDS) { + daysOnSides = 35; + } + + if (timePeriod === _8_HOURS_IN_MILISECONDS) { + daysOnSides = 44; + } + + if (timePeriod === _12_HOURS_IN_MILISECONDS) { + daysOnSides = 56; + } + + if (timePeriod === ONE_DAY_IN_MILISECONDS) { + daysOnSides = 154; + } + return daysOnSides; } @@ -54,20 +70,22 @@ function getTransparenceFactor(timePeriod) { function recalculatePeriod(zoomLevel) { - if (zoomLevel > 600) { - return _1_MINUTE_IN_MILISECONDS; - } + console.log(" recalculatePeriod > " + zoomLevel); - if (zoomLevel > 300) { + if (zoomLevel > 200) { return _1_MINUTE_IN_MILISECONDS; } if (zoomLevel > 120) { - return _1_MINUTE_IN_MILISECONDS; + return _2_MINUTES_IN_MILISECONDS; + } + + if (zoomLevel > 80) { + return _3_MINUTES_IN_MILISECONDS; } if (zoomLevel > 60) { - return _5_MINUTES_IN_MILISECONDS; + return _4_MINUTES_IN_MILISECONDS; } if (zoomLevel > 15) { @@ -78,27 +96,55 @@ function recalculatePeriod(zoomLevel) { return _10_MINUTES_IN_MILISECONDS; } + if (zoomLevel > - 10) { + return _15_MINUTES_IN_MILISECONDS; + } + if (zoomLevel > - 13) { + return _20_MINUTES_IN_MILISECONDS; + } + + if (zoomLevel > - 15) { return _30_MINUTES_IN_MILISECONDS; } - if (zoomLevel > - 24) { + if (zoomLevel > - 16) { + return _40_MINUTES_IN_MILISECONDS; + } + + if (zoomLevel > - 17) { + return _45_MINUTES_IN_MILISECONDS; + } + + if (zoomLevel > - 18) { return _1_HOUR_IN_MILISECONDS; } + if (zoomLevel > - 24) { + return _2_HOURS_IN_MILISECONDS; + } + if (zoomLevel > - 25) { return _3_HOURS_IN_MILISECONDS; } - if (zoomLevel > - 26) { + if (zoomLevel > - 27) { + return _4_HOURS_IN_MILISECONDS; + } + + if (zoomLevel > - 27.5) { return _6_HOURS_IN_MILISECONDS; } - if (zoomLevel > - 27) { + if (zoomLevel > - 27.75) { + return _8_HOURS_IN_MILISECONDS; + } + + if (zoomLevel > - 28) { return _12_HOURS_IN_MILISECONDS; } - if (zoomLevel <= - 27) { + if (zoomLevel <= - 28) { return ONE_DAY_IN_MILISECONDS; } } diff --git a/Dashboard.js b/Dashboard.js index 0c62151ed..5c2f4766d 100644 --- a/Dashboard.js +++ b/Dashboard.js @@ -50,18 +50,29 @@ const LESS_WIDHTER_VOLUME_BAR_TOP_FACTOR = 1 / 4; const ONE_DAY_IN_MILISECONDS = 24 * 60 * 60 * 1000; const _12_HOURS_IN_MILISECONDS = 12 * 60 * 60 * 1000; +const _8_HOURS_IN_MILISECONDS = 8 * 60 * 60 * 1000; const _6_HOURS_IN_MILISECONDS = 6 * 60 * 60 * 1000; +const _4_HOURS_IN_MILISECONDS = 4 * 60 * 60 * 1000; const _3_HOURS_IN_MILISECONDS = 3 * 60 * 60 * 1000; +const _2_HOURS_IN_MILISECONDS = 2 * 60 * 60 * 1000; const _1_HOUR_IN_MILISECONDS = 1 * 60 * 60 * 1000; + +const _45_MINUTES_IN_MILISECONDS = 45 * 60 * 1000; +const _40_MINUTES_IN_MILISECONDS = 40 * 60 * 1000; const _30_MINUTES_IN_MILISECONDS = 30 * 60 * 1000; +const _20_MINUTES_IN_MILISECONDS = 20 * 60 * 1000; +const _15_MINUTES_IN_MILISECONDS = 15 * 60 * 1000; const _10_MINUTES_IN_MILISECONDS = 10 * 60 * 1000; const _5_MINUTES_IN_MILISECONDS = 5 * 60 * 1000; +const _4_MINUTES_IN_MILISECONDS = 4 * 60 * 1000; +const _3_MINUTES_IN_MILISECONDS = 3 * 60 * 1000; +const _2_MINUTES_IN_MILISECONDS = 2 * 60 * 1000; const _1_MINUTE_IN_MILISECONDS = 1 * 60 * 1000; const EARLIEST_DATE = new Date(2014, 0, 18, 4, 26, 8); const FONT_ASPECT_RATIO = 0.60; const CHART_ASPECT_RATIO = 1 / 10; -const INITIAL_TIME_PERIOD = ONE_DAY_IN_MILISECONDS; +const INITIAL_TIME_PERIOD = _10_MINUTES_IN_MILISECONDS; /* Here we list the valid Time Periods: */ diff --git a/Ecosystem.js b/Ecosystem.js index 5f7fccc0a..73f3eab1a 100644 --- a/Ecosystem.js +++ b/Ecosystem.js @@ -70,7 +70,7 @@ function newEcosystem() { codeName: "Market Candlesticks", displayName: "Candlesticks", exchangeList: ["Poloniex"], - validPeriods: ["24-hs", "12-hs", "06-hs", "03-hs", "01-hs"], + validPeriods: ["24-hs", "12-hs", "08-hs", "06-hs", "04-hs", "03-hs", "02-hs", "01-hs"], plotter: { devTeam: "AAMasters", repo: "AAOlivia-Plotter", @@ -107,7 +107,7 @@ function newEcosystem() { codeName: "Market Volumes", displayName: "Volumes", exchangeList: ["Poloniex"], - validPeriods: ["24-hs", "12-hs", "06-hs", "03-hs", "01-hs"], + validPeriods: ["24-hs", "12-hs", "08-hs", "06-hs", "04-hs", "03-hs", "02-hs", "01-hs"], plotter: { devTeam: "AAMasters", repo: "AAOlivia-Plotter", @@ -144,7 +144,7 @@ function newEcosystem() { codeName: "Daily Candlesticks", displayName: "Candlesticks", exchangeList: ["Poloniex"], - validPeriods: ["30-min", "15-min", "10-min", "05-min", "01-min"], + validPeriods: ["45-min", "40-min", "30-min", "20-min", "15-min", "10-min", "05-min", "04-min", "03-min", "02-min", "01-min"], plotter: { devTeam: "AAMasters", repo: "AAOlivia-Plotter", @@ -181,7 +181,7 @@ function newEcosystem() { codeName: "Daily Volumes", displayName: "Volumes", exchangeList: ["Poloniex"], - validPeriods: ["30-min", "15-min", "10-min", "05-min", "01-min"], + validPeriods: ["45-min", "40-min", "30-min", "20-min", "15-min", "10-min", "05-min", "04-min", "03-min", "02-min", "01-min"], plotter: { devTeam: "AAMasters", repo: "AAOlivia-Plotter", diff --git a/FileCloud.js b/FileCloud.js index a8c4a324e..9fd9fb913 100644 --- a/FileCloud.js +++ b/FileCloud.js @@ -33,12 +33,14 @@ function newFileCloud() { filePath = filePath.replace("@Year", pDatetime.getUTCFullYear()); filePath = filePath.replace("@Month", pad(pDatetime.getUTCMonth() + 1, 2)); - filePath = filePath.replace("@Month", pad(pDatetime.getUTCDate(), 2)); + filePath = filePath.replace("@Day", pad(pDatetime.getUTCDate(), 2)); } fileService.getFileToText('data', filePath, fileName, undefined, onFileReceived); + console.log("File Requested > " + filePath); + function onFileReceived(err, text, response) { let data; diff --git a/FileCursor.js b/FileCursor.js index a0814a035..b16b759a3 100644 --- a/FileCursor.js +++ b/FileCursor.js @@ -12,7 +12,8 @@ function newFileCursor() { fileCursor.files = files; - let cursorSize = 3; + let minCursorSize = 10; + let maxCursorSize = 30; let market; let exchange; @@ -115,7 +116,7 @@ function newFileCursor() { i++; - if (i < cursorSize) { + if (i < minCursorSize) { getNextFile(); @@ -128,8 +129,8 @@ function newFileCursor() { date = removeTime(cursorDate); - let minDate = date.valueOf() - cursorSize / 2 * 24 * 60 * 60 * 1000; - let maxDate = date.valueOf() + cursorSize / 2 * 24 * 60 * 60 * 1000; + let minDate = date.valueOf() - maxCursorSize * ONE_DAY_IN_MILISECONDS / 2; + let maxDate = date.valueOf() + maxCursorSize * ONE_DAY_IN_MILISECONDS / 2; for (let key of fileCursor.files.keys()) { diff --git a/FileCursorCache.js b/FileCursorCache.js index 84745c6eb..eaa283df4 100644 --- a/FileCursorCache.js +++ b/FileCursorCache.js @@ -54,7 +54,7 @@ function newFileCursorCache() { if (layer.validPeriods.includes(periodName) === true) { - let fileCursor = newFileCursos(); + let fileCursor = newFileCursor(); fileCursor.initialize(fileCloud, product, exchange, pMarket, periodName, pDatetime, onFileReceived); fileCursors.set(periodTime, fileCursor); @@ -78,7 +78,7 @@ function newFileCursorCache() { datetime = newDatetime; - fileCursors.forEach(setDatetime) + fileCursors.forEach(setDatetimeToEach) function setDatetimeToEach(value, key, map) { diff --git a/Utilities.js b/Utilities.js index 592beef72..438ab31c6 100644 --- a/Utilities.js +++ b/Utilities.js @@ -52,8 +52,6 @@ function getDateFromPoint(point, container, plotArea) { let date = new Date(point.x); - date = removeTime(date); - return date; } diff --git a/ViewPort.js b/ViewPort.js index c3298aa8f..d0e6d3702 100644 --- a/ViewPort.js +++ b/ViewPort.js @@ -199,7 +199,9 @@ function newViewPort() { } else { event.type = "Zoom Out"; } - + + console.log("Zoom Changed > " + event.newLevel); + viewPort.eventHandler.raiseEvent("Zoom Changed", event); return true; } diff --git a/index.html b/index.html index 5cf79f66f..41eefd8bd 100644 --- a/index.html +++ b/index.html @@ -7,6 +7,7 @@ +