diff --git a/Frontend Angular 4/package-lock.json b/Frontend Angular 4/package-lock.json index 0aacc9198e6c10eb6e34fecbea62e4bba2c94535..86e56592f30f972b8a28c41955afcabf0ff6ec10 100644 --- a/Frontend Angular 4/package-lock.json +++ b/Frontend Angular 4/package-lock.json @@ -4519,7 +4519,7 @@ "dev": true }, "graph3D": { - "version": "git://github.com/ifagian/graph3D.git#187fec44e862e43cb289070e4f136fa43f286ab4", + "version": "git://github.com/ifagian/graph3D.git#7ccf98694a6c2afc03f39d5f8bbe548f28c3538d", "from": "git://github.com/ifagian/graph3D.git#master", "requires": { "gif.js": "^0.2.0", diff --git a/Frontend Angular 4/src/app/layout/plotter/graph3D/graph3D.helper.ts b/Frontend Angular 4/src/app/layout/plotter/graph3D/graph3D.helper.ts index eef025d8a8d6ce443b8ab15c0f95479e566f9046..9a9673a0ac3544d8d37d7a0b770da1c1989b2cc5 100644 --- a/Frontend Angular 4/src/app/layout/plotter/graph3D/graph3D.helper.ts +++ b/Frontend Angular 4/src/app/layout/plotter/graph3D/graph3D.helper.ts @@ -1,5 +1,5 @@ export function formatJSON(jsonString: string) : string { - const regexRot = /\"rot\"\:\((\d*.\d*),(\d*.\d*),(\d*.\d*)\)/g; + const regexRot = /\"rot\"\:\((\-?\d*.\d*),(\-?\d*.\d*),(\-?\d*.\d*)\)/g; const regexPts = /\"pts\"\:\[\((\-?\d*.\d*),(\-?\d*.\d*),(\-?\d*.\d*)\),\((\-?\d*.\d*),(\-?\d*.\d*),(\-?\d*.\d*)\)\]/g; return jsonString diff --git a/Frontend Angular 4/src/app/shared/config.ts b/Frontend Angular 4/src/app/shared/config.ts index e9d12f0dbbbb52b918844ec8b9e329609f5ce7f6..b3b1163617d271c0379d09f1260091ab153f232f 100755 --- a/Frontend Angular 4/src/app/shared/config.ts +++ b/Frontend Angular 4/src/app/shared/config.ts @@ -21,8 +21,8 @@ // export const GHCI_URL = 'ws://35.199.110.129:9090/endpoint'; // Google cloud platform v2 -// export const SERVER = 'http://35.198.60.74:9090'; -// export const GHCI_URL = 'ws://35.198.60.74:9090/endpoint'; +// export const SERVER = 'http://35.199.87.61:9090'; +// export const GHCI_URL = 'ws://35.199.87.61:9090/endpoint'; // psico export const SERVER = 'https://matefun.math.psico.edu.uy'; diff --git a/Frontend Angular 4/src/app/shared/services/ghci.service.ts b/Frontend Angular 4/src/app/shared/services/ghci.service.ts index a23f12d57d5e316d23bc3880e63feb95da1cdac3..e7d61c20d7417c8d68b9295457ead45f05eba8e5 100755 --- a/Frontend Angular 4/src/app/shared/services/ghci.service.ts +++ b/Frontend Angular 4/src/app/shared/services/ghci.service.ts @@ -145,7 +145,7 @@ export class GHCIService { var ErrorFinalText = `${this.translateService.get('i18n.codemirror.command.inColumn').value}` + columna + ": " + ErrorTextToShow; - if((this.currentFile == this.lastErrorFile) && (this.codemirrorRef!==null)){ + if((this.currentFile.toLowerCase() == this.lastErrorFile.toLowerCase()) && (this.codemirrorRef!==null)){ var makeMarker = function() { var marker = document.createElement("div"); marker.id = "error_" + line.toString(); @@ -214,7 +214,7 @@ export class GHCIService { var warningFinalText = `${this.translateService.get('i18n.codemirror.command.inColumn').value}` + columna + ": " + warningTextToShow; - if((this.currentFile == this.lastWarningFile) && (this.codemirrorRef!==null)){ + if((this.currentFile.toLowerCase() == this.lastWarningFile.toLowerCase()) && (this.codemirrorRef!==null)){ var makeMarker = function() { var marker = document.createElement("div"); marker.style.width = "15px";