diff --git a/src/asammdf/gui/ui/define_channel_dialog.py b/src/asammdf/gui/ui/define_channel_dialog.py index 3a171824e..72f8370dd 100644 --- a/src/asammdf/gui/ui/define_channel_dialog.py +++ b/src/asammdf/gui/ui/define_channel_dialog.py @@ -114,7 +114,7 @@ def setupUi(self, ComputedChannel): self.label_8 = QLabel(ComputedChannel) self.label_8.setObjectName(u"label_8") - self.label_8.setAlignment(Qt.AlignLeading|Qt.AlignLeft|Qt.AlignTop) + self.label_8.setAlignment(Qt.AlignmentFlag.AlignLeading|Qt.AlignmentFlag.AlignLeft|Qt.AlignmentFlag.AlignTop) self.gridLayout.addWidget(self.label_8, 5, 0, 1, 1) @@ -145,12 +145,12 @@ def setupUi(self, ComputedChannel): self.verticalLayout.setContentsMargins(1, 1, 1, 1) self.scrollArea = QScrollArea(self.groupBox) self.scrollArea.setObjectName(u"scrollArea") - self.scrollArea.setFrameShape(QFrame.NoFrame) + self.scrollArea.setFrameShape(QFrame.Shape.NoFrame) self.scrollArea.setLineWidth(0) self.scrollArea.setWidgetResizable(True) self.args_widget = QWidget() self.args_widget.setObjectName(u"args_widget") - self.args_widget.setGeometry(QRect(0, 0, 713, 69)) + self.args_widget.setGeometry(QRect(0, 0, 717, 71)) self.arg_layout = QGridLayout(self.args_widget) self.arg_layout.setSpacing(1) self.arg_layout.setObjectName(u"arg_layout") @@ -193,33 +193,39 @@ def setupUi(self, ComputedChannel): self.groupBox_2 = QGroupBox(ComputedChannel) self.groupBox_2.setObjectName(u"groupBox_2") self.gridLayout_2 = QGridLayout(self.groupBox_2) + self.gridLayout_2.setSpacing(1) self.gridLayout_2.setObjectName(u"gridLayout_2") - self.gridLayout_2.setHorizontalSpacing(1) - self.gridLayout_2.setVerticalSpacing(1) self.gridLayout_2.setContentsMargins(1, 1, 1, 1) - self.sample_by_sample = QRadioButton(self.groupBox_2) - self.sample_by_sample.setObjectName(u"sample_by_sample") - self.sample_by_sample.setChecked(True) + self.complete_signal = QRadioButton(self.groupBox_2) + self.complete_signal.setObjectName(u"complete_signal") + self.complete_signal.setChecked(False) - self.gridLayout_2.addWidget(self.sample_by_sample, 0, 0, 1, 1) + self.gridLayout_2.addWidget(self.complete_signal, 2, 0, 1, 1) + + self.label_25 = QLabel(self.groupBox_2) + self.label_25.setObjectName(u"label_25") + + self.gridLayout_2.addWidget(self.label_25, 2, 1, 1, 1) self.label_24 = QLabel(self.groupBox_2) self.label_24.setObjectName(u"label_24") - self.label_24.setTextFormat(Qt.RichText) + self.label_24.setTextFormat(Qt.TextFormat.RichText) self.label_24.setWordWrap(False) self.gridLayout_2.addWidget(self.label_24, 0, 1, 1, 1) - self.complete_signal = QRadioButton(self.groupBox_2) - self.complete_signal.setObjectName(u"complete_signal") - self.complete_signal.setChecked(False) + self.sample_by_sample = QRadioButton(self.groupBox_2) + self.sample_by_sample.setObjectName(u"sample_by_sample") + self.sample_by_sample.setChecked(True) - self.gridLayout_2.addWidget(self.complete_signal, 1, 0, 1, 1) + self.gridLayout_2.addWidget(self.sample_by_sample, 0, 0, 1, 1) - self.label_25 = QLabel(self.groupBox_2) - self.label_25.setObjectName(u"label_25") + self.line = QFrame(self.groupBox_2) + self.line.setObjectName(u"line") + self.line.setFrameShape(QFrame.Shape.HLine) + self.line.setFrameShadow(QFrame.Shadow.Sunken) - self.gridLayout_2.addWidget(self.label_25, 1, 1, 1, 1) + self.gridLayout_2.addWidget(self.line, 1, 1, 1, 1) self.gridLayout_2.setColumnStretch(1, 1) @@ -269,16 +275,6 @@ def retranslateUi(self, ComputedChannel): self.label_9.setText(QCoreApplication.translate("ComputedChannel", u"Name", None)) self.label.setText(QCoreApplication.translate("ComputedChannel", u"Arguments:", None)) self.groupBox_2.setTitle(QCoreApplication.translate("ComputedChannel", u"Computation mode", None)) - self.sample_by_sample.setText(QCoreApplication.translate("ComputedChannel", u"sample by sample", None)) - self.label_24.setText(QCoreApplication.translate("ComputedChannel", u"\n" -"\n" -"", None)) self.complete_signal.setText(QCoreApplication.translate("ComputedChannel", u"complete signal", None)) self.label_25.setText(QCoreApplication.translate("ComputedChannel", u"\n" "\n" +"", None)) + self.sample_by_sample.setText(QCoreApplication.translate("ComputedChannel", u"sample by sample", None)) # retranslateUi + diff --git a/src/asammdf/gui/ui/define_channel_dialog.ui b/src/asammdf/gui/ui/define_channel_dialog.ui index 85aa31e02..5aa8cac7b 100644 --- a/src/asammdf/gui/ui/define_channel_dialog.ui +++ b/src/asammdf/gui/ui/define_channel_dialog.ui @@ -28,20 +28,20 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -59,24 +59,24 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - Qt::Horizontal + Qt::Orientation::Horizontal @@ -152,7 +152,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -182,7 +182,7 @@ Computed channel comment - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop @@ -216,7 +216,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -233,24 +233,24 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - QFrame::NoFrame + QFrame::Shape::NoFrame 0 @@ -263,26 +263,26 @@ 0 0 - 713 - 69 + 717 + 71 - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -297,7 +297,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -344,30 +344,41 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - - - 1 - - - 1 - - - + 1 + + + 1 + + + - sample by sample + complete signal - true + false + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><meta charset="utf-8" /><style type="text/css"> +p, li { white-space: pre-wrap; } +hr { height: 1px; border-width: 0; } +</style></head><body style=" font-family:'Segoe UI'; font-size:9pt; font-weight:400; font-style:normal;"> +<ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'MS Shell Dlg 2'; font-size:8pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">the function will be called only once</li> +<li style=" font-family:'MS Shell Dlg 2'; font-size:8pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">each argument will receive the complete signal ndarray</li></ul> +<ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'MS Shell Dlg 2'; font-size:8pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">the<span style=" font-style:italic;"> </span><span style=" font-weight:700; font-style:italic;">t</span><span style=" font-style:italic;"> </span>argument will receive the complete time base ndarray</li></ul></body></html> @@ -384,34 +395,27 @@ hr { height: 1px; border-width: 0; } <li style=" font-family:'MS Shell Dlg 2'; font-size:8pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">the<span style=" font-weight:700; font-style:italic;"> t</span> argument will receive the current time stamp value</li></ul></body></html> - Qt::RichText + Qt::TextFormat::RichText false - - + + - complete signal + sample by sample - false + true - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><meta charset="utf-8" /><style type="text/css"> -p, li { white-space: pre-wrap; } -hr { height: 1px; border-width: 0; } -</style></head><body style=" font-family:'Segoe UI'; font-size:9pt; font-weight:400; font-style:normal;"> -<ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'MS Shell Dlg 2'; font-size:8pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">the function will be called only once</li> -<li style=" font-family:'MS Shell Dlg 2'; font-size:8pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">each argument will receive the complete signal ndarray</li></ul> -<ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'MS Shell Dlg 2'; font-size:8pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">the<span style=" font-style:italic;"> </span><span style=" font-weight:700; font-style:italic;">t</span><span style=" font-style:italic;"> </span>argument will receive the complete time base ndarray</li></ul></body></html> + + + Qt::Orientation::Horizontal diff --git a/src/asammdf/gui/widgets/functions_manager.py b/src/asammdf/gui/widgets/functions_manager.py index b28f4b906..e9d3b406b 100644 --- a/src/asammdf/gui/widgets/functions_manager.py +++ b/src/asammdf/gui/widgets/functions_manager.py @@ -137,7 +137,6 @@ def add_definition(self): } self.functions_list.clear() - self.functions_list.addItem("GLOBALS") names = natsorted(self.definitions) self.functions_list.addItems(names)