diff --git a/src/asammdf/gui/ui/batch_widget.py b/src/asammdf/gui/ui/batch_widget.py index a041f21fe..b618341c3 100644 --- a/src/asammdf/gui/ui/batch_widget.py +++ b/src/asammdf/gui/ui/batch_widget.py @@ -137,7 +137,7 @@ def setupUi(self, batch_widget): self.scrollArea_3.setWidgetResizable(True) self.scrollAreaWidgetContents_3 = QWidget() self.scrollAreaWidgetContents_3.setObjectName(u"scrollAreaWidgetContents_3") - self.scrollAreaWidgetContents_3.setGeometry(QRect(0, 0, 832, 698)) + self.scrollAreaWidgetContents_3.setGeometry(QRect(0, 0, 840, 706)) self.horizontalLayout_2 = QHBoxLayout(self.scrollAreaWidgetContents_3) self.horizontalLayout_2.setSpacing(1) self.horizontalLayout_2.setObjectName(u"horizontalLayout_2") @@ -328,12 +328,6 @@ def setupUi(self, batch_widget): self.verticalLayout_21.setObjectName(u"verticalLayout_21") self.verticalLayout_21.setContentsMargins(1, 1, 1, 1) self.output_format = QComboBox(self.groupBox_11) - self.output_format.addItem("") - self.output_format.addItem("") - self.output_format.addItem("") - self.output_format.addItem("") - self.output_format.addItem("") - self.output_format.addItem("") self.output_format.setObjectName(u"output_format") self.verticalLayout_21.addWidget(self.output_format) @@ -851,7 +845,7 @@ def setupUi(self, batch_widget): self.scrollArea.setWidgetResizable(True) self.scrollAreaWidgetContents = QWidget() self.scrollAreaWidgetContents.setObjectName(u"scrollAreaWidgetContents") - self.scrollAreaWidgetContents.setGeometry(QRect(0, 0, 832, 698)) + self.scrollAreaWidgetContents.setGeometry(QRect(0, 0, 840, 706)) self.gridLayout_3 = QGridLayout(self.scrollAreaWidgetContents) self.gridLayout_3.setSpacing(1) self.gridLayout_3.setObjectName(u"gridLayout_3") @@ -1153,7 +1147,7 @@ def setupUi(self, batch_widget): self.retranslateUi(batch_widget) self.aspects.setCurrentIndex(0) - self.output_options.setCurrentIndex(0) + self.output_options.setCurrentIndex(3) self.quoting.setCurrentIndex(1) self.quoting_bus.setCurrentIndex(1) self.tabWidget.setCurrentIndex(0) @@ -1216,13 +1210,6 @@ def retranslateUi(self, batch_widget): self.raster_search_btn.setText("") self.resample_time_from_zero.setText(QCoreApplication.translate("batch_widget", u"Time from 0s", None)) self.groupBox_11.setTitle(QCoreApplication.translate("batch_widget", u"Ouput format", None)) - self.output_format.setItemText(0, QCoreApplication.translate("batch_widget", u"MDF", None)) - self.output_format.setItemText(1, QCoreApplication.translate("batch_widget", u"ASC", None)) - self.output_format.setItemText(2, QCoreApplication.translate("batch_widget", u"CSV", None)) - self.output_format.setItemText(3, QCoreApplication.translate("batch_widget", u"HDF5", None)) - self.output_format.setItemText(4, QCoreApplication.translate("batch_widget", u"MAT", None)) - self.output_format.setItemText(5, QCoreApplication.translate("batch_widget", u"Parquet", None)) - self.mdf_split.setText(QCoreApplication.translate("batch_widget", u"Split data blocks", None)) self.label_39.setText(QCoreApplication.translate("batch_widget", u"Compression", None)) self.label_40.setText(QCoreApplication.translate("batch_widget", u"Version", None)) diff --git a/src/asammdf/gui/ui/batch_widget.ui b/src/asammdf/gui/ui/batch_widget.ui index b354bb929..5cb859d91 100644 --- a/src/asammdf/gui/ui/batch_widget.ui +++ b/src/asammdf/gui/ui/batch_widget.ui @@ -15,20 +15,20 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -54,20 +54,20 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -188,20 +188,20 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -212,31 +212,31 @@ 0 0 - 832 - 698 + 840 + 706 - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -271,8 +271,8 @@ - 1 - + 1 + @@ -349,8 +349,8 @@ - 1 - + 1 + @@ -376,20 +376,20 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -403,20 +403,20 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -487,20 +487,20 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -581,76 +581,45 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - - - - MDF - - - - - ASC - - - - - CSV - - - - - HDF5 - - - - - MAT - - - - - Parquet - - - + - 0 + 3 - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -715,20 +684,20 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -787,20 +756,20 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -888,20 +857,20 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -1009,20 +978,20 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -1212,20 +1181,20 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -1292,20 +1261,20 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -1423,20 +1392,20 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -1447,26 +1416,26 @@ 0 0 - 832 - 698 + 840 + 706 - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -1474,20 +1443,20 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -1697,20 +1666,20 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -1733,20 +1702,20 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -1768,8 +1737,8 @@ - 1 - + 1 + @@ -1809,20 +1778,20 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -1891,16 +1860,16 @@ - 1 - + 1 + - 1 - + 1 + diff --git a/src/asammdf/gui/ui/file_widget.py b/src/asammdf/gui/ui/file_widget.py index 5b2533375..798b67f50 100644 --- a/src/asammdf/gui/ui/file_widget.py +++ b/src/asammdf/gui/ui/file_widget.py @@ -244,7 +244,7 @@ def setupUi(self, file_widget): self.scrollArea.setWidgetResizable(True) self.scrollAreaWidgetContents = QWidget() self.scrollAreaWidgetContents.setObjectName(u"scrollAreaWidgetContents") - self.scrollAreaWidgetContents.setGeometry(QRect(0, 0, 310, 626)) + self.scrollAreaWidgetContents.setGeometry(QRect(0, 0, 331, 610)) self.verticalLayout_4 = QVBoxLayout(self.scrollAreaWidgetContents) self.verticalLayout_4.setSpacing(1) self.verticalLayout_4.setObjectName(u"verticalLayout_4") @@ -361,12 +361,6 @@ def setupUi(self, file_widget): self.verticalLayout_20.setObjectName(u"verticalLayout_20") self.verticalLayout_20.setContentsMargins(1, 1, 1, 1) self.output_format = QComboBox(self.groupBox_10) - self.output_format.addItem("") - self.output_format.addItem("") - self.output_format.addItem("") - self.output_format.addItem("") - self.output_format.addItem("") - self.output_format.addItem("") self.output_format.setObjectName(u"output_format") self.verticalLayout_20.addWidget(self.output_format) @@ -767,7 +761,7 @@ def setupUi(self, file_widget): self.scrollArea_2.setWidgetResizable(True) self.scrollAreaWidgetContents_2 = QWidget() self.scrollAreaWidgetContents_2.setObjectName(u"scrollAreaWidgetContents_2") - self.scrollAreaWidgetContents_2.setGeometry(QRect(0, 0, 991, 602)) + self.scrollAreaWidgetContents_2.setGeometry(QRect(0, 0, 999, 610)) self.gridLayout_7 = QGridLayout(self.scrollAreaWidgetContents_2) self.gridLayout_7.setSpacing(1) self.gridLayout_7.setObjectName(u"gridLayout_7") @@ -1073,7 +1067,7 @@ def setupUi(self, file_widget): self.retranslateUi(file_widget) self.aspects.setCurrentIndex(0) - self.output_options.setCurrentIndex(4) + self.output_options.setCurrentIndex(3) self.quoting.setCurrentIndex(1) self.quoting_bus.setCurrentIndex(1) self.tabWidget.setCurrentIndex(0) @@ -1172,13 +1166,6 @@ def retranslateUi(self, file_widget): self.raster_search_btn.setText("") self.resample_time_from_zero.setText(QCoreApplication.translate("file_widget", u"Time from 0s", None)) self.groupBox_10.setTitle(QCoreApplication.translate("file_widget", u"Ouput format", None)) - self.output_format.setItemText(0, QCoreApplication.translate("file_widget", u"MDF", None)) - self.output_format.setItemText(1, QCoreApplication.translate("file_widget", u"ASC", None)) - self.output_format.setItemText(2, QCoreApplication.translate("file_widget", u"CSV", None)) - self.output_format.setItemText(3, QCoreApplication.translate("file_widget", u"HDF5", None)) - self.output_format.setItemText(4, QCoreApplication.translate("file_widget", u"MAT", None)) - self.output_format.setItemText(5, QCoreApplication.translate("file_widget", u"Parquet", None)) - self.mdf_split_size.setSuffix(QCoreApplication.translate("file_widget", u"MB", None)) self.label_29.setText(QCoreApplication.translate("file_widget", u"Compression", None)) self.label_27.setText(QCoreApplication.translate("file_widget", u"Version", None)) diff --git a/src/asammdf/gui/ui/file_widget.ui b/src/asammdf/gui/ui/file_widget.ui index 4028e48f2..5b997d25a 100644 --- a/src/asammdf/gui/ui/file_widget.ui +++ b/src/asammdf/gui/ui/file_widget.ui @@ -27,20 +27,20 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -65,20 +65,20 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -87,8 +87,8 @@ - 1 - + 1 + @@ -123,8 +123,8 @@ - 1 - + 1 + @@ -300,25 +300,25 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -353,8 +353,8 @@ - 1 - + 1 + @@ -431,8 +431,8 @@ - 1 - + 1 + @@ -465,31 +465,31 @@ 0 0 - 310 - 626 + 331 + 610 - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -503,20 +503,20 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -593,20 +593,20 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -693,76 +693,45 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - - - - MDF - - - - - ASC - - - - - CSV - - - - - HDF5 - - - - - MAT - - - - - Parquet - - - + - 4 + 3 - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -804,20 +773,20 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -887,20 +856,20 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -988,20 +957,20 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -1109,20 +1078,20 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -1347,20 +1316,20 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -1371,26 +1340,26 @@ 0 0 - 991 - 602 + 999 + 610 - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -1398,20 +1367,20 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -1617,20 +1586,20 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -1711,20 +1680,20 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -1760,20 +1729,20 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -1808,8 +1777,8 @@ - 1 - + 1 + @@ -1858,20 +1827,20 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + @@ -1901,20 +1870,20 @@ - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + - 1 - + 1 + diff --git a/src/asammdf/gui/widgets/batch.py b/src/asammdf/gui/widgets/batch.py index 3d37c78d7..295863bd5 100644 --- a/src/asammdf/gui/widgets/batch.py +++ b/src/asammdf/gui/widgets/batch.py @@ -1686,19 +1686,19 @@ def change_modify_output_folder(self, event=None): def output_format_changed(self, name): if name == "MDF": - self.output_options.setCurrentIndex(0) + self.output_options.setCurrentWidget(self.MDF_2) elif name == "MAT": - self.output_options.setCurrentIndex(2) + self.output_options.setCurrentWidget(self.MAT_2) self.export_compression_mat.clear() self.export_compression_mat.addItems(["enabled", "disabled"]) self.export_compression_mat.setCurrentIndex(0) elif name == "CSV": - self.output_options.setCurrentIndex(3) + self.output_options.setCurrentWidget(self.CSV) elif name == "ASC": - self.output_options.setCurrentIndex(4) + self.output_options.setCurrentWidget(self.page) else: - self.output_options.setCurrentIndex(1) + self.output_options.setCurrentWidget(self.HDF5_2) if name == "Parquet": self.export_compression.setEnabled(True) self.export_compression.clear() diff --git a/src/asammdf/gui/widgets/file.py b/src/asammdf/gui/widgets/file.py index 4cd7f3ef7..b53d49b9f 100644 --- a/src/asammdf/gui/widgets/file.py +++ b/src/asammdf/gui/widgets/file.py @@ -748,20 +748,20 @@ def _update_channel_tree(self, index=None, widget=None, force=False): def output_format_changed(self, name): if name == "MDF": - self.output_options.setCurrentIndex(0) + self.output_options.setCurrentWidget(self.MDF) elif name == "MAT": - self.output_options.setCurrentIndex(2) + self.output_options.setCurrentWidget(self.MAT) self.export_compression_mat.clear() self.export_compression_mat.addItems(["enabled", "disabled"]) self.export_compression_mat.setCurrentIndex(0) elif name == "CSV": - self.output_options.setCurrentIndex(3) + self.output_options.setCurrentWidget(self.CSV) elif name == "ASC": - self.output_options.setCurrentIndex(4) + self.output_options.setCurrentWidget(self.page) else: - self.output_options.setCurrentIndex(1) + self.output_options.setCurrentWidget(self.HDF5) if name == "Parquet": self.export_compression.setEnabled(True) self.export_compression.clear()