Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
X
XRF-App
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
chnet
XRF-App
Compare revisions
905db42695db550ea57f04a24e8a943b3cec76db to master
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
chnet/XRF-App
Select target project
No results found
master
Select Git revision
Branches
cleanup
master
Swap
Target
faproietti/XRF-App
Select target project
faproietti/XRF-App
chnet/XRF-App
2 results
905db42695db550ea57f04a24e8a943b3cec76db
Select Git revision
Branches
cleanup
master
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (4)
Merge branch 'cleanup' into 'master'
· 4895a74c
Fabio Proietti
authored
5 years ago
Cleanup See merge request
!1
4895a74c
Update importFile.ts
· 5b96b75e
Fabio Proietti
authored
5 years ago
5b96b75e
Update importFile.ts
· 6e2ef2a0
Fabio Proietti
authored
5 years ago
6e2ef2a0
Update fs.ts
· c8f08ac7
Fabio Proietti
authored
5 years ago
c8f08ac7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
fs.ts
+1
-1
1 addition, 1 deletion
fs.ts
importFile.ts
+3
-3
3 additions, 3 deletions
importFile.ts
with
4 additions
and
4 deletions
fs.ts
View file @
c8f08ac7
...
...
@@ -250,7 +250,7 @@ class Fs {
// in modo che essi siano memorizzati in un formato più leggibile. Sono ricavate
// 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
);
this
.
get_metadata
(
image
,
lines
);
...
...
This diff is collapsed.
Click to expand it.
importFile.ts
View file @
c8f08ac7
...
...
@@ -57,8 +57,8 @@ class ImportFile {
let
file
:
File
=
fileInputButton
.
files
[
0
];
let
readerObject
=
new
FileReader
();
readerObject
.
onload
=
()
=>
{
let
content
:
string
=
readerObject
.
result
;
let
image
:
Image
=
this
.
fs
.
readImage
(
this
.
image
,
this
.
chart
,
content
);
let
content
=
readerObject
.
result
;
let
image
=
this
.
fs
.
readImage
(
this
.
image
,
this
.
chart
,
content
);
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
.
callbackManager
.
closeBootstrapModel
(
"
btnCloseModal
"
);
});
...
...
@@ -137,7 +137,7 @@ class ImportFile {
console
.
log
(
"
Try to open
"
+
file
.
name
+
"
...
"
);
let
readerObject
=
new
FileReader
();
readerObject
.
onload
=
()
=>
{
let
content
:
string
=
readerObject
.
result
;
let
content
=
readerObject
.
result
;
fs
.
readImage
(
drawImage
,
drawChart
,
content
);
this
.
callbackManager
.
showElement
(
"
load-spinner
"
,
false
);
};
...
...
This diff is collapsed.
Click to expand it.