diff --git a/config/imaging/f1.json b/config/imaging/f1.json new file mode 100644 index 0000000..b7c4b5f --- /dev/null +++ b/config/imaging/f1.json @@ -0,0 +1 @@ +{"t_end": 1499, "t_start": 0, "v2": 5900, "dct_center": 497, "dct_bandwidth": 739, "f_rows": 1502} \ No newline at end of file diff --git a/config/imaging/f2.json b/config/imaging/f2.json new file mode 100644 index 0000000..0b94281 --- /dev/null +++ b/config/imaging/f2.json @@ -0,0 +1 @@ +{"t_end": 4502, "t_start": 0, "v2": 1530, "dct_center": 580, "dct_bandwidth": 735, "f_rows": 4419} \ No newline at end of file diff --git a/flandre/nodes/Beamformer.py b/flandre/nodes/Beamformer.py index 661da40..95b02ee 100644 --- a/flandre/nodes/Beamformer.py +++ b/flandre/nodes/Beamformer.py @@ -33,14 +33,14 @@ class Beamformer(Node): if data is None: return d2 = (data - .crop(arg.t_start, arg.t_end) # .dct(80, 1500) .dct_center(arg.dct_center, arg.dct_bandwidth) .call(lambda m: m.astype(cp.int16)) .call(pwi) .call(cp.asarray, order='C') .argrelextrema() - .conv_guass(b=18 * 0.01) + .conv_guass(b=arg.beta * 0.01) + .crop(arg.t_start, arg.t_end) .rotate90() # .grey() .cpu() diff --git a/flandre/nodes/ImageQt.py b/flandre/nodes/ImageQt.py index 92ce0bb..7e5a0c4 100644 --- a/flandre/nodes/ImageQt.py +++ b/flandre/nodes/ImageQt.py @@ -52,10 +52,7 @@ class Adv(QMainWindow, Ui_MainWindow): self.zoom -= 0.1 def on_zmq_event(self, msg: QByteArray): - t0 = time.time() msg = Msg.decode_msg(msg.data()) - t1 = time.time() - print(t1 - t0) if isinstance(msg, KillMsg): if msg.name == '': self.close() @@ -63,7 +60,6 @@ class Adv(QMainWindow, Ui_MainWindow): w = msg.rfmat.w h = msg.rfmat.h d: RfMat = msg.rfmat - d2 = (d .pseudo_color(cond=not self.grey) .grey(cond=self.grey) diff --git a/flandre/nodes/MainUI.py b/flandre/nodes/MainUI.py index d431b06..3ae1282 100644 --- a/flandre/nodes/MainUI.py +++ b/flandre/nodes/MainUI.py @@ -456,6 +456,12 @@ class Adv(QMainWindow, Ui_MainWindow): if self.cb_bscan.sender() is None: self.p.send(SetWindowVisibleMsg('ui', 'bscan', v == 2)) + @pyqtSlot(int) + def on_s_beta_valueChanged(self, v): + if self.s_beta.sender() is None: + self.arg.beta = v + self.p.send(self.arg) + @pyqtSlot(int) def on_s_dct_center_valueChanged(self, v): if self.s_dct_center.sender() is None: diff --git a/flandre/pyqt/Main.py b/flandre/pyqt/Main.py index 204ec24..2970f4e 100644 --- a/flandre/pyqt/Main.py +++ b/flandre/pyqt/Main.py @@ -489,13 +489,16 @@ class Ui_MainWindow(object): self.spinBox.setObjectName("spinBox") self.gridLayout_5.addWidget(self.spinBox, 4, 2, 1, 1) spacerItem2 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) - self.gridLayout_5.addItem(spacerItem2, 9, 1, 1, 1) + self.gridLayout_5.addItem(spacerItem2, 10, 1, 1, 1) self.s_t_end = QJumpSlider(parent=self.centralwidget) self.s_t_end.setMinimum(1) self.s_t_end.setMaximum(1500) self.s_t_end.setOrientation(QtCore.Qt.Orientation.Horizontal) self.s_t_end.setObjectName("s_t_end") self.gridLayout_5.addWidget(self.s_t_end, 4, 1, 1, 1) + self.spinBox_7 = QtWidgets.QSpinBox(parent=self.centralwidget) + self.spinBox_7.setObjectName("spinBox_7") + self.gridLayout_5.addWidget(self.spinBox_7, 7, 2, 1, 1) self.label_5 = QtWidgets.QLabel(parent=self.centralwidget) self.label_5.setObjectName("label_5") self.gridLayout_5.addWidget(self.label_5, 4, 0, 1, 1) @@ -521,6 +524,15 @@ class Ui_MainWindow(object): self.spinBox_3 = QtWidgets.QSpinBox(parent=self.centralwidget) self.spinBox_3.setObjectName("spinBox_3") self.gridLayout_5.addWidget(self.spinBox_3, 6, 2, 1, 1) + self.spinBox_13 = QtWidgets.QSpinBox(parent=self.centralwidget) + self.spinBox_13.setObjectName("spinBox_13") + self.gridLayout_5.addWidget(self.spinBox_13, 8, 2, 1, 1) + self.s_f_rows = QtWidgets.QSlider(parent=self.centralwidget) + self.s_f_rows.setMinimum(500) + self.s_f_rows.setMaximum(7000) + self.s_f_rows.setOrientation(QtCore.Qt.Orientation.Horizontal) + self.s_f_rows.setObjectName("s_f_rows") + self.gridLayout_5.addWidget(self.s_f_rows, 8, 1, 1, 1) self.s_dct_bandwidth = QtWidgets.QSlider(parent=self.centralwidget) self.s_dct_bandwidth.setOrientation(QtCore.Qt.Orientation.Horizontal) self.s_dct_bandwidth.setObjectName("s_dct_bandwidth") @@ -544,21 +556,22 @@ class Ui_MainWindow(object): self.label_2.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.label_2.setObjectName("label_2") self.gridLayout_5.addWidget(self.label_2, 0, 0, 1, 3) - self.s_f_rows = QtWidgets.QSlider(parent=self.centralwidget) - self.s_f_rows.setMinimum(500) - self.s_f_rows.setMaximum(7000) - self.s_f_rows.setOrientation(QtCore.Qt.Orientation.Horizontal) - self.s_f_rows.setObjectName("s_f_rows") - self.gridLayout_5.addWidget(self.s_f_rows, 8, 1, 1, 1) self.spinBox_12 = QtWidgets.QSpinBox(parent=self.centralwidget) self.spinBox_12.setObjectName("spinBox_12") self.gridLayout_5.addWidget(self.spinBox_12, 3, 2, 1, 1) - self.spinBox_7 = QtWidgets.QSpinBox(parent=self.centralwidget) - self.spinBox_7.setObjectName("spinBox_7") - self.gridLayout_5.addWidget(self.spinBox_7, 7, 2, 1, 1) - self.spinBox_13 = QtWidgets.QSpinBox(parent=self.centralwidget) - self.spinBox_13.setObjectName("spinBox_13") - self.gridLayout_5.addWidget(self.spinBox_13, 8, 2, 1, 1) + self.s_beta = QtWidgets.QSlider(parent=self.centralwidget) + self.s_beta.setMinimum(1) + self.s_beta.setMaximum(30) + self.s_beta.setProperty("value", 10) + self.s_beta.setOrientation(QtCore.Qt.Orientation.Horizontal) + self.s_beta.setObjectName("s_beta") + self.gridLayout_5.addWidget(self.s_beta, 9, 1, 1, 1) + self.label_35 = QtWidgets.QLabel(parent=self.centralwidget) + self.label_35.setObjectName("label_35") + self.gridLayout_5.addWidget(self.label_35, 9, 0, 1, 1) + self.spinBox_14 = QtWidgets.QSpinBox(parent=self.centralwidget) + self.spinBox_14.setObjectName("spinBox_14") + self.gridLayout_5.addWidget(self.spinBox_14, 9, 2, 1, 1) self.gridLayout.addLayout(self.gridLayout_5, 3, 0, 1, 1) self.gridLayout.setRowStretch(0, 1) MainWindow.setCentralWidget(self.centralwidget) @@ -640,4 +653,5 @@ class Ui_MainWindow(object): self.b_new_imaging_config.setText(_translate("MainWindow", "New")) self.label_6.setText(_translate("MainWindow", "v2")) self.label_2.setText(_translate("MainWindow", "Imaging")) + self.label_35.setText(_translate("MainWindow", "beta")) from flandre.pyqt.QJumpSlider import QJumpSlider diff --git a/flandre/pyqt/Main.ui b/flandre/pyqt/Main.ui index d70ae94..c2ea02d 100644 --- a/flandre/pyqt/Main.ui +++ b/flandre/pyqt/Main.ui @@ -912,7 +912,7 @@ border-radius: 7px; - + Qt::Orientation::Vertical @@ -938,6 +938,9 @@ border-radius: 7px; + + + @@ -979,6 +982,22 @@ border-radius: 7px; + + + + + + + 500 + + + 7000 + + + Qt::Orientation::Horizontal + + + @@ -1025,27 +1044,34 @@ border-radius: 7px; - - + + + + + - 500 + 1 - 7000 + 30 + + + 10 Qt::Orientation::Horizontal - - + + + + beta + + - - - - - + + diff --git a/flandre/utils/Msg.py b/flandre/utils/Msg.py index eaf737f..cecd9fa 100644 --- a/flandre/utils/Msg.py +++ b/flandre/utils/Msg.py @@ -246,6 +246,7 @@ class ImageArgMsg(Msg): dct_center: int = 0 dct_bandwidth: int = 0 f_rows: int = 0 + beta: int = 10 @staticmethod def from_path(p: Path):