Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • faproietti/XRF-App
  • chnet/XRF-App
2 results
Show changes
Commits on Source (4)
...@@ -250,7 +250,7 @@ class Fs { ...@@ -250,7 +250,7 @@ class Fs {
// in modo che essi siano memorizzati in un formato più leggibile. Sono ricavate // in modo che essi siano memorizzati in un formato più leggibile. Sono ricavate
// anche altre variabili necessarie per il resto del codice. // anche altre variabili necessarie per il resto del codice.
readImage(image: Image, chart: Chart, content: string): Image { readImage(image: Image, chart: Chart, content: any): Image {
let lines = content.split("\n").map(Number); let lines = content.split("\n").map(Number);
this.get_metadata(image, lines); this.get_metadata(image, lines);
......
...@@ -57,8 +57,8 @@ class ImportFile { ...@@ -57,8 +57,8 @@ class ImportFile {
let file: File = fileInputButton.files[0]; let file: File = fileInputButton.files[0];
let readerObject = new FileReader(); let readerObject = new FileReader();
readerObject.onload = () => { readerObject.onload = () => {
let content: string = readerObject.result; let content = readerObject.result;
let image: Image = this.fs.readImage(this.image, this.chart, content); let image = this.fs.readImage(this.image, this.chart, content);
this.callbackManager.showElement("load-spinner", false); this.callbackManager.showElement("load-spinner", false);
this.image.drawImg({ x: 0, y: 0 }, { x: image.width - 1, y: image.height - 1 }, 0, image.channelDepth, this.image.drawImg({ x: 0, y: 0 }, { x: image.width - 1, y: image.height - 1 }, 0, image.channelDepth,
() => { this.callbackManager.closeBootstrapModel("btnCloseModal"); }); () => { this.callbackManager.closeBootstrapModel("btnCloseModal"); });
...@@ -137,7 +137,7 @@ class ImportFile { ...@@ -137,7 +137,7 @@ class ImportFile {
console.log("Try to open " + file.name + " ..."); console.log("Try to open " + file.name + " ...");
let readerObject = new FileReader(); let readerObject = new FileReader();
readerObject.onload = () => { readerObject.onload = () => {
let content: string = readerObject.result; let content = readerObject.result;
fs.readImage(drawImage, drawChart, content); fs.readImage(drawImage, drawChart, content);
this.callbackManager.showElement("load-spinner", false); this.callbackManager.showElement("load-spinner", false);
}; };
......