bug bug bug

Author: Uoops

src/controllers/main_window_controller.py

@@ -13,6 +13,8 @@ def __init__(self, view, model):
         }
 
     def init_biomarker_window(self, biomarker_type):
+        # To dynamically create frame for different biomarkers, need first init (optimize later)
+        self.view.window.frame_biomarker_layout = QHBoxLayout(self.view.window.frame_biomarker_type)
         self.supported_biomarker[biomarker_type]()
 
     def init_general_window(self):
@@ -35,16 +37,13 @@ def init_biomarker_type(self):
         self.view.window.combo_box_biomarker.currentIndexChanged.connect(self.switch_biomarker)
 
     def switch_biomarker(self):
-        selected_biomarker = self.view.window.combo_box_biomarker.currentText()
+        selected_biomarker = self.get_biomarker_type()
         self.supported_biomarker[selected_biomarker]()
 
     def create_hfo_window(self):
         # set biomarker type
         self.set_biomarker_type('HFO')
 
-        # dynamically create frame for different biomarkers
-        self.view.window.frame_biomarker_layout = QHBoxLayout(self.view.window.frame_biomarker_type)
-
         # create detection parameters stacked widget
         self.view.create_stacked_widget_detection_param('HFO')
 
@@ -76,6 +75,7 @@ def create_spindle_window(self):
 
         # manage flag
         self.view.window.is_data_filtered = False
+        self.view.window.quick_detect_open = False
 
         # create center waveform and mini plot
         self.model.create_center_waveform_and_mini_plot()

src/models/main_waveform_plot_model.py

@@ -71,7 +71,7 @@ def set_channel_indices_to_plot(self,channel_indices_to_plot:list):
         self.channels_to_plot = [self.channel_names[index] for index in channel_indices_to_plot]
 
     def update_channel_names(self, new_channel_names):
-        self.channel_names = new_channel_names
+        self.channel_names = list(new_channel_names)
 
     def set_waveform_filter(self, filtered):
         self.filtered = filtered

src/models/main_window_model.py

@@ -30,6 +30,9 @@ def __init__(self, main_window):
         self.backend = None
         self.biomarker_type = None
 
+        # handel signal connection carefully when switch biomarkers, optimized in the future
+        self.signal_connected = False
+
     def set_biomarker_type_and_init_backend(self, bio_type):
         self.biomarker_type = bio_type
         if bio_type == 'HFO':
@@ -106,6 +109,12 @@ def create_center_waveform_and_mini_plot(self):
                                                                         self.window.waveform_mini_widget,
                                                                         self.backend)
 
+        # part of “clear everything if exit”, optimize in the future
+        if self.signal_connected:
+            self.window.waveform_time_scroll_bar.valueChanged.disconnect(self.scroll_time_waveform_plot)
+            self.window.channel_scroll_bar.valueChanged.disconnect(self.scroll_channel_waveform_plot)
+            self.signal_connected = True
+
     def init_classifier_param(self):
         self.window.classifier_param = ParamClassifier()
         # self.classifier_save_button.clicked.connect(self.hfo_app.set_classifier())
@@ -525,6 +534,9 @@ def update_edf_info(self, results):
         # connect buttons
         self.window.waveform_time_scroll_bar.valueChanged.connect(self.scroll_time_waveform_plot)
         self.window.channel_scroll_bar.valueChanged.connect(self.scroll_channel_waveform_plot)
+
+        self.signal_connected = True
+
         self.window.waveform_plot_button.clicked.connect(self.waveform_plot_button_clicked)
         self.window.waveform_plot_button.setEnabled(True)
         self.window.Choose_Channels_Button.clicked.connect(self.open_channel_selection)
@@ -643,16 +655,22 @@ def filtering_complete(self):
         else:
             self.backend.set_unfiltered_60()
 
-        self.window.STE_save_button.setEnabled(True)
-        self.window.ste_detect_button.setEnabled(True)
-        self.window.MNI_save_button.setEnabled(True)
-        self.window.mni_detect_button.setEnabled(True)
-        self.window.HIL_save_button.setEnabled(True)
-        self.window.hil_detect_button.setEnabled(True)
-        self.window.is_data_filtered = True
-        self.window.show_filtered = True
-        self.window.waveform_plot.set_filtered(True)
-        self.window.save_npz_button.setEnabled(True)
+        if self.biomarker_type == 'HFO':
+            self.window.STE_save_button.setEnabled(True)
+            self.window.ste_detect_button.setEnabled(True)
+            self.window.MNI_save_button.setEnabled(True)
+            self.window.mni_detect_button.setEnabled(True)
+            self.window.HIL_save_button.setEnabled(True)
+            self.window.hil_detect_button.setEnabled(True)
+            self.window.is_data_filtered = True
+            self.window.show_filtered = True
+            self.window.waveform_plot.set_filtered(True)
+            self.window.save_npz_button.setEnabled(True)
+        elif self.biomarker_type == 'Spindle':
+            self.window.is_data_filtered = True
+            self.window.show_filtered = True
+            self.window.waveform_plot.set_filtered(True)
+            self.window.save_npz_button.setEnabled(True)
 
     def detect_HFOs(self):
         print("Detecting HFOs...")
@@ -936,9 +954,6 @@ def reinitialize(self):
         self.window.main_length.setText("")
         self.window.statistics_label.setText("")
 
-    def close_other_window(self):
-        self.window.close_signal.emit()
-
     def update_ste_params(self, ste_params):
         rms_window = str(ste_params["rms_window"])
         min_window = str(ste_params["min_window"])
@@ -1043,7 +1058,8 @@ def set_detector_param_display(self):
             self.update_hil_params(detector_params.detector_param.to_dict())
 
     def open_bipolar_channel_selection(self):
-        self.window.bipolar_channel_selection_window = BipolarChannelSelectionWindow(self.backend,
+        self.window.bipolar_channel_selection_window = BipolarChannelSelectionWindow(self,
+                                                                                     self.backend,
                                                                                      self.window,
                                                                                      self.window.close_signal,
                                                                                      self.window.waveform_plot)

src/models/mini_plot_model.py

@@ -45,7 +45,7 @@ def set_channel_indices_to_plot(self,channel_indices_to_plot:list):
         self.channels_to_plot = [self.channel_names[index] for index in channel_indices_to_plot]
 
     def update_channel_names(self, new_channel_names):
-        self.channel_names = new_channel_names
+        self.channel_names = list(new_channel_names)
 
     def get_all_biomarkers_for_channel(self, channel, t_start=0, t_end=sys.maxsize):
         return self.backend.event_features.get_biomarkers_for_channel(channel, t_start, t_end)

src/spindle_app.py

@@ -182,7 +182,11 @@ def filter_eeg_data(self, param_filter: ParamFilter = None):
         self.filter_data = np.array(self.filter_data)
         self.filter_data_un60 = self.filter_data.copy()
 
+        # Spindle frequency range do not have 60hz problem
         self.filter_data_60 = self.filter_60(self.filter_data)
+        if self.filter_data_60.size == 0:
+            self.filter_data_60 = self.filter_data.copy()
+
         self.filtered = True
 
     def has_filtered_data(self):
@@ -258,7 +262,10 @@ def detect_biomarker(self, param_filter: ParamFilter = None, param_detector: Par
                                            min_distance=param_detector.min_distance, thresh={'corr': param_detector.corr,
                                                                                              'rel_pow': param_detector.rel_pow,
                                                                                              'rms': param_detector.rms})
-        self.filter_data = sp._data_filt
+        if self.filter_data is None and sp is not None:
+            self.filter_data = sp._data_filt.copy()
+            self.filter_data_60 = sp._data_filt.copy()
+            self.filter_data_un60 = sp._data_filt.copy()
         self.event_features = SpindleFeature.construct(sp, self.param_detector.detector_type, self.sample_freq)
         self.detected = True
 

src/ui/bipolar_channel_selection.py

@@ -15,11 +15,12 @@
 
 
 class BipolarChannelSelectionWindow(QtWidgets.QDialog):
-    def __init__(self, backend=None, main_window=None, close_signal = None,waveform_plot = None):
+    def __init__(self, main_window_model=None, backend=None, main_window=None, close_signal = None,waveform_plot = None):
         # print(ROOT_DIR)
         super(BipolarChannelSelectionWindow, self).__init__()
         self.ui = uic.loadUi(os.path.join(ROOT_DIR, 'bipolar_channel_selection.ui'), self)
 
+        self.main_window_model = main_window_model
         self.backend = backend
         self.main_window = main_window
         self.setWindowTitle("Bipolar Channel Selection")
@@ -55,7 +56,7 @@ def check_channels(self):
                 #create bipolar channel and add to data, channel_name lists
                 self.backend.add_bipolar_channel(self.channel_1,self.channel_2)
                 self.waveform_plot.update_channel_names(self.backend.channel_names)
-                self.main_window.set_channels_to_plot(self.backend.channel_names, display_all=False)
+                self.main_window_model.set_channels_to_plot(self.backend.channel_names, display_all=False)
             self.close()
         else:
             msg = QMessageBox()

src/ui/channels_selection.py

@@ -19,11 +19,11 @@
 
 
 class ChannelSelectionWindow(QtWidgets.QDialog):
-    def __init__(self, backend=None, main_window=None, close_signal = None):
+    def __init__(self, backend=None, main_window_model=None, close_signal = None):
         super(ChannelSelectionWindow, self).__init__()
 
         self.backend = backend
-        self.main_window = main_window
+        self.main_window_model = main_window_model
         self.layout = QGridLayout()
         self.setWindowTitle("Channel Selection")
         self.setWindowIcon(QtGui.QIcon(os.path.join(ROOT_DIR, 'images/icon1.png')))
@@ -57,7 +57,7 @@ def __init__(self, backend=None, main_window=None, close_signal = None):
 
     def set_channels(self):
         eeg_data,channels = self.backend.get_eeg_data()
-        channels_indexes_to_plot = self.main_window.get_channel_indices_to_plot()
+        channels_indexes_to_plot = self.main_window_model.get_channel_indices_to_plot()
         self.channel_checkboxes = {}
         self.n_channels = len(channels)
         self.channels = channels
@@ -115,12 +115,12 @@ def get_channels_to_show(self):
             if self.scroll_layout.itemAtPosition(1+i//2,i%2).widget().isChecked():
                 channels_to_show.append(self.channels[i])
 
-        if self.main_window is not None:
-            self.main_window.set_channels_to_plot(channels_to_show)
+        if self.main_window_model is not None:
+            self.main_window_model.set_channels_to_plot(channels_to_show)
         # else:
         #     print("main window is none")
         #     print(channels_to_show)
-        self.main_window.channel_selection_update()
+        self.main_window_model.channel_selection_update()
         self.close()
 
 

src/ui/plot_waveform.py

@@ -21,6 +21,10 @@ def __init__(self, main_waveform_plot_widget: pg.PlotWidget, mini_plot_widget: p
         self.mini_plot_controller = MiniPlotController(mini_plot_widget, backend)
         self.main_waveform_plot_controller = MainWaveformPlotController(main_waveform_plot_widget, backend)
 
+        # clear everything if exit
+        self.main_waveform_plot_controller.clear()
+        self.mini_plot_controller.clear()
+
         self.time_window = 20 #20 second time window
         self.time_increment = 20
         # self.old_size = (self.waveform_display.x(),self.waveform_display.y(),self.waveform_display.width(),self.waveform_display.height())