frame supporting fitFunction

This commit is contained in:
Luis Fernando Molina committed 2019-05-10 13:30:16 +02:00
1 parent c6c95d8e6b
commit ee5f43ce88
3 files changed
+53 -9

No files matched your search

+45 -8
View File
@@ -275,28 +275,29 @@ function newFrame () {
}
}
function draw (drawGrid, drawBorders, drawBackground) {
function draw (drawGrid, drawBorders, drawBackground, fitFunction) {
if (drawBorders === true) {
borders()
borders(fitFunction)
}
if (drawGrid === true) {
grid()
grid(fitFunction)
}
if (drawBackground === true) {
background()
background(fitFunction)
}
}
function background () {
function background (fitFunction) {
let params = {
cornerRadius: 5,
lineWidth: 0.1,
opacity: 0.75,
container: thisObject.container,
borderColor: UI_COLOR.DARK,
backgroundColor: UI_COLOR.WHITE
backgroundColor: UI_COLOR.WHITE,
fitFunction: fitFunction
}
roundedCornersBackground(params)
@@ -316,6 +317,11 @@ function newFrame () {
titleBarPoint1 = frameThisPoint(titleBarPoint1)
titleBarPoint2 = frameThisPoint(titleBarPoint2)
if (fitFunction !== undefined) {
titleBarPoint1 = fitFunction(titleBarPoint1)
titleBarPoint2 = fitFunction(titleBarPoint2)
}
/* We paint the title bar now */
browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.DARK + ', 0.75)'
@@ -354,11 +360,15 @@ function newFrame () {
labelPoint = thisObject.frameThisPoint(labelPoint)
if (fitFunction !== undefined) {
labelPoint = fitFunction(labelPoint)
}
browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.WHITE + ', 1)'
browserCanvasContext.fillText(label, labelPoint.x, labelPoint.y)
}
function borders () {
function borders (fitFunction) {
/* Lest get the important points of the drawing so as to apply the needed transformations. */
let point1
@@ -393,6 +403,13 @@ function newFrame () {
point3 = transformThisPoint(point3, thisObject.container)
point4 = transformThisPoint(point4, thisObject.container)
if (fitFunction !== undefined) {
point1 = fitFunction(point1)
point2 = fitFunction(point2)
point3 = fitFunction(point3)
point4 = fitFunction(point4)
}
/* Lets start the drawing. */
browserCanvasContext.beginPath()
@@ -410,7 +427,7 @@ function newFrame () {
browserCanvasContext.closePath()
}
function grid (smallLines) {
function grid (fitFunction, smallLines) {
if (smallLines === true) {
/* Small Lines */
@@ -433,6 +450,11 @@ function newFrame () {
point1 = transformThisPoint(point1, thisObject.container)
point2 = transformThisPoint(point2, thisObject.container)
if (fitFunction !== undefined) {
point1 = fitFunction(point1)
point2 = fitFunction(point2)
}
browserCanvasContext.moveTo(point1.x, point1.y)
browserCanvasContext.lineTo(point2.x, point2.y)
}
@@ -450,6 +472,11 @@ function newFrame () {
point3 = transformThisPoint(point3, thisObject.container)
point4 = transformThisPoint(point4, thisObject.container)
if (fitFunction !== undefined) {
point3 = fitFunction(point3)
point4 = fitFunction(point4)
}
browserCanvasContext.moveTo(point3.x, point3.y)
browserCanvasContext.lineTo(point4.x, point4.y)
}
@@ -480,6 +507,11 @@ function newFrame () {
point1 = transformThisPoint(point1, thisObject.container)
point2 = transformThisPoint(point2, thisObject.container)
if (fitFunction !== undefined) {
point1 = fitFunction(point1)
point2 = fitFunction(point2)
}
browserCanvasContext.moveTo(point1.x, point1.y)
browserCanvasContext.lineTo(point2.x, point2.y)
}
@@ -497,6 +529,11 @@ function newFrame () {
point3 = transformThisPoint(point3, thisObject.container)
point4 = transformThisPoint(point4, thisObject.container)
if (fitFunction !== undefined) {
point3 = fitFunction(point3)
point4 = fitFunction(point4)
}
browserCanvasContext.moveTo(point3.x, point3.y)
browserCanvasContext.lineTo(point4.x, point4.y)
}
+1 -1
View File
@@ -234,7 +234,7 @@
function draw () {
if (isInitialized === false) { return }
thisObject.container.frame.draw(false, false, true)
thisObject.container.frame.draw(false, false, true, canvas.chartSpace.fitIntoVisibleArea)
for (let i = 0; i < visibleProductCards.length; i++) {
visibleProductCards[i].draw()
+7
View File
@@ -26,6 +26,13 @@ function roundedCornersBackground (params) {
borderPoint3 = params.container.frame.frameThisPoint(borderPoint3)
borderPoint4 = params.container.frame.frameThisPoint(borderPoint4)
if (params.fitFunction !== undefined) {
borderPoint1 = params.fitFunction(borderPoint1)
borderPoint2 = params.fitFunction(borderPoint2)
borderPoint3 = params.fitFunction(borderPoint3)
borderPoint4 = params.fitFunction(borderPoint4)
}
browserCanvasContext.setLineDash([0, 0])
/* Shadow */