lifetime: added prompt for skip rows, can now load csv

Author: LAKESIDE\LindaT18

PythonGUI_apps/Lifetime_analysis/Lifetime_plot_fit.py

@@ -87,20 +87,29 @@ def __init__(self):
         self.out = None # output file after fitting
         self.data_list = []
         self.show()
+
 
     def open_file(self):
         """ Open data file """
 #        try:
         self.filename = QtWidgets.QFileDialog.getOpenFileName(self)
         try:
-            self.file = np.loadtxt(self.filename[0], skiprows=10)
-#        except ValueError:
-#            self.file = np.loadtxt(filename[0], skiprows=10)
+            if ".csv" in self.filename[0] or ".txt" in self.filename[0]: #if txt or csv, prompt user to enter # of rows to skip
+                self.skip_rows_window = SkipRowsWindow()
+                self.skip_rows_window.skip_rows_signal.connect(self.open_with_skip_rows_window)
         except UnicodeDecodeError:
             self.file = read_picoharp_phd(self.filename[0])
         except:
             pass
 
+    def open_with_skip_rows_window(self):
+        """ Prompts user to enter how many rows to skip """
+        self.skip_rows = self.skip_rows_window.ui.skip_rows_spinBox.value()
+        if ".txt" in self.filename[0]:
+            self.file = np.loadtxt(self.filename[0], skiprows=self.skip_rows)
+        elif ".csv" in self.filename[0]:
+            self.file = np.genfromtxt(self.filename[0], skip_header=self.skip_rows, delimiter=",")
+
     def open_irf_file(self):
         """ Open file with irf - enabled if 'load separate irf' is checled """
         filename = QtWidgets.QFileDialog.getOpenFileName(self)
@@ -465,7 +474,6 @@ def export_data(self):
         self.data_list = []
         file.close()
 
-
     def pub_ready_plot_export(self):
         try:
             filename = QtWidgets.QFileDialog.getSaveFileName(self,caption="Filename with EXTENSION")
@@ -497,6 +505,28 @@ def close_application(self):
         else:
             pass
 
+"""Skip rows GUI"""
+ui_file_path = (base_path / "skip_rows.ui").resolve()
+skiprows_WindowTemplate, skiprows_TemplateBaseClass = pg.Qt.loadUiType(ui_file_path)
+
+class SkipRowsWindow(skiprows_TemplateBaseClass):
+    
+    skip_rows_signal = QtCore.pyqtSignal() #signal to help with pass info back to MainWindow
+    
+    def __init__(self):
+        skiprows_TemplateBaseClass.__init__(self)
+
+        # Create the param window
+        self.ui = skiprows_WindowTemplate()
+        self.ui.setupUi(self)
+        self.ui.done_pushButton.clicked.connect(self.done)
+        self.setWindowFlag(QtCore.Qt.WindowCloseButtonHint, False)
+        self.show()
+    
+    def done(self):
+        self.skip_rows_signal.emit()
+        self.close()
+
 def run():
     win = MainWindow()
     QtGui.QApplication.instance().exec_()

PythonGUI_apps/Lifetime_analysis/skip_rows.ui

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>413</width>
+    <height>94</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Enter rows to skip</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Rows to skip</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QSpinBox" name="skip_rows_spinBox">
+     <property name="value">
+      <number>10</number>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QPushButton" name="done_pushButton">
+     <property name="text">
+      <string>Done</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>