From 12e949264f784ad235b597ec9039f9441564f29f Mon Sep 17 00:00:00 2001 From: Pixelguy14 <160289138+Pixelguy14@users.noreply.github.com> Date: Mon, 15 Jul 2024 14:31:18 -0600 Subject: [PATCH] Add files via upload --- JuliaIMZML_GUI/app.jl | 24 ++++++++++++++---------- JuliaIMZML_GUI/app.jl.html | 5 +++-- JuliaIMZML_GUI/log/dev-2024-07-13.log | 20 ++++++++++++++++++++ JuliaIMZML_GUI/log/dev-2024-07-15.log | 21 +++++++++++++++++++++ 4 files changed, 58 insertions(+), 12 deletions(-) create mode 100644 JuliaIMZML_GUI/log/dev-2024-07-15.log diff --git a/JuliaIMZML_GUI/app.jl b/JuliaIMZML_GUI/app.jl index a23ba07..bccb1af 100644 --- a/JuliaIMZML_GUI/app.jl +++ b/JuliaIMZML_GUI/app.jl @@ -36,7 +36,8 @@ end # variables must be initialized with constant values, or variables defined outside of the @app block @out test = "/wp.jpeg" #mkdir("new_folder") - @in file_route = "None" + @in file_route = "" + @in file_name = "" @out warning_fr = "" @in Nmass = 0.0 @in Tol = 0.0 @@ -47,6 +48,7 @@ end @in ImgPlus = false @in ImgMinus = false @in msg = "" + @out full_route = "" # == Reactive handlers == # reactive handlers watch a variable and execute a block of code when @@ -56,9 +58,10 @@ end triqProb = 0.0 end end - @onchange file_route begin - if contains_word(file_route, ".imzML") + @onchange file_name begin + if contains_word(file_name, ".imzML") warning_fr = "" + full_route = joinpath( file_route, file_name ) else warning_fr = "is not an imzML file" end @@ -74,22 +77,23 @@ end #SaveBitmap( "$(Nmass).bmp", #IntQuant( slice ), #ViridisPalette ) + #samplesDir = "/home/julian/Documentos/Cinvestav_2024/Web/Archivos IMZML" - samplesDir = "/home/julian/Documentos/Cinvestav_2024/Web/Julia/JuliaIMZML_GUI/public/Files" - fileName = "royaimg.imzML" - if isfile(joinpath( samplesDir, fileName )) + #samplesDir = "/home/julian/Documentos/Cinvestav_2024/Web/Julia/JuliaIMZML_GUI/public/Files" + #fileName = "royaimg.imzML" + if isfile(full_route) msg="File exists, Nmass=$(Nmass) Tol=$(Tol)" else msg="File does not exist" end - spectra = LoadImzml(joinpath( samplesDir, fileName )) + spectra = LoadImzml(full_route) slice = getSlice(spectra, Nmass, Tol) if triqProb != 0 SaveBitmap( joinpath( samplesDir, "TrIQ_$(Nmass).bmp" ), TrIQ( slice, Nmass, triqProb ), ViridisPalette ) else - SaveBitmap( joinpath( samplesDir, "$(Nmass).bmp" ), + SaveBitmap( joinpath( file_route, "$(Nmass).bmp" ), IntQuant( slice ), ViridisPalette ) end @@ -99,7 +103,7 @@ end while !isfile("/$(indeximg).jpeg") && indeximg > 0 && indeximg <999 indeximg-=1 end - if(indeximg == 0) + if(indeximg <= 0) indeximg = Nmass end test = "/$(indeximg).jpeg" @@ -110,7 +114,7 @@ end while !isfile("/$(indeximg).jpeg") && indeximg > 0 && indeximg <999 indeximg+=1 end - if(indeximg == 999) + if(indeximg >= 999) indeximg = Nmass end test = "/$(indeximg).jpeg" diff --git a/JuliaIMZML_GUI/app.jl.html b/JuliaIMZML_GUI/app.jl.html index e3d3e7e..4eede1a 100644 --- a/JuliaIMZML_GUI/app.jl.html +++ b/JuliaIMZML_GUI/app.jl.html @@ -8,8 +8,9 @@
- -

route of file: {{file_route}} {{warning_fr}}

+ + +

full route: {{full_route}} {{warning_fr}}

diff --git a/JuliaIMZML_GUI/log/dev-2024-07-13.log b/JuliaIMZML_GUI/log/dev-2024-07-13.log index b31a263..21fd4a8 100644 --- a/JuliaIMZML_GUI/log/dev-2024-07-13.log +++ b/JuliaIMZML_GUI/log/dev-2024-07-13.log @@ -115,3 +115,23 @@ └ @ GenieAutoReload /home/julian/.julia/packages/GenieAutoReload/ESvsh/src/GenieAutoReload.jl:22 ┌ Info: 2024-07-13 16:33:46 Autoreloading └ @ GenieAutoReload /home/julian/.julia/packages/GenieAutoReload/ESvsh/src/GenieAutoReload.jl:22 +┌ Info: 2024-07-13 16:36:09 Autoreloading +└ @ GenieAutoReload /home/julian/.julia/packages/GenieAutoReload/ESvsh/src/GenieAutoReload.jl:22 +┌ Info: 2024-07-13 16:36:09 Autoreloading +└ @ GenieAutoReload /home/julian/.julia/packages/GenieAutoReload/ESvsh/src/GenieAutoReload.jl:22 +┌ Info: 2024-07-13 16:36:12 Autoreloading +└ @ GenieAutoReload /home/julian/.julia/packages/GenieAutoReload/ESvsh/src/GenieAutoReload.jl:22 +┌ Info: 2024-07-13 16:36:12 Autoreloading +└ @ GenieAutoReload /home/julian/.julia/packages/GenieAutoReload/ESvsh/src/GenieAutoReload.jl:22 +┌ Info: 2024-07-13 16:36:41 Autoreloading +└ @ GenieAutoReload /home/julian/.julia/packages/GenieAutoReload/ESvsh/src/GenieAutoReload.jl:22 +┌ Info: 2024-07-13 16:36:41 Autoreloading +└ @ GenieAutoReload /home/julian/.julia/packages/GenieAutoReload/ESvsh/src/GenieAutoReload.jl:22 +┌ Warning: 2024-07-13 16:37:20 SystemError("opening file \"/home/julian/Documentos/Cinvestav_2024/Web/Julia/JuliaIMZML_GUI/public/Files/royaimg.ibd\"", 2, nothing) +└ @ Stipple /home/julian/.julia/packages/Stipple/Hr6Qa/src/Stipple.jl:999 +┌ Warning: 2024-07-13 16:39:00 SystemError("opening file \"/home/julian/Documentos/Cinvestav_2024/Web/Julia/JuliaIMZML_GUI/public/Files/royaimg.ibd\"", 2, nothing) +└ @ Stipple /home/julian/.julia/packages/Stipple/Hr6Qa/src/Stipple.jl:999 +┌ Info: 2024-07-13 16:52:38 Autoreloading +└ @ GenieAutoReload /home/julian/.julia/packages/GenieAutoReload/ESvsh/src/GenieAutoReload.jl:22 +┌ Info: 2024-07-13 16:52:38 Autoreloading +└ @ GenieAutoReload /home/julian/.julia/packages/GenieAutoReload/ESvsh/src/GenieAutoReload.jl:22 diff --git a/JuliaIMZML_GUI/log/dev-2024-07-15.log b/JuliaIMZML_GUI/log/dev-2024-07-15.log new file mode 100644 index 0000000..66591ad --- /dev/null +++ b/JuliaIMZML_GUI/log/dev-2024-07-15.log @@ -0,0 +1,21 @@ +┌ Info: 2024-07-15 13:50:14 Watching ["/home/julian/Documentos/Cinvestav_2024/Web/Julia/JuliaIMZML_GUI"] +└ @ GenieAutoReload /home/julian/.julia/packages/GenieAutoReload/ESvsh/src/GenieAutoReload.jl:19 +┌ Info: 2024-07-15 13:50:17 Autoreloading +└ @ GenieAutoReload /home/julian/.julia/packages/GenieAutoReload/ESvsh/src/GenieAutoReload.jl:22 +┌ Info: 2024-07-15 13:50:39 Watching ["/home/julian/Documentos/Cinvestav_2024/Web/Julia/JuliaIMZML_GUI"] +└ @ GenieAutoReload /home/julian/.julia/packages/GenieAutoReload/ESvsh/src/GenieAutoReload.jl:19 +┌ Info: 2024-07-15 13:50:39 Autoreloading +└ @ GenieAutoReload /home/julian/.julia/packages/GenieAutoReload/ESvsh/src/GenieAutoReload.jl:22 +┌ Info: 2024-07-15 13:50:42 +│ Web Server starting at http://0.0.0.0:9101?CHANNEL__=KPZEIPZCZYWEZGSXPTDUGQJOKUUJFKKD +└ @ Genie.Server /home/julian/.julia/packages/Genie/uliWf/src/Server.jl:182 +┌ Info: 2024-07-15 13:50:43 Listening on: 0.0.0.0:9101, thread id: 1 +└ @ HTTP.Servers /home/julian/.julia/packages/HTTP/sJD5V/src/Servers.jl:382 +┌ Info: 2024-07-15 13:52:23 Autoreloading +└ @ GenieAutoReload /home/julian/.julia/packages/GenieAutoReload/ESvsh/src/GenieAutoReload.jl:22 +┌ Info: 2024-07-15 13:52:23 Autoreloading +└ @ GenieAutoReload /home/julian/.julia/packages/GenieAutoReload/ESvsh/src/GenieAutoReload.jl:22 +┌ Info: 2024-07-15 13:52:25 Autoreloading +└ @ GenieAutoReload /home/julian/.julia/packages/GenieAutoReload/ESvsh/src/GenieAutoReload.jl:22 +┌ Info: 2024-07-15 13:52:25 Autoreloading +└ @ GenieAutoReload /home/julian/.julia/packages/GenieAutoReload/ESvsh/src/GenieAutoReload.jl:22