From 14af9474331825546bd310b901d221b95ff3ece5 Mon Sep 17 00:00:00 2001 From: Pixelguy14 Date: Wed, 19 Feb 2025 11:32:34 -0600 Subject: [PATCH] Minor text corrections, file loading corrections --- README.md | 5 ++-- app.jl | 66 +++++++++++++++++++++++++++++--------------- app.jl.html | 10 +++---- config/env/global.jl | 2 +- 4 files changed, 51 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index 98e1b61..ac1e8a5 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,5 @@ A Graphical User Interface for MSI in Julia: https://github.com/CINVESTAV-LABI/j 3. After the script has finished loading, You can open a page (http://127.0.0.1:1481/) in your browser with the web app running. Additional notes:
-After the first boot initializes the packages in your computer, subsequent uses of the app should not take longer to load.
-Recomended system requirements: 4 core processor, 8 GB ram
-Minimum system requirements: 2 core processor, 8 GB ram (long loading times)
\ No newline at end of file +After the first boot initializes the packages in your computer, subsequent uses of the app should take less time to load.
+Recomended system requirements: 4 core processor, 8 GB ram
\ No newline at end of file diff --git a/app.jl b/app.jl index 93ba8e5..4e8aa8f 100644 --- a/app.jl +++ b/app.jl @@ -72,10 +72,10 @@ include("./julia_imzML_visual.jl") ## Tabulation variables @out tabIDs=["tab0","tab1","tab2","tab3","tab4"] - @out tabLabels=["Image", "TrIQ", "Spectrum Plot", "Topology Plot","Surface Plot"] + @out tabLabels=["Image", "TrIQ", "Spectrum Plot", "Topography Plot","Surface Plot"] @in selectedTab="tab0" @out CompTabIDs=["tab0","tab1","tab2","tab3","tab4"] - @out CompTabLabels=["Image", "TrIQ", "Spectrum Plot", "Topology Plot","Surface Plot"] + @out CompTabLabels=["Image", "TrIQ", "Spectrum Plot", "Topography Plot","Surface Plot"] @in CompSelectedTab="tab0" # Interface Images @@ -247,6 +247,7 @@ include("./julia_imzML_visual.jl") @onbutton btnSearch begin full_route=pick_file(; filterlist="imzML,mzML") + msg="" if full_route=="" msg="No file selected" warning_msg=true @@ -260,9 +261,25 @@ include("./julia_imzML_visual.jl") # Splitting the route with regex from imzml to mzml so the plotting can work full_routeMz=replace(full_route, r"\.[^.]*$" => ".mzML") if isfile(full_routeMz) - # We enable coord search and spectra plot creation + # Start the sum spectrum creation on loading + progressSpectraPlot=true + btnPlotDisable=true + btnStartDisable=true + msg="Loading SUM spectrum plot..." + sTime=time() + plotdata, plotlayout, xSpectraMz, ySpectraMz=sumSpectrumPlot(full_routeMz) + selectedTab="tab2" + progressSpectraPlot=false + btnPlotDisable=false + + # We enable coord search and spectra plot creation, also re-enable main process btnSpectraDisable=false SpectraEnabled=true + btnStartDisable=false + + fTime=time() + eTime=round(fTime-sTime,digits=3) + msg="Plot loaded in $(eTime) seconds" else # If there's no MzML file, we deny access again btnSpectraDisable=true @@ -280,26 +297,29 @@ include("./julia_imzML_visual.jl") btnStartDisable=true full_route=full_routeMz end - progressSpectraPlot=true - btnPlotDisable=true - btnStartDisable=true - msg="Loading SUM spectrum plot..." - sTime=time() - plotdata, plotlayout, xSpectraMz, ySpectraMz=sumSpectrumPlot(full_routeMz) - selectedTab="tab2" - progressSpectraPlot=false - btnPlotDisable=false - if endswith(full_route, "imzML") - btnStartDisable=false - end - if isfile(full_routeMz) - # We enable coord search and spectra plot creation - btnSpectraDisable=false - SpectraEnabled=true - end - fTime=time() - eTime=round(fTime-sTime,digits=3) - msg="Plot loaded in $(eTime) seconds" + if endswith(full_route, "imzML") + btnStartDisable=false + end + if isfile(full_routeMz) + # Start the sum spectrum creation on loading + progressSpectraPlot=true + btnPlotDisable=true + btnStartDisable=true + msg="Loading SUM spectrum plot..." + sTime=time() + plotdata, plotlayout, xSpectraMz, ySpectraMz=sumSpectrumPlot(full_routeMz) + selectedTab="tab2" + progressSpectraPlot=false + btnPlotDisable=false + + # We enable coord search and spectra plot creation + btnSpectraDisable=false + SpectraEnabled=true + + fTime=time() + eTime=round(fTime-sTime,digits=3) + msg="Plot loaded in $(eTime) seconds" + end end xCoord=0 yCoord=0 diff --git a/app.jl.html b/app.jl.html index aa397a8..4f0db7a 100644 --- a/app.jl.html +++ b/app.jl.html @@ -60,7 +60,7 @@ label="Generate Spectra" icon="play_arrow"> @@ -109,25 +109,25 @@ label="Generate Plots" icon="play_arrow"> - Image Topology Plot + Image topography Plot - TrIQ Topology Plot + TrIQ topography Plot - Image Surface Plot + Image surface Plot diff --git a/config/env/global.jl b/config/env/global.jl index 0b24049..5ea3d97 100644 --- a/config/env/global.jl +++ b/config/env/global.jl @@ -1 +1 @@ -ENV["GENIE_ENV"] = "prod" +ENV["GENIE_ENV"] = "dev"