Skip to content

Development #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 25 commits into from
Aug 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
c1002fb
load data from h5, spec scan: init work on handling pkl w/o scan params
Aug 7, 2019
9099bc8
lifetime: added prompt for skip rows, can now load csv
Aug 12, 2019
6a0406c
added skip rows prompt for irf
Aug 12, 2019
959d317
fix load phd
Aug 12, 2019
051c756
added analyze lifetime/spectrum from flim, clear lifetime export data…
Aug 13, 2019
fc8cbbb
ui changes, fix FLIM image direction
Aug 13, 2019
e5aad83
added export fig for spectra scan, added export data for single spectrum
Aug 13, 2019
b65a738
window title changes, minor ui changes in MainDataBrowser
SarthakJariwala Aug 14, 2019
079a67f
remove old files that are not required
SarthakJariwala Aug 14, 2019
95ddb39
initial work on image analysis
Aug 16, 2019
11b21fe
resized image according to scaling_factor
Aug 19, 2019
73bb638
image_analysis: add grayscale option, flim: average instead of sum fo…
Aug 19, 2019
52be7a4
added pixera pixel size
Aug 19, 2019
0c6944e
fix scalebar -- include delay in update solved it
SarthakJariwala Aug 20, 2019
8fce783
image analysis: fix image orientation, roi height, add scalebar; spec…
Aug 20, 2019
1fa99d0
add comments
Aug 20, 2019
0c29d95
fix roi direction, keep pixera image size
Aug 21, 2019
5f21a07
fix roi plot orientationm spot greyscale
Aug 21, 2019
c196dda
initial work on separate rgb plot and horizontal rgb avg
Aug 21, 2019
d9844ad
moved pg.setConfigOption to init functions
Aug 21, 2019
45d4ac4
use separate image plot instead of imageview
Aug 22, 2019
9afb6b9
add default roi position and angle
Aug 22, 2019
f0505dd
update scaling factor before loading image
Aug 22, 2019
e41bf1e
add resize option for spot, fixed image plot axes
Aug 22, 2019
e2f3e9a
add interpolation to psf data
Aug 22, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 50 additions & 45 deletions PythonGUI_apps/DataBrowser.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
from pathlib import Path

import pyqtgraph as pg
from pyqtgraph.Qt import QtGui
from pyqtgraph.Qt import QtGui, QtCore

from Lifetime_analysis import Lifetime_plot_fit
from Spectrum_analysis import Spectra_plot_fit
from FLIM_analysis import FLIM_plot
from UV_Vis_analysis import uv_vis_analysis
from PLQE_analysis import plqe_analysis
from H5_Pkl import h5_pkl_view, h5_view_and_plot

from Image_analysis import Image_analysis
pg.mkQApp()
pg.setConfigOption('background', 'w')
#pg.setConfigOption('background', 'w')

base_path = Path(__file__).parent
file_path = (base_path / "DataBrowser_GUI.ui").resolve()
Expand All @@ -29,50 +29,55 @@

WindowTemplate, TemplateBaseClass = pg.Qt.loadUiType(uiFile)

class MainWindow(TemplateBaseClass):
def __init__(self):
TemplateBaseClass.__init__(self)
# Create the main window
self.ui = WindowTemplate()
self.ui.setupUi(self)
self.ui.select_comboBox.addItems(["Lifetime Analysis", "Spectrum Analysis", "FLIM Analysis",
"UV-Vis Analysis", "PLQE Analysis", "H5 View/Plot", "H5/PKL Viewer"])
self.ui.load_pushButton.clicked.connect(self.load_app)
self.show()
class MainWindow(TemplateBaseClass):
def __init__(self):
TemplateBaseClass.__init__(self)
# Create the main window
self.ui = WindowTemplate()
self.ui.setupUi(self)
self.ui.select_comboBox.addItems(["Lifetime Analysis", "Spectrum Analysis", "FLIM Analysis",
"UV-Vis Analysis", "PLQE Analysis", "H5 View/Plot", "H5/PKL Viewer", "Image Analysis"])
self.ui.load_pushButton.clicked.connect(self.load_app)
self.show()


def load_app(self):

analysis_software = self.ui.select_comboBox.currentText()

if analysis_software == "Lifetime Analysis":
self.lifetime_window = Lifetime_plot_fit.MainWindow()
self.lifetime_window.show()
elif analysis_software == "Spectrum Analysis":
self.spectrum_window = Spectra_plot_fit.MainWindow()
self.spectrum_window.show()
elif analysis_software == "FLIM Analysis":
self.flim_window = FLIM_plot.MainWindow()
self.flim_window.show()
elif analysis_software == "UV-Vis Analysis":
self.uv_vis_window = uv_vis_analysis.MainWindow()
self.uv_vis_window.show()
elif analysis_software == "PLQE Analysis":
self.plqe_window = plqe_analysis.MainWindow()
self.plqe_window.show()
elif analysis_software == "H5 View/Plot":
app = h5_view_and_plot.H5ViewPlot(sys.argv)
#sys.exit(app.exec_())
elif analysis_software == "H5/PKL Viewer":
app = h5_pkl_view.H5PklView(sys.argv)
#sys.exit(app.exec_())

def load_app(self):

analysis_software = self.ui.select_comboBox.currentText()

if analysis_software == "Lifetime Analysis":
self.lifetime_window = Lifetime_plot_fit.MainWindow()
self.lifetime_window.show()
elif analysis_software == "Spectrum Analysis":
self.spectrum_window = Spectra_plot_fit.MainWindow()
self.spectrum_window.show()
elif analysis_software == "FLIM Analysis":
self.flim_window = FLIM_plot.MainWindow()
self.flim_window.show()
elif analysis_software == "UV-Vis Analysis":
self.uv_vis_window = uv_vis_analysis.MainWindow()
self.uv_vis_window.show()
elif analysis_software == "PLQE Analysis":
self.plqe_window = plqe_analysis.MainWindow()
self.plqe_window.show()
elif analysis_software == "H5 View/Plot":
app = h5_view_and_plot.H5ViewPlot(sys.argv)
#sys.exit(app.exec_())
elif analysis_software == "H5/PKL Viewer":
app = h5_pkl_view.H5PklView(sys.argv)
#sys.exit(app.exec_())
elif analysis_software == "Image Analysis":
self.image_window = Image_analysis.MainWindow()
self.image_window.show()



def run():
win = MainWindow()
QtGui.QApplication.instance().exec_()
return
win = MainWindow()
QtGui.QApplication.instance().exec_()
return

run()
17 changes: 10 additions & 7 deletions PythonGUI_apps/DataBrowser_GUI.ui
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,29 @@
<rect>
<x>0</x>
<y>0</y>
<width>684</width>
<height>403</height>
<width>435</width>
<height>221</height>
</rect>
</property>
<property name="windowTitle">
<string>MainWindow</string>
<string>GLabViz - DataBrowser</string>
</property>
<widget class="QWidget" name="centralwidget">
<layout class="QFormLayout" name="formLayout">
<item row="1" column="0" colspan="2">
<widget class="QLabel" name="label">
<property name="font">
<font>
<pointsize>20</pointsize>
<pointsize>30</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Welcome to the GLabViz</string>
<string>GLabViz</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
Expand Down Expand Up @@ -82,8 +85,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>684</width>
<height>38</height>
<width>435</width>
<height>21</height>
</rect>
</property>
</widget>
Expand Down
Loading