diff --git a/Docs/ChangeLog.md b/Docs/ChangeLog.md index ed07d0e..9d1d902 100644 --- a/Docs/ChangeLog.md +++ b/Docs/ChangeLog.md @@ -1,3 +1,9 @@ +# Version: 1.109.4 +## Date: 2024-07-24 +### Changes: +- Fix: Fixed the size of group box in the Taxa-Functions Network plot was too small to show the content. + + # Version: 1.109.3 ## Date: 2024-07-24 ### Changes: diff --git a/metax/gui/metax_gui/main_window.ui b/metax/gui/metax_gui/main_window.ui index 1f1f51d..2d98a47 100644 --- a/metax/gui/metax_gui/main_window.ui +++ b/metax/gui/metax_gui/main_window.ui @@ -7,7 +7,7 @@ 0 0 1122 - 703 + 707 @@ -46,7 +46,7 @@ Qt::LeftToRight - 4 + 6 false @@ -4403,8 +4403,8 @@ 0 0 - 996 - 70 + 403 + 66 @@ -7567,7 +7567,7 @@ QTabWidget::Triangular - 0 + 1 @@ -8525,23 +8525,6 @@ Taxa-Func Network - - - - Qt::Horizontal - - - - - - - - 0 - 0 - - - - @@ -8555,126 +8538,88 @@ - - + + - - - false - + - + 0 0 - Drop Item + Table - + false - - - 0 - 0 - - - - Clean List - + + + Taxa + + + + + Functions + + + + + Taxa-Functions + + - - - false - - - Add a list to the drawing box, make sure there is one item per line. - + - Add a list + Meta + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + - - - - - 0 - 0 - - + + Qt::Horizontal - - + + - + 0 0 - - - 16777215 - 50 - - - Group - - - true - - - - - - - Qt::Horizontal + Focus List - - - - false - + + - + 0 0 - - - 16777215 - 50 - - - - Plot Ntework - - - false - - - - - - - Show Parameter + + Qt::Horizontal @@ -8682,6 +8627,12 @@ + + + 0 + 0 + + Qt::RightToLeft @@ -8695,6 +8646,12 @@ false + + + 0 + 0 + + @@ -8704,90 +8661,166 @@ false + + + 0 + 0 + + - - - - false - + + - + 0 0 - 100 - 16777215 + 16777215 + 50 - - Add conditionally filtered items to the drawing box + + Group + + + true + + + + - Add Top to List + Show Parameter - - + + - + + + false + - + 0 0 - Table + Drop Item - + false - - - Taxa - - - - - Functions - - - - - Taxa-Functions - - + + + 0 + 0 + + + + Clean List + - - - Meta + + + false - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + Add a list to the drawing box, make sure there is one item per line. + + + Add a list - - - - + + + + + + + + + + + 0 + 0 + + + + + + + + false + + + + 0 + 0 + + + + + 100 + 16777215 + + + + Add selected item to the drawing box + + + Add to Focus List + + + + + + + false + + + + 0 + 0 + + + + + 100 + 16777215 + + + + Add conditionally filtered items to the drawing box + + + Add Top to List + + + + + + + @@ -8911,54 +8944,39 @@ - - - - - - - - + + + + Qt::Horizontal + + - - + + false - + 0 0 - 100 - 16777215 + 16777215 + 50 - - Add selected item to the drawing box - - Add to Focus List - - - - - - - - 0 - 0 - + Plot Ntework - - Focus List + + false - + @@ -8980,8 +8998,8 @@ 0 0 - 383 - 68 + 1016 + 89 @@ -9975,7 +9993,7 @@ 0 0 1122 - 21 + 23 diff --git a/metax/gui/metax_gui/ui_main_window.py b/metax/gui/metax_gui/ui_main_window.py index 494d4de..22bb16d 100644 --- a/metax/gui/metax_gui/ui_main_window.py +++ b/metax/gui/metax_gui/ui_main_window.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file 'c:\Users\Qing\OneDrive - University of Ottawa\code\TaxaFunc\MetaX\metax\gui\metax_gui\main_window.ui' +# Form implementation generated from reading ui file 'c:\Users\max\OneDrive - University of Ottawa\code\TaxaFunc\MetaX\metax\gui\metax_gui\main_window.ui' # # Created by: PyQt5 UI code generator 5.15.9 # @@ -14,7 +14,7 @@ class Ui_metaX_main(object): def setupUi(self, metaX_main): metaX_main.setObjectName("metaX_main") - metaX_main.resize(1122, 703) + metaX_main.resize(1122, 707) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -2350,7 +2350,7 @@ def setupUi(self, metaX_main): self.scrollArea_3.setWidgetResizable(True) self.scrollArea_3.setObjectName("scrollArea_3") self.scrollAreaWidgetContents_4 = QtWidgets.QWidget() - self.scrollAreaWidgetContents_4.setGeometry(QtCore.QRect(0, 0, 996, 70)) + self.scrollAreaWidgetContents_4.setGeometry(QtCore.QRect(0, 0, 403, 66)) self.scrollAreaWidgetContents_4.setObjectName("scrollAreaWidgetContents_4") self.gridLayout_68 = QtWidgets.QGridLayout(self.scrollAreaWidgetContents_4) self.gridLayout_68.setObjectName("gridLayout_68") @@ -4478,19 +4478,6 @@ def setupUi(self, metaX_main): self.tab_9.setObjectName("tab_9") self.gridLayout_6 = QtWidgets.QGridLayout(self.tab_9) self.gridLayout_6.setObjectName("gridLayout_6") - self.line_27 = QtWidgets.QFrame(self.tab_9) - self.line_27.setFrameShape(QtWidgets.QFrame.HLine) - self.line_27.setFrameShadow(QtWidgets.QFrame.Sunken) - self.line_27.setObjectName("line_27") - self.gridLayout_6.addWidget(self.line_27, 1, 0, 1, 3) - self.listWidget_tfnet_focus_list = QtWidgets.QListWidget(self.tab_9) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.MinimumExpanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.listWidget_tfnet_focus_list.sizePolicy().hasHeightForWidth()) - self.listWidget_tfnet_focus_list.setSizePolicy(sizePolicy) - self.listWidget_tfnet_focus_list.setObjectName("listWidget_tfnet_focus_list") - self.gridLayout_6.addWidget(self.listWidget_tfnet_focus_list, 8, 1, 1, 2) self.radioButton_network_bysample = QtWidgets.QRadioButton(self.tab_9) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) @@ -4499,31 +4486,44 @@ def setupUi(self, metaX_main): self.radioButton_network_bysample.setSizePolicy(sizePolicy) self.radioButton_network_bysample.setObjectName("radioButton_network_bysample") self.gridLayout_6.addWidget(self.radioButton_network_bysample, 4, 0, 1, 1) - self.verticalLayout_5 = QtWidgets.QVBoxLayout() - self.verticalLayout_5.setObjectName("verticalLayout_5") - self.pushButton_tfnet_drop_item = QtWidgets.QPushButton(self.tab_9) - self.pushButton_tfnet_drop_item.setEnabled(False) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + self.horizontalLayout_9 = QtWidgets.QHBoxLayout() + self.horizontalLayout_9.setObjectName("horizontalLayout_9") + self.label_49 = QtWidgets.QLabel(self.tab_9) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.pushButton_tfnet_drop_item.sizePolicy().hasHeightForWidth()) - self.pushButton_tfnet_drop_item.setSizePolicy(sizePolicy) - self.pushButton_tfnet_drop_item.setObjectName("pushButton_tfnet_drop_item") - self.verticalLayout_5.addWidget(self.pushButton_tfnet_drop_item) - self.pushButton_tfnet_clean_list = QtWidgets.QPushButton(self.tab_9) - self.pushButton_tfnet_clean_list.setEnabled(False) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed) + sizePolicy.setHeightForWidth(self.label_49.sizePolicy().hasHeightForWidth()) + self.label_49.setSizePolicy(sizePolicy) + self.label_49.setObjectName("label_49") + self.horizontalLayout_9.addWidget(self.label_49) + self.comboBox_tfnet_table = QtWidgets.QComboBox(self.tab_9) + self.comboBox_tfnet_table.setEnabled(False) + self.comboBox_tfnet_table.setObjectName("comboBox_tfnet_table") + self.comboBox_tfnet_table.addItem("") + self.comboBox_tfnet_table.addItem("") + self.comboBox_tfnet_table.addItem("") + self.horizontalLayout_9.addWidget(self.comboBox_tfnet_table) + self.label_150 = QtWidgets.QLabel(self.tab_9) + self.label_150.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.label_150.setObjectName("label_150") + self.horizontalLayout_9.addWidget(self.label_150) + self.comboBox_network_meta = QtWidgets.QComboBox(self.tab_9) + self.comboBox_network_meta.setObjectName("comboBox_network_meta") + self.horizontalLayout_9.addWidget(self.comboBox_network_meta) + self.gridLayout_6.addLayout(self.horizontalLayout_9, 0, 0, 1, 3) + self.line_27 = QtWidgets.QFrame(self.tab_9) + self.line_27.setFrameShape(QtWidgets.QFrame.HLine) + self.line_27.setFrameShadow(QtWidgets.QFrame.Sunken) + self.line_27.setObjectName("line_27") + self.gridLayout_6.addWidget(self.line_27, 1, 0, 1, 3) + self.label_77 = QtWidgets.QLabel(self.tab_9) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Minimum) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.pushButton_tfnet_clean_list.sizePolicy().hasHeightForWidth()) - self.pushButton_tfnet_clean_list.setSizePolicy(sizePolicy) - self.pushButton_tfnet_clean_list.setObjectName("pushButton_tfnet_clean_list") - self.verticalLayout_5.addWidget(self.pushButton_tfnet_clean_list) - self.pushButton_tfnet_add_a_list = QtWidgets.QPushButton(self.tab_9) - self.pushButton_tfnet_add_a_list.setEnabled(False) - self.pushButton_tfnet_add_a_list.setObjectName("pushButton_tfnet_add_a_list") - self.verticalLayout_5.addWidget(self.pushButton_tfnet_add_a_list) - self.gridLayout_6.addLayout(self.verticalLayout_5, 8, 0, 1, 1) + sizePolicy.setHeightForWidth(self.label_77.sizePolicy().hasHeightForWidth()) + self.label_77.setSizePolicy(sizePolicy) + self.label_77.setObjectName("label_77") + self.gridLayout_6.addWidget(self.label_77, 6, 0, 1, 1) self.line_28 = QtWidgets.QFrame(self.tab_9) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum) sizePolicy.setHorizontalStretch(0) @@ -4534,53 +4534,101 @@ def setupUi(self, metaX_main): self.line_28.setFrameShadow(QtWidgets.QFrame.Sunken) self.line_28.setObjectName("line_28") self.gridLayout_6.addWidget(self.line_28, 5, 0, 1, 3) - self.radioButton_network_bygroup = QtWidgets.QRadioButton(self.tab_9) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.radioButton_network_bygroup.sizePolicy().hasHeightForWidth()) - self.radioButton_network_bygroup.setSizePolicy(sizePolicy) - self.radioButton_network_bygroup.setMaximumSize(QtCore.QSize(16777215, 50)) - self.radioButton_network_bygroup.setChecked(True) - self.radioButton_network_bygroup.setObjectName("radioButton_network_bygroup") - self.gridLayout_6.addWidget(self.radioButton_network_bygroup, 2, 0, 1, 1) - self.line_33 = QtWidgets.QFrame(self.tab_9) - self.line_33.setFrameShape(QtWidgets.QFrame.HLine) - self.line_33.setFrameShadow(QtWidgets.QFrame.Sunken) - self.line_33.setObjectName("line_33") - self.gridLayout_6.addWidget(self.line_33, 9, 0, 1, 3) - self.pushButton_plot_network = QtWidgets.QPushButton(self.tab_9) - self.pushButton_plot_network.setEnabled(False) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.pushButton_plot_network.sizePolicy().hasHeightForWidth()) - self.pushButton_plot_network.setSizePolicy(sizePolicy) - self.pushButton_plot_network.setMaximumSize(QtCore.QSize(16777215, 50)) - self.pushButton_plot_network.setCheckable(False) - self.pushButton_plot_network.setObjectName("pushButton_plot_network") - self.gridLayout_6.addWidget(self.pushButton_plot_network, 10, 1, 1, 2) - self.checkBox_7 = QtWidgets.QCheckBox(self.tab_9) - self.checkBox_7.setObjectName("checkBox_7") - self.gridLayout_6.addWidget(self.checkBox_7, 10, 0, 1, 1) self.horizontalLayout_55 = QtWidgets.QHBoxLayout() self.horizontalLayout_55.setObjectName("horizontalLayout_55") self.checkBox_tfnetwork_in_condition = QtWidgets.QCheckBox(self.tab_9) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.checkBox_tfnetwork_in_condition.sizePolicy().hasHeightForWidth()) + self.checkBox_tfnetwork_in_condition.setSizePolicy(sizePolicy) self.checkBox_tfnetwork_in_condition.setLayoutDirection(QtCore.Qt.RightToLeft) self.checkBox_tfnetwork_in_condition.setObjectName("checkBox_tfnetwork_in_condition") self.horizontalLayout_55.addWidget(self.checkBox_tfnetwork_in_condition) self.comboBox_tfnetwork_condition_meta = QtWidgets.QComboBox(self.tab_9) self.comboBox_tfnetwork_condition_meta.setEnabled(False) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.comboBox_tfnetwork_condition_meta.sizePolicy().hasHeightForWidth()) + self.comboBox_tfnetwork_condition_meta.setSizePolicy(sizePolicy) self.comboBox_tfnetwork_condition_meta.setObjectName("comboBox_tfnetwork_condition_meta") self.horizontalLayout_55.addWidget(self.comboBox_tfnetwork_condition_meta) self.horizontalLayout_80 = QtWidgets.QHBoxLayout() self.horizontalLayout_80.setObjectName("horizontalLayout_80") self.comboBox_tfnetwork_condition_group = QtWidgets.QComboBox(self.tab_9) self.comboBox_tfnetwork_condition_group.setEnabled(False) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.comboBox_tfnetwork_condition_group.sizePolicy().hasHeightForWidth()) + self.comboBox_tfnetwork_condition_group.setSizePolicy(sizePolicy) self.comboBox_tfnetwork_condition_group.setObjectName("comboBox_tfnetwork_condition_group") self.horizontalLayout_80.addWidget(self.comboBox_tfnetwork_condition_group) self.horizontalLayout_55.addLayout(self.horizontalLayout_80) self.gridLayout_6.addLayout(self.horizontalLayout_55, 2, 1, 1, 1) + self.radioButton_network_bygroup = QtWidgets.QRadioButton(self.tab_9) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.radioButton_network_bygroup.sizePolicy().hasHeightForWidth()) + self.radioButton_network_bygroup.setSizePolicy(sizePolicy) + self.radioButton_network_bygroup.setMaximumSize(QtCore.QSize(16777215, 50)) + self.radioButton_network_bygroup.setChecked(True) + self.radioButton_network_bygroup.setObjectName("radioButton_network_bygroup") + self.gridLayout_6.addWidget(self.radioButton_network_bygroup, 2, 0, 1, 1) + self.checkBox_7 = QtWidgets.QCheckBox(self.tab_9) + self.checkBox_7.setObjectName("checkBox_7") + self.gridLayout_6.addWidget(self.checkBox_7, 10, 0, 1, 1) + self.verticalLayout_5 = QtWidgets.QVBoxLayout() + self.verticalLayout_5.setObjectName("verticalLayout_5") + self.pushButton_tfnet_drop_item = QtWidgets.QPushButton(self.tab_9) + self.pushButton_tfnet_drop_item.setEnabled(False) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.pushButton_tfnet_drop_item.sizePolicy().hasHeightForWidth()) + self.pushButton_tfnet_drop_item.setSizePolicy(sizePolicy) + self.pushButton_tfnet_drop_item.setObjectName("pushButton_tfnet_drop_item") + self.verticalLayout_5.addWidget(self.pushButton_tfnet_drop_item) + self.pushButton_tfnet_clean_list = QtWidgets.QPushButton(self.tab_9) + self.pushButton_tfnet_clean_list.setEnabled(False) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.pushButton_tfnet_clean_list.sizePolicy().hasHeightForWidth()) + self.pushButton_tfnet_clean_list.setSizePolicy(sizePolicy) + self.pushButton_tfnet_clean_list.setObjectName("pushButton_tfnet_clean_list") + self.verticalLayout_5.addWidget(self.pushButton_tfnet_clean_list) + self.pushButton_tfnet_add_a_list = QtWidgets.QPushButton(self.tab_9) + self.pushButton_tfnet_add_a_list.setEnabled(False) + self.pushButton_tfnet_add_a_list.setObjectName("pushButton_tfnet_add_a_list") + self.verticalLayout_5.addWidget(self.pushButton_tfnet_add_a_list) + self.gridLayout_6.addLayout(self.verticalLayout_5, 8, 0, 1, 1) + self.gridLayout_network_sample = QtWidgets.QGridLayout() + self.gridLayout_network_sample.setObjectName("gridLayout_network_sample") + self.gridLayout_6.addLayout(self.gridLayout_network_sample, 4, 1, 1, 3) + self.gridLayout_network_group = QtWidgets.QGridLayout() + self.gridLayout_network_group.setObjectName("gridLayout_network_group") + self.gridLayout_6.addLayout(self.gridLayout_network_group, 2, 2, 1, 2) + self.listWidget_tfnet_focus_list = QtWidgets.QListWidget(self.tab_9) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.MinimumExpanding) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.listWidget_tfnet_focus_list.sizePolicy().hasHeightForWidth()) + self.listWidget_tfnet_focus_list.setSizePolicy(sizePolicy) + self.listWidget_tfnet_focus_list.setObjectName("listWidget_tfnet_focus_list") + self.gridLayout_6.addWidget(self.listWidget_tfnet_focus_list, 8, 1, 1, 3) + self.pushButton_tfnet_add_to_list = QtWidgets.QPushButton(self.tab_9) + self.pushButton_tfnet_add_to_list.setEnabled(False) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Preferred) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.pushButton_tfnet_add_to_list.sizePolicy().hasHeightForWidth()) + self.pushButton_tfnet_add_to_list.setSizePolicy(sizePolicy) + self.pushButton_tfnet_add_to_list.setMaximumSize(QtCore.QSize(100, 16777215)) + self.pushButton_tfnet_add_to_list.setObjectName("pushButton_tfnet_add_to_list") + self.gridLayout_6.addWidget(self.pushButton_tfnet_add_to_list, 6, 3, 1, 1) self.pushButton_tfnet_add_top = QtWidgets.QPushButton(self.tab_9) self.pushButton_tfnet_add_top.setEnabled(False) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Preferred) @@ -4590,32 +4638,10 @@ def setupUi(self, metaX_main): self.pushButton_tfnet_add_top.setSizePolicy(sizePolicy) self.pushButton_tfnet_add_top.setMaximumSize(QtCore.QSize(100, 16777215)) self.pushButton_tfnet_add_top.setObjectName("pushButton_tfnet_add_top") - self.gridLayout_6.addWidget(self.pushButton_tfnet_add_top, 7, 2, 1, 1) - self.horizontalLayout_9 = QtWidgets.QHBoxLayout() - self.horizontalLayout_9.setObjectName("horizontalLayout_9") - self.label_49 = QtWidgets.QLabel(self.tab_9) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Preferred) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.label_49.sizePolicy().hasHeightForWidth()) - self.label_49.setSizePolicy(sizePolicy) - self.label_49.setObjectName("label_49") - self.horizontalLayout_9.addWidget(self.label_49) - self.comboBox_tfnet_table = QtWidgets.QComboBox(self.tab_9) - self.comboBox_tfnet_table.setEnabled(False) - self.comboBox_tfnet_table.setObjectName("comboBox_tfnet_table") - self.comboBox_tfnet_table.addItem("") - self.comboBox_tfnet_table.addItem("") - self.comboBox_tfnet_table.addItem("") - self.horizontalLayout_9.addWidget(self.comboBox_tfnet_table) - self.label_150 = QtWidgets.QLabel(self.tab_9) - self.label_150.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) - self.label_150.setObjectName("label_150") - self.horizontalLayout_9.addWidget(self.label_150) - self.comboBox_network_meta = QtWidgets.QComboBox(self.tab_9) - self.comboBox_network_meta.setObjectName("comboBox_network_meta") - self.horizontalLayout_9.addWidget(self.comboBox_network_meta) - self.gridLayout_6.addLayout(self.horizontalLayout_9, 0, 0, 1, 3) + self.gridLayout_6.addWidget(self.pushButton_tfnet_add_top, 7, 3, 1, 1) + self.comboBox_tfnet_select_list = QtWidgets.QComboBox(self.tab_9) + self.comboBox_tfnet_select_list.setObjectName("comboBox_tfnet_select_list") + self.gridLayout_6.addWidget(self.comboBox_tfnet_select_list, 6, 1, 1, 2) self.horizontalLayout_58 = QtWidgets.QHBoxLayout() self.horizontalLayout_58.setObjectName("horizontalLayout_58") self.label_78 = QtWidgets.QLabel(self.tab_9) @@ -4668,34 +4694,23 @@ def setupUi(self, metaX_main): self.checkBox_tfnet_top_filtered.setSizePolicy(sizePolicy) self.checkBox_tfnet_top_filtered.setObjectName("checkBox_tfnet_top_filtered") self.horizontalLayout_58.addWidget(self.checkBox_tfnet_top_filtered) - self.gridLayout_6.addLayout(self.horizontalLayout_58, 7, 1, 1, 1) - self.gridLayout_network_group = QtWidgets.QGridLayout() - self.gridLayout_network_group.setObjectName("gridLayout_network_group") - self.gridLayout_6.addLayout(self.gridLayout_network_group, 2, 2, 1, 1) - self.gridLayout_network_sample = QtWidgets.QGridLayout() - self.gridLayout_network_sample.setObjectName("gridLayout_network_sample") - self.gridLayout_6.addLayout(self.gridLayout_network_sample, 4, 1, 1, 2) - self.comboBox_tfnet_select_list = QtWidgets.QComboBox(self.tab_9) - self.comboBox_tfnet_select_list.setObjectName("comboBox_tfnet_select_list") - self.gridLayout_6.addWidget(self.comboBox_tfnet_select_list, 6, 1, 1, 1) - self.pushButton_tfnet_add_to_list = QtWidgets.QPushButton(self.tab_9) - self.pushButton_tfnet_add_to_list.setEnabled(False) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Preferred) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.pushButton_tfnet_add_to_list.sizePolicy().hasHeightForWidth()) - self.pushButton_tfnet_add_to_list.setSizePolicy(sizePolicy) - self.pushButton_tfnet_add_to_list.setMaximumSize(QtCore.QSize(100, 16777215)) - self.pushButton_tfnet_add_to_list.setObjectName("pushButton_tfnet_add_to_list") - self.gridLayout_6.addWidget(self.pushButton_tfnet_add_to_list, 6, 2, 1, 1) - self.label_77 = QtWidgets.QLabel(self.tab_9) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Minimum) + self.gridLayout_6.addLayout(self.horizontalLayout_58, 7, 1, 1, 2) + self.line_33 = QtWidgets.QFrame(self.tab_9) + self.line_33.setFrameShape(QtWidgets.QFrame.HLine) + self.line_33.setFrameShadow(QtWidgets.QFrame.Sunken) + self.line_33.setObjectName("line_33") + self.gridLayout_6.addWidget(self.line_33, 9, 0, 1, 4) + self.pushButton_plot_network = QtWidgets.QPushButton(self.tab_9) + self.pushButton_plot_network.setEnabled(False) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.label_77.sizePolicy().hasHeightForWidth()) - self.label_77.setSizePolicy(sizePolicy) - self.label_77.setObjectName("label_77") - self.gridLayout_6.addWidget(self.label_77, 6, 0, 1, 1) + sizePolicy.setHeightForWidth(self.pushButton_plot_network.sizePolicy().hasHeightForWidth()) + self.pushButton_plot_network.setSizePolicy(sizePolicy) + self.pushButton_plot_network.setMaximumSize(QtCore.QSize(16777215, 50)) + self.pushButton_plot_network.setCheckable(False) + self.pushButton_plot_network.setObjectName("pushButton_plot_network") + self.gridLayout_6.addWidget(self.pushButton_plot_network, 10, 1, 1, 3) self.groupBox_taxa_func_link_net_plot_settings = QtWidgets.QGroupBox(self.tab_9) self.groupBox_taxa_func_link_net_plot_settings.setMaximumSize(QtCore.QSize(16777215, 220)) self.groupBox_taxa_func_link_net_plot_settings.setObjectName("groupBox_taxa_func_link_net_plot_settings") @@ -4705,7 +4720,7 @@ def setupUi(self, metaX_main): self.scrollArea_7.setWidgetResizable(True) self.scrollArea_7.setObjectName("scrollArea_7") self.scrollAreaWidgetContents_8 = QtWidgets.QWidget() - self.scrollAreaWidgetContents_8.setGeometry(QtCore.QRect(0, 0, 383, 68)) + self.scrollAreaWidgetContents_8.setGeometry(QtCore.QRect(0, 0, 1016, 89)) self.scrollAreaWidgetContents_8.setObjectName("scrollAreaWidgetContents_8") self.gridLayout_66 = QtWidgets.QGridLayout(self.scrollAreaWidgetContents_8) self.gridLayout_66.setObjectName("gridLayout_66") @@ -4792,7 +4807,7 @@ def setupUi(self, metaX_main): self.gridLayout_66.addLayout(self.horizontalLayout_69, 1, 1, 1, 1) self.scrollArea_7.setWidget(self.scrollAreaWidgetContents_8) self.gridLayout_63.addWidget(self.scrollArea_7, 0, 0, 1, 1) - self.gridLayout_6.addWidget(self.groupBox_taxa_func_link_net_plot_settings, 11, 0, 1, 3) + self.gridLayout_6.addWidget(self.groupBox_taxa_func_link_net_plot_settings, 11, 0, 1, 4) self.tabWidget_2.addTab(self.tab_9, "") self.gridLayout_19.addWidget(self.tabWidget_2, 0, 0, 1, 1) self.tabWidget_TaxaFuncAnalyzer.addTab(self.tab_others_stats, "") @@ -5216,7 +5231,7 @@ def setupUi(self, metaX_main): self.statusbar.setObjectName("statusbar") metaX_main.setStatusBar(self.statusbar) self.menuBar = QtWidgets.QMenuBar(metaX_main) - self.menuBar.setGeometry(QtCore.QRect(0, 0, 1122, 21)) + self.menuBar.setGeometry(QtCore.QRect(0, 0, 1122, 23)) self.menuBar.setObjectName("menuBar") self.menuTools = QtWidgets.QMenu(self.menuBar) self.menuTools.setObjectName("menuTools") @@ -5276,12 +5291,12 @@ def setupUi(self, metaX_main): self.retranslateUi(metaX_main) self.stackedWidget.setCurrentIndex(0) - self.tabWidget_TaxaFuncAnalyzer.setCurrentIndex(4) + self.tabWidget_TaxaFuncAnalyzer.setCurrentIndex(6) self.toolBox_2.setCurrentIndex(0) self.tabWidget_4.setCurrentIndex(0) self.tabWidget_3.setCurrentIndex(1) self.tabWidget.setCurrentIndex(1) - self.tabWidget_2.setCurrentIndex(0) + self.tabWidget_2.setCurrentIndex(1) self.tabWidget_6.setCurrentIndex(1) self.toolBox_metalab_res_anno.setCurrentIndex(0) self.tabWidget_5.setCurrentIndex(0) @@ -5890,21 +5905,23 @@ def retranslateUi(self, metaX_main): self.label_61.setText(_translate("metaX_main", "Theme")) self.tabWidget_2.setTabText(self.tabWidget_2.indexOf(self.tab_8), _translate("metaX_main", "Taxa-Func Link")) self.radioButton_network_bysample.setText(_translate("metaX_main", "Sample")) + self.label_49.setText(_translate("metaX_main", "Table")) + self.comboBox_tfnet_table.setItemText(0, _translate("metaX_main", "Taxa")) + self.comboBox_tfnet_table.setItemText(1, _translate("metaX_main", "Functions")) + self.comboBox_tfnet_table.setItemText(2, _translate("metaX_main", "Taxa-Functions")) + self.label_150.setText(_translate("metaX_main", "Meta")) + self.label_77.setText(_translate("metaX_main", "Focus List")) + self.checkBox_tfnetwork_in_condition.setText(_translate("metaX_main", "In Condition")) + self.radioButton_network_bygroup.setText(_translate("metaX_main", "Group")) + self.checkBox_7.setText(_translate("metaX_main", "Show Parameter")) self.pushButton_tfnet_drop_item.setText(_translate("metaX_main", "Drop Item")) self.pushButton_tfnet_clean_list.setText(_translate("metaX_main", "Clean List")) self.pushButton_tfnet_add_a_list.setToolTip(_translate("metaX_main", "Add a list to the drawing box, make sure there is one item per line.")) self.pushButton_tfnet_add_a_list.setText(_translate("metaX_main", "Add a list")) - self.radioButton_network_bygroup.setText(_translate("metaX_main", "Group")) - self.pushButton_plot_network.setText(_translate("metaX_main", "Plot Ntework")) - self.checkBox_7.setText(_translate("metaX_main", "Show Parameter")) - self.checkBox_tfnetwork_in_condition.setText(_translate("metaX_main", "In Condition")) + self.pushButton_tfnet_add_to_list.setToolTip(_translate("metaX_main", "Add selected item to the drawing box")) + self.pushButton_tfnet_add_to_list.setText(_translate("metaX_main", "Add to Focus List")) self.pushButton_tfnet_add_top.setToolTip(_translate("metaX_main", "Add conditionally filtered items to the drawing box")) self.pushButton_tfnet_add_top.setText(_translate("metaX_main", "Add Top to List")) - self.label_49.setText(_translate("metaX_main", "Table")) - self.comboBox_tfnet_table.setItemText(0, _translate("metaX_main", "Taxa")) - self.comboBox_tfnet_table.setItemText(1, _translate("metaX_main", "Functions")) - self.comboBox_tfnet_table.setItemText(2, _translate("metaX_main", "Taxa-Functions")) - self.label_150.setText(_translate("metaX_main", "Meta")) self.label_78.setText(_translate("metaX_main", "Select Top")) self.label_79.setText(_translate("metaX_main", "Sort by")) self.comboBox_tfnet_top_by.setItemText(0, _translate("metaX_main", "Total Intensity")) @@ -5919,9 +5936,7 @@ def retranslateUi(self, metaX_main): self.comboBox_tfnet_top_by.setItemText(9, _translate("metaX_main", "Deseq2-up(log2FC)")) self.comboBox_tfnet_top_by.setItemText(10, _translate("metaX_main", "Deseq2-down(log2FC)")) self.checkBox_tfnet_top_filtered.setText(_translate("metaX_main", "Filter with threshold")) - self.pushButton_tfnet_add_to_list.setToolTip(_translate("metaX_main", "Add selected item to the drawing box")) - self.pushButton_tfnet_add_to_list.setText(_translate("metaX_main", "Add to Focus List")) - self.label_77.setText(_translate("metaX_main", "Focus List")) + self.pushButton_plot_network.setText(_translate("metaX_main", "Plot Ntework")) self.groupBox_taxa_func_link_net_plot_settings.setTitle(_translate("metaX_main", "Plotting Parameter")) self.label_50.setText(_translate("metaX_main", "Width")) self.label_51.setText(_translate("metaX_main", "Height")) diff --git a/metax/taxafunc_ploter/network_plot.py b/metax/taxafunc_ploter/network_plot.py index d0ccce1..92a6349 100644 --- a/metax/taxafunc_ploter/network_plot.py +++ b/metax/taxafunc_ploter/network_plot.py @@ -25,7 +25,7 @@ def __init__(self, tfobj, label_position="bottom", text_width = 300, gravity = 0.2, - show_sub_title = True, + show_sub_title = False, ): diff --git a/metax/utils/version.py b/metax/utils/version.py index 9dffc68..cc9d4ce 100644 --- a/metax/utils/version.py +++ b/metax/utils/version.py @@ -1,2 +1,2 @@ -__version__ = '1.109.3' +__version__ = '1.109.4' API_version = '2' \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 414d38e..90f6d20 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "MetaXTools" -version = "1.108.7" +version = "1.109.4" description = "MetaXTools is a novel tool for linking peptide sequences with taxonomic and functional information in Metaproteomics." readme = "README_PyPi.md" license = { text = "NorthOmics" }