From 72cb64e731a2bff25db62e769d5ff02976c6a312 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Juli=C3=A1n=20Sierra=20=C3=81lvarez?= <160289138+Pixelguy14@users.noreply.github.com> Date: Sat, 12 Oct 2024 11:18:22 -0600 Subject: [PATCH 1/2] Testing condition to avoid errors in macOS --- app.jl | 60 ++++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 44 insertions(+), 16 deletions(-) diff --git a/app.jl b/app.jl index c4035d4..eb91416 100644 --- a/app.jl +++ b/app.jl @@ -80,33 +80,57 @@ rgb_ViridisPalette =reinterpret(ColorTypes.RGB24, ViridisPalette) end @onchange file_name begin msg = "" - if contains(file_name,".imzML") - warning_fr = "" - full_route = joinpath( file_route, file_name ) - if isfile(full_route) # check if the file exists - full_routeMz = split( full_route, "." )[1] * ".mzML" # Splitting the route from imzml to mzml so the plotting can work - if isfile(full_routeMz) && (full_routeMz2 == "" || full_routeMz2 != full_routeMz) # check if there is an mzML file around + try + if contains(file_name,".imzML") + warning_fr = "" + full_route = joinpath( file_route, file_name ) + if isfile(full_route) # check if the file exists + full_routeMz = split( full_route, "." )[1] * ".mzML" # Splitting the route from imzml to mzml so the plotting can work + if isfile(full_routeMz) && (full_routeMz2 == "" || full_routeMz2 != full_routeMz) # check if there is an mzML file around + Disab_btn = true + warning_fr = "Loading plot..." + spectraMz = LoadMzml(full_routeMz) + # dims = size(spectraMz) + # scansMax = dims[2] # we get the total of scansMax + # traceSpectra = PlotlyBase.scatter(x = spectraMz[1, 1], y = spectraMz[2, 1], mode="lines") + traceSpectra = PlotlyBase.scatter(x = mean(spectraMz[1,:]), y = mean(spectraMz[2,:]), mode="lines") + plotdata = [traceSpectra] # we add the data of spectra to the plot + spectraMz = nothing # Important for memory cleaning + GC.gc() # Trigger garbage collection + if Sys.islinux() + ccall(:malloc_trim, Int32, (Int32,), 0) # Ensure julia returns the freed memory to OS + end + warning_fr = "Plot loaded." + Disab_btn = false + full_routeMz2 = full_routeMz # to avoid creating the plot if its the same file read as before + end + else + warning_fr = "is not an imzML file" + end + elseif contains(file_name,".mzML") + full_routeMz = joinpath( file_route, file_name ) + warning_fr = "$(full_routeMz)" + if isfile(full_routeMz) && (full_routeMz2 == "" || full_routeMz2 != full_routeMz) # check if there is an mzML file around # check if the file exists Disab_btn = true warning_fr = "Loading plot..." spectraMz = LoadMzml(full_routeMz) - # dims = size(spectraMz) - # scansMax = dims[2] # we get the total of scansMax - # traceSpectra = PlotlyBase.scatter(x = spectraMz[1, 1], y = spectraMz[2, 1], mode="lines") traceSpectra = PlotlyBase.scatter(x = mean(spectraMz[1,:]), y = mean(spectraMz[2,:]), mode="lines") plotdata = [traceSpectra] # we add the data of spectra to the plot spectraMz = nothing # Important for memory cleaning GC.gc() # Trigger garbage collection - ccall(:malloc_trim, Int32, (Int32,), 0) # Ensure julia returns the freed memory to OS + if Sys.islinux() + ccall(:malloc_trim, Int32, (Int32,), 0) # Ensure julia returns the freed memory to OS + end warning_fr = "Plot loaded." Disab_btn = false full_routeMz2 = full_routeMz # to avoid creating the plot if its the same file read as before end else - warning_fr = "is not an imzML file" + full_route = "/" + warning_fr = "is not an imzML or mzML file" end - else - full_route = "/" - warning_fr = "is not an imzML file" + catch e + msg = "There was an error, please verify the file and try again. $(e)" end end @onchange Nmass begin @@ -159,7 +183,9 @@ rgb_ViridisPalette =reinterpret(ColorTypes.RGB24, ViridisPalette) spectra = nothing # Important for memory cleaning slice = nothing GC.gc() # Trigger garbage collection - ccall(:malloc_trim, Int32, (Int32,), 0) # Ensure julia returns the freed memory to OS + if Sys.islinux() + ccall(:malloc_trim, Int32, (Int32,), 0) # Ensure julia returns the freed memory to OS + end Disab_btn = false end @onbutton ImgMinus begin @@ -216,7 +242,9 @@ rgb_ViridisPalette =reinterpret(ColorTypes.RGB24, ViridisPalette) lastimgTriq = indeximgTriq end GC.gc() # Trigger garbage collection - ccall(:malloc_trim, Int32, (Int32,), 0) # Ensure julia returns the freed memory to OS + if Sys.islinux() + ccall(:malloc_trim, Int32, (Int32,), 0) # Ensure julia returns the freed memory to OS + end end # == Pages == # register a new route and the page that will be loaded on access From c0418c4ff0b2bcd2d6a0e38d9602ef1a96d75b80 Mon Sep 17 00:00:00 2001 From: ING-HGA <45300713+ING-HGA@users.noreply.github.com> Date: Thu, 17 Oct 2024 16:53:04 -0600 Subject: [PATCH 2/2] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index dff96c4..1e3f510 100644 --- a/README.md +++ b/README.md @@ -32,4 +32,5 @@ activate . ``` using Genie ; Genie.loadapp() ; up() ``` -6. And finally open the port that gets generated by Genie to access to the GUI (https://localhost:????)
+6. After the package is loaded, open the port generated by Genie to access the GUI by pressing cmd (macOS) or ctrl (Linux/Windows) in the http:// direction, as shown in the figure. +![Open Julia](https://github.com/user-attachments/assets/37e191d7-635d-458f-a1cd-719e2964594f)