misleep 0.2.0b0__tar.gz → 0.2.2b0__tar.gz

{misleep-0.2.0b0 → misleep-0.2.2b0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: misleep
-Version: 0.2.0b0
+Version: 0.2.2b0
 Summary: MiSleep: Mice Sleep EEG/EMG visualization, scoring and analysis.
 Home-page: https://github.com/BryanWang0702/MiSleep/
 Download-URL: https://github.com/BryanWang0702/MiSleep/
@@ -37,7 +37,7 @@ MiSleep is for EEG/EMG signal processing and visualization
 
 ## Get start
 ```shell
-pip install misleep==0.1.3b
+pip install misleep==0.2.2b0
 ```
 
 ### New features

{misleep-0.2.0b0 → misleep-0.2.2b0}/README.md

@@ -5,7 +5,7 @@ MiSleep is for EEG/EMG signal processing and visualization
 
 ## Get start
 ```shell
-pip install misleep==0.1.3b
+pip install misleep==0.2.2b0
 ```
 
 ### New features

{misleep-0.2.0b0 → misleep-0.2.2b0}/misleep/config.ini

@@ -1,5 +1,5 @@
 [gui]
-version = v0.2.0 Beta
+version = v0.2.2 Beta
 updatetime = 2024/04/01
 marker = ['pat', 'add water', 'third']
 startend = ['SWA', 'SWA', 'start end label', 'start end label', 'start end label', 'start end label', 'start end label']
@@ -8,5 +8,5 @@ statecolor = {"1": "orange", "2": "skyblue", "3": "red", "4": "white"}
 statecolorbgalpha = 0.1
 markerlinecolor = "red"
 startendlinecolor = "blue"
-openpath = E:/workplace/EEGProcessing/00_DATA/medusa/example_data/15_48_32_055/label.txt
+openpath = E:/workplace/EEGProcessing/00_DATA/20240117_0700_WXQ_3mice_24h/mouse2/mouse2_label.txt
 

{misleep-0.2.0b0 → misleep-0.2.2b0}/misleep/gui/dialog.py

@@ -158,11 +158,16 @@ class transferResult_dialog(QDialog, Ui_TransferResultDialog):
         self.setupUi(self)
 
         self.ACTimeEditor.setDisabled(True)
-        self.ResetTimeCheckBox.clicked.connect(self.enable_time_editor)
+        self.TransferStartTimeEdit.setDisabled(True)
+        self.ResetTimeCheckBox.clicked.connect(self.enable_ac_time_editor)
+        self.ResetTransferStartTimeCheckBox.clicked.connect(self.enable_start_time_editor)
         
-    def enable_time_editor(self):
+    def enable_ac_time_editor(self):
         self.ACTimeEditor.setEnabled(True)
 
+    def enable_start_time_editor(self):
+        self.TransferStartTimeEdit.setEnabled(True)
+
     def transfer(self, config, mianno, ac_time):
         """Transfer result to dataframe, triggered by okay button"""
 
@@ -171,6 +176,15 @@ class transferResult_dialog(QDialog, Ui_TransferResultDialog):
         else:
             ac_time = datetime.datetime.strptime(ac_time, "%Y%m%d-%H:%M:%S")
         
+        if self.ResetTransferStartTimeCheckBox.isChecked():
+            start_time = self.TransferStartTimeEdit.dateTime().toPyDateTime()
+            if start_time > ac_time:
+                delay_seconds = (start_time - ac_time).seconds
+                mianno._marker = mianno.marker[delay_seconds:]
+                mianno._start_end = mianno.start_end[delay_seconds:]
+                mianno._sleep_state = mianno.sleep_state[delay_seconds:]
+                ac_time = start_time
+        
         
         fd, _ = QFileDialog.getSaveFileName(self, "Save transfered result",
                                                 f"{config['gui']['openpath'].split('/')[0]}/transfer_result.xlsx", 

{misleep-0.2.0b0 → misleep-0.2.2b0}/misleep/gui/main_window.py

@@ -916,6 +916,7 @@ class main_window(QMainWindow, Ui_MiSleep):
             self.plot_marker_line()
         
             self.is_saved = False
+            self.AnnotationPathLabel.setText('*Annotation path:')
 
         if self.StartEndRadio.isChecked():
             x = round(event.xdata / self.midata.sf[
@@ -1289,6 +1290,7 @@ class main_window(QMainWindow, Ui_MiSleep):
                 [sleep_type] * (self.start_end[1] - self.start_end[0])
         
         self.is_saved = False
+        self.AnnotationPathLabel.setText('*Annotation path:')
         self.replot_sleep_state_bg(state=sleep_type)
         self.plot_hypo()
 
@@ -1319,6 +1321,7 @@ class main_window(QMainWindow, Ui_MiSleep):
         self.plot_start_end_label_line()
     
         self.is_saved = False
+        self.AnnotationPathLabel.setText('*Annotation path:')
 
     def about_bar_dispatcher(self, signal):
         """Triggered by AboutBar action, show About dialog"""
@@ -1349,6 +1352,7 @@ class main_window(QMainWindow, Ui_MiSleep):
     def transfer_result(self):
         """Transfer result into file"""
         self.transfer_result_dialog.ACTimeEditor.setDateTime(self.ac_time)
+        self.transfer_result_dialog.TransferStartTimeEdit.setDateTime(self.ac_time)
         self.transfer_result_dialog.exec_()
         if self.label_dialog.closed:
             return
@@ -1363,7 +1367,8 @@ class main_window(QMainWindow, Ui_MiSleep):
         saved = save_thread.save_anno()
         if saved:
             self.is_saved = True
-            QMessageBox.about(self, "Info", "Annotation saved")
+            
+            self.AnnotationPathLabel.setText('Annotation path:')
         save_thread.quit()
 
     def save_data(self):

{misleep-0.2.0b0 → misleep-0.2.2b0}/misleep/gui/uis/main_window_ui.py

@@ -69,9 +69,9 @@ class Ui_MiSleep(object):
         self.DataPathEdit.setReadOnly(True)
         self.DataPathEdit.setObjectName("DataPathEdit")
         self.formLayout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.DataPathEdit)
-        self.label_5 = QtWidgets.QLabel(self.dockWidgetContents_3)
-        self.label_5.setObjectName("label_5")
-        self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label_5)
+        self.AnnotationPathLabel = QtWidgets.QLabel(self.dockWidgetContents_3)
+        self.AnnotationPathLabel.setObjectName("AnnotationPathLabel")
+        self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.AnnotationPathLabel)
         self.AnnoPathEdit = QtWidgets.QLineEdit(self.dockWidgetContents_3)
         self.AnnoPathEdit.setReadOnly(True)
         self.AnnoPathEdit.setObjectName("AnnoPathEdit")
@@ -355,7 +355,7 @@ class Ui_MiSleep(object):
         MiSleep.setWindowTitle(_translate("MiSleep", "MiSleep"))
         self.MetaDock.setWindowTitle(_translate("MiSleep", "Meta"))
         self.label_4.setText(_translate("MiSleep", "Data path:"))
-        self.label_5.setText(_translate("MiSleep", "Annotation path:"))
+        self.AnnotationPathLabel.setText(_translate("MiSleep", "Annotation path:"))
         self.label_6.setText(_translate("MiSleep", "Acquisition Time:"))
         self.AcTimeEdit.setDisplayFormat(_translate("MiSleep", "yyyy/MM/dd HH:mm:ss"))
         self.ChannelDock.setWindowTitle(_translate("MiSleep", "Channel"))
@@ -407,4 +407,4 @@ class Ui_MiSleep(object):
         self.actionMerge_Data.setText(_translate("MiSleep", "Merge Data"))
         self.actionTransfer_Result.setText(_translate("MiSleep", "Transfer Result"))
         self.actionTransfer_Result.setToolTip(_translate("MiSleep", "Transfer Result"))
-from misleep.gui.resources import misleep
+from misleep.gui.resources import misleep

{misleep-0.2.0b0 → misleep-0.2.2b0}/misleep/gui/uis/transfer_result_dialog_ui.py

@@ -14,27 +14,43 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_TransferResultDialog(object):
     def setupUi(self, TransferResultDialog):
         TransferResultDialog.setObjectName("TransferResultDialog")
-        TransferResultDialog.resize(324, 193)
+        TransferResultDialog.resize(278, 290)
         self.verticalLayout = QtWidgets.QVBoxLayout(TransferResultDialog)
         self.verticalLayout.setObjectName("verticalLayout")
         self.groupBox = QtWidgets.QGroupBox(TransferResultDialog)
         self.groupBox.setObjectName("groupBox")
         self.gridLayout = QtWidgets.QGridLayout(self.groupBox)
         self.gridLayout.setObjectName("gridLayout")
-        self.ResetTimeCheckBox = QtWidgets.QCheckBox(self.groupBox)
-        self.ResetTimeCheckBox.setObjectName("ResetTimeCheckBox")
-        self.gridLayout.addWidget(self.ResetTimeCheckBox, 0, 0, 1, 1)
+        self.line = QtWidgets.QFrame(self.groupBox)
+        self.line.setFrameShape(QtWidgets.QFrame.HLine)
+        self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.line.setObjectName("line")
+        self.gridLayout.addWidget(self.line, 5, 0, 1, 2)
+        self.RejectArtifactCheckBox = QtWidgets.QCheckBox(self.groupBox)
+        self.RejectArtifactCheckBox.setObjectName("RejectArtifactCheckBox")
+        self.gridLayout.addWidget(self.RejectArtifactCheckBox, 7, 0, 1, 1)
+        self.ContainEventsCheckBox = QtWidgets.QCheckBox(self.groupBox)
+        self.ContainEventsCheckBox.setObjectName("ContainEventsCheckBox")
+        self.gridLayout.addWidget(self.ContainEventsCheckBox, 4, 0, 1, 1)
+        self.StateSpecAnalysisCheckBox = QtWidgets.QCheckBox(self.groupBox)
+        self.StateSpecAnalysisCheckBox.setObjectName("StateSpecAnalysisCheckBox")
+        self.gridLayout.addWidget(self.StateSpecAnalysisCheckBox, 6, 0, 1, 1)
         self.ACTimeEditor = QtWidgets.QDateTimeEdit(self.groupBox)
         self.ACTimeEditor.setObjectName("ACTimeEditor")
         self.gridLayout.addWidget(self.ACTimeEditor, 1, 0, 1, 1)
-        self.ContainEventsCheckBox = QtWidgets.QCheckBox(self.groupBox)
-        self.ContainEventsCheckBox.setObjectName("ContainEventsCheckBox")
-        self.gridLayout.addWidget(self.ContainEventsCheckBox, 3, 0, 1, 1)
+        self.ResetTimeCheckBox = QtWidgets.QCheckBox(self.groupBox)
+        self.ResetTimeCheckBox.setObjectName("ResetTimeCheckBox")
+        self.gridLayout.addWidget(self.ResetTimeCheckBox, 0, 0, 1, 1)
+        self.ResetTransferStartTimeCheckBox = QtWidgets.QCheckBox(self.groupBox)
+        self.ResetTransferStartTimeCheckBox.setObjectName("ResetTransferStartTimeCheckBox")
+        self.gridLayout.addWidget(self.ResetTransferStartTimeCheckBox, 2, 0, 1, 1)
         spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
         self.gridLayout.addItem(spacerItem, 1, 1, 1, 1)
-        self.RejectArtifactCheckBox = QtWidgets.QCheckBox(self.groupBox)
-        self.RejectArtifactCheckBox.setObjectName("RejectArtifactCheckBox")
-        self.gridLayout.addWidget(self.RejectArtifactCheckBox, 2, 0, 1, 1)
+        self.TransferStartTimeEdit = QtWidgets.QDateTimeEdit(self.groupBox)
+        self.TransferStartTimeEdit.setObjectName("TransferStartTimeEdit")
+        self.gridLayout.addWidget(self.TransferStartTimeEdit, 3, 0, 1, 1)
+        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.gridLayout.addItem(spacerItem1, 3, 1, 1, 1)
         self.verticalLayout.addWidget(self.groupBox)
         self.buttonBox = QtWidgets.QDialogButtonBox(TransferResultDialog)
         self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
@@ -51,7 +67,10 @@ class Ui_TransferResultDialog(object):
         _translate = QtCore.QCoreApplication.translate
         TransferResultDialog.setWindowTitle(_translate("TransferResultDialog", "Dialog"))
         self.groupBox.setTitle(_translate("TransferResultDialog", "Transfer result options"))
-        self.ResetTimeCheckBox.setText(_translate("TransferResultDialog", "Reset acquisition time"))
-        self.ACTimeEditor.setDisplayFormat(_translate("TransferResultDialog", "yyyy/MM/dd HH:mm:ss"))
-        self.ContainEventsCheckBox.setText(_translate("TransferResultDialog", "Contain Start-End events"))
         self.RejectArtifactCheckBox.setText(_translate("TransferResultDialog", "Reject artifact"))
+        self.ContainEventsCheckBox.setText(_translate("TransferResultDialog", "Contain Start-End events"))
+        self.StateSpecAnalysisCheckBox.setText(_translate("TransferResultDialog", "State spectral analysis"))
+        self.ACTimeEditor.setDisplayFormat(_translate("TransferResultDialog", "yyyy/MM/dd HH:mm:ss"))
+        self.ResetTimeCheckBox.setText(_translate("TransferResultDialog", "Reset acquisition time"))
+        self.ResetTransferStartTimeCheckBox.setText(_translate("TransferResultDialog", "Reset transfer start time"))
+        self.TransferStartTimeEdit.setDisplayFormat(_translate("TransferResultDialog", "yyyy/MM/dd HH:mm:ss"))

{misleep-0.2.0b0 → misleep-0.2.2b0}/misleep/io/signal_io.py

@@ -47,9 +47,12 @@ def load_mat(data_path):
 
         # If old version misleep data
         if names is None:
-            signals = raw_data
-            channels = [f'ch{each + 1}' for each in range(raw_data.shape[0])]
-            sf = [305. for _ in range(raw_data.shape[0])]
+            if raw_data.shape[0] > raw_data.shape[1]:
+                signals = raw_data.T
+            else:
+                signals = raw_data
+            channels = [f'ch{each + 1}' for each in range(signals.shape[0])]
+            sf = [305. for _ in range(signals.shape[0])]
             time = datetime.datetime.now().strftime("%Y%m%d-%H:%M:%S")
             return MiData(signals=signals, channels=channels, sf=sf, time=time)
 
@@ -88,9 +91,13 @@ def load_mat(data_path):
     
         except Exception:
             # If old version misleep data
-            signals = raw_data
-            channels = [f'ch{each + 1}' for each in range(raw_data.shape[0])]
-            sf = [305. for _ in range(raw_data.shape[0])]
+            if raw_data.shape[0] > raw_data.shape[1]:
+                signals = raw_data.T
+            else:
+                signals = raw_data
+            
+            channels = [f'ch{each + 1}' for each in range(signals.shape[0])]
+            sf = [305. for _ in range(signals.shape[0])]
             time = datetime.datetime.now().strftime("%Y%m%d-%H:%M:%S")
             return MiData(signals=signals, channels=channels, sf=sf, time=time)  
 

{misleep-0.2.0b0 → misleep-0.2.2b0}/misleep.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: misleep
-Version: 0.2.0b0
+Version: 0.2.2b0
 Summary: MiSleep: Mice Sleep EEG/EMG visualization, scoring and analysis.
 Home-page: https://github.com/BryanWang0702/MiSleep/
 Download-URL: https://github.com/BryanWang0702/MiSleep/
@@ -37,7 +37,7 @@ MiSleep is for EEG/EMG signal processing and visualization
 
 ## Get start
 ```shell
-pip install misleep==0.1.3b
+pip install misleep==0.2.2b0
 ```
 
 ### New features

{misleep-0.2.0b0 → misleep-0.2.2b0}/setup.py

@@ -11,7 +11,7 @@ MAINTAINER_EMAIL = "swang@gmail.com"
 URL = "https://github.com/BryanWang0702/MiSleep/"
 LICENSE = "BSD (3-clause)"
 DOWNLOAD_URL = "https://github.com/BryanWang0702/MiSleep/"
-VERSION = "0.2.0 Beta"
+VERSION = "0.2.2b0"
 
 INSTALL_REQUIRES = [
     "numpy>=1.18.1",