From 03422d65d344e36368a5be411192da83a92e4982 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 3 May 2018 20:51:39 +0200 Subject: [PATCH] More Code Cleaning --- .vs/AAWeb/v15/.suo | Bin 67584 -> 67072 bytes AggregatedOrdersArray.js | 120 --------------- Project.njsproj | 3 - Resistance.js | 16 -- SpreadChart.js | 309 --------------------------------------- index.html | 4 - server.js | 2 +- 7 files changed, 1 insertion(+), 453 deletions(-) delete mode 100644 AggregatedOrdersArray.js delete mode 100644 Resistance.js delete mode 100644 SpreadChart.js diff --git a/.vs/AAWeb/v15/.suo b/.vs/AAWeb/v15/.suo index 4214dc4e9fc6146ae98f0c2fe46c3fe1ebc7f78b..633fd274b31f5cb4a5f36d5b063944e271e6ba26 100644 GIT binary patch delta 1962 zcmbVMYiv|i5WaKv?yFE?-4?WzvMo|utgz+Ls=T&zc~`KtVl53&q`X8P%M!&9XaR-j z#?T$KK;jQi^ba*L>?J^W36>@nQA$hq7+k>R)^9MK`hG9IgxAYI9UYw~0d5`z+*xBd%FK7&}RU7FH|K>WwVSmsy z7kP`)`GzBVV*zL}-~>7`{IK`iJQvn$^APL+pr7sch0U2S||=*pa{x+rKG6jNb4E0hz$#z!Sg-ARBlH=s?b6uw#L7 zz<6K+kOpjH^7?b9f)xT%Z5r$ho0q^o3Cyzn^7>LgkM(*|rDV@B2MNjiqIa{o35>5& z1-ZI3zPzh_muNiYw#FXmR|H^RS&nNph=}dZ+Bg(cii+T3UA7g$Mfh&Phk=KHZovnF zcMC3>_~7>x{66@ypVYilaEaN17Z@v%)Ghdf;5`K|vJ0fzRu+ojVLodPFRud&+B4~} z-TH{A)9tvdnAwAi|CH^Q!pdS$EN!OHl3LgL2 zJ1_N95ZUlE*w1Z_b;GUY$uasjX?@O-$HYQ;LF7=ZsIQec>^qW33An64#s#7>u1lX_ zh0>3^6WPVY#UqdIcTp`-MB=nWo{5}*;y~J9ZgS*X(X<%pQA!UpozmL8y`>*g{i>2g zsF=LC*0SDEK}VQ{-$vV&tEr&Z#H{*LvxOG{S`OqH^gDTxeO~K@*Vj^tL`CRKg06vxI{YY(L3*|Lh;>&R^i1K;<~M6d~-v8Yw3mt zhd!e8MN`MrJ!(;jMf*F6PrQ7))8)r^c=bWW?T1J4w6_jeKb=k`eN5?Ag>CgIrFScR z*@LpO_{UD4KCg6#Y8c_bDc?AlWRFJLNz?(IN+@+z5{@G8W?(LB?X_MqwA?%NoJ62G2D{5uOputoyqHJ{^4G(v*fh zCbdb4g8x;*XgKSjT+ZF|Y_U;=UH)4am!50B;Mq5I{X3PR1<{tA)m$A&<#T&-s0uIr z#G&^V;L5v`R8wC2}l(dYHi)88Ozpm;FhZiPIIiNAl<697HwEsD4lbCuhI`Y+h^yT=Q+=> z@AJHGcR=gz*ZT8trc)o-=&*ssVo80!=1%|()5UUq=6QWn+?9*)D0YZ0_yn(s^XN&; zkJwLjN0#9q)~v486ncnxG8_3N#33_ZMP4TyX1>hyTpLeu8u2huPGk}pgp0UI{r8jS zx)tQzL;e8am2G0%UVkk1vvy4vps0WUh>fk+PN>C@@;s*zNW5@q6D)yg}l>@ z3&~dz$!5OA^gQ|&vBS)3$k!5&5le|Z1lH+w&^A!xh-s&ctDhqugXi=@LsXlRPE|H< zU`f~Ak#x)+L1lbiOsI87?4p3Rja<={OCc}J`f?4&tZyH|nuhh|_H4>o-vb6#%|@jv=DTDDU`Sl_i2#}cgXa)KveeG>^jYaV&lH=kHfY#_3Tjl?E`RVpSn z6D33`Q9;xp*c_|2QpDQxtZa{%aW#3KJ#6(PZz_w;4KWJ_aQ-Ca4fu?$2YRSXX;HI6 zPrN#RHo8>-@-t<-Dq|x*Xk*&QRdMti>dcMg6~)PGXr2$ zP;br@$n_EW!G8>O;+abhW3oiXx(n-+u|z@jht;AM{i?ZG(T)Xuo?AUjo%EG=jFiT*ik=*-nMQv z`b4n^?j51E`LTrxcB$f2)nuo8WTi_mv2U!5`@vdW;4heWV=6zu%2_;H6O;}_jS zzoR88?t@=J9uY?4hz=}1e-pP4SFpqGqlEVxYVfZM$m2r3B8-NS&|S{9#DWrgZ$Se8 zIKsw1lTwv%;ui?^ehON6|IwlSn?>?%fn`UNRMO=i!Faj*za(HuWT(J9p(*X;9LNLq zS2gI4-#NxJS}fl3Z!TB<{(Ub_zn;bCj>6N!?x7zvaK=wIzoTz1x&G0elC~3tc*+rn%z9BP8?E?kOl#DY!asm9J^?yudSkMHn8|a(Ymg zmjq59E5NO9e5iitlCvJN>RyAcM!@qSHA9muw!%o - @@ -93,11 +92,9 @@ - Code - Code diff --git a/Resistance.js b/Resistance.js deleted file mode 100644 index 08f4f2c8d..000000000 --- a/Resistance.js +++ /dev/null @@ -1,16 +0,0 @@ -function newResistance() { - - var resistance = { - begin: undefined, - end: undefined, - type: undefined, - rate: undefined, - min: undefined, - max: undefined, - open: undefined, - close: undefined - }; - - return resistance; - -} \ No newline at end of file diff --git a/SpreadChart.js b/SpreadChart.js deleted file mode 100644 index c06288974..000000000 --- a/SpreadChart.js +++ /dev/null @@ -1,309 +0,0 @@ - -function newSpreadChart() { - - var trades = []; - var sells = []; - var buys = []; - - var timeLineCoordinateSystem = newTimeLineCoordinateSystem(); - - var datetime; - var datetimeRange; - - var spreadChart = { - setDatetime: setDatetime, - setDatetimeRange: setDatetimeRange, - container: undefined, - draw: draw, - getContainer: getContainer, - initialize: initialize - }; - - var container = newContainer(); - container.initialize(); - spreadChart.container = container; - - container.displacement.containerName = "Spread Chart"; - container.frame.containerName = "Spread Chart"; - - var marketId; - var exchangeId; - var marketTrades; - - return spreadChart; - - function initialize(exchange, market, trades) { - - marketId = market; - exchangeId = exchange; - marketTrades = trades; - - } - - function getContainer(point) { - - var container; - - /* First we check if this point is inside this space. */ - - if (this.container.frame.isThisPointHere(point) === true) { - - return this.container; - - } else { - - /* This point does not belong to this space. */ - - return undefined; - } - - } - - - function setDatetime(newDatetime) { - - datetime = newDatetime; - - } - - - - function setDatetimeRange(newDatetimeRange) { - - datetimeRange = newDatetimeRange; - - trades = []; - - marketTrades.getTradesByDateRange(datetimeRange, onTradesReady); - - function onTradesReady(tradesReceived) { - - trades = tradesReceived; - - recalculateScale(); - splitTrades(); - } - } - - - - function draw() { - - this.container.frame.draw(); - - drawBackground(); - - plotSpreadChart(); - } - - - - function recalculateScale() { - - var minValue = { - x: 10000000000000, - y: 10000000000000 - }; - - var maxValue = { - x: 0, - y: 0 - }; - - for (var i = 0; i < trades.length; i++) { - - var trade = trades[i]; - - var datetime = trade.datetime.valueOf(); - - if (minValue.x > datetime) { - minValue.x = datetime; - } - - if (maxValue.x < datetime) { - maxValue.x = datetime; - } - - var rate = trade.rate; - - if (minValue.y > rate) { - minValue.y = rate; - } - - if (maxValue.y < rate) { - maxValue.y = rate; - } - - } - - timeLineCoordinateSystem.initialize( - minValue, - maxValue, - spreadChart.container.frame.width, - spreadChart.container.frame.height - ); - - } - - - - function splitTrades() { - - for (let i = 0; i < trades.length; i++) { - - let trade = trades[i]; - - if (trade.type === "sell") { - sells.push(trade); - } else { - buys.push(trade); - } - } - - } - - function plotSpreadChart() { - - if (sells.length > 0) { - - let point; - - let firstPoint = { - x: (sells[0].datetime.valueOf() - timeLineCoordinateSystem.min.x) * timeLineCoordinateSystem.scale.x, - y: spreadChart.container.frame.height - (sells[0].rate - timeLineCoordinateSystem.min.y) * timeLineCoordinateSystem.scale.y - }; - - firstPoint = transformThisPoint(firstPoint, spreadChart.container); - - let seconddPoint = { - x: (sells[0].datetime.valueOf() - timeLineCoordinateSystem.min.x) * timeLineCoordinateSystem.scale.x, - y: spreadChart.container.frame.height - }; - - seconddPoint = transformThisPoint(seconddPoint, spreadChart.container); - - - browserCanvasContext.beginPath(); - - browserCanvasContext.moveTo(seconddPoint.x, seconddPoint.y); - browserCanvasContext.lineTo(firstPoint.x, firstPoint.y); - - let thirdPoint; - - for (let i = 0; i < sells.length; i++) { - - let sell = sells[i]; - - point = { - x: (sell.datetime.valueOf() - timeLineCoordinateSystem.min.x) * timeLineCoordinateSystem.scale.x, - y: spreadChart.container.frame.height - (sell.rate - timeLineCoordinateSystem.min.y) * timeLineCoordinateSystem.scale.y - }; - - thirdPoint = { - x: point.x, - y: spreadChart.container.frame.height - }; - - point = transformThisPoint(point, spreadChart.container); - browserCanvasContext.lineTo(point.x, point.y); - - } - - thirdPoint = transformThisPoint(thirdPoint, spreadChart.container); - browserCanvasContext.lineTo(thirdPoint.x, thirdPoint.y); - - browserCanvasContext.closePath(); - - browserCanvasContext.strokeStyle = 'rgba(117, 27, 5, 0.70)'; - browserCanvasContext.lineWidth = 1; - browserCanvasContext.stroke(); - - browserCanvasContext.fillStyle = 'rgba(230, 67, 34, 0.70)'; - browserCanvasContext.fill(); - - } - - if (buys.length > 0) { - - let firstPoint = { - x: (buys[0].datetime.valueOf() - timeLineCoordinateSystem.min.x) * timeLineCoordinateSystem.scale.x, - y: spreadChart.container.frame.height - (buys[0].rate - timeLineCoordinateSystem.min.y) * timeLineCoordinateSystem.scale.y - }; - - firstPoint = transformThisPoint(firstPoint, spreadChart.container); - - let seconddPoint = { - x: (buys[0].datetime.valueOf() - timeLineCoordinateSystem.min.x) * timeLineCoordinateSystem.scale.x, - y: 0 - }; - - seconddPoint = transformThisPoint(seconddPoint, spreadChart.container); - - - - browserCanvasContext.beginPath(); - - browserCanvasContext.moveTo(seconddPoint.x, seconddPoint.y); - browserCanvasContext.lineTo(firstPoint.x, firstPoint.y); - - let thirdPoint; - - for (let i = 0; i < buys.length; i++) { - - let buy = buys[i]; - - point = { - x: (buy.datetime.valueOf() - timeLineCoordinateSystem.min.x) * timeLineCoordinateSystem.scale.x, - y: spreadChart.container.frame.height - (buy.rate - timeLineCoordinateSystem.min.y) * timeLineCoordinateSystem.scale.y - }; - - thirdPoint = { - x: spreadChart.container.frame.width, - y: 0 - }; - - point = transformThisPoint(point, spreadChart.container); - browserCanvasContext.lineTo(point.x, point.y); - - } - - thirdPoint = transformThisPoint(thirdPoint, spreadChart.container); - browserCanvasContext.lineTo(thirdPoint.x, thirdPoint.y); - browserCanvasContext.closePath(); - - browserCanvasContext.strokeStyle = 'rgba(4, 74, 117, 0.70)'; - browserCanvasContext.lineWidth = 1; - browserCanvasContext.stroke(); - - browserCanvasContext.fillStyle = 'rgba(34, 174, 230, 0.70)'; - browserCanvasContext.fill(); - - } - } - - - function drawBackground() { - - var market = markets.get(marketId); - var label = market.assetA + " " + market.assetB; - - var fontSize = 50;//+ spreadChart.container.zoom.level(); - - browserCanvasContext.font = fontSize + 'px verdana'; - - /* Now we transform x on the actual coordinate on the canvas. */ - - var point = { - x: spreadChart.container.frame.width / 2 - label.length / 2 * fontSize / 2, - y: spreadChart.container.frame.height * 3 / 8 - }; - - point = transformThisPoint(point, spreadChart.container); - - browserCanvasContext.fillStyle = 'rgba(190, 190, 190, 0.25)'; - - browserCanvasContext.fillText(label, point.x, point.y); - - } -} - diff --git a/index.html b/index.html index 99e98e881..12c98c8c1 100644 --- a/index.html +++ b/index.html @@ -30,22 +30,18 @@ - - - - diff --git a/server.js b/server.js index 330817bd6..1cf8bb361 100644 --- a/server.js +++ b/server.js @@ -6,7 +6,7 @@ if (CONSOLE_LOG === true) { } -const DEBUG_MODE = true; // This forces the server to read Plotters from the local drive. +const DEBUG_MODE = false; // This forces the server to read Plotters from the local drive. if (CONSOLE_LOG === true && DEBUG_MODE === true) {