Skip to content

Commit

Permalink
- Fix: Fixed the bug of when use Anydata moed, the report will raise …
Browse files Browse the repository at this point in the history 
…error.

- Change: changed the approche of filter the minimum number of peptides threshold for the protein.(Avaliable for Razor and Anti-Razor method)
  • Loading branch information
@byemaxx
byemaxx committed Oct 17, 2024
1 parent 9060e6d commit 7343ea1
Show file tree
Hide file tree
Showing 8 changed files with 243 additions and 152 deletions.
3 changes: 2 additions & 1 deletion Docs/ChangeLog.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Version: 1.115.4
## Date: 2024-10-07
### Changes:
- TODO: use the peptide number for 'self.peptide_num_used' after filtering the minimum peptide number
- Fix: Fixed the bug of when use Anydata moed, the report will raise error.
- Change: changed the approche of filter the minimum number of peptides threshold for the protein.(Avaliable for Razor and Anti-Razor method)

# Version: 1.115.3
## Date: 2024-10-04
Expand Down
8 changes: 6 additions & 2 deletions metax/gui/main_gui.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -993,10 +993,14 @@ def update_method_of_protein_inference(self):
self.checkBox_infrence_protein_by_sample.setChecked(True)
self.checkBox_infrence_protein_by_sample.setEnabled(False)
self.comboBox_protein_ranking_method.setEnabled(False)
# enable the peptide_num_threshold
self.spinBox_peptide_num_threshold_protein.setEnabled(True)
else: # method is ["rank"]
self.checkBox_infrence_protein_by_sample.setEnabled(True)
self.comboBox_protein_ranking_method.setEnabled(True)
self.checkBox_infrence_protein_by_sample.setChecked(False)
# disable the peptide_num_threshold
self.spinBox_peptide_num_threshold_protein.setEnabled(False)



Expand Down Expand Up @@ -1853,11 +1857,11 @@ def run_after_set_multi_tables(self):

# Final message
if self.tfa.any_df_mode:
num_item = self.tfa.custom_df.shape[0]
original_num_peptide = self.tfa.custom_df.shape[0]
msg = f"""<html>
<body>
<p>Custom data is ready!</p>
<p>Number of items: [{num_item}]</p>
<p>Number of items: [{original_num_peptide}]</p>
</body>
</html>
"""
Expand Down
146 changes: 73 additions & 73 deletions metax/gui/metax_gui/main_window.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<enum>Qt::LeftToRight</enum>
</property>
<property name="currentIndex">
<number>2</number>
<number>4</number>
</property>
<property name="documentMode">
<bool>false</bool>
Expand Down Expand Up @@ -245,8 +245,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>391</width>
<height>80</height>
<width>528</width>
<height>534</height>
</rect>
</property>
<attribute name="label">
Expand Down Expand Up @@ -1476,7 +1476,7 @@
<property name="maximumSize">
<size>
<width>16777215</width>
<height>280</height>
<height>300</height>
</size>
</property>
<property name="title">
Expand Down Expand Up @@ -1505,7 +1505,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>660</width>
<width>1016</width>
<height>232</height>
</rect>
</property>
Expand Down Expand Up @@ -2759,7 +2759,7 @@
<property name="maximumSize">
<size>
<width>16777215</width>
<height>280</height>
<height>300</height>
</size>
</property>
<property name="title">
Expand All @@ -2776,7 +2776,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>621</width>
<width>999</width>
<height>150</height>
</rect>
</property>
Expand Down Expand Up @@ -3750,7 +3750,7 @@
<property name="maximumSize">
<size>
<width>16777215</width>
<height>240</height>
<height>280</height>
</size>
</property>
<property name="title">
Expand Down Expand Up @@ -3779,7 +3779,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>878</width>
<width>1020</width>
<height>128</height>
</rect>
</property>
Expand Down Expand Up @@ -4801,7 +4801,7 @@
<enum>QTabWidget::Triangular</enum>
</property>
<property name="currentIndex">
<number>3</number>
<number>2</number>
</property>
<widget class="QWidget" name="tab_3">
<attribute name="title">
Expand Down Expand Up @@ -5144,7 +5144,7 @@
</property>
</widget>
</item>
<item row="10" column="1" colspan="2">
<item row="10" column="1">
<widget class="QPushButton" name="pushButton_dunnett_test">
<property name="enabled">
<bool>false</bool>
Expand Down Expand Up @@ -5239,64 +5239,11 @@
</item>
</layout>
</item>
<item row="9" column="1" colspan="2">
<widget class="Line" name="line_26">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="11" column="1" colspan="2">
<widget class="QPushButton" name="pushButton_multi_deseq2">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Run Deseq2</string>
</property>
</widget>
</item>
<item row="4" column="1" colspan="2">
<layout class="QGridLayout" name="gridLayout_72">
<item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_dunnett_group"/>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_114">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Groups (Default all)</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QComboBox" name="comboBox_dunnett_control_group"/>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_115">
<property name="text">
<string>Control Group</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QCheckBox" name="checkBox_comparing_group_control_in_condition">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Comparing in Each Condition</string>
</property>
</widget>
</item>
<item row="2" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_24">
<item>
Expand All @@ -5321,8 +5268,61 @@
</item>
</layout>
</item>
<item row="2" column="0">
<widget class="QCheckBox" name="checkBox_comparing_group_control_in_condition">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Comparing in Each Condition</string>
</property>
</widget>
</item>
<item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_dunnett_group"/>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_114">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Groups (Default all)</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_115">
<property name="text">
<string>Control Group</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="9" column="1" colspan="2">
<widget class="Line" name="line_26">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="10" column="2">
<widget class="QPushButton" name="pushButton_multi_deseq2">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Run Deseq2</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_19">
Expand Down Expand Up @@ -6207,7 +6207,7 @@
<property name="maximumSize">
<size>
<width>16777215</width>
<height>220</height>
<height>240</height>
</size>
</property>
<property name="title">
Expand Down Expand Up @@ -7437,7 +7437,7 @@
<property name="maximumSize">
<size>
<width>16777215</width>
<height>220</height>
<height>240</height>
</size>
</property>
<property name="title">
Expand All @@ -7454,8 +7454,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>620</width>
<height>65</height>
<width>1016</width>
<height>105</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_57">
Expand Down Expand Up @@ -7819,7 +7819,7 @@
<enum>QTabWidget::Triangular</enum>
</property>
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="tab_8">
<attribute name="title">
Expand Down Expand Up @@ -8146,7 +8146,7 @@
<property name="maximumSize">
<size>
<width>16777215</width>
<height>220</height>
<height>240</height>
</size>
</property>
<property name="title">
Expand Down Expand Up @@ -9258,7 +9258,7 @@
<property name="maximumSize">
<size>
<width>16777215</width>
<height>220</height>
<height>240</height>
</size>
</property>
<property name="title">
Expand All @@ -9275,8 +9275,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>383</width>
<height>68</height>
<width>1016</width>
<height>141</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_66">
Expand Down
Loading

0 comments on commit 7343ea1

Please sign in to comment.