diff --git a/app.jl b/app.jl index 1b4d040..90c389a 100644 --- a/app.jl +++ b/app.jl @@ -58,17 +58,19 @@ end @out btnStartDisable = true @out btnPlotDisable = true @in warning_msg = false + @in CompareDialog = false # Interface Variables @in file_route = "" @in file_name = "" @in Nmass = 0.0 @in Tol = 0.0 - @in triqProb = 0.0 - @in triqColor = 0 + @in triqProb = 0.98 + @in triqColor = 256 # Interface Buttons @in mainProcess = false # To generate images + @in CompareBtn = false # to open dialog @in createSumPlot = false # To generate sum spectrum plot @in image3dPlot = false # To generate 3d plot based on current image @in triq3dPlot = false # To generate 3d plot based on current triq image @@ -438,7 +440,7 @@ end elevation = Float32.(Array(img_gray)) ./ 255.0 # Normalize between 0 and 1 #println("Elevation size:", size(elevation)) # Smooth the image - sigma = 1.0 + sigma = 3.0 kernel = Kernel.gaussian(sigma) #println(size(kernel)) elevation_smoothed = imfilter(elevation, kernel) @@ -455,7 +457,7 @@ end x_nticks = min(20, length(x)) y_nticks = min(20, length(y)) z_nticks = 5 - aspect_ratio = attr(x = 1, y = length(y) / length(x), z = 1) + aspect_ratio = attr(x = 1, y = length(y) / length(x), z = 0.5) # Define the layout for the 3D plot layout3D = PlotlyBase.Layout( @@ -513,7 +515,7 @@ end img_array = Array(img_gray) elevation = Float32.(Array(img_gray)) ./ 255.0 # Normalize between 0 and 1 # Smooth the image - sigma = 4.0 + sigma = 3.0 kernel = Kernel.gaussian(sigma) elevation_smoothed = imfilter(elevation, kernel) @@ -588,7 +590,7 @@ end elevation = Float32.(Array(img_gray)) ./ 255.0 # Normalize between 0 and 1 # Smooth the image - sigma = 4.0 + sigma = 3.0 kernel = Kernel.gaussian(sigma) elevation_smoothed = imfilter(elevation, kernel) @@ -646,7 +648,7 @@ end elevation = Float32.(Array(img_gray)) ./ 255.0 # Normalize between 0 and 1 # Smooth the image - sigma = 4.0 + sigma = 3.0 kernel = Kernel.gaussian(sigma) elevation_smoothed = imfilter(elevation, kernel) @@ -689,6 +691,10 @@ end end end + @onbutton CompareBtn begin + CompareDialog = true + end + GC.gc() # Trigger garbage collection if Sys.islinux() ccall(:malloc_trim, Int32, (Int32,), 0) # Ensure julia returns the freed memory to OS diff --git a/app.jl.html b/app.jl.html index 0141935..b9c2306 100644 --- a/app.jl.html +++ b/app.jl.html @@ -70,7 +70,7 @@
- +
@@ -81,23 +81,28 @@
-
-
- - Start Process - - +
+ + Start Process + + + + Compare + +

{{msg}}

@@ -161,7 +166,30 @@ - + + + + + + + + +
Compare two diferent images or plots in a larger screen
+ + + +
+
+ {{msg}} +
+
+ {{msg}} +
+
+ + + + diff --git "a/ongoing_tasks.txt\n" "b/ongoing_tasks.txt\n" index 5e1035b..b7a9ea5 100644 --- "a/ongoing_tasks.txt\n" +++ "b/ongoing_tasks.txt\n" @@ -1,5 +1,4 @@ PENDING - Rmsi & julia coherence with image creation and colorbar avoid image enlargement -> CURRENT WIP image flip upside down @@ -9,6 +8,11 @@ PENDING Create function that makes the imzML from mzML files Possibility to add multiple imzML to process at once ? Pixel selection marks + + Rotate vertical images + Easier input for files + TrIQ default values + Comparative for two values DONE Quicker start for julia GUI diff --git a/start_MSI_GUI.jl b/start_MSI_GUI.jl index 1ad03d7..6d6ea81 100644 --- a/start_MSI_GUI.jl +++ b/start_MSI_GUI.jl @@ -6,8 +6,6 @@ Pkg.gc() Pkg.add("Libz") ; Pkg.add("PlotlyBase") ; Pkg.add("CairoMakie") ; Pkg.add("Colors") ; Pkg.add("Statistics") ; Pkg.add("NaturalSort") ; Pkg.add("GenieFramework") ;Pkg.add("Genie") Pkg.add(url="https://github.com/CINVESTAV-LABI/julia_mzML_imzML") # With this we ensure it uses the latest library iteration Pkg.add("Images") ; Pkg.add("LinearAlgebra") -Pkg.instantiate() -Pkg.update() using Genie