From f8f6ef2efed99065a256ae60e88ad79999e568b7 Mon Sep 17 00:00:00 2001 From: tillraab Date: Tue, 1 Oct 2019 15:42:27 +0200 Subject: [PATCH] bf and cfg atdaptation --- electrode_check.py | 4 +- rasp_grid.py | 6 +-- rasp_grid_cfg.py | 115 ++++++++++++++++++++++++--------------------- 3 files changed, 66 insertions(+), 59 deletions(-) diff --git a/electrode_check.py b/electrode_check.py index 62f88e0..9d743df 100644 --- a/electrode_check.py +++ b/electrode_check.py @@ -362,7 +362,7 @@ def main(): ylim = (yspan[0] - np.abs(np.diff(yspan)) * 0.2, yspan[1] + np.abs(np.diff(yspan)) * 0.2) for ch in channel_array: - h, = Plot.axs[ch].plot(np.arange(250)[:len(channel_data[ch])] / rate, channel_data[ch], color='k') + h, = Plot.axs[ch].plot(np.arange(250)[:len(channel_data[ch])] / rate, channel_data[ch] / 1000, color='k') Plot.axs[ch].set_ylim(ylim) Plot.channel_handle.append(h) @@ -373,7 +373,7 @@ def main(): yspan = [np.min(channel_data[power_channel]), np.max(channel_data[power_channel])] ylim = [yspan[0] - np.abs(np.diff(yspan)) * 0.2, yspan[1] + np.abs(np.diff(yspan)) * 0.2] for ch in channel_array: - Plot.channel_handle[ch].set_data(np.arange(250)[:len(channel_data[ch])] / rate, channel_data[ch]) + Plot.channel_handle[ch].set_data(np.arange(250)[:len(channel_data[ch])] / rate, channel_data[ch] / 1000) Plot.axs[ch].set_ylim(ylim) Plot.fig.canvas.draw() diff --git a/rasp_grid.py b/rasp_grid.py index feea2c4..69d7f9a 100644 --- a/rasp_grid.py +++ b/rasp_grid.py @@ -382,14 +382,14 @@ def main(): index = transfer_status.current_index if (last_idx > index) and (index != -1): - np.array(data[last_idx:], dtype=np.float32).tofile(f) - np.array(data[:index], dtype=np.float32).tofile(f) + (np.array(data[last_idx:], dtype=np.float32) / 1000).tofile(f) + (np.array(data[:index], dtype=np.float32) / 1000).tofile(f) f.flush() if index == -1: pass else: - np.array(data[last_idx:index], dtype=np.float32).tofile(f) + (np.array(data[last_idx:index], dtype=np.float32) / 1000).tofile(f) if index == -1: last_idx= len(data) diff --git a/rasp_grid_cfg.py b/rasp_grid_cfg.py index 5949af9..39361f3 100644 --- a/rasp_grid_cfg.py +++ b/rasp_grid_cfg.py @@ -10,7 +10,7 @@ from PyQt5.QtCore import * class Grid_tab(QWidget): def __init__(self): super().__init__() - + self.gird_no_val = 1 self.columns_val = 8 self.rows_val = 8 self.col_dist_val = 50 @@ -32,40 +32,45 @@ class Grid_tab(QWidget): self.setLayout(self.gridlayout) def get_widgets(self): + grid_noL = QLabel('Grid no:', self) + self.grid_no = QLineEdit(str(self.gird_no_val), self) + self.gridlayout.addWidget(grid_noL, 0, 0) + self.gridlayout.addWidget(self.grid_no, 0, 1) + col_elecsU =QLabel('n', self) col_elecsL =QLabel('Electrod Columns:', self) self.col_elecs = QLineEdit(str(self.columns_val), self) - self.gridlayout.addWidget(col_elecsL, 0, 0) - self.gridlayout.addWidget(self.col_elecs, 0, 1) - self.gridlayout.addWidget(col_elecsU, 0, 2) + self.gridlayout.addWidget(col_elecsL, 1, 0) + self.gridlayout.addWidget(self.col_elecs, 1, 1) + self.gridlayout.addWidget(col_elecsU, 1, 2) row_elecsU = QLabel('n', self) row_elecsL = QLabel('Electrod Rows:', self) self.row_elecs = QLineEdit(str(self.rows_val), self) - self.gridlayout.addWidget(row_elecsL, 1, 0) - self.gridlayout.addWidget(self.row_elecs, 1, 1) - self.gridlayout.addWidget(row_elecsU, 1, 2) + self.gridlayout.addWidget(row_elecsL, 2, 0) + self.gridlayout.addWidget(self.row_elecs, 2, 1) + self.gridlayout.addWidget(row_elecsU, 2, 2) col_spaceU = QLabel('cm', self) col_spaceL = QLabel('Column spacing:', self) self.col_space = QLineEdit(str(self.col_dist_val), self) - self.gridlayout.addWidget(col_spaceL, 2, 0) - self.gridlayout.addWidget(self.col_space, 2, 1) - self.gridlayout.addWidget(col_spaceU, 2, 2) + self.gridlayout.addWidget(col_spaceL, 3, 0) + self.gridlayout.addWidget(self.col_space, 3, 1) + self.gridlayout.addWidget(col_spaceU, 3, 2) row_spaceU = QLabel('cm', self) row_spaceL = QLabel('Row spacing:', self) self.row_space = QLineEdit(str(self.row_dist_val), self) - self.gridlayout.addWidget(row_spaceL, 3, 0) - self.gridlayout.addWidget(self.row_space, 3, 1) - self.gridlayout.addWidget(row_spaceU, 3, 2) + self.gridlayout.addWidget(row_spaceL, 4, 0) + self.gridlayout.addWidget(self.row_space, 4, 1) + self.gridlayout.addWidget(row_spaceU, 4, 2) - channel_offsetU = QLabel('n', self) - channel_offsetL = QLabel('Channel offset:', self) - self.channel_offset = QLineEdit(str(self.channel_offset_val), self) - self.gridlayout.addWidget(channel_offsetL, 4, 0) - self.gridlayout.addWidget(self.channel_offset, 4, 1) - self.gridlayout.addWidget(channel_offsetU, 4, 2) + # channel_offsetU = QLabel('n', self) + # channel_offsetL = QLabel('Channel offset:', self) + # self.channel_offset = QLineEdit(str(self.channel_offset_val), self) + # self.gridlayout.addWidget(channel_offsetL, 4, 0) + # self.gridlayout.addWidget(self.channel_offset, 4, 1) + # self.gridlayout.addWidget(channel_offsetU, 4, 2) elec_typeL = QLabel('Electrode Type:', self) self.elec_type = QLineEdit(self.elec_type_val, self) @@ -99,7 +104,7 @@ class Grid_tab(QWidget): self.gridlayout.addWidget(water_depthU, 9, 2) space = QLabel('', self) - self.gridlayout.addWidget(space, 10, 0) + self.gridlayout.addWidget(space, 9, 0) class Hardware_settings_tab(QWidget): def __init__(self): @@ -271,29 +276,29 @@ class Recording_settings(QWidget): self.gridlayout.addWidget(experimenterL, 10, 0) self.gridlayout.addWidget(self.experimenter, 10, 1) - DataTimeU = QLabel('ms', self) - DataTimeL = QLabel('Data Time:', self) - self.datatime = QLineEdit(str(self.datatime_val), self) - self.gridlayout.addWidget(DataTimeL, 11, 0) - self.gridlayout.addWidget(self.datatime, 11, 1) - self.gridlayout.addWidget(DataTimeU, 11, 2) - - DataIntervalU = QLabel('ms', self) - DataIntervalL = QLabel('Data Interval:', self) - self.datainterval = QLineEdit(str(self.datainterval_val), self) - self.gridlayout.addWidget(DataIntervalL, 12, 0) - self.gridlayout.addWidget(self.datainterval, 12, 1) - self.gridlayout.addWidget(DataIntervalU, 12, 2) - - BufferTimeU = QLabel('s', self) - BufferTimeL = QLabel('Buffer Time:', self) - self.buffertime = QLineEdit(str(self.buffertime_val), self) - self.gridlayout.addWidget(BufferTimeL, 13, 0) - self.gridlayout.addWidget(self.buffertime, 13, 1) - self.gridlayout.addWidget(BufferTimeU, 13, 2) + # DataTimeU = QLabel('ms', self) + # DataTimeL = QLabel('Data Time:', self) + # self.datatime = QLineEdit(str(self.datatime_val), self) + # self.gridlayout.addWidget(DataTimeL, 11, 0) + # self.gridlayout.addWidget(self.datatime, 11, 1) + # self.gridlayout.addWidget(DataTimeU, 11, 2) + # + # DataIntervalU = QLabel('ms', self) + # DataIntervalL = QLabel('Data Interval:', self) + # self.datainterval = QLineEdit(str(self.datainterval_val), self) + # self.gridlayout.addWidget(DataIntervalL, 12, 0) + # self.gridlayout.addWidget(self.datainterval, 12, 1) + # self.gridlayout.addWidget(DataIntervalU, 12, 2) + # + # BufferTimeU = QLabel('s', self) + # BufferTimeL = QLabel('Buffer Time:', self) + # self.buffertime = QLineEdit(str(self.buffertime_val), self) + # self.gridlayout.addWidget(BufferTimeL, 13, 0) + # self.gridlayout.addWidget(self.buffertime, 13, 1) + # self.gridlayout.addWidget(BufferTimeU, 13, 2) space = QLabel('', self) - self.gridlayout.addWidget(space, 14, 0) + self.gridlayout.addWidget(space, 11, 0) class MainWindow(QTabWidget): @@ -346,6 +351,7 @@ class MainWindow(QTabWidget): self.show() def init_vars(self): + self.Grid.grid_no_val = 1 self.Grid.columns_val = 8 self.Grid.rows_val = 8 self.Grid.col_dist_val = 50 @@ -377,9 +383,9 @@ class MainWindow(QTabWidget): self.Recording.water_oxy_val = 0 self.Recording.comment_val = '~' self.Recording.experimenter_val = 'T. Raab et al. :)' - self.Recording.datatime_val = 100 - self.Recording.datainterval_val = 1000 - self.Recording.buffertime_val = 60 + # self.Recording.datatime_val = 100 + # self.Recording.datainterval_val = 1000 + # self.Recording.buffertime_val = 60 def closeMe(self): quit() @@ -389,8 +395,9 @@ class MainWindow(QTabWidget): cfg = f.readlines() for line in cfg: - - if 'Columns1' in line: + if 'Gridno' in line: + self.Grid.grid_no_val = int(line.split(':')[1].strip()) + elif 'Columns1' in line: self.Grid.columns_val = int(line.split(':')[1].strip()) elif 'Rows1' in line: self.Grid.rows_val = int(line.split(':')[1].strip()) @@ -398,8 +405,8 @@ class MainWindow(QTabWidget): self.Grid.col_dist_val = float(line.split(':')[-1].strip().replace('cm', '')) elif "RowDistance1" in line: self.Grid.row_dist_val = float(line.split(':')[-1].strip().replace('cm', '')) - elif "ChannelOffset1" in line: - self.Grid.channel_offset_val = int(line.split(':')[-1].strip()) + # elif "ChannelOffset1" in line: + # self.Grid.channel_offset_val = int(line.split(':')[-1].strip()) elif "ElectrodeType1" in line: self.Grid.elec_type_val = line.split(':')[-1].strip() elif "RefElectrodeType1" in line: @@ -450,12 +457,12 @@ class MainWindow(QTabWidget): self.Recording.comment_val = ':'.join(line.split(':')[1:]).strip() elif "Experimenter" in line: self.Recording.experimenter_val = ':'.join(line.split(':')[1:]).strip() - elif "DataTime" in line: - self.Recording.datatime_val = int(line.split(':')[-1].strip().replace('ms', '')) - elif "DataInterval" in line: - self.Recording.datainterval_val = int(line.split(':')[-1].strip().replace('ms', '')) - elif "BufferTime" in line: - self.Recording.buffertime_val = int(line.split(':')[-1].strip().replace('s', '')) + # elif "DataTime" in line: + # self.Recording.datatime_val = int(line.split(':')[-1].strip().replace('ms', '')) + # elif "DataInterval" in line: + # self.Recording.datainterval_val = int(line.split(':')[-1].strip().replace('ms', '')) + # elif "BufferTime" in line: + # self.Recording.buffertime_val = int(line.split(':')[-1].strip().replace('s', '')) else: continue