diff --git a/PythonGUI_apps/Spectrum_analysis/Spectra_plot_fit.py b/PythonGUI_apps/Spectrum_analysis/Spectra_plot_fit.py
index e1cdd67..69f182b 100644
--- a/PythonGUI_apps/Spectrum_analysis/Spectra_plot_fit.py
+++ b/PythonGUI_apps/Spectrum_analysis/Spectra_plot_fit.py
@@ -113,6 +113,10 @@ def __init__(self):
# for i in reversed(range(self.ui.bounds_groupBox.layout().count())):
# self.ui.bounds_groupBox.layout().itemAt(i).widget().deleteLater()
#self.ui.single_bounds_page.layout().addWidget(QtWidgets.QPushButton("test"))
+
+ self.ui.plot = pg.PlotWidget()
+ self.ui.plot.setTitle(title="Spectrum Plot")
+ #self.ui.plot.show()
self.file = None
self.bck_file = None
@@ -366,7 +370,7 @@ def plot(self):
self.normalize()
self.check_eV_state()
-
+ self.ui.plot.show()
self.ui.plot.plot(self.x, self.y, clear=self.clear_check(), pen='r')
except Exception as e:
diff --git a/PythonGUI_apps/Spectrum_analysis/Spectra_plot_fit_gui.ui b/PythonGUI_apps/Spectrum_analysis/Spectra_plot_fit_gui.ui
index e1fc8de..7e013d3 100644
--- a/PythonGUI_apps/Spectrum_analysis/Spectra_plot_fit_gui.ui
+++ b/PythonGUI_apps/Spectrum_analysis/Spectra_plot_fit_gui.ui
@@ -6,8 +6,8 @@
0
0
- 2284
- 1476
+ 2115
+ 1483
@@ -787,30 +787,6 @@
Load Settings
- -
-
-
-
- 10
-
-
-
-
- -
-
-
-
- 10
-
-
-
- Subtract Background
-
-
- true
-
-
-
-
@@ -823,7 +799,7 @@
- -
+
-
@@ -835,7 +811,7 @@
- -
+
-
@@ -871,7 +847,7 @@
- -
+
-
@@ -895,63 +871,84 @@
- -
-
+
-
+
10
- Background File
+ Subtract Background
+
+
+ true
- -
-
+
-
+
+
+
+ 10
+
+
- Export Settings
+ Export Fit Data
-
-
+
10
- Export Fit Data
+ Add Trace to Memory
- -
-
+
-
+
10
- false
- Clear Plot
+ Plot without Background
- -
-
+
-
+
+
+
+ 10
+ 50
+ false
+
+
+
+ Plot
+
+
+
+ -
+
10
- Normalize
+ Background File
- -
+
-
@@ -966,41 +963,56 @@
- -
-
+
-
+
10
- Plot without Background
+ Normalize
- -
-
+
-
+
10
- 50
- false
+ false
- Plot
+ Clear Plot
+
+
+
+ -
+
+
+ Export Settings
+
+
+
+ -
+
+
+ For Data
-
-
-
-
- 10
-
+
+
+ For Figure
+
+
+ -
+
- Add Trace to Memory
+ Plot Control
@@ -1008,7 +1020,13 @@
-
-
+
+
+
+ 10
+
+
+
@@ -1019,7 +1037,7 @@
-
-
-
+
-
@@ -1090,100 +1108,78 @@ File
- -
-
+
-
+
12
-
- Intensity Sums
-
- -
-
+
-
+
12
- For Raw Scan Data
+ Export Fitted
+Scan
- -
-
+
-
+
12
- # Y points
-
-
-
- -
-
-
- 2000
-
-
- 100
-
-
-
- -
-
-
- 2000
-
-
- 100
+ Launch Data Viewer
- -
-
+
-
+
12
- # X points
+ After Fitting Scan Data
- -
-
+
-
+
12
- After Fitting Scan Data
+ Intensity Sums
- -
-
+
-
+
12
- For Fit Scale
+ For Raw Scan Data
- -
-
+
-
+
12
@@ -1194,22 +1190,19 @@ File
- -
-
+
-
+
12
- Use Raw Scan Settings
-
-
- true
+ Plot
- -
+
-
@@ -1228,73 +1221,110 @@ File
- -
-
+
-
+
12
- Analyze Spectra Fits
+ Plot
- -
-
+
-
+
12
+
+ Export Settings
+
- -
-
+
-
+
12
- Launch Data Viewer
+ Analyze Spectra Fits
- -
-
+
-
+
12
- Export Fitted
-Scan
+ For Fit Scale
- -
-
+
-
+
12
- Plot
+ Use Raw Scan Settings
+
+
+ true
- -
-
+
-
+
12
- Plot
+ # X points
+
+
+
+ -
+
+
+
+ 12
+
+
+
+ # Y points
+
+
+
+ -
+
+
+ 2000
+
+
+ 100
+
+
+
+ -
+
+
+ 2000
+
+
+ 100
@@ -1422,20 +1452,13 @@ Scan
0
0
- 2284
+ 2115
38
-
-
- PlotWidget
- QGraphicsView
-
-
-