Skip to content

Commit 5ec86e5

Browse files
committed
增加对于Polarity Filter的支持
1 parent ecf2bbf commit 5ec86e5

7 files changed

Lines changed: 105 additions & 37 deletions

File tree

AirdPro/Constants/SoftwareInfo.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ static class SoftwareInfo
1616

1717
public static string CLIENT_VERSION_DESCRIPTION = "1. Completely solve the problem of memory leaks\r\n" +
1818
"2. Increase the conversion speed of columns\r\n" +
19-
"3. Distributed task processing system\r\n"
19+
"3. Distributed task processing system\r\n" +
20+
"4. Support for Mixed Polarity Filter\r\n"
2021
;
2122

2223
public static string NAME = "AirdPro";

AirdPro/Converters/PwizConverter.cs

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1709,6 +1709,32 @@ public void PretreatmentDda()
17091709
JobInfo.Log(Tag.Effective_MS1_List_Size + Ms1List.Count);
17101710
JobInfo.Log(Tag.MS2_Group_List_Size + Ms2Table.Count);
17111711
JobInfo.Log(Tag.Start_Processing_MS1_List);
1712+
1713+
if (JobInfo.config.polarityFilter != 0)
1714+
{
1715+
if (JobInfo.config.polarityFilter == 1) //Only Negative
1716+
{
1717+
for (int i = Ms1List.Count - 1; i >= 0; i--)
1718+
{
1719+
if (!Ms1List[i].polarity.Equals(Polarity.NEGATIVE))
1720+
{
1721+
Ms2Table.Remove(Ms1List[i].num);
1722+
Ms1List.RemoveAt(i);
1723+
}
1724+
}
1725+
}
1726+
else if (JobInfo.config.polarityFilter == 2)
1727+
{
1728+
for (int i = Ms1List.Count - 1; i >= 0; i--)
1729+
{
1730+
if (!Ms1List[i].polarity.Equals(Polarity.POSITIVE))
1731+
{
1732+
Ms2Table.Remove(Ms1List[i].num);
1733+
Ms1List.RemoveAt(i);
1734+
}
1735+
}
1736+
}
1737+
}
17121738
}
17131739

17141740
public void PretreatmentDia()

AirdPro/Forms/ConversionConfigListForm.Designer.cs

Lines changed: 64 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AirdPro/Forms/ConversionConfigListForm.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,8 @@ private ConversionConfig BuildConfigInfo()
116116
config.engine = cbCompEngine.SelectedIndex;
117117
config.configName = tbNameConfig.Text;
118118
config.indexFormat = cbIndexFormat.SelectedIndex;
119+
config.polarityFilter = cbPolarityFilter.SelectedIndex;
120+
119121
//如果不是自动决策的,则会使用配置的组合压缩器
120122
if (!cbAutoDecision.Checked)
121123
{
@@ -152,7 +154,7 @@ private ConversionConfig BuildConfigInfo()
152154
config.compressionSizeWeight = int.Parse(cbCSWeight.Text);
153155
config.compressionTimeWeight = int.Parse(cbCTWeight.Text);
154156
config.decompressionTimeWeight = int.Parse(cbDTWeight.Text);
155-
157+
156158
//Filter字段
157159
config.noMS1 = cbNoMS1.Checked;
158160
config.noMS2 = cbNoMS2.Checked;
@@ -228,6 +230,7 @@ public void ShowConfig(string name, ConversionConfig config)
228230
cbIndexFormat.SelectedIndex = config.indexFormat;
229231
cbNoMS1.Checked = config.noMS1;
230232
cbNoMS2.Checked = config.noMS2;
233+
cbPolarityFilter.SelectedIndex = config.polarityFilter;
231234
}
232235

233236
private void deleteToolStripMenuItem_Click(object sender, EventArgs e)

AirdPro/Forms/ConversionConfigListForm.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
129129
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
130130
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACA
131-
CAAAAk1TRnQBSQFMAgEBAgEAAVgBAQFYAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
131+
CAAAAk1TRnQBSQFMAgEBAgEAAWABAQFgAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
132132
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
133133
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
134134
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

AirdPro/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@
3030
//
3131
// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
3232
// 方法是按如下所示使用“*”: :
33-
[assembly: AssemblyVersion("6.0.2")]
33+
[assembly: AssemblyVersion("6.0.3")]

AirdPro/Storage/Config/ConversionConfig.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,13 @@ public class ConversionConfig : ICloneable
5656
*/
5757
public bool autoDecision = false;
5858

59+
/**
60+
* 0: No Filter
61+
* 1: Only Negative
62+
* 2: Only Positive
63+
*/
64+
public int polarityFilter = 0;
65+
5966
/**
6067
* 转换后的索引格式,支持输出JSON,Protobuf或者两者均输出的形式
6168
* 0. JSON

0 commit comments

Comments
 (0)