fez5587/Superalgos
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #521 from Superalgos/develop

Browse Source 
Beta 8 SP 4 Hotfix 1
This commit is contained in:
Luis Fernando Molina authored and GitHub committed 2021-01-31 18:11:31 +01:00
2 parents c200b94b1a 6a8e58f461
commit c736bdee86
2 files changed
+13 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Projects/Superalgos/UI/Spaces/Charting-Space/ChartingSpace.js
+2 -2
View File
@@ -252,7 +252,7 @@ function newSuperalgosChartingSpace() {
returnPoint.y = COCKPIT_SPACE_POSITION
}
} else {
if (point.y > COCKPIT_SPACE_POSITION + COCKPIT_SPACE_HEIGHT / 2) {
if (point.y > COCKPIT_SPACE_POSITION ) {
returnPoint.y = COCKPIT_SPACE_POSITION + COCKPIT_SPACE_HEIGHT / 2
}
}
@@ -273,7 +273,7 @@ function newSuperalgosChartingSpace() {
return false
}
if (point.y > COCKPIT_SPACE_POSITION + COCKPIT_SPACE_HEIGHT / 2) {
if (point.y > COCKPIT_SPACE_POSITION) {
return false
}
Projects/Superalgos/UI/Spaces/Charting-Space/Plotting/Plotter.js
+11 -8
View File
@@ -812,14 +812,16 @@ function newPlotter() {
y: dataPointObject.y
}
dataPoint = UI.projects.superalgos.spaces.chartingSpace.viewport.fitIntoVisibleArea(dataPoint)
dataPoint = thisObject.fitFunction(dataPoint)
imagePosition.x = dataPoint.x
imagePosition.y = dataPoint.y
imagePosition.x = dataPoint.x - imageSize / 2 + offsetX
imagePosition.y = dataPoint.y - imageSize / 2 - offsetY
imagePosition = thisObject.fitFunction(imagePosition, true)
let imageToDraw = UI.projects.superalgos.spaces.designSpace.getIconByProjectAndName('Superalgos', imageName)
if (imageToDraw !== undefined) {
if (imageToDraw.canDrawIcon === true) {
browserCanvasContext.drawImage(imageToDraw, imagePosition.x - imageSize / 2 + offsetX, imagePosition.y - imageSize / 2 - offsetY, imageSize, imageSize)
browserCanvasContext.drawImage(imageToDraw, imagePosition.x, imagePosition.y, imageSize, imageSize)
}
} else {
console.log('Can not plot image named ' + imageName + ' of product ' + productDefinition.name + ' because it does not exist.')
@@ -858,14 +860,15 @@ function newPlotter() {
y: dataPointObject.y
}
dataPoint = UI.projects.superalgos.spaces.chartingSpace.viewport.fitIntoVisibleArea(dataPoint)
dataPoint = thisObject.fitFunction(dataPoint)
textPosition.x = dataPoint.x
textPosition.y = dataPoint.y
textPosition.x = dataPoint.x + offsetX
textPosition.y = dataPoint.y - offsetY
textPosition = thisObject.fitFunction(textPosition)
browserCanvasContext.font = fontSize + 'px ' + UI_FONT.PRIMARY
browserCanvasContext.fillStyle = 'rgba(' + paletteColor + ', ' + opacity + ')'
browserCanvasContext.fillText(value, textPosition.x + offsetX, textPosition.y - offsetY)
browserCanvasContext.fillText(value, textPosition.x, textPosition.y)
}
}
}