Skip to content

Commit d475372

Browse files
hcjihcji
authored
Merge pull request #2 from hcji/testing
Testing
2 parents fa8d9d9 + b9235ed commit d475372

7 files changed

+372
-310
lines changed

‎AnalTSAUI.py

-36
Original file line numberDiff line numberDiff line change
@@ -602,42 +602,6 @@ def VisualizeDist(self):
602602
self.FillTable(resultTable)
603603
self.EnableMenu()
604604

605-
606-
# Inflect method
607-
def ShowAnalInflect(self):
608-
columns = self.columns
609-
self.tableWidgetProteinList.clear()
610-
self.progressBar.setValue(0)
611-
self.resultData = []
612-
613-
r1p1Data = self.tableRep1Protein1.model()._data
614-
r1p2Data = self.tableRep1Protein2.model()._data
615-
try:
616-
r2p1Data = self.tableRep2Protein1.model()._data
617-
r2p2Data = self.tableRep2Protein2.model()._data
618-
except:
619-
r2p1Data = None
620-
r2p2Data = None
621-
622-
Rsq = self.minR2_Infl
623-
NumSD = self.numSD_Infl
624-
625-
temps = np.array([float(t.replace('T', '')) for t in columns])
626-
cols = ['Accession'] + columns
627-
628-
if (r2p1Data is None) or (r2p2Data is None):
629-
self.ErrorMsg('NPARC must run with two replicates')
630-
return None
631-
r1p1 = r1p1Data.loc[:, cols]
632-
r1p2 = r1p2Data.loc[:, cols]
633-
r2p1 = r2p1Data.loc[:, cols]
634-
r2p2 = r2p2Data.loc[:, cols]
635-
636-
self.Running_Win.show()
637-
run_inflect(temps, r1p1, r1p2, r2p1, r2p2, Rsq, NumSD)
638-
self.Running_Win.close()
639-
self.VisualizeInflect()
640-
641605

642606
def VisualizeInflect(self):
643607
try:

‎AnaliTSA.py

+98-81
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,38 @@
22

33
# Form implementation generated from reading ui file 'AnaliTSA.ui'
44
#
5-
# Created by: PyQt5 UI code generator 5.9.2
5+
# Created by: PyQt5 UI code generator 5.15.4
66
#
7-
# WARNING! All changes made in this file will be lost!
7+
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
8+
# run again. Do not edit this file unless you know what you are doing.
9+
810

911
from PyQt5 import QtCore, QtGui, QtWidgets
1012

13+
1114
class Ui_Form(object):
1215
def setupUi(self, Form):
1316
Form.setObjectName("Form")
14-
Form.resize(1045, 772)
17+
Form.resize(1099, 785)
1518
font = QtGui.QFont()
1619
font.setFamily("Times New Roman")
1720
font.setPointSize(11)
1821
Form.setFont(font)
19-
self.gridLayout_5 = QtWidgets.QGridLayout(Form)
20-
self.gridLayout_5.setObjectName("gridLayout_5")
21-
self.horizontalLayout_7 = QtWidgets.QHBoxLayout()
22-
self.horizontalLayout_7.setObjectName("horizontalLayout_7")
23-
self.verticalLayout_4 = QtWidgets.QVBoxLayout()
24-
self.verticalLayout_4.setObjectName("verticalLayout_4")
22+
self.gridLayout = QtWidgets.QGridLayout(Form)
23+
self.gridLayout.setObjectName("gridLayout")
24+
self.splitter = QtWidgets.QSplitter(Form)
25+
self.splitter.setOrientation(QtCore.Qt.Horizontal)
26+
self.splitter.setObjectName("splitter")
27+
self.widget = QtWidgets.QWidget(self.splitter)
28+
self.widget.setObjectName("widget")
29+
self.verticalLayout_8 = QtWidgets.QVBoxLayout(self.widget)
30+
self.verticalLayout_8.setContentsMargins(0, 0, 0, 0)
31+
self.verticalLayout_8.setObjectName("verticalLayout_8")
32+
self.verticalLayout_5 = QtWidgets.QVBoxLayout()
33+
self.verticalLayout_5.setObjectName("verticalLayout_5")
2534
self.verticalLayout_3 = QtWidgets.QVBoxLayout()
2635
self.verticalLayout_3.setObjectName("verticalLayout_3")
27-
self.label_1 = QtWidgets.QLabel(Form)
36+
self.label_1 = QtWidgets.QLabel(self.widget)
2837
font = QtGui.QFont()
2938
font.setFamily("Times New Roman")
3039
font.setPointSize(12)
@@ -35,116 +44,125 @@ def setupUi(self, Form):
3544
self.verticalLayout_3.addWidget(self.label_1)
3645
self.horizontalLayout = QtWidgets.QHBoxLayout()
3746
self.horizontalLayout.setObjectName("horizontalLayout")
38-
self.label_2 = QtWidgets.QLabel(Form)
47+
self.verticalLayout_2 = QtWidgets.QVBoxLayout()
48+
self.verticalLayout_2.setObjectName("verticalLayout_2")
49+
self.label_2 = QtWidgets.QLabel(self.widget)
3950
font = QtGui.QFont()
4051
font.setFamily("Times New Roman")
4152
font.setPointSize(11)
4253
self.label_2.setFont(font)
4354
self.label_2.setObjectName("label_2")
44-
self.horizontalLayout.addWidget(self.label_2)
45-
self.comboBoxMethod = QtWidgets.QComboBox(Form)
46-
self.comboBoxMethod.setObjectName("comboBoxMethod")
47-
self.horizontalLayout.addWidget(self.comboBoxMethod)
48-
self.verticalLayout_3.addLayout(self.horizontalLayout)
49-
self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
50-
self.horizontalLayout_2.setObjectName("horizontalLayout_2")
51-
self.label_3 = QtWidgets.QLabel(Form)
55+
self.verticalLayout_2.addWidget(self.label_2)
56+
self.label_3 = QtWidgets.QLabel(self.widget)
5257
font = QtGui.QFont()
5358
font.setFamily("Times New Roman")
5459
font.setPointSize(11)
5560
self.label_3.setFont(font)
5661
self.label_3.setObjectName("label_3")
57-
self.horizontalLayout_2.addWidget(self.label_3)
58-
self.comboBoxLog2 = QtWidgets.QComboBox(Form)
59-
self.comboBoxLog2.setObjectName("comboBoxLog2")
60-
self.horizontalLayout_2.addWidget(self.comboBoxLog2)
61-
self.verticalLayout_3.addLayout(self.horizontalLayout_2)
62-
self.horizontalLayout_3 = QtWidgets.QHBoxLayout()
63-
self.horizontalLayout_3.setObjectName("horizontalLayout_3")
64-
self.label_9 = QtWidgets.QLabel(Form)
62+
self.verticalLayout_2.addWidget(self.label_3)
63+
self.label_9 = QtWidgets.QLabel(self.widget)
6564
font = QtGui.QFont()
6665
font.setFamily("Times New Roman")
6766
font.setPointSize(11)
6867
self.label_9.setFont(font)
6968
self.label_9.setObjectName("label_9")
70-
self.horizontalLayout_3.addWidget(self.label_9)
71-
self.doubleSpinBoxFCthres = QtWidgets.QDoubleSpinBox(Form)
72-
self.doubleSpinBoxFCthres.setProperty("value", 1.1)
73-
self.doubleSpinBoxFCthres.setObjectName("doubleSpinBoxFCthres")
74-
self.horizontalLayout_3.addWidget(self.doubleSpinBoxFCthres)
75-
self.verticalLayout_3.addLayout(self.horizontalLayout_3)
76-
self.horizontalLayout_4 = QtWidgets.QHBoxLayout()
77-
self.horizontalLayout_4.setObjectName("horizontalLayout_4")
78-
self.label_10 = QtWidgets.QLabel(Form)
69+
self.verticalLayout_2.addWidget(self.label_9)
70+
self.label_10 = QtWidgets.QLabel(self.widget)
7971
font = QtGui.QFont()
8072
font.setFamily("Times New Roman")
8173
font.setPointSize(11)
8274
self.label_10.setFont(font)
8375
self.label_10.setObjectName("label_10")
84-
self.horizontalLayout_4.addWidget(self.label_10)
85-
self.doubleSpinBoxPthres = QtWidgets.QDoubleSpinBox(Form)
76+
self.verticalLayout_2.addWidget(self.label_10)
77+
self.label = QtWidgets.QLabel(self.widget)
78+
self.label.setObjectName("label")
79+
self.verticalLayout_2.addWidget(self.label)
80+
self.horizontalLayout.addLayout(self.verticalLayout_2)
81+
self.verticalLayout = QtWidgets.QVBoxLayout()
82+
self.verticalLayout.setObjectName("verticalLayout")
83+
self.comboBoxMethod = QtWidgets.QComboBox(self.widget)
84+
self.comboBoxMethod.setObjectName("comboBoxMethod")
85+
self.verticalLayout.addWidget(self.comboBoxMethod)
86+
self.comboBoxLog2 = QtWidgets.QComboBox(self.widget)
87+
self.comboBoxLog2.setObjectName("comboBoxLog2")
88+
self.verticalLayout.addWidget(self.comboBoxLog2)
89+
self.doubleSpinBoxFCthres = QtWidgets.QDoubleSpinBox(self.widget)
90+
self.doubleSpinBoxFCthres.setProperty("value", 1.1)
91+
self.doubleSpinBoxFCthres.setObjectName("doubleSpinBoxFCthres")
92+
self.verticalLayout.addWidget(self.doubleSpinBoxFCthres)
93+
self.doubleSpinBoxPthres = QtWidgets.QDoubleSpinBox(self.widget)
8694
self.doubleSpinBoxPthres.setSingleStep(0.01)
8795
self.doubleSpinBoxPthres.setProperty("value", 0.05)
8896
self.doubleSpinBoxPthres.setObjectName("doubleSpinBoxPthres")
89-
self.horizontalLayout_4.addWidget(self.doubleSpinBoxPthres)
90-
self.verticalLayout_3.addLayout(self.horizontalLayout_4)
91-
self.horizontalLayout_5 = QtWidgets.QHBoxLayout()
92-
self.horizontalLayout_5.setObjectName("horizontalLayout_5")
93-
self.pushButtonData = QtWidgets.QPushButton(Form)
97+
self.verticalLayout.addWidget(self.doubleSpinBoxPthres)
98+
self.comboBoxBalance = QtWidgets.QComboBox(self.widget)
99+
self.comboBoxBalance.setObjectName("comboBoxBalance")
100+
self.verticalLayout.addWidget(self.comboBoxBalance)
101+
self.horizontalLayout.addLayout(self.verticalLayout)
102+
self.verticalLayout_3.addLayout(self.horizontalLayout)
103+
self.verticalLayout_5.addLayout(self.verticalLayout_3)
104+
self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
105+
self.horizontalLayout_2.setObjectName("horizontalLayout_2")
106+
self.pushButtonData = QtWidgets.QPushButton(self.widget)
94107
self.pushButtonData.setObjectName("pushButtonData")
95-
self.horizontalLayout_5.addWidget(self.pushButtonData)
96-
self.pushButtonOK = QtWidgets.QPushButton(Form)
108+
self.horizontalLayout_2.addWidget(self.pushButtonData)
109+
self.pushButtonOK = QtWidgets.QPushButton(self.widget)
97110
self.pushButtonOK.setObjectName("pushButtonOK")
98-
self.horizontalLayout_5.addWidget(self.pushButtonOK)
99-
self.pushButtonClose = QtWidgets.QPushButton(Form)
111+
self.horizontalLayout_2.addWidget(self.pushButtonOK)
112+
self.pushButtonClose = QtWidgets.QPushButton(self.widget)
100113
self.pushButtonClose.setObjectName("pushButtonClose")
101-
self.horizontalLayout_5.addWidget(self.pushButtonClose)
102-
self.verticalLayout_3.addLayout(self.horizontalLayout_5)
103-
self.verticalLayout_4.addLayout(self.verticalLayout_3)
104-
self.verticalLayout_2 = QtWidgets.QVBoxLayout()
105-
self.verticalLayout_2.setObjectName("verticalLayout_2")
106-
self.label_8 = QtWidgets.QLabel(Form)
114+
self.horizontalLayout_2.addWidget(self.pushButtonClose)
115+
self.verticalLayout_5.addLayout(self.horizontalLayout_2)
116+
self.verticalLayout_8.addLayout(self.verticalLayout_5)
117+
self.verticalLayout_7 = QtWidgets.QVBoxLayout()
118+
self.verticalLayout_7.setObjectName("verticalLayout_7")
119+
self.verticalLayout_6 = QtWidgets.QVBoxLayout()
120+
self.verticalLayout_6.setObjectName("verticalLayout_6")
121+
self.label_8 = QtWidgets.QLabel(self.widget)
107122
font = QtGui.QFont()
108123
font.setFamily("Times New Roman")
109124
font.setPointSize(12)
110125
font.setBold(False)
111126
font.setWeight(50)
112127
self.label_8.setFont(font)
113128
self.label_8.setObjectName("label_8")
114-
self.verticalLayout_2.addWidget(self.label_8)
115-
self.tableWidgetLabel = QtWidgets.QTableWidget(Form)
129+
self.verticalLayout_6.addWidget(self.label_8)
130+
self.tableWidgetLabel = QtWidgets.QTableWidget(self.widget)
116131
self.tableWidgetLabel.setMinimumSize(QtCore.QSize(400, 0))
117132
self.tableWidgetLabel.setObjectName("tableWidgetLabel")
118133
self.tableWidgetLabel.setColumnCount(0)
119134
self.tableWidgetLabel.setRowCount(0)
120-
self.verticalLayout_2.addWidget(self.tableWidgetLabel)
121-
self.horizontalLayout_6 = QtWidgets.QHBoxLayout()
122-
self.horizontalLayout_6.setObjectName("horizontalLayout_6")
135+
self.verticalLayout_6.addWidget(self.tableWidgetLabel)
136+
self.verticalLayout_7.addLayout(self.verticalLayout_6)
137+
self.horizontalLayout_3 = QtWidgets.QHBoxLayout()
138+
self.horizontalLayout_3.setObjectName("horizontalLayout_3")
123139
spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
124-
self.horizontalLayout_6.addItem(spacerItem)
125-
self.pushButtonSave = QtWidgets.QPushButton(Form)
140+
self.horizontalLayout_3.addItem(spacerItem)
141+
self.pushButtonSave = QtWidgets.QPushButton(self.widget)
126142
self.pushButtonSave.setObjectName("pushButtonSave")
127-
self.horizontalLayout_6.addWidget(self.pushButtonSave)
128-
self.verticalLayout_2.addLayout(self.horizontalLayout_6)
129-
self.verticalLayout_4.addLayout(self.verticalLayout_2)
130-
self.horizontalLayout_7.addLayout(self.verticalLayout_4)
131-
self.verticalLayout_5 = QtWidgets.QVBoxLayout()
132-
self.verticalLayout_5.setObjectName("verticalLayout_5")
133-
self.verticalLayout = QtWidgets.QVBoxLayout()
134-
self.verticalLayout.setObjectName("verticalLayout")
135-
self.label_11 = QtWidgets.QLabel(Form)
143+
self.horizontalLayout_3.addWidget(self.pushButtonSave)
144+
self.verticalLayout_7.addLayout(self.horizontalLayout_3)
145+
self.verticalLayout_8.addLayout(self.verticalLayout_7)
146+
self.widget1 = QtWidgets.QWidget(self.splitter)
147+
self.widget1.setObjectName("widget1")
148+
self.verticalLayout_9 = QtWidgets.QVBoxLayout(self.widget1)
149+
self.verticalLayout_9.setContentsMargins(0, 0, 0, 0)
150+
self.verticalLayout_9.setObjectName("verticalLayout_9")
151+
self.verticalLayout_4 = QtWidgets.QVBoxLayout()
152+
self.verticalLayout_4.setObjectName("verticalLayout_4")
153+
self.label_11 = QtWidgets.QLabel(self.widget1)
136154
font = QtGui.QFont()
137155
font.setFamily("Times New Roman")
138156
font.setPointSize(12)
139157
self.label_11.setFont(font)
140158
self.label_11.setObjectName("label_11")
141-
self.verticalLayout.addWidget(self.label_11)
142-
self.tableViewData = QtWidgets.QTableView(Form)
159+
self.verticalLayout_4.addWidget(self.label_11)
160+
self.tableViewData = QtWidgets.QTableView(self.widget1)
143161
self.tableViewData.setMinimumSize(QtCore.QSize(0, 250))
144162
self.tableViewData.setObjectName("tableViewData")
145-
self.verticalLayout.addWidget(self.tableViewData)
146-
self.verticalLayout_5.addLayout(self.verticalLayout)
147-
self.tabWidget = QtWidgets.QTabWidget(Form)
163+
self.verticalLayout_4.addWidget(self.tableViewData)
164+
self.verticalLayout_9.addLayout(self.verticalLayout_4)
165+
self.tabWidget = QtWidgets.QTabWidget(self.widget1)
148166
self.tabWidget.setMinimumSize(QtCore.QSize(0, 300))
149167
font = QtGui.QFont()
150168
font.setPointSize(12)
@@ -155,8 +173,8 @@ def setupUi(self, Form):
155173
font.setPointSize(12)
156174
self.vocano.setFont(font)
157175
self.vocano.setObjectName("vocano")
158-
self.gridLayout = QtWidgets.QGridLayout(self.vocano)
159-
self.gridLayout.setObjectName("gridLayout")
176+
self.gridLayout_5 = QtWidgets.QGridLayout(self.vocano)
177+
self.gridLayout_5.setObjectName("gridLayout_5")
160178
self.groupBoxVolcano = QtWidgets.QGroupBox(self.vocano)
161179
self.groupBoxVolcano.setMinimumSize(QtCore.QSize(0, 0))
162180
font = QtGui.QFont()
@@ -165,7 +183,7 @@ def setupUi(self, Form):
165183
self.groupBoxVolcano.setFont(font)
166184
self.groupBoxVolcano.setTitle("")
167185
self.groupBoxVolcano.setObjectName("groupBoxVolcano")
168-
self.gridLayout.addWidget(self.groupBoxVolcano, 0, 0, 1, 1)
186+
self.gridLayout_5.addWidget(self.groupBoxVolcano, 0, 0, 1, 1)
169187
self.tabWidget.addTab(self.vocano, "")
170188
self.heatmap = QtWidgets.QWidget()
171189
self.heatmap.setObjectName("heatmap")
@@ -209,9 +227,8 @@ def setupUi(self, Form):
209227
self.groupBoxPCA.setObjectName("groupBoxPCA")
210228
self.gridLayout_4.addWidget(self.groupBoxPCA, 0, 0, 1, 1)
211229
self.tabWidget.addTab(self.pcaplot, "")
212-
self.verticalLayout_5.addWidget(self.tabWidget)
213-
self.horizontalLayout_7.addLayout(self.verticalLayout_5)
214-
self.gridLayout_5.addLayout(self.horizontalLayout_7, 0, 0, 1, 1)
230+
self.verticalLayout_9.addWidget(self.tabWidget)
231+
self.gridLayout.addWidget(self.splitter, 0, 0, 1, 1)
215232

216233
self.retranslateUi(Form)
217234
self.tabWidget.setCurrentIndex(0)
@@ -225,6 +242,7 @@ def retranslateUi(self, Form):
225242
self.label_3.setText(_translate("Form", "Log2 Transformed"))
226243
self.label_9.setText(_translate("Form", "Fold change threshold"))
227244
self.label_10.setText(_translate("Form", "P-value threshold"))
245+
self.label.setText(_translate("Form", "Balance data"))
228246
self.pushButtonData.setText(_translate("Form", "Data"))
229247
self.pushButtonOK.setText(_translate("Form", "Confirm"))
230248
self.pushButtonClose.setText(_translate("Form", "Cancel"))
@@ -245,4 +263,3 @@ def retranslateUi(self, Form):
245263
ui.setupUi(Form)
246264
Form.show()
247265
sys.exit(app.exec_())
248-

0 commit comments

Comments
 (0)