Skip to content

Commit b65a738

Browse files
SarthakJariwalaSarthakJariwala
committed
window title changes, minor ui changes in MainDataBrowser
1 parent e5aad83 commit b65a738

10 files changed

Lines changed: 587 additions & 582 deletions

File tree

‎PythonGUI_apps/DataBrowser.py‎

Lines changed: 46 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from pathlib import Path
1111

1212
import pyqtgraph as pg
13-
from pyqtgraph.Qt import QtGui
13+
from pyqtgraph.Qt import QtGui, QtCore
1414

1515
from Lifetime_analysis import Lifetime_plot_fit
1616
from Spectrum_analysis import Spectra_plot_fit
@@ -20,7 +20,7 @@
2020
from H5_Pkl import h5_pkl_view, h5_view_and_plot
2121

2222
pg.mkQApp()
23-
pg.setConfigOption('background', 'w')
23+
#pg.setConfigOption('background', 'w')
2424

2525
base_path = Path(__file__).parent
2626
file_path = (base_path / "DataBrowser_GUI.ui").resolve()
@@ -29,50 +29,52 @@
2929

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

32-
class MainWindow(TemplateBaseClass):
33-
34-
def __init__(self):
35-
TemplateBaseClass.__init__(self)
36-
37-
# Create the main window
38-
self.ui = WindowTemplate()
39-
self.ui.setupUi(self)
40-
self.ui.select_comboBox.addItems(["Lifetime Analysis", "Spectrum Analysis", "FLIM Analysis",
41-
"UV-Vis Analysis", "PLQE Analysis", "H5 View/Plot", "H5/PKL Viewer"])
42-
self.ui.load_pushButton.clicked.connect(self.load_app)
43-
44-
self.show()
32+
class MainWindow(TemplateBaseClass):
33+
34+
def __init__(self):
35+
TemplateBaseClass.__init__(self)
36+
37+
# Create the main window
38+
self.ui = WindowTemplate()
39+
self.ui.setupUi(self)
40+
self.ui.select_comboBox.addItems(["Lifetime Analysis", "Spectrum Analysis", "FLIM Analysis",
41+
"UV-Vis Analysis", "PLQE Analysis", "H5 View/Plot", "H5/PKL Viewer"])
42+
self.ui.load_pushButton.clicked.connect(self.load_app)
43+
44+
self.show()
4545

46-
47-
def load_app(self):
48-
49-
analysis_software = self.ui.select_comboBox.currentText()
50-
51-
if analysis_software == "Lifetime Analysis":
52-
self.lifetime_window = Lifetime_plot_fit.MainWindow()
53-
self.lifetime_window.show()
54-
elif analysis_software == "Spectrum Analysis":
55-
self.spectrum_window = Spectra_plot_fit.MainWindow()
56-
self.spectrum_window.show()
57-
elif analysis_software == "FLIM Analysis":
58-
self.flim_window = FLIM_plot.MainWindow()
59-
self.flim_window.show()
60-
elif analysis_software == "UV-Vis Analysis":
61-
self.uv_vis_window = uv_vis_analysis.MainWindow()
62-
self.uv_vis_window.show()
63-
elif analysis_software == "PLQE Analysis":
64-
self.plqe_window = plqe_analysis.MainWindow()
65-
self.plqe_window.show()
66-
elif analysis_software == "H5 View/Plot":
67-
app = h5_view_and_plot.H5ViewPlot(sys.argv)
68-
#sys.exit(app.exec_())
69-
elif analysis_software == "H5/PKL Viewer":
70-
app = h5_pkl_view.H5PklView(sys.argv)
71-
#sys.exit(app.exec_())
46+
47+
def load_app(self):
48+
49+
analysis_software = self.ui.select_comboBox.currentText()
50+
51+
if analysis_software == "Lifetime Analysis":
52+
self.lifetime_window = Lifetime_plot_fit.MainWindow()
53+
self.lifetime_window.show()
54+
elif analysis_software == "Spectrum Analysis":
55+
self.spectrum_window = Spectra_plot_fit.MainWindow()
56+
self.spectrum_window.show()
57+
elif analysis_software == "FLIM Analysis":
58+
self.flim_window = FLIM_plot.MainWindow()
59+
self.flim_window.show()
60+
elif analysis_software == "UV-Vis Analysis":
61+
self.uv_vis_window = uv_vis_analysis.MainWindow()
62+
self.uv_vis_window.show()
63+
elif analysis_software == "PLQE Analysis":
64+
self.plqe_window = plqe_analysis.MainWindow()
65+
self.plqe_window.show()
66+
elif analysis_software == "H5 View/Plot":
67+
app = h5_view_and_plot.H5ViewPlot(sys.argv)
68+
#sys.exit(app.exec_())
69+
elif analysis_software == "H5/PKL Viewer":
70+
app = h5_pkl_view.H5PklView(sys.argv)
71+
#sys.exit(app.exec_())
72+
73+
7274

7375
def run():
74-
win = MainWindow()
75-
QtGui.QApplication.instance().exec_()
76-
return
76+
win = MainWindow()
77+
QtGui.QApplication.instance().exec_()
78+
return
7779

7880
run()

‎PythonGUI_apps/DataBrowser_GUI.ui‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,29 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>684</width>
10-
<height>403</height>
9+
<width>435</width>
10+
<height>221</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
14-
<string>MainWindow</string>
14+
<string>GLabViz - DataBrowser</string>
1515
</property>
1616
<widget class="QWidget" name="centralwidget">
1717
<layout class="QFormLayout" name="formLayout">
1818
<item row="1" column="0" colspan="2">
1919
<widget class="QLabel" name="label">
2020
<property name="font">
2121
<font>
22-
<pointsize>20</pointsize>
22+
<pointsize>30</pointsize>
2323
<weight>75</weight>
2424
<bold>true</bold>
2525
</font>
2626
</property>
2727
<property name="text">
28-
<string>Welcome to the GLabViz</string>
28+
<string>GLabViz</string>
29+
</property>
30+
<property name="alignment">
31+
<set>Qt::AlignCenter</set>
2932
</property>
3033
</widget>
3134
</item>
@@ -82,8 +85,8 @@
8285
<rect>
8386
<x>0</x>
8487
<y>0</y>
85-
<width>684</width>
86-
<height>38</height>
88+
<width>435</width>
89+
<height>21</height>
8790
</rect>
8891
</property>
8992
</widget>

‎PythonGUI_apps/FLIM_analysis/flim_plot_gui.ui‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
14-
<string>Form</string>
14+
<string>FLIM Analysis</string>
1515
</property>
1616
<layout class="QGridLayout" name="gridLayout_2">
1717
<item row="0" column="0">

‎PythonGUI_apps/H5_Pkl/h5_pkl_view_gui.ui‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
14-
<string>ScopeFoundry Data Browser</string>
14+
<string>H5/pkl View</string>
1515
</property>
1616
<widget class="QWidget" name="centralwidget">
1717
<layout class="QVBoxLayout" name="verticalLayout_2">
@@ -78,7 +78,7 @@
7878
<x>0</x>
7979
<y>0</y>
8080
<width>856</width>
81-
<height>31</height>
81+
<height>21</height>
8282
</rect>
8383
</property>
8484
</widget>

‎PythonGUI_apps/H5_Pkl/h5_view_and_plot_gui.ui‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
14-
<string>ScopeFoundry Data Browser</string>
14+
<string>H5 View and Plot</string>
1515
</property>
1616
<widget class="QWidget" name="centralwidget">
1717
<layout class="QVBoxLayout" name="verticalLayout_2">
@@ -257,7 +257,7 @@
257257
<x>0</x>
258258
<y>0</y>
259259
<width>856</width>
260-
<height>31</height>
260+
<height>21</height>
261261
</rect>
262262
</property>
263263
</widget>
@@ -267,7 +267,7 @@
267267
<customwidget>
268268
<class>PlotWidget</class>
269269
<extends>QGraphicsView</extends>
270-
<header location="global">pyqtgraph</header>
270+
<header>pyqtgraph</header>
271271
</customwidget>
272272
<customwidget>
273273
<class>ImageView</class>

‎PythonGUI_apps/Lifetime_analysis/Lifetime_analysis_gui_layout.ui‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
14-
<string>MainWindow</string>
14+
<string>Lifetime Analysis</string>
1515
</property>
1616
<widget class="QWidget" name="centralwidget">
1717
<layout class="QGridLayout" name="gridLayout_6">
@@ -1262,7 +1262,7 @@
12621262
<x>0</x>
12631263
<y>0</y>
12641264
<width>1490</width>
1265-
<height>31</height>
1265+
<height>21</height>
12661266
</rect>
12671267
</property>
12681268
<widget class="QMenu" name="menuFile">

0 commit comments

Comments
 (0)