Asthetics works, comma on thoursands

This commit is contained in:
Luis Fernando Molina committed 2018-06-01 18:51:49 +02:00
1 parent 02fcb356b0
commit 37a47cc43e
7 files changed
+25 -22

No files matched your search

+3 -2
View File
@@ -501,9 +501,10 @@
let fontSize = 10;
let label = ' ' + Math.round(j * 1000000) / 1000000;
label = Number(label).toLocaleString();
let labelPoint = {
x: viewPort.visibleArea.bottomRight.x + 1,
x: viewPort.visibleArea.bottomRight.x + 5,
y: point1.y + fontSize / 2 * FONT_ASPECT_RATIO
};
@@ -540,7 +541,7 @@
let label = ' ' + pad(labelValue, 3) + '%';
let labelPoint = {
x: -2,
x: 0,
y: point1.y + fontSize / 2 * FONT_ASPECT_RATIO
};
+4 -2
View File
@@ -13,9 +13,11 @@ UI_COLOR = {
UI_FONT = {
PRIMARY: "Saira",
SECONDARY: "Courier New"
SECONDARY: "Source Code Pro"
};
FONT_ASPECT_RATIO = 0.50;
/* User Interface Panels */
UI_PANEL = {
@@ -157,7 +159,7 @@ 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;
let INITIAL_ZOOM_LEVEL = -26; // This is the zoom level at the view port in which the APP starts.
+1 -1
View File
@@ -2,7 +2,7 @@
function newFileCursor() {
const MODULE_NAME = "File Cursor";
const INFO_LOG = false;
const INFO_LOG = true;
const ERROR_LOG = true;
const logger = newWebDebugLog();
logger.fileName = MODULE_NAME;
+3 -3
View File
@@ -295,12 +295,12 @@ function newNote() {
let startingPosition = {
x: pFloatingObject.currentPosition.x,
y: pFloatingObject.currentPosition.y - labelRows.length / 2 * (fontSize * 0.60 + 10)
y: pFloatingObject.currentPosition.y - labelRows.length / 2 * (fontSize * FONT_ASPECT_RATIO + 10)
};
labelPoint = {
x: startingPosition.x - labelRow.length / 2 * fontSize * 0.60,
y: startingPosition.y + (i + 1) * (fontSize * 0.60 + 10)
x: startingPosition.x - labelRow.length / 2 * fontSize * FONT_ASPECT_RATIO,
y: startingPosition.y + (i + 1) * (fontSize * FONT_ASPECT_RATIO + 10)
};
browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY;
+4 -4
View File
@@ -126,8 +126,8 @@ function newProfileBall() {
if (label !== undefined) {
labelPoint = {
x: pFloatingObject.currentPosition.x - label.length / 2 * fontSize * 0.60,
y: pFloatingObject.currentPosition.y - pFloatingObject.currentImageSize / 2 - fontSize * 0.60 - 5
x: pFloatingObject.currentPosition.x - label.length / 2 * fontSize * FONT_ASPECT_RATIO,
y: pFloatingObject.currentPosition.y - pFloatingObject.currentImageSize / 2 - fontSize * FONT_ASPECT_RATIO - 5
};
browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY;
@@ -141,8 +141,8 @@ function newProfileBall() {
if (label !== undefined) {
labelPoint = {
x: pFloatingObject.currentPosition.x - label.length / 2 * fontSize * 0.60,
y: pFloatingObject.currentPosition.y + pFloatingObject.currentImageSize / 2 + fontSize * 0.60 + 10
x: pFloatingObject.currentPosition.x - label.length / 2 * fontSize * FONT_ASPECT_RATIO,
y: pFloatingObject.currentPosition.y + pFloatingObject.currentImageSize / 2 + fontSize * FONT_ASPECT_RATIO + 10
};
browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY;
+6 -6
View File
@@ -447,8 +447,8 @@
label = thisObject.devTeam.displayName;
labelPoint = {
x: 10 + devTeamImageSize / 2 - label.length / 2 * fontSize * 0.60,
y: thisObject.container.frame.height / 2 + devTeamImageSize / 2 + fontSize * 0.60 + 5
x: 10 + devTeamImageSize / 2 - label.length / 2 * fontSize * FONT_ASPECT_RATIO,
y: thisObject.container.frame.height / 2 + devTeamImageSize / 2 + fontSize * FONT_ASPECT_RATIO + 5
};
labelPoint = thisObject.container.frame.frameThisPoint(labelPoint);
@@ -462,8 +462,8 @@
label = thisObject.bot.displayName;
labelPoint = {
x: thisObject.container.frame.width - 10 - botImageSize - 5 + botImageSize / 2 - label.length / 2 * fontSize * 0.60,
y: thisObject.container.frame.height / 2 + devTeamImageSize / 2 + fontSize * 0.60 + 5
x: thisObject.container.frame.width - 10 - botImageSize - 5 + botImageSize / 2 - label.length / 2 * fontSize * FONT_ASPECT_RATIO,
y: thisObject.container.frame.height / 2 + devTeamImageSize / 2 + fontSize * FONT_ASPECT_RATIO + 5
};
labelPoint = thisObject.container.frame.frameThisPoint(labelPoint);
@@ -484,8 +484,8 @@
};
labelPoint = {
x: thisObject.container.frame.width / 2 - label.length / 2 * fontSize * 0.60,
y: thisObject.container.frame.height / 2 - devTeamImageSize / 2 - fontSize * 0.60 - 5
x: thisObject.container.frame.width / 2 - label.length / 2 * fontSize * FONT_ASPECT_RATIO,
y: thisObject.container.frame.height / 2 - devTeamImageSize / 2 - fontSize * FONT_ASPECT_RATIO - 5
};
labelPoint = thisObject.container.frame.frameThisPoint(labelPoint);
+4 -4
View File
@@ -968,8 +968,8 @@
point = transformThisPoint(point, thisObject.container);
point = {
x: (viewPort.visibleArea.bottomRight.x - viewPort.visibleArea.bottomLeft.x) / 2 - label.length / 2 * currentFontSize * 0.60,
y: point.y + currentFontSize * 0.60 / 2
x: (viewPort.visibleArea.bottomRight.x - viewPort.visibleArea.bottomLeft.x) / 2 - label.length / 2 * currentFontSize * FONT_ASPECT_RATIO,
y: point.y + currentFontSize * FONT_ASPECT_RATIO / 2
};
} else {
@@ -977,8 +977,8 @@
targetLabelFontSize = 150;
point = {
x: (viewPort.visibleArea.bottomRight.x - viewPort.visibleArea.bottomLeft.x) / 2 - label.length / 2 * currentFontSize * 0.60,
y: (viewPort.visibleArea.bottomLeft.y - viewPort.visibleArea.topLeft.y) / 2 + currentFontSize * 0.60 / 2
x: (viewPort.visibleArea.bottomRight.x - viewPort.visibleArea.bottomLeft.x) / 2 - label.length / 2 * currentFontSize * FONT_ASPECT_RATIO,
y: (viewPort.visibleArea.bottomLeft.y - viewPort.visibleArea.topLeft.y) / 2 + currentFontSize * FONT_ASPECT_RATIO / 2
};
}