diff --git a/pwiz_tools/Skyline/Controls/SequenceTree.cs b/pwiz_tools/Skyline/Controls/SequenceTree.cs index f29abfcbec..adfff45f08 100644 --- a/pwiz_tools/Skyline/Controls/SequenceTree.cs +++ b/pwiz_tools/Skyline/Controls/SequenceTree.cs @@ -142,44 +142,48 @@ public void InitializeTree(IDocumentUIContainer documentUIContainer) ImageList = new ImageList { - TransparentColor = Color.Magenta + TransparentColor = Color.Magenta, + ColorDepth = ColorDepth.Depth24Bit }; - ImageList.Images.Add(Resources.Blank); - ImageList.Images.Add(Resources.Protein); - ImageList.Images.Add(Resources.Peptide); - ImageList.Images.Add(Resources.TransitionGroup); - ImageList.Images.Add(Resources.Fragment); - ImageList.Images.Add(Resources.PeptideLib); - ImageList.Images.Add(Resources.PeptideIrt); - ImageList.Images.Add(Resources.PeptideIrtLib); - ImageList.Images.Add(Resources.PeptideStandard); - ImageList.Images.Add(Resources.PeptideStandardLib); - ImageList.Images.Add(Resources.PeptideQc); - ImageList.Images.Add(Resources.PeptideQcLib); - ImageList.Images.Add(Resources.TransitionGroupLib); - ImageList.Images.Add(Resources.FragmentLib); - ImageList.Images.Add(Resources.PeptideDecoy); - ImageList.Images.Add(Resources.TransitionGroupDecoy); - ImageList.Images.Add(Resources.FragmentDecoy); - ImageList.Images.Add(Resources.ProteinDecoy); - ImageList.Images.Add(Resources.PeptideDecoyLib); - ImageList.Images.Add(Resources.TransitionGroupLibDecoy); - ImageList.Images.Add(Resources.FragmentLibDecoy); - ImageList.Images.Add(Resources.Molecule); - ImageList.Images.Add(Resources.MoleculeLib); - ImageList.Images.Add(Resources.MoleculeIrt); - ImageList.Images.Add(Resources.MoleculeIrtLib); - ImageList.Images.Add(Resources.MoleculeStandard); - ImageList.Images.Add(Resources.MoleculeStandardLib); - ImageList.Images.Add(Resources.MoleculeList); - ImageList.Images.Add(Resources.PeptideList); - ImageList.Images.Add(Resources.EmptyList); - - StateImageList = new ImageList(); - StateImageList.Images.Add(Resources.Peak); - StateImageList.Images.Add(Resources.Keep); - StateImageList.Images.Add(Resources.NoPeak); - StateImageList.Images.Add(Resources.PeakBlank); + ImageList.Images.Add(Resources.Blank); // 1bpp + ImageList.Images.Add(Resources.Protein); // 16bpp + ImageList.Images.Add(Resources.Peptide); // 4bpp + ImageList.Images.Add(Resources.TransitionGroup); // 8bpp + ImageList.Images.Add(Resources.Fragment); // 8bpp + ImageList.Images.Add(Resources.PeptideLib); // 4bpp + ImageList.Images.Add(Resources.PeptideIrt); // 4bpp + ImageList.Images.Add(Resources.PeptideIrtLib); // 4bpp + ImageList.Images.Add(Resources.PeptideStandard); // 4bpp + ImageList.Images.Add(Resources.PeptideStandardLib); // 4bpp + ImageList.Images.Add(Resources.PeptideQc); // 4bpp + ImageList.Images.Add(Resources.PeptideQcLib); // 4bpp + ImageList.Images.Add(Resources.TransitionGroupLib); // 8bpp + ImageList.Images.Add(Resources.FragmentLib); // 8bpp + ImageList.Images.Add(Resources.PeptideDecoy); // 4bpp + ImageList.Images.Add(Resources.TransitionGroupDecoy); // 8bpp + ImageList.Images.Add(Resources.FragmentDecoy); // 8bpp + ImageList.Images.Add(Resources.ProteinDecoy); // 24bpp + ImageList.Images.Add(Resources.PeptideDecoyLib); // 4bpp + ImageList.Images.Add(Resources.TransitionGroupLibDecoy); // 8bpp + ImageList.Images.Add(Resources.FragmentLibDecoy); // 8bpp + ImageList.Images.Add(Resources.Molecule); // 24bpp + ImageList.Images.Add(Resources.MoleculeLib); // 24bpp + ImageList.Images.Add(Resources.MoleculeIrt); // 24bpp + ImageList.Images.Add(Resources.MoleculeIrtLib); // 24bpp + ImageList.Images.Add(Resources.MoleculeStandard); // 24bpp + ImageList.Images.Add(Resources.MoleculeStandardLib); // 24bpp + ImageList.Images.Add(Resources.MoleculeList); // 16bpp + ImageList.Images.Add(Resources.PeptideList); // 16bpp + ImageList.Images.Add(Resources.EmptyList); // 16bpp + + StateImageList = new ImageList + { + ColorDepth = ColorDepth.Depth24Bit + }; + StateImageList.Images.Add(Resources.Peak); // 8bpp + StateImageList.Images.Add(Resources.Keep); // 24bpp + StateImageList.Images.Add(Resources.NoPeak); // 24bpp + StateImageList.Images.Add(Resources.PeakBlank); // 8bpp // Add the editable node at the end Nodes.Add(new EmptyNode()); diff --git a/pwiz_tools/Skyline/Controls/StatementCompletionTextBox.cs b/pwiz_tools/Skyline/Controls/StatementCompletionTextBox.cs index 1bde5f2124..c726cacb4a 100644 --- a/pwiz_tools/Skyline/Controls/StatementCompletionTextBox.cs +++ b/pwiz_tools/Skyline/Controls/StatementCompletionTextBox.cs @@ -44,7 +44,11 @@ public class StatementCompletionTextBox private ProteinMatchQuery _proteinMatcher; private CancellationTokenSource _cancellationTokenSource; private readonly IDocumentUIContainer _documentUiContainer; - private readonly ImageList _imageList = new ImageList() {TransparentColor = Color.Magenta}; + private readonly ImageList _imageList = new ImageList + { + TransparentColor = Color.Magenta, + ColorDepth = ColorDepth.Depth16Bit + }; private ProteomeDb _proteomeDb; private bool _hideOnLoseFocus; @@ -55,8 +59,8 @@ public StatementCompletionTextBox(IDocumentUIContainer documentUiContainer, bool { MatchTypes = ProteinMatchTypes.ALL; _documentUiContainer = documentUiContainer; - _imageList.Images.Add(Resources.Protein); - _imageList.Images.Add(Resources.Peptide); + _imageList.Images.Add(Resources.Protein); // 16bpp + _imageList.Images.Add(Resources.Peptide); // 4bpp _hideOnLoseFocus = hideOnLoseFocus; } @@ -426,7 +430,7 @@ protected void TextBox_HandleDestroyed(EventArgs e) _cancellationTokenSource = null; } } - public static readonly ImageList IMAGE_LIST = new ImageList(); + // public static readonly ImageList IMAGE_LIST = new ImageList(); private enum ImageId { protein, diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/en/s-06.png b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/en/s-06.png index 946b222619..c33ecbec28 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/en/s-06.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/en/s-06.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/en/s-09.png b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/en/s-09.png index 3e3484d103..62104d66f6 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/en/s-09.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/en/s-09.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/en/s-10.png b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/en/s-10.png index dc5477a575..e50fe6cf57 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/en/s-10.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/en/s-10.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/en/s-11.png b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/en/s-11.png index 4c2f963d54..4784fe63fb 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/en/s-11.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/en/s-11.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/en/s-12.png b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/en/s-12.png index 57ddf91b05..d5f84ce938 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/en/s-12.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/en/s-12.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/en/s-13.png b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/en/s-13.png index bb8d29b8a5..71c086afab 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/en/s-13.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/en/s-13.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/en/s-14.png b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/en/s-14.png index a366adbf42..ade603eeb4 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/en/s-14.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/en/s-14.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/ja/s-06.png b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/ja/s-06.png index b87a383242..44967dd361 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/ja/s-06.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/ja/s-06.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/ja/s-09.png b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/ja/s-09.png index 570825438a..b894a474a6 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/ja/s-09.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/ja/s-09.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/ja/s-10.png b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/ja/s-10.png index 9bb073a073..99043696ae 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/ja/s-10.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/ja/s-10.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/ja/s-11.png b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/ja/s-11.png index d809faccf5..5d2ae9594f 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/ja/s-11.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/ja/s-11.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/ja/s-12.png b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/ja/s-12.png index f2e0b88dc4..82ce71df25 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/ja/s-12.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/ja/s-12.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/ja/s-13.png b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/ja/s-13.png index 800304d124..eb0f939148 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/ja/s-13.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/ja/s-13.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/ja/s-14.png b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/ja/s-14.png index 651a1105a3..446d6b3711 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/ja/s-14.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/ja/s-14.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/zh-CHS/s-06.png b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/zh-CHS/s-06.png index 85bd58d884..313185d425 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/zh-CHS/s-06.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/zh-CHS/s-06.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/zh-CHS/s-09.png b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/zh-CHS/s-09.png index b594cee630..2fa6a28677 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/zh-CHS/s-09.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/zh-CHS/s-09.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/zh-CHS/s-10.png b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/zh-CHS/s-10.png index 49864d3d01..6a8d94e82b 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/zh-CHS/s-10.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/zh-CHS/s-10.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/zh-CHS/s-11.png b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/zh-CHS/s-11.png index 1a1f71f8eb..99713f7096 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/zh-CHS/s-11.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/zh-CHS/s-11.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/zh-CHS/s-12.png b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/zh-CHS/s-12.png index 207c03c400..c00866561b 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/zh-CHS/s-12.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/zh-CHS/s-12.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/zh-CHS/s-13.png b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/zh-CHS/s-13.png index 2f7b5b68d4..460e0e5737 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/zh-CHS/s-13.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/zh-CHS/s-13.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/zh-CHS/s-14.png b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/zh-CHS/s-14.png index 5826e0a834..80df5f7ac5 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/zh-CHS/s-14.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AbsoluteQuant/zh-CHS/s-14.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-01.png b/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-01.png index 505ee555db..cd4e598afa 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-01.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-01.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-02.png b/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-02.png index 0bd9b05194..7bf52b4764 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-02.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-02.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-06.png b/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-06.png index 886dad3753..91f72b7ad1 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-06.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-06.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-07.png b/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-07.png index 88766600fe..c46cfc0924 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-07.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-07.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-09.png b/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-09.png index 18ee6d6a25..439e607da1 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-09.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-09.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-11.png b/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-11.png index 86e777026e..0ad6c6f411 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-11.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-11.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-13.png b/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-13.png index faa359c61f..64f87a7473 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-13.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-13.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-15.png b/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-15.png index 56b81c0c64..8068fea552 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-15.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-15.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-16.png b/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-16.png index 6ab1172ce3..3ac6bba360 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-16.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-16.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-17.png b/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-17.png index 8d9121392a..c0e5f18b76 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-17.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-17.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-19.png b/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-19.png index 2a8731e806..d86e90b5b8 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-19.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-19.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-20.png b/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-20.png index ce00a1bda0..7681e0c722 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-20.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-20.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-21.png b/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-21.png index 0d6a55af25..34a1f4f0f0 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-21.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-21.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-23.png b/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-23.png index a54214f388..a1b5dd8db9 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-23.png and b/pwiz_tools/Skyline/Documentation/Tutorials/AuditLog/en/s-23.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/en/s-22.png b/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/en/s-22.png index eb7dad8f58..317faa7ec1 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/en/s-22.png and b/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/en/s-22.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/en/s-23.png b/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/en/s-23.png index 0687f9238b..0fd6d6614c 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/en/s-23.png and b/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/en/s-23.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/en/s-28.png b/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/en/s-28.png index 06d229bd26..49f0b14c48 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/en/s-28.png and b/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/en/s-28.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/ja/s-22.png b/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/ja/s-22.png index 587f06e1e9..22a8a9041a 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/ja/s-22.png and b/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/ja/s-22.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/ja/s-23.png b/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/ja/s-23.png index 04d5484f2e..96823233ec 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/ja/s-23.png and b/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/ja/s-23.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/ja/s-28.png b/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/ja/s-28.png index 9ba3050a96..5e8e83f0f1 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/ja/s-28.png and b/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/ja/s-28.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/zh-CHS/s-22.png b/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/zh-CHS/s-22.png index 30c4218736..e1df56682e 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/zh-CHS/s-22.png and b/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/zh-CHS/s-22.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/zh-CHS/s-23.png b/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/zh-CHS/s-23.png index ecc5b9e120..0034ff2c85 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/zh-CHS/s-23.png and b/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/zh-CHS/s-23.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/zh-CHS/s-28.png b/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/zh-CHS/s-28.png index 9b285c46c2..f622cfec98 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/zh-CHS/s-28.png and b/pwiz_tools/Skyline/Documentation/Tutorials/CustomReports/zh-CHS/s-28.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/en/s-06.png b/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/en/s-06.png index 9cc1c5816d..ef35c3e614 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/en/s-06.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/en/s-06.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/en/s-07.png b/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/en/s-07.png index dd0e35e6af..1e526537d0 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/en/s-07.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/en/s-07.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/en/s-09.png b/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/en/s-09.png index c2af7ed149..a8afae3eca 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/en/s-09.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/en/s-09.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/en/s-15.png b/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/en/s-15.png index 6c700b734d..97d4114cd3 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/en/s-15.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/en/s-15.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/en/s-17.png b/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/en/s-17.png index d3964c6c70..da114ca033 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/en/s-17.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/en/s-17.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/ja/s-06.png b/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/ja/s-06.png index ecf1644912..f883f0da8b 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/ja/s-06.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/ja/s-06.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/ja/s-07.png b/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/ja/s-07.png index a4e41f0d54..4ef006b4c8 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/ja/s-07.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/ja/s-07.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/ja/s-09.png b/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/ja/s-09.png index ea7a70c7d7..d8775a7a6c 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/ja/s-09.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/ja/s-09.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/ja/s-15.png b/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/ja/s-15.png index b3461c02da..61607e03e7 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/ja/s-15.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/ja/s-15.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/ja/s-17.png b/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/ja/s-17.png index fa31b6688e..2fdfbed3eb 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/ja/s-17.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/ja/s-17.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/zh-CHS/s-06.png b/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/zh-CHS/s-06.png index 7e81dfa0c8..000f3dfd9b 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/zh-CHS/s-06.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/zh-CHS/s-06.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/zh-CHS/s-07.png b/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/zh-CHS/s-07.png index da86b79c3f..a6e997e56c 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/zh-CHS/s-07.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/zh-CHS/s-07.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/zh-CHS/s-09.png b/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/zh-CHS/s-09.png index e26072e206..b5907e3dd2 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/zh-CHS/s-09.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/zh-CHS/s-09.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/zh-CHS/s-15.png b/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/zh-CHS/s-15.png index c5e460a301..5b787997ce 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/zh-CHS/s-15.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/zh-CHS/s-15.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/zh-CHS/s-17.png b/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/zh-CHS/s-17.png index 40053f25a0..77b0200ea6 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/zh-CHS/s-17.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DDASearch/zh-CHS/s-17.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-PASEF/en/s-06.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-PASEF/en/s-06.png index caeac4aa02..a8c9f928ed 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-PASEF/en/s-06.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-PASEF/en/s-06.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-PASEF/en/s-19.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-PASEF/en/s-19.png index 91db21d482..f8421d8292 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-PASEF/en/s-19.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-PASEF/en/s-19.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-PASEF/en/s-20.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-PASEF/en/s-20.png index 23c37adb07..61fde5debd 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-PASEF/en/s-20.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-PASEF/en/s-20.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-PASEF/en/s-21.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-PASEF/en/s-21.png index 296f1c6345..64345ed376 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-PASEF/en/s-21.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-PASEF/en/s-21.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/en/s-05.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/en/s-05.png index b09a8cc7ec..6694e9af85 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/en/s-05.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/en/s-05.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/en/s-18.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/en/s-18.png index 8b5a9cefe7..aca668b8c6 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/en/s-18.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/en/s-18.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/en/s-19.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/en/s-19.png index 7a5edef4a6..9e6fbceff9 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/en/s-19.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/en/s-19.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/en/s-20.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/en/s-20.png index 7c8e88e8fc..334074c678 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/en/s-20.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/en/s-20.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/ja/s-05.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/ja/s-05.png index ac4b536e3a..c64a4c9bd2 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/ja/s-05.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/ja/s-05.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/ja/s-18.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/ja/s-18.png index 10cfebcabb..ef97408e7b 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/ja/s-18.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/ja/s-18.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/ja/s-19.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/ja/s-19.png index d0ce98bdb8..639cb53f01 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/ja/s-19.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/ja/s-19.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/ja/s-20.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/ja/s-20.png index 51a82f1d97..11768800ee 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/ja/s-20.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/ja/s-20.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/zh-CHS/s-05.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/zh-CHS/s-05.png index 117b8cbb37..87da48638c 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/zh-CHS/s-05.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/zh-CHS/s-05.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/zh-CHS/s-18.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/zh-CHS/s-18.png index bda53d63cc..69171d4928 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/zh-CHS/s-18.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/zh-CHS/s-18.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/zh-CHS/s-19.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/zh-CHS/s-19.png index bee78bbc51..8bdad914eb 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/zh-CHS/s-19.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/zh-CHS/s-19.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/zh-CHS/s-20.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/zh-CHS/s-20.png index 9525542434..a9787d4fd5 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/zh-CHS/s-20.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-QE/zh-CHS/s-20.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/en/s-05.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/en/s-05.png index 8863343377..ba50c1622a 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/en/s-05.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/en/s-05.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/en/s-18.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/en/s-18.png index 5dd97e787f..d6c5a32a35 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/en/s-18.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/en/s-18.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/en/s-19.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/en/s-19.png index 18f1764335..25d8133405 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/en/s-19.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/en/s-19.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/en/s-20.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/en/s-20.png index df33159ab7..7e41629840 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/en/s-20.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/en/s-20.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/ja/s-05.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/ja/s-05.png index afe6e94baa..fbd5e354c9 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/ja/s-05.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/ja/s-05.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/ja/s-18.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/ja/s-18.png index fc43c4d648..c83b2fe220 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/ja/s-18.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/ja/s-18.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/ja/s-19.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/ja/s-19.png index cb86dbfddb..9a2221b9a2 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/ja/s-19.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/ja/s-19.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/ja/s-20.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/ja/s-20.png index f40092f195..6870c83fab 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/ja/s-20.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/ja/s-20.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/zh-CHS/s-05.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/zh-CHS/s-05.png index 1c3aa3918a..b328ca7e04 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/zh-CHS/s-05.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/zh-CHS/s-05.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/zh-CHS/s-18.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/zh-CHS/s-18.png index 0adeb2b730..358851f8cf 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/zh-CHS/s-18.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/zh-CHS/s-18.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/zh-CHS/s-19.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/zh-CHS/s-19.png index 0c66b902b2..e33956b8e9 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/zh-CHS/s-19.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/zh-CHS/s-19.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/zh-CHS/s-20.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/zh-CHS/s-20.png index a67fabdbca..b733212e56 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/zh-CHS/s-20.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-TTOF/zh-CHS/s-20.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-01.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-01.png index b3a3cc1c76..e5e939b5aa 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-01.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-01.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-02.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-02.png index 845cfe65b3..95e170e2af 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-02.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-02.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-03.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-03.png index f581fa16cf..11c67ab12f 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-03.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-03.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-04.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-04.png index 8c8c624864..664dedbfb5 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-04.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-04.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-05.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-05.png index 42b48aea68..512e316506 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-05.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-05.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-06.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-06.png index f4122c10d2..e2a8d4ab8d 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-06.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-06.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-07.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-07.png index 7bef0a1efd..be40d0325f 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-07.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-07.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-08.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-08.png index d6a6f82e41..f1747c40c4 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-08.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-08.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-09.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-09.png index 9b90a5f85c..779e4fae40 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-09.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-09.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-10.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-10.png index 320c5b4b76..5f5b0a5d76 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-10.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-10.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-11.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-11.png index 3badd14156..4026de317a 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-11.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-11.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-12.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-12.png index ba57272d34..54dea57fd4 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-12.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-12.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-14.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-14.png index c3c5e44827..bfa257de52 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-14.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-14.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-15.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-15.png index 70c33ebf62..e23b3e9643 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-15.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-15.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-16.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-16.png index 4b5eef1afb..8068863373 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-16.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-16.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-17.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-17.png index 18be8ff942..7fdd9ade72 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-17.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-17.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-18.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-18.png index 6bfafd10ee..87a3f7e27b 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-18.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-18.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-19.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-19.png index 8427cf7445..64779a11eb 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-19.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-19.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-20.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-20.png index 1f2ea480d5..91ad9fe38f 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-20.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-20.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-21.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-21.png index 31f501e81b..d6a977b20f 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-21.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-21.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-22.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-22.png index f9cfee946f..bd83f3b35a 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-22.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-22.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-23.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-23.png index 4a1398b2c9..73b8cb7834 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-23.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-23.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-24.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-24.png index 130ddde928..4d8b94a36c 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-24.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-24.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-25.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-25.png index 28005573b8..e4caaf3b33 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-25.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-25.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-26.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-26.png index 3a122c78a3..7616edff65 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-26.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-26.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-27.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-27.png index b41c7b8692..29160a8523 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-27.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-27.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-28.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-28.png index dd0c77c7d0..b42eb248a7 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-28.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA-Umpire-TTOF/en/s-28.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA/en/s-09.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA/en/s-09.png index 7a8a2f2795..c0169b85d2 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA/en/s-09.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA/en/s-09.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA/en/s-16.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA/en/s-16.png index 62d960493e..3b35f8fcce 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA/en/s-16.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA/en/s-16.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA/en/s-17.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA/en/s-17.png index 0a1e00b908..87be3d1849 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA/en/s-17.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA/en/s-17.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA/en/s-19.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA/en/s-19.png index c430fd4366..2e80804ece 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA/en/s-19.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA/en/s-19.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA/en/s-21.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA/en/s-21.png index bd0bdf2de0..8c81fbe77a 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA/en/s-21.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA/en/s-21.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA/ja/s-09.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA/ja/s-09.png index e51b430214..98002fc9fc 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA/ja/s-09.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA/ja/s-09.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA/ja/s-16.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA/ja/s-16.png index cb31468ba3..cca8e22890 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA/ja/s-16.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA/ja/s-16.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA/ja/s-17.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA/ja/s-17.png index 7349e45174..e56765836d 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA/ja/s-17.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA/ja/s-17.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA/ja/s-19.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA/ja/s-19.png index 34b4e5c103..b61bd0b032 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA/ja/s-19.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA/ja/s-19.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA/ja/s-21.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA/ja/s-21.png index 797e0bdd79..763feab035 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA/ja/s-21.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA/ja/s-21.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA/zh-CHS/s-09.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA/zh-CHS/s-09.png index a3f0898741..161769801e 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA/zh-CHS/s-09.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA/zh-CHS/s-09.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA/zh-CHS/s-16.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA/zh-CHS/s-16.png index 6ebc9e2e1d..594f63bf6d 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA/zh-CHS/s-16.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA/zh-CHS/s-16.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA/zh-CHS/s-17.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA/zh-CHS/s-17.png index 69fe28b744..983a8238f1 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA/zh-CHS/s-17.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA/zh-CHS/s-17.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA/zh-CHS/s-19.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA/zh-CHS/s-19.png index 52753b68a6..1daea0ba09 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA/zh-CHS/s-19.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA/zh-CHS/s-19.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/DIA/zh-CHS/s-21.png b/pwiz_tools/Skyline/Documentation/Tutorials/DIA/zh-CHS/s-21.png index 14ee445ceb..c24c0370f2 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/DIA/zh-CHS/s-21.png and b/pwiz_tools/Skyline/Documentation/Tutorials/DIA/zh-CHS/s-21.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-07.png b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-07.png index 8e47b65794..8b1033bb47 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-07.png and b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-07.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-08.png b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-08.png index 98402b7fbe..3efa52fc9e 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-08.png and b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-08.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-09.png b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-09.png index 7a61a98a89..66feaffab8 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-09.png and b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-09.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-10.png b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-10.png index 2524c2987c..3217d9dac0 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-10.png and b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-10.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-11.png b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-11.png index 3bd6c16459..fb73538a42 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-11.png and b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-11.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-15.png b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-15.png index 7d3be54954..a5552d95aa 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-15.png and b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-15.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-18.png b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-18.png index 557660643b..295dbdedd1 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-18.png and b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-18.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-21.png b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-21.png index a995bb9a1b..34116483b3 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-21.png and b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-21.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-22.png b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-22.png index a46ee79f41..335d6fe468 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-22.png and b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-22.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-07.png b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-07.png index 3fceda29da..cf4398be31 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-07.png and b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-07.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-08.png b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-08.png index 11c5102ef3..f8d6b8f190 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-08.png and b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-08.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-09.png b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-09.png index d0a52da456..f7c3d11212 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-09.png and b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-09.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-10.png b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-10.png index 655a340083..fc4f8a692c 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-10.png and b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-10.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-11.png b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-11.png index 96467fde84..1f8e740a90 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-11.png and b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-11.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-15.png b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-15.png index 7d3be54954..a5552d95aa 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-15.png and b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-15.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-18.png b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-18.png index 557660643b..295dbdedd1 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-18.png and b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-18.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-21.png b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-21.png index 5ef49bf2b9..7456944435 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-21.png and b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-21.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-22.png b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-22.png index e5bf8b2901..b64d7396b1 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-22.png and b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/ja/s-22.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-07.png b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-07.png index 2a505e4e23..30b1443769 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-07.png and b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-07.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-08.png b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-08.png index b85dc4b2d4..e873bd8f54 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-08.png and b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-08.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-09.png b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-09.png index ae35b2e133..3a2cdc8eb9 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-09.png and b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-09.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-10.png b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-10.png index 91d7af522e..c26b91dc9e 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-10.png and b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-10.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-11.png b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-11.png index 8692c97cc7..52cac7039b 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-11.png and b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-11.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-15.png b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-15.png index 7d3be54954..a5552d95aa 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-15.png and b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-15.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-18.png b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-18.png index 557660643b..295dbdedd1 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-18.png and b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-18.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-21.png b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-21.png index 7c7f493c0a..dfb4b69c8e 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-21.png and b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-21.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-22.png b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-22.png index 17dfc0f103..f7cc222f33 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-22.png and b/pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/zh-CHS/s-22.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/en/s-04.png b/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/en/s-04.png index c6a09689d4..396ad6401e 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/en/s-04.png and b/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/en/s-04.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/en/s-05.png b/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/en/s-05.png index 2016d221e0..499166a842 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/en/s-05.png and b/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/en/s-05.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/en/s-06.png b/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/en/s-06.png index f36875e218..f54ab10ae8 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/en/s-06.png and b/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/en/s-06.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/en/s-08.png b/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/en/s-08.png index 3f13343d91..b2be74042e 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/en/s-08.png and b/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/en/s-08.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/en/s-79.png b/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/en/s-79.png index 47d2dc563b..fdeb9c4479 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/en/s-79.png and b/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/en/s-79.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/ja/s-04.png b/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/ja/s-04.png index 1bae992297..0b4d8accb3 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/ja/s-04.png and b/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/ja/s-04.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/ja/s-05.png b/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/ja/s-05.png index 68303331e7..372ade2a00 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/ja/s-05.png and b/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/ja/s-05.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/ja/s-06.png b/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/ja/s-06.png index 0f30868bdd..a8d6cfbc8c 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/ja/s-06.png and b/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/ja/s-06.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/ja/s-08.png b/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/ja/s-08.png index 7b2195b166..76226521c5 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/ja/s-08.png and b/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/ja/s-08.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/ja/s-79.png b/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/ja/s-79.png index 47d2dc563b..fdeb9c4479 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/ja/s-79.png and b/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/ja/s-79.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/zh-CHS/s-04.png b/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/zh-CHS/s-04.png index 4fc6f4477f..b2c67fd600 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/zh-CHS/s-04.png and b/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/zh-CHS/s-04.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/zh-CHS/s-05.png b/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/zh-CHS/s-05.png index 328e1576f5..a40d3d9987 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/zh-CHS/s-05.png and b/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/zh-CHS/s-05.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/zh-CHS/s-06.png b/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/zh-CHS/s-06.png index 81dd6f4b3a..ebbec9997b 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/zh-CHS/s-06.png and b/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/zh-CHS/s-06.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/zh-CHS/s-08.png b/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/zh-CHS/s-08.png index aca7498f56..259572392a 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/zh-CHS/s-08.png and b/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/zh-CHS/s-08.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/zh-CHS/s-79.png b/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/zh-CHS/s-79.png index 47d2dc563b..fdeb9c4479 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/zh-CHS/s-79.png and b/pwiz_tools/Skyline/Documentation/Tutorials/GroupedStudies/zh-CHS/s-79.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/HiResMetabolomics/en/s-08.png b/pwiz_tools/Skyline/Documentation/Tutorials/HiResMetabolomics/en/s-08.png index b7d3f530c6..e1bd4afa8d 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/HiResMetabolomics/en/s-08.png and b/pwiz_tools/Skyline/Documentation/Tutorials/HiResMetabolomics/en/s-08.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/HiResMetabolomics/en/s-09.png b/pwiz_tools/Skyline/Documentation/Tutorials/HiResMetabolomics/en/s-09.png index b29140f13b..ed2db2e1fa 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/HiResMetabolomics/en/s-09.png and b/pwiz_tools/Skyline/Documentation/Tutorials/HiResMetabolomics/en/s-09.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/HiResMetabolomics/en/s-10.png b/pwiz_tools/Skyline/Documentation/Tutorials/HiResMetabolomics/en/s-10.png index 28574000c8..3419f670d4 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/HiResMetabolomics/en/s-10.png and b/pwiz_tools/Skyline/Documentation/Tutorials/HiResMetabolomics/en/s-10.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/HiResMetabolomics/en/s-11.png b/pwiz_tools/Skyline/Documentation/Tutorials/HiResMetabolomics/en/s-11.png index 8fcae8fe78..f93a576282 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/HiResMetabolomics/en/s-11.png and b/pwiz_tools/Skyline/Documentation/Tutorials/HiResMetabolomics/en/s-11.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/HiResMetabolomics/en/s-12.png b/pwiz_tools/Skyline/Documentation/Tutorials/HiResMetabolomics/en/s-12.png index ade73a3669..8a81f93598 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/HiResMetabolomics/en/s-12.png and b/pwiz_tools/Skyline/Documentation/Tutorials/HiResMetabolomics/en/s-12.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/HiResMetabolomics/en/s-13.png b/pwiz_tools/Skyline/Documentation/Tutorials/HiResMetabolomics/en/s-13.png index 4241db3574..d10be2d6f7 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/HiResMetabolomics/en/s-13.png and b/pwiz_tools/Skyline/Documentation/Tutorials/HiResMetabolomics/en/s-13.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-01.png b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-01.png index c49775004c..94a8a7cd8b 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-01.png and b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-01.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-02.png b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-02.png index acf35c9667..bb7894ac3c 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-02.png and b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-02.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-03.png b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-03.png index 2cef362b19..c52da27432 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-03.png and b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-03.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-04.png b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-04.png index 6c27bacdd2..91cff543ac 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-04.png and b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-04.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-05.png b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-05.png index 8aef9486b1..4952ebae74 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-05.png and b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-05.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-06.png b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-06.png index 68b09abcb5..c203b560a5 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-06.png and b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-06.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-07.png b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-07.png index cb9d08d7e7..3cf8af24ef 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-07.png and b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-07.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-08.png b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-08.png index b9d3a000f7..cf7267015f 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-08.png and b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-08.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-09.png b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-09.png index 5bd4538a92..508db06bbf 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-09.png and b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-09.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-10.png b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-10.png index 43ff34516d..020e5de144 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-10.png and b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-10.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-11.png b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-11.png index 1b7f6293f9..95fa209e09 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-11.png and b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-11.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-12.png b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-12.png index f840e137b5..e07e275c84 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-12.png and b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-12.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-13.png b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-13.png index 48638525f2..dcf26c1219 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-13.png and b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-13.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-14.png b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-14.png index 3875f9f6ac..ba0d9635b3 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-14.png and b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-14.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-15.png b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-15.png index 9db72191a0..46907b8a1d 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-15.png and b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-15.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-16.png b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-16.png index 04625a9107..433f498f35 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-16.png and b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-16.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-17.png b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-17.png index 0b3d1cce35..1452351724 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-17.png and b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-17.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-18.png b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-18.png index 4f11231b9d..a3949c9480 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-18.png and b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-18.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-19.png b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-19.png index 21b170e3a6..8505c2f809 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-19.png and b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-19.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-20.png b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-20.png index 64f5f7a375..8057f147dd 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-20.png and b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-20.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-21.png b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-21.png index 66b69b2b26..b3959407b4 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-21.png and b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-21.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-22.png b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-22.png index 00822810cc..2765b8c5db 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-22.png and b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-22.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-23.png b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-23.png index 98fd2ab8c7..080728321e 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-23.png and b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-23.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-24.png b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-24.png index ee8c2c0623..44ae723dbb 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-24.png and b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-24.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-25.png b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-25.png index d5acd5de34..1f80150769 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-25.png and b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-25.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-26.png b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-26.png index 6afd5c08c1..cde757c62d 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-26.png and b/pwiz_tools/Skyline/Documentation/Tutorials/IMSFiltering/en/s-26.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/LibraryExplorer/en/s-11.png b/pwiz_tools/Skyline/Documentation/Tutorials/LibraryExplorer/en/s-11.png index f13116cc43..0832534c1e 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/LibraryExplorer/en/s-11.png and b/pwiz_tools/Skyline/Documentation/Tutorials/LibraryExplorer/en/s-11.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/LibraryExplorer/en/s-23.png b/pwiz_tools/Skyline/Documentation/Tutorials/LibraryExplorer/en/s-23.png index c1dc1eccdb..ab9da6ae11 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/LibraryExplorer/en/s-23.png and b/pwiz_tools/Skyline/Documentation/Tutorials/LibraryExplorer/en/s-23.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/en/s-09.png b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/en/s-09.png index 823bb4c6f7..2797541c0b 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/en/s-09.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/en/s-09.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/en/s-12.png b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/en/s-12.png index fb5c2dfdd1..b57a4695c7 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/en/s-12.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/en/s-12.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/en/s-13.png b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/en/s-13.png index 5545002954..ac09b052a5 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/en/s-13.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/en/s-13.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/en/s-14.png b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/en/s-14.png index 50744350ca..bfabbec2b4 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/en/s-14.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/en/s-14.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/en/s-22.png b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/en/s-22.png index 775a47c0b3..6c4f8c42ae 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/en/s-22.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/en/s-22.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/en/s-23.png b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/en/s-23.png index 41008a266a..5b17c1c3a2 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/en/s-23.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/en/s-23.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/ja/s-09.png b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/ja/s-09.png index ec70ba1639..e7ddf9baea 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/ja/s-09.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/ja/s-09.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/ja/s-12.png b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/ja/s-12.png index 498e2e7a23..70ae2c4984 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/ja/s-12.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/ja/s-12.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/ja/s-13.png b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/ja/s-13.png index 3219e05153..5b50fb7664 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/ja/s-13.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/ja/s-13.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/ja/s-14.png b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/ja/s-14.png index a7600ab1d5..09045cd7ea 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/ja/s-14.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/ja/s-14.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/ja/s-22.png b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/ja/s-22.png index c4f49f114f..e919226173 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/ja/s-22.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/ja/s-22.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/ja/s-23.png b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/ja/s-23.png index 9ce7a3bb14..051661212b 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/ja/s-23.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/ja/s-23.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/zh-CHS/s-09.png b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/zh-CHS/s-09.png index cbc6695f5c..a7961dad22 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/zh-CHS/s-09.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/zh-CHS/s-09.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/zh-CHS/s-12.png b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/zh-CHS/s-12.png index 914ee6f014..f013e325f7 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/zh-CHS/s-12.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/zh-CHS/s-12.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/zh-CHS/s-13.png b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/zh-CHS/s-13.png index 2ac14b3f7a..cbb5156c7e 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/zh-CHS/s-13.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/zh-CHS/s-13.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/zh-CHS/s-14.png b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/zh-CHS/s-14.png index 0241a2b087..56627e2c83 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/zh-CHS/s-14.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/zh-CHS/s-14.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/zh-CHS/s-22.png b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/zh-CHS/s-22.png index 2a59a381af..49995bcd3d 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/zh-CHS/s-22.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/zh-CHS/s-22.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/zh-CHS/s-23.png b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/zh-CHS/s-23.png index 2b29a74bfa..718141e53c 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/zh-CHS/s-23.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/zh-CHS/s-23.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/zh-CHS/s-44.png b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/zh-CHS/s-44.png index 3511f0b7a3..0cab628f5c 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/zh-CHS/s-44.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MS1Filtering/zh-CHS/s-44.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-04.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-04.png index 6523ea2291..c7554f314d 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-04.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-04.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-05.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-05.png index 315e21ef7a..9432586152 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-05.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-05.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-08.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-08.png index a73a7ed4bc..55716b0b86 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-08.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-08.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-11.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-11.png index a19174bd2b..15720fba25 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-11.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-11.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-16.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-16.png index d6152447a7..7c1aad3b68 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-16.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-16.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-17.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-17.png index 0b500c16a6..81da1480fa 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-17.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-17.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-18.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-18.png index c78a142e5d..314f56029d 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-18.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-18.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-04.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-04.png index 2723b4183d..8c30b60ff5 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-04.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-04.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-05.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-05.png index 4fd51e29d6..3b0fc1010a 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-05.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-05.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-08.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-08.png index 4d73152c1f..49b7eaa161 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-08.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-08.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-11.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-11.png index f10ab26786..19b7cf2284 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-11.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-11.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-16.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-16.png index d9e37538ca..ee99d88b8e 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-16.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-16.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-17.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-17.png index 493729c0d6..674c081673 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-17.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-17.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-18.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-18.png index a482bc9e4d..7d6c949602 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-18.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/ja/s-18.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/zh-CHS/s-04.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/zh-CHS/s-04.png index 9f7b35893b..0ea1ee291c 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/zh-CHS/s-04.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/zh-CHS/s-04.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/zh-CHS/s-05.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/zh-CHS/s-05.png index 78c48a3149..3f7e88e40d 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/zh-CHS/s-05.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/zh-CHS/s-05.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/zh-CHS/s-08.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/zh-CHS/s-08.png index 254014fbf7..f8a7386c14 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/zh-CHS/s-08.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/zh-CHS/s-08.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/zh-CHS/s-11.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/zh-CHS/s-11.png index d7f46f361e..0765750bb5 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/zh-CHS/s-11.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/zh-CHS/s-11.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/zh-CHS/s-16.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/zh-CHS/s-16.png index dcc605a144..f6bf3a80c0 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/zh-CHS/s-16.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/zh-CHS/s-16.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/zh-CHS/s-17.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/zh-CHS/s-17.png index 78d663824f..db44b51788 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/zh-CHS/s-17.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/zh-CHS/s-17.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/zh-CHS/s-18.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/zh-CHS/s-18.png index 1f6d8eb311..d49b14eea7 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/zh-CHS/s-18.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/zh-CHS/s-18.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-01.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-01.png index 21953355a5..9e41b30632 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-01.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-01.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-08.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-08.png index a2af36006b..c8401721a9 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-08.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-08.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-10.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-10.png index 0ef6294bde..6093c6d46a 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-10.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-10.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-13.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-13.png index 199cb02641..26c98f221c 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-13.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-13.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-14.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-14.png index 90d2000211..3cae5cc1e4 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-14.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-14.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-17.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-17.png index 80c7300b07..672aad5dd9 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-17.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-17.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-21.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-21.png index abe6ded5f4..d218d767e6 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-21.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-21.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/ja/s-01.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/ja/s-01.png index bcaaf6bde4..bf070299bf 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/ja/s-01.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/ja/s-01.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/ja/s-08.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/ja/s-08.png index 98a015ac83..3cc2a379f7 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/ja/s-08.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/ja/s-08.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/ja/s-10.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/ja/s-10.png index cbb1bb0261..5670ad7ee6 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/ja/s-10.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/ja/s-10.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/ja/s-13.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/ja/s-13.png index b1a51b2e70..12ac006ac1 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/ja/s-13.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/ja/s-13.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/ja/s-14.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/ja/s-14.png index d041f9e648..5fd7d57a61 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/ja/s-14.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/ja/s-14.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/ja/s-17.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/ja/s-17.png index 44033c87ea..dadc422121 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/ja/s-17.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/ja/s-17.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/ja/s-21.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/ja/s-21.png index 6cee798d33..06315aec46 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/ja/s-21.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/ja/s-21.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/zh-CHS/s-01.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/zh-CHS/s-01.png index bd9fb01799..a69e11f63e 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/zh-CHS/s-01.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/zh-CHS/s-01.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/zh-CHS/s-08.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/zh-CHS/s-08.png index de0f8e9d8a..e8fc0f786c 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/zh-CHS/s-08.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/zh-CHS/s-08.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/zh-CHS/s-10.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/zh-CHS/s-10.png index 66cb8bd7fe..4b305c439d 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/zh-CHS/s-10.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/zh-CHS/s-10.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/zh-CHS/s-13.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/zh-CHS/s-13.png index 9460f4bc3e..cecee4a4f9 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/zh-CHS/s-13.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/zh-CHS/s-13.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/zh-CHS/s-14.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/zh-CHS/s-14.png index 3b5811ae2e..5ad14a7141 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/zh-CHS/s-14.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/zh-CHS/s-14.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/zh-CHS/s-17.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/zh-CHS/s-17.png index b63641bb37..d930b18625 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/zh-CHS/s-17.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/zh-CHS/s-17.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/zh-CHS/s-21.png b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/zh-CHS/s-21.png index 4e23ec49c4..f308f8c932 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/zh-CHS/s-21.png and b/pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/zh-CHS/s-21.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/OptimizeCE/en/s-03.png b/pwiz_tools/Skyline/Documentation/Tutorials/OptimizeCE/en/s-03.png index 144aa14d3a..b13b2e0cd3 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/OptimizeCE/en/s-03.png and b/pwiz_tools/Skyline/Documentation/Tutorials/OptimizeCE/en/s-03.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/OptimizeCE/en/s-05.png b/pwiz_tools/Skyline/Documentation/Tutorials/OptimizeCE/en/s-05.png index d654b8cf6b..0e87252831 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/OptimizeCE/en/s-05.png and b/pwiz_tools/Skyline/Documentation/Tutorials/OptimizeCE/en/s-05.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/OptimizeCE/en/s-06.png b/pwiz_tools/Skyline/Documentation/Tutorials/OptimizeCE/en/s-06.png index f1e5acc49a..22b43f90eb 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/OptimizeCE/en/s-06.png and b/pwiz_tools/Skyline/Documentation/Tutorials/OptimizeCE/en/s-06.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-01.png b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-01.png index d868005de2..d6f79e86fa 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-01.png and b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-01.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-15.png b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-15.png index 2df68109de..fcaa18e840 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-15.png and b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-15.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-16.png b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-16.png index 4e0a9fad15..bb63b41453 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-16.png and b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-16.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-27.png b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-27.png index 6fe4a35d61..67c9fd3348 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-27.png and b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-27.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-28.png b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-28.png index 38433e4bb1..bb654dfad9 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-28.png and b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-28.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-29.png b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-29.png index 314e034c83..7f40def30a 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-29.png and b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-29.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-33.png b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-33.png index 68ee4f6dd4..26ef4e41a8 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-33.png and b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/en/s-33.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/ja/s-01.png b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/ja/s-01.png index 22ca238a06..4dc63d0699 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/ja/s-01.png and b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/ja/s-01.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/ja/s-16.png b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/ja/s-16.png index adf0196a14..30ceea3cde 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/ja/s-16.png and b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/ja/s-16.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/ja/s-27.png b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/ja/s-27.png index 3a8396a623..5bd681124c 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/ja/s-27.png and b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/ja/s-27.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/ja/s-28.png b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/ja/s-28.png index 419314bea7..693eb01366 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/ja/s-28.png and b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/ja/s-28.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/ja/s-29.png b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/ja/s-29.png index 58a2a2ea7b..2e6d72d591 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/ja/s-29.png and b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/ja/s-29.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/ja/s-33.png b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/ja/s-33.png index 20385656d3..b78663d94d 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/ja/s-33.png and b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/ja/s-33.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/zh-CHS/s-01.png b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/zh-CHS/s-01.png index 3ea40592ff..dc1793a266 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/zh-CHS/s-01.png and b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/zh-CHS/s-01.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/zh-CHS/s-16.png b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/zh-CHS/s-16.png index 5f23af8e76..20bb3b4b87 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/zh-CHS/s-16.png and b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/zh-CHS/s-16.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/zh-CHS/s-27.png b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/zh-CHS/s-27.png index bfc4ca8a3a..63ca2be933 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/zh-CHS/s-27.png and b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/zh-CHS/s-27.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/zh-CHS/s-28.png b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/zh-CHS/s-28.png index bd3b782e4d..0fb1fd3d15 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/zh-CHS/s-28.png and b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/zh-CHS/s-28.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/zh-CHS/s-29.png b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/zh-CHS/s-29.png index 044a25fdc6..70397c2291 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/zh-CHS/s-29.png and b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/zh-CHS/s-29.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/zh-CHS/s-33.png b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/zh-CHS/s-33.png index 68d55413ee..32d1ad6e3d 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/PRM/zh-CHS/s-33.png and b/pwiz_tools/Skyline/Documentation/Tutorials/PRM/zh-CHS/s-33.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/PeakPicking/en/s-02.png b/pwiz_tools/Skyline/Documentation/Tutorials/PeakPicking/en/s-02.png index 493c58fddd..b62f53935f 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/PeakPicking/en/s-02.png and b/pwiz_tools/Skyline/Documentation/Tutorials/PeakPicking/en/s-02.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/PeakPicking/en/s-04.png b/pwiz_tools/Skyline/Documentation/Tutorials/PeakPicking/en/s-04.png index dd16ce908e..10ad310848 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/PeakPicking/en/s-04.png and b/pwiz_tools/Skyline/Documentation/Tutorials/PeakPicking/en/s-04.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/PeakPicking/en/s-17.png b/pwiz_tools/Skyline/Documentation/Tutorials/PeakPicking/en/s-17.png index b8ebbf0dc4..4cdf684383 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/PeakPicking/en/s-17.png and b/pwiz_tools/Skyline/Documentation/Tutorials/PeakPicking/en/s-17.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/PeakPicking/en/s-19.png b/pwiz_tools/Skyline/Documentation/Tutorials/PeakPicking/en/s-19.png index d1aa7166ea..b93f1cfaf6 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/PeakPicking/en/s-19.png and b/pwiz_tools/Skyline/Documentation/Tutorials/PeakPicking/en/s-19.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/en/s-03.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/en/s-03.png index 37e49045db..cd4748dbcf 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/en/s-03.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/en/s-03.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/en/s-04.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/en/s-04.png index b0761f260a..cd685b8a38 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/en/s-04.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/en/s-04.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/en/s-05.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/en/s-05.png index 1ef85c742e..866bdc3c8c 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/en/s-05.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/en/s-05.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/en/s-06.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/en/s-06.png index 740776d266..debe330737 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/en/s-06.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/en/s-06.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/ja/s-03.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/ja/s-03.png index f022181fcb..af05f5399a 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/ja/s-03.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/ja/s-03.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/ja/s-04.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/ja/s-04.png index 989884de78..12068a33a1 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/ja/s-04.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/ja/s-04.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/ja/s-05.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/ja/s-05.png index b3599ddc06..66fb969f0d 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/ja/s-05.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/ja/s-05.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/ja/s-06.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/ja/s-06.png index 779e3bba6d..b1552fd332 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/ja/s-06.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/ja/s-06.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/zh-CHS/s-03.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/zh-CHS/s-03.png index 1dc9d03cc1..b50b9675dc 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/zh-CHS/s-03.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/zh-CHS/s-03.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/zh-CHS/s-04.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/zh-CHS/s-04.png index 0a14b4d71d..fc7da5da1a 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/zh-CHS/s-04.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/zh-CHS/s-04.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/zh-CHS/s-05.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/zh-CHS/s-05.png index 993e251f17..51d2255bb6 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/zh-CHS/s-05.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/zh-CHS/s-05.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/zh-CHS/s-06.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/zh-CHS/s-06.png index 1b0b808db6..b71d103a48 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/zh-CHS/s-06.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMolecule/zh-CHS/s-06.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-01.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-01.png index 732ad5bb73..6e3db5dfa2 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-01.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-01.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-02.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-02.png index 3b72a724fe..9d02424186 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-02.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-02.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-03.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-03.png index 959f97c3b7..c17936cffe 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-03.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-03.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-04.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-04.png index 76a90c361c..3142e4cfc8 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-04.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-04.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-05.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-05.png index b601101c71..479009c182 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-05.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-05.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-06.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-06.png index 2cef362b19..c52da27432 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-06.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-06.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-07.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-07.png index 5fc6b15e55..c7bcf95527 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-07.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-07.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-08.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-08.png index fef0c8e52d..1918373fb2 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-08.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-08.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-09.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-09.png index 9fa9749c9f..75b8b73abd 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-09.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-09.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-10.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-10.png index f7583cd33b..68497128b1 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-10.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-10.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-11.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-11.png index 4000fa9f8a..9f7526a233 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-11.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-11.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-12.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-12.png index d347e4da63..99b672343a 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-12.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-12.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-13.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-13.png index 413fb70444..962af4dc49 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-13.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-13.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-14.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-14.png index ba676a85a5..28ee98e132 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-14.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-14.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-15.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-15.png index 505625786c..536bff9d78 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-15.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-15.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-16.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-16.png index bad859e258..0883b0a555 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-16.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-16.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-17.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-17.png index 691563df68..313f8ac054 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-17.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-17.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-18.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-18.png index 55a50189c3..383cfd15da 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-18.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-18.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-19.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-19.png index 1aac70c8d8..1633ebf0ef 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-19.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-19.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-20.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-20.png index 991da7ed87..a831f34558 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-20.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeIMSLibraries/en/s-20.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-02.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-02.png index 9336b5aa9b..eca7e13404 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-02.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-02.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-07.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-07.png index 27d7c0b0a6..541cbf5503 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-07.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-07.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-09.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-09.png index e84e83ffbe..a3ef2485f7 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-09.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-09.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-11.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-11.png index b8b5a49465..a6143f8ad0 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-11.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-11.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-12.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-12.png index cdcf22bb12..e2e4dcb8fb 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-12.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-12.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-13.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-13.png index 23bc0dcae4..e7d72a248b 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-13.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-13.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-20.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-20.png index a927404755..f2d9c3fa60 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-20.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-20.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-22.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-22.png index 57fe2edafd..6a48b023ee 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-22.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-22.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-29.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-29.png index e1ffe8c96a..7194bfc357 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-29.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-29.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-30.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-30.png index 45be80bfdb..7dfadeaa6b 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-30.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-30.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-31.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-31.png index 2216f55ed9..77c2d31a80 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-31.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-31.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-32.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-32.png index dc8f783401..5cb9b9a5d2 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-32.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-32.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-33.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-33.png index 4da5bf851b..89ea65a541 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-33.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/en/s-33.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-01.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-01.png index 6b1e214f72..34078f2aaf 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-01.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-01.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-06.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-06.png index 1894f92191..f13539d218 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-06.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-06.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-08.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-08.png index cd8e8439f6..d316bf8b8e 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-08.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-08.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-10.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-10.png index 26086f671b..b28d5ceb72 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-10.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-10.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-11.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-11.png index 04dc170d1a..571591c505 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-11.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-11.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-12.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-12.png index 7a4e116ae5..afcbf7da6e 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-12.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-12.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-19.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-19.png index 11d5367186..3742469ae8 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-19.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-19.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-21.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-21.png index 22d2fcc1b2..16708438ac 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-21.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-21.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-28.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-28.png index 6f4768160d..2e42f66943 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-28.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-28.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-29.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-29.png index d94fa9989b..c0ebe7f79d 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-29.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-29.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-30.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-30.png index 29ccf150ba..b0978672c3 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-30.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-30.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-31.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-31.png index 08719d431e..362cb06d05 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-31.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-31.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-32.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-32.png index 4e4f3eaa2d..6e5cde985b 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-32.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/ja/s-32.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-01.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-01.png index bb141d05e2..888f8d0459 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-01.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-01.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-06.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-06.png index e61e33260c..bcfb757c21 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-06.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-06.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-08.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-08.png index 0bae72f296..5db0d3c581 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-08.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-08.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-10.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-10.png index 6944593d9d..e4388cd5af 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-10.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-10.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-11.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-11.png index 41ce04f58a..4154314270 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-11.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-11.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-12.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-12.png index 4a9b03a8c1..e29623dd5d 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-12.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-12.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-19.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-19.png index 9e79026a2a..1c5ae85df5 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-19.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-19.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-21.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-21.png index 54693868ff..666d081358 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-21.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-21.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-28.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-28.png index 18763d4355..1c643e0b54 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-28.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-28.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-29.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-29.png index 57c70a1edf..a0cb02d472 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-29.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-29.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-30.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-30.png index 6b50672558..f477f5ee38 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-30.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-30.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-31.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-31.png index bef0878153..cf75491aa6 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-31.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-31.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-32.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-32.png index df6a5bc6d8..1841e2c7c8 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-32.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeMethodDevCEOpt/zh-CHS/s-32.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/en/s-04.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/en/s-04.png index c4609ba8fd..d23adc8fef 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/en/s-04.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/en/s-04.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/en/s-09.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/en/s-09.png index 998f4ad6a0..806f664b4b 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/en/s-09.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/en/s-09.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/en/s-10.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/en/s-10.png index d3a82857a9..621714cda0 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/en/s-10.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/en/s-10.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/en/s-11.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/en/s-11.png index ea639560da..f2229c60ce 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/en/s-11.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/en/s-11.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/en/s-12.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/en/s-12.png index e97fcb26a5..a09afd12ad 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/en/s-12.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/en/s-12.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/en/s-13.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/en/s-13.png index 9dbdd32468..b35d82afcf 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/en/s-13.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/en/s-13.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/en/s-14.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/en/s-14.png index f5fa4a9908..b45a68f417 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/en/s-14.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/en/s-14.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/ja/s-04.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/ja/s-04.png index 94bb52b1d1..f248ac8346 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/ja/s-04.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/ja/s-04.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/ja/s-09.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/ja/s-09.png index ba8ba7645c..5b51ffa0d8 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/ja/s-09.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/ja/s-09.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/ja/s-10.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/ja/s-10.png index 50f488019c..4f3a7f5abb 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/ja/s-10.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/ja/s-10.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/ja/s-11.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/ja/s-11.png index b52b461c48..d13906147f 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/ja/s-11.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/ja/s-11.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/ja/s-12.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/ja/s-12.png index 77cd1f7f1d..cf9706b8de 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/ja/s-12.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/ja/s-12.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/ja/s-13.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/ja/s-13.png index 2a2d2a5a3f..b025af54d1 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/ja/s-13.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/ja/s-13.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/ja/s-14.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/ja/s-14.png index 24ab8a2544..10b18fd1d4 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/ja/s-14.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/ja/s-14.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/zh-CHS/s-04.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/zh-CHS/s-04.png index 17a82b9d5e..16a046c6e3 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/zh-CHS/s-04.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/zh-CHS/s-04.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/zh-CHS/s-09.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/zh-CHS/s-09.png index 7b457122c7..25b93bbfd7 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/zh-CHS/s-09.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/zh-CHS/s-09.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/zh-CHS/s-10.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/zh-CHS/s-10.png index d7a7ea67d4..c386918b8b 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/zh-CHS/s-10.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/zh-CHS/s-10.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/zh-CHS/s-11.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/zh-CHS/s-11.png index 9ded1df340..14b65d22dd 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/zh-CHS/s-11.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/zh-CHS/s-11.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/zh-CHS/s-12.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/zh-CHS/s-12.png index cf397b05d1..f5f9904918 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/zh-CHS/s-12.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/zh-CHS/s-12.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/zh-CHS/s-13.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/zh-CHS/s-13.png index 225e72253d..3675069767 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/zh-CHS/s-13.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/zh-CHS/s-13.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/zh-CHS/s-14.png b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/zh-CHS/s-14.png index 12ea0f41d4..0dde809de2 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/zh-CHS/s-14.png and b/pwiz_tools/Skyline/Documentation/Tutorials/SmallMoleculeQuantification/zh-CHS/s-14.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/iRT/en/s-03.png b/pwiz_tools/Skyline/Documentation/Tutorials/iRT/en/s-03.png index d211d3c42f..c8a2439abd 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/iRT/en/s-03.png and b/pwiz_tools/Skyline/Documentation/Tutorials/iRT/en/s-03.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/iRT/en/s-07.png b/pwiz_tools/Skyline/Documentation/Tutorials/iRT/en/s-07.png index 91e6bc9547..46bf1d06ea 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/iRT/en/s-07.png and b/pwiz_tools/Skyline/Documentation/Tutorials/iRT/en/s-07.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/iRT/en/s-28.png b/pwiz_tools/Skyline/Documentation/Tutorials/iRT/en/s-28.png index 1dad05983c..2c23d7cba8 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/iRT/en/s-28.png and b/pwiz_tools/Skyline/Documentation/Tutorials/iRT/en/s-28.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/iRT/ja/s-03.png b/pwiz_tools/Skyline/Documentation/Tutorials/iRT/ja/s-03.png index 61daae3d76..8b01b5f824 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/iRT/ja/s-03.png and b/pwiz_tools/Skyline/Documentation/Tutorials/iRT/ja/s-03.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/iRT/ja/s-07.png b/pwiz_tools/Skyline/Documentation/Tutorials/iRT/ja/s-07.png index bcb241ad31..68942bb241 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/iRT/ja/s-07.png and b/pwiz_tools/Skyline/Documentation/Tutorials/iRT/ja/s-07.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/iRT/ja/s-28.png b/pwiz_tools/Skyline/Documentation/Tutorials/iRT/ja/s-28.png index 88b310e683..646eea10e0 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/iRT/ja/s-28.png and b/pwiz_tools/Skyline/Documentation/Tutorials/iRT/ja/s-28.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/iRT/zh-CHS/s-03.png b/pwiz_tools/Skyline/Documentation/Tutorials/iRT/zh-CHS/s-03.png index 0560a65522..d248d05e03 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/iRT/zh-CHS/s-03.png and b/pwiz_tools/Skyline/Documentation/Tutorials/iRT/zh-CHS/s-03.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/iRT/zh-CHS/s-07.png b/pwiz_tools/Skyline/Documentation/Tutorials/iRT/zh-CHS/s-07.png index 5f92491e2a..9992a141d0 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/iRT/zh-CHS/s-07.png and b/pwiz_tools/Skyline/Documentation/Tutorials/iRT/zh-CHS/s-07.png differ diff --git a/pwiz_tools/Skyline/Documentation/Tutorials/iRT/zh-CHS/s-28.png b/pwiz_tools/Skyline/Documentation/Tutorials/iRT/zh-CHS/s-28.png index 4579f67d9c..e5df1877e1 100644 Binary files a/pwiz_tools/Skyline/Documentation/Tutorials/iRT/zh-CHS/s-28.png and b/pwiz_tools/Skyline/Documentation/Tutorials/iRT/zh-CHS/s-28.png differ diff --git a/pwiz_tools/Skyline/Executables/DevTools/ImageComparer/ImageComparerWindow.cs b/pwiz_tools/Skyline/Executables/DevTools/ImageComparer/ImageComparerWindow.cs index 5a7cd4d48b..2db864bfd2 100644 --- a/pwiz_tools/Skyline/Executables/DevTools/ImageComparer/ImageComparerWindow.cs +++ b/pwiz_tools/Skyline/Executables/DevTools/ImageComparer/ImageComparerWindow.cs @@ -19,6 +19,7 @@ using System; using System.Diagnostics; using System.Drawing; +using System.Drawing.Imaging; using System.IO; using System.Linq; using System.Net; @@ -833,6 +834,38 @@ private void ScreenshotPreviewForm_KeyDown(object sender, KeyEventArgs e) e.Handled = true; } break; + case Keys.V: + if (e.Control) + { + Paste(); + e.Handled = true; + } + break; + } + } + + private void Paste() + { + try + { + var image = Clipboard.GetImage(); + if (image == null) + { + ShowMessage("No image found on the clipboard."); + return; + } + + lock (_lock) + { + image.Save(_fileToShow.Path, ImageFormat.Png); + _newScreenshot.FileLoaded = null; + } + + FormStateChanged(); + } + catch (Exception e) + { + ShowMessageWithException("Failed to save bitmap from clipboard.", e); } } diff --git a/pwiz_tools/Skyline/FileUI/PublishDocumentDlg.cs b/pwiz_tools/Skyline/FileUI/PublishDocumentDlg.cs index 7acaf23114..b38276c092 100644 --- a/pwiz_tools/Skyline/FileUI/PublishDocumentDlg.cs +++ b/pwiz_tools/Skyline/FileUI/PublishDocumentDlg.cs @@ -67,12 +67,12 @@ public PublishDocumentDlg(IDocumentUIContainer docContainer, SettingsList + /// For consistent screenshots involving AuditLogEntries + /// + public static ITimeProvider TimeProvider { get; set; } + + public static DateTime Now + { + get { return TimeProvider?.Now ?? DateTime.UtcNow; } + } + public const string XML_ROOT = "audit_log_entry"; private ImmutableList _allInfo; @@ -904,7 +919,7 @@ public static AuditLogEntry ClearLogEntry(SrmDocument doc) /// public static AuditLogEntry CreateEmptyEntry() { - return new AuditLogEntry(DateTime.UtcNow, string.Empty, SrmDocument.DOCUMENT_TYPE.none); + return new AuditLogEntry(Now, string.Empty, SrmDocument.DOCUMENT_TYPE.none); } /// @@ -1015,7 +1030,7 @@ private static AuditLogEntry CreateCountChangeEntry(MessageType singular, /// public static AuditLogEntry CreateSingleMessageEntry(MessageInfo info, string extraInfo = null) { - var result = new AuditLogEntry(DateTime.UtcNow, string.Empty, info.DocumentType, extraInfo) + var result = new AuditLogEntry(Now, string.Empty, info.DocumentType, extraInfo) { UndoRedo = info.ToMessage(LogLevel.undo_redo), Summary = info.ToMessage(LogLevel.summary), @@ -1103,8 +1118,7 @@ public static AuditLogEntry DiffDocNodes(MessageType action, SrmDocumentPair doc Reflector.EnumerateDiffNodes(objInfo, property, docType, false, ignoreTransitions ? (Func) (node => !IsTransitionDiff(node.Property.PropertyType)) - : null), - DateTime.UtcNow); + : null)); if (diffTree.Root != null) { @@ -1127,7 +1141,7 @@ public static AuditLogEntry DiffDocNodes(MessageType action, SrmDocumentPair doc /// public static AuditLogEntry CreateLogEnabledDisabledEntry(SrmDocument document) { - var result = new AuditLogEntry(DateTime.UtcNow, string.Empty, document.DocumentType); + var result = new AuditLogEntry(Now, string.Empty, document.DocumentType); var type = document.Settings.DataSettings.AuditLogging ? MessageType.log_enabled : MessageType.log_disabled; var docType = document.DocumentType; @@ -1635,7 +1649,7 @@ protected virtual AuditLogEntry CreateEntry(SrmDocumentPair docPair) .ChangeRootObjectPair(docPair.ToObjectType()); var diffTree = - DiffTree.FromEnumerator(Reflector.EnumerateDiffNodes(docPair.ToObjectType(), rootProp, docPair.OldDocumentType, (T)this), DateTime.UtcNow); + DiffTree.FromEnumerator(Reflector.EnumerateDiffNodes(docPair.ToObjectType(), rootProp, docPair.OldDocumentType, (T)this)); if (diffTree.Root == null) return baseEntry; diff --git a/pwiz_tools/Skyline/Model/AuditLog/DiffNode.cs b/pwiz_tools/Skyline/Model/AuditLog/DiffNode.cs index a2897a2f84..73a194a6e7 100644 --- a/pwiz_tools/Skyline/Model/AuditLog/DiffNode.cs +++ b/pwiz_tools/Skyline/Model/AuditLog/DiffNode.cs @@ -390,19 +390,19 @@ public DiffNodeNamePair ChangeName(PropertyName name) public class DiffTree { - public DiffTree(DiffNode root, DateTime? timeStamp = null) + public DiffTree(DiffNode root) { Root = root; - TimeStamp = timeStamp ?? DateTime.UtcNow; + TimeStamp = AuditLogEntry.Now; } - public static DiffTree FromEnumerator(IEnumerator treeEnumerator, DateTime? timeStamp = null) + public static DiffTree FromEnumerator(IEnumerator treeEnumerator) { DiffNode current = null; while (treeEnumerator.MoveNext()) current = treeEnumerator.Current; - return new DiffTree(current, timeStamp ?? DateTime.UtcNow); + return new DiffTree(current); } public DiffNode Root { get; private set; } diff --git a/pwiz_tools/Skyline/Model/AuditLog/ReflectorToString.cs b/pwiz_tools/Skyline/Model/AuditLog/ReflectorToString.cs index 1a9d925c2a..40f06be63c 100644 --- a/pwiz_tools/Skyline/Model/AuditLog/ReflectorToString.cs +++ b/pwiz_tools/Skyline/Model/AuditLog/ReflectorToString.cs @@ -37,7 +37,7 @@ public static string ToString(ObjectPair rootPair, SrmDocument.DOCUMENT_ var enumerator = EnumerateDiffNodes(objectInfo, rootProp, docType, true); - return ToString(objectInfo.ParentObjectPair, docType, DiffTree.FromEnumerator(enumerator, DateTime.UtcNow).Root, state); + return ToString(objectInfo.ParentObjectPair, docType, DiffTree.FromEnumerator(enumerator).Root, state); } /// diff --git a/pwiz_tools/Skyline/Program.cs b/pwiz_tools/Skyline/Program.cs index fbbd252de1..55bf4b422d 100644 --- a/pwiz_tools/Skyline/Program.cs +++ b/pwiz_tools/Skyline/Program.cs @@ -101,7 +101,6 @@ public static bool SkylineOffscreen public static bool IsPassZero { get { return NoVendorReaders; } } // Currently the only time NoVendorReaders gets set is pass0 public static bool NoSaveSettings { get; set; } // Set true to use separate settings file. public static bool ShowFormNames { get; set; } // Set true to show each Form name in title. - public static bool ShowMatchingPages { get; set; } // Set true to show tutorial pages automatically when pausing for moust click public static int UnitTestTimeoutMultiplier { get; set; } // Set to positive multiplier for multi-process stress runs. public static int PauseSeconds @@ -116,7 +115,7 @@ public static int PauseSeconds } } // Positive to pause when displaying dialogs for unit test, <0 to pause for mouse click - public static int PauseStartingPage { get; set; } // First page to pause at during pause for screenshots + public static int PauseStartingScreenshot { get; set; } // First screenshot to pause at during pause for screenshots public static IList PauseForms { get; set; } // List of forms to pause after displaying. public static string ExtraRawFileSearchFolder { get; set; } // Perf test support for avoiding extra copying of large raw files public static List TestExceptions { get; set; } // To avoid showing unexpected exception UI during tests and instead log them as failures diff --git a/pwiz_tools/Skyline/SettingsUI/FullScanSettingsControl.cs b/pwiz_tools/Skyline/SettingsUI/FullScanSettingsControl.cs index 18cb2080ea..274c78b404 100644 --- a/pwiz_tools/Skyline/SettingsUI/FullScanSettingsControl.cs +++ b/pwiz_tools/Skyline/SettingsUI/FullScanSettingsControl.cs @@ -191,7 +191,7 @@ public double? PrecursorRes double precursorRes; return double.TryParse(textPrecursorRes.Text, out precursorRes) ? (double?)precursorRes : null; } - set { textPrecursorRes.Text = FormatPrecursorRes(value, PrecursorMassAnalyzer); } + set { textPrecursorRes.Text = FormatRes(value, PrecursorMassAnalyzer); } } public double? PrecursorResMz @@ -211,7 +211,7 @@ public double? ProductRes double productRes; return double.TryParse(textProductRes.Text, out productRes) ? (double?)productRes : null; } - set { textProductRes.Text = value.ToString(); } + set { textProductRes.Text = FormatRes(value, ProductMassAnalyzer); } } public double? ProductResMz @@ -885,7 +885,7 @@ public double TimeAroundPrediction get { return double.Parse(tbxTimeAroundPrediction.Text); } } - private static string FormatPrecursorRes(double? resolvingPower, FullScanMassAnalyzerType analyzerType) + private static string FormatRes(double? resolvingPower, FullScanMassAnalyzerType analyzerType) { if (!resolvingPower.HasValue) return string.Empty; @@ -921,7 +921,7 @@ public static void SetAnalyzerType(FullScanMassAnalyzerType analyzerTypeNew, labelTh.Visible = false; textAt.Visible = false; textRes.Enabled = true; - textRes.Text = FormatPrecursorRes( + textRes.Text = FormatRes( resCurrent.HasValue && (analyzerTypeCurrent == analyzerTypeNew) ? resCurrent : TransitionFullScan.DEFAULT_CENTROIDED_PPM, @@ -951,9 +951,9 @@ public static void SetAnalyzerType(FullScanMassAnalyzerType analyzerTypeNew, } if (analyzerTypeNew == analyzerTypeCurrent && resCurrent.HasValue) - textRes.Text = FormatPrecursorRes(resCurrent, analyzerTypeNew); + textRes.Text = FormatRes(resCurrent, analyzerTypeNew); else - textRes.Text = FormatPrecursorRes(TransitionFullScan.DEFAULT_RES_VALUES[(int)analyzerTypeNew], analyzerTypeNew); + textRes.Text = FormatRes(TransitionFullScan.DEFAULT_RES_VALUES[(int)analyzerTypeNew], analyzerTypeNew); labelAt.Visible = variableRes; textAt.Visible = variableRes; diff --git a/pwiz_tools/Skyline/Skyline.sln.DotSettings b/pwiz_tools/Skyline/Skyline.sln.DotSettings index 1c8e806898..0777fcff5a 100644 --- a/pwiz_tools/Skyline/Skyline.sln.DotSettings +++ b/pwiz_tools/Skyline/Skyline.sln.DotSettings @@ -168,6 +168,14 @@ <Policy><Descriptor Staticness="Any" AccessRightKinds="Any" Description="Interfaces"><ElementKinds><Kind Name="INTERFACE" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="I" Suffix="" Style="AaBb" /></Policy> <Policy><Descriptor Staticness="Static" AccessRightKinds="Protected, ProtectedInternal, Internal, Public, PrivateProtected" Description="Static readonly fields (not private)"><ElementKinds><Kind Name="READONLY_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /></Policy> <Policy><Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static fields (private)"><ElementKinds><Kind Name="FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /></Policy> + True + True + True + True + True + True + True + True True False True diff --git a/pwiz_tools/Skyline/SkylineTester/SkylineTesterWindow.Designer.cs b/pwiz_tools/Skyline/SkylineTester/SkylineTesterWindow.Designer.cs index 5cd7a7bf7e..ab57065f23 100644 --- a/pwiz_tools/Skyline/SkylineTester/SkylineTesterWindow.Designer.cs +++ b/pwiz_tools/Skyline/SkylineTester/SkylineTesterWindow.Designer.cs @@ -99,7 +99,6 @@ private void InitializeComponent() this.SeenColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.tabTutorials = new System.Windows.Forms.TabPage(); this.groupBox21 = new System.Windows.Forms.GroupBox(); - this.showMatchingPagesTutorial = new System.Windows.Forms.CheckBox(); this.showFormNamesTutorial = new System.Windows.Forms.CheckBox(); this.label16 = new System.Windows.Forms.Label(); this.groupBox14 = new System.Windows.Forms.GroupBox(); @@ -107,8 +106,8 @@ private void InitializeComponent() this.groupBox3 = new System.Windows.Forms.GroupBox(); this.tutorialsTree = new SkylineTester.MyTreeView(); this.groupBox4 = new System.Windows.Forms.GroupBox(); - this.pauseStartingPage = new System.Windows.Forms.TextBox(); - this.labelPauseStartingPage = new System.Windows.Forms.Label(); + this.pauseStartingScreenshot = new System.Windows.Forms.TextBox(); + this.labelPauseStartingScreenshot = new System.Windows.Forms.Label(); this.modeTutorialsCoverShots = new System.Windows.Forms.RadioButton(); this.pauseTutorialsSeconds = new System.Windows.Forms.NumericUpDown(); this.tutorialsDemoMode = new System.Windows.Forms.RadioButton(); @@ -725,7 +724,6 @@ private void InitializeComponent() // groupBox21 // this.groupBox21.BackColor = System.Drawing.Color.Transparent; - this.groupBox21.Controls.Add(this.showMatchingPagesTutorial); this.groupBox21.Controls.Add(this.showFormNamesTutorial); this.groupBox21.Location = new System.Drawing.Point(13, 295); this.groupBox21.Margin = new System.Windows.Forms.Padding(4); @@ -736,16 +734,6 @@ private void InitializeComponent() this.groupBox21.TabStop = false; this.groupBox21.Text = "Options"; // - // showMatchingPagesTutorial - // - this.showMatchingPagesTutorial.AutoSize = true; - this.showMatchingPagesTutorial.Location = new System.Drawing.Point(8, 45); - this.showMatchingPagesTutorial.Name = "showMatchingPagesTutorial"; - this.showMatchingPagesTutorial.Size = new System.Drawing.Size(160, 17); - this.showMatchingPagesTutorial.TabIndex = 6; - this.showMatchingPagesTutorial.Text = "Show matching tutorial page"; - this.showMatchingPagesTutorial.UseVisualStyleBackColor = true; - // // showFormNamesTutorial // this.showFormNamesTutorial.AutoSize = true; @@ -825,8 +813,8 @@ private void InitializeComponent() // // groupBox4 // - this.groupBox4.Controls.Add(this.pauseStartingPage); - this.groupBox4.Controls.Add(this.labelPauseStartingPage); + this.groupBox4.Controls.Add(this.pauseStartingScreenshot); + this.groupBox4.Controls.Add(this.labelPauseStartingScreenshot); this.groupBox4.Controls.Add(this.modeTutorialsCoverShots); this.groupBox4.Controls.Add(this.pauseTutorialsSeconds); this.groupBox4.Controls.Add(this.tutorialsDemoMode); @@ -842,22 +830,22 @@ private void InitializeComponent() this.groupBox4.TabStop = false; this.groupBox4.Text = "Pause"; // - // pauseStartingPage + // pauseStartingScreenshot // - this.pauseStartingPage.Location = new System.Drawing.Point(99, 45); - this.pauseStartingPage.Name = "pauseStartingPage"; - this.pauseStartingPage.Size = new System.Drawing.Size(41, 20); - this.pauseStartingPage.TabIndex = 2; - this.pauseStartingPage.Text = "1"; + this.pauseStartingScreenshot.Location = new System.Drawing.Point(99, 45); + this.pauseStartingScreenshot.Name = "pauseStartingScreenshot"; + this.pauseStartingScreenshot.Size = new System.Drawing.Size(41, 20); + this.pauseStartingScreenshot.TabIndex = 2; + this.pauseStartingScreenshot.Text = "1"; // - // labelPauseStartingPage + // labelPauseStartingScreenshot // - this.labelPauseStartingPage.AutoSize = true; - this.labelPauseStartingPage.Location = new System.Drawing.Point(25, 48); - this.labelPauseStartingPage.Name = "labelPauseStartingPage"; - this.labelPauseStartingPage.Size = new System.Drawing.Size(75, 13); - this.labelPauseStartingPage.TabIndex = 1; - this.labelPauseStartingPage.Text = "Starting figure:"; + this.labelPauseStartingScreenshot.AutoSize = true; + this.labelPauseStartingScreenshot.Location = new System.Drawing.Point(25, 48); + this.labelPauseStartingScreenshot.Name = "labelPauseStartingScreenshot"; + this.labelPauseStartingScreenshot.Size = new System.Drawing.Size(69, 13); + this.labelPauseStartingScreenshot.TabIndex = 1; + this.labelPauseStartingScreenshot.Text = "Starting shot:"; // // modeTutorialsCoverShots // @@ -925,7 +913,6 @@ private void InitializeComponent() this.pauseTutorialsScreenShots.Text = "Pause for screen shots"; this.toolTip1.SetToolTip(this.pauseTutorialsScreenShots, "Interactively pauses the tutorial test at calls to PauseForScreenShot()"); this.pauseTutorialsScreenShots.UseVisualStyleBackColor = true; - this.pauseTutorialsScreenShots.CheckedChanged += new System.EventHandler(this.pauseTutorialsScreenShots_CheckedChanged); // // runTutorials // @@ -2813,7 +2800,7 @@ private void InitializeComponent() // this.outputSplitContainer.Panel2.Controls.Add(this.errorConsole); this.outputSplitContainer.Size = new System.Drawing.Size(671, 562); - this.outputSplitContainer.SplitterDistance = 338; + this.outputSplitContainer.SplitterDistance = 332; this.outputSplitContainer.SplitterWidth = 10; this.outputSplitContainer.TabIndex = 35; // @@ -2835,7 +2822,7 @@ private void InitializeComponent() this.commandShell.NextCommand = 0; this.commandShell.RestartCount = 0; this.commandShell.RunStartTime = new System.DateTime(((long)(0))); - this.commandShell.Size = new System.Drawing.Size(671, 338); + this.commandShell.Size = new System.Drawing.Size(671, 332); this.commandShell.StopButton = null; this.commandShell.TabIndex = 2; this.commandShell.Text = ""; @@ -2853,7 +2840,7 @@ private void InitializeComponent() this.errorConsole.Margin = new System.Windows.Forms.Padding(0); this.errorConsole.Name = "errorConsole"; this.errorConsole.ReadOnly = true; - this.errorConsole.Size = new System.Drawing.Size(671, 214); + this.errorConsole.Size = new System.Drawing.Size(671, 220); this.errorConsole.TabIndex = 3; this.errorConsole.Text = ""; this.errorConsole.SelectionChanged += new System.EventHandler(this.errorConsole_SelectionChanged); @@ -3627,7 +3614,6 @@ private void InitializeComponent() private ToolStripLabel labelFormsSeenPercent; private GroupBox groupBox2; private CheckBox runBuildVerificationTests; - private CheckBox showMatchingPagesTutorial; private ToolStripMenuItem optionsToolStripMenuItem; private ToolStripMenuItem accessInternet; private ToolTip toolTip1; @@ -3675,8 +3661,8 @@ private void InitializeComponent() private CheckBox nightlyRunIndefinitely; private CheckBox recordAuditLogs; private RadioButton modeTutorialsCoverShots; - private TextBox pauseStartingPage; - private Label labelPauseStartingPage; + private TextBox pauseStartingScreenshot; + private Label labelPauseStartingScreenshot; private Button diffButton; private ComboBox formsLanguageDiff; private Label label20; diff --git a/pwiz_tools/Skyline/SkylineTester/SkylineTesterWindow.cs b/pwiz_tools/Skyline/SkylineTester/SkylineTesterWindow.cs index 4dd2f9d364..0651746253 100644 --- a/pwiz_tools/Skyline/SkylineTester/SkylineTesterWindow.cs +++ b/pwiz_tools/Skyline/SkylineTester/SkylineTesterWindow.cs @@ -1063,7 +1063,6 @@ public string SaveSettings() tutorialsDemoMode, tutorialsLanguage, showFormNamesTutorial, - showMatchingPagesTutorial, tutorialsTree, // Tests @@ -1498,7 +1497,7 @@ public void EnableButtonSelectFailedTests(bool hasFailures) public CheckBox Pass0 { get { return pass0; } } public CheckBox Pass1 { get { return pass1; } } public RadioButton ModeTutorialsCoverShots { get { return modeTutorialsCoverShots; } } - public TextBox PauseStartingPage { get { return pauseStartingPage; } } + public TextBox PauseStartingScreenshot { get { return pauseStartingScreenshot; } } public RadioButton PauseTutorialsScreenShots { get { return pauseTutorialsScreenShots; } } public NumericUpDown PauseTutorialsSeconds { get { return pauseTutorialsSeconds; } } public RadioButton QualityChooseTests { get { return qualityChooseTests; } } @@ -1523,7 +1522,6 @@ public void EnableButtonSelectFailedTests(bool hasFailures) public Button RunTests { get { return runTests; } } public Button RunTutorials { get { return runTutorials; } } public CheckBox ShowFormNames { get { return showFormNames; } } - public CheckBox ShowMatchingPagesTutorial { get { return showMatchingPagesTutorial; } } public CheckBox ShowFormNamesTutorial { get { return showFormNamesTutorial; } } public ComboBox TestSet { get { return testSet; } } public RadioButton SkipCheckedTests { get { return skipCheckedTests; } } @@ -1744,14 +1742,6 @@ private void formsGrid_SelectionChanged(object sender, EventArgs e) labelSelectedFormsCount.Text = formsGrid.SelectedRows.Count + " selected"; } - private void pauseTutorialsScreenShots_CheckedChanged(object sender, EventArgs e) - { - bool pauseChecked = pauseTutorialsScreenShots.Checked; - showMatchingPagesTutorial.Enabled = pauseChecked; - if (!pauseChecked) - showMatchingPagesTutorial.Checked = false; - } - private void comboBoxRunStats_SelectedIndexChanged(object sender, EventArgs e) { _tabRunStats.Process(GetSelectedLog(comboBoxRunStats), GetSelectedLog(comboBoxRunStatsCompare)); diff --git a/pwiz_tools/Skyline/SkylineTester/SkylineTesterWindow.resx b/pwiz_tools/Skyline/SkylineTester/SkylineTesterWindow.resx index 0f3f13fedd..f3f65189de 100644 --- a/pwiz_tools/Skyline/SkylineTester/SkylineTesterWindow.resx +++ b/pwiz_tools/Skyline/SkylineTester/SkylineTesterWindow.resx @@ -120,15 +120,6 @@ 281, 17 - - 517, 17 - - - 17, 17 - - - 397, 17 - 397, 17 @@ -157,15 +148,6 @@ True - - True - - - True - - - True - 517, 17 @@ -190,23 +172,8 @@ True - - True - - - True - - - True - - - True - - - True - - - True + + 17, 17 True diff --git a/pwiz_tools/Skyline/SkylineTester/TabTutorials.cs b/pwiz_tools/Skyline/SkylineTester/TabTutorials.cs index 1afec00d27..d83c009c7e 100644 --- a/pwiz_tools/Skyline/SkylineTester/TabTutorials.cs +++ b/pwiz_tools/Skyline/SkylineTester/TabTutorials.cs @@ -46,8 +46,6 @@ public override bool Run() args.Append(MainWindow.GetCulture(MainWindow.TutorialsLanguage)); if (MainWindow.ShowFormNamesTutorial.Checked) args.Append(" showformnames=on"); - if (MainWindow.ShowMatchingPagesTutorial.Checked) - args.Append(" showpages=on"); if (MainWindow.TutorialsDemoMode.Checked) args.Append(" demo=on"); else @@ -57,9 +55,9 @@ public override bool Run() pauseSeconds = -2; // Magic number that tells TestRunner to grab tutorial cover shot then move on to next test else if (MainWindow.PauseTutorialsScreenShots.Checked) { - int startingPage; - if (Int32.TryParse(MainWindow.PauseStartingPage.Text, out startingPage) && startingPage > 1) - args.Append(" startingpage=").Append(startingPage); + int startingScreenshot; + if (Int32.TryParse(MainWindow.PauseStartingScreenshot.Text, out startingScreenshot) && startingScreenshot > 1) + args.Append(" startingshot=").Append(startingScreenshot); } else if (!Int32.TryParse(MainWindow.PauseTutorialsSeconds.Text, out pauseSeconds)) pauseSeconds = 0; diff --git a/pwiz_tools/Skyline/TestPerf/DdaTutorialTest.cs b/pwiz_tools/Skyline/TestPerf/DdaTutorialTest.cs index 87653c946e..2df781f98c 100644 --- a/pwiz_tools/Skyline/TestPerf/DdaTutorialTest.cs +++ b/pwiz_tools/Skyline/TestPerf/DdaTutorialTest.cs @@ -119,14 +119,12 @@ private void TestMsFraggerSearch() else FileEx.SafeDelete(Path.Combine(requiredFile.InstallPath, requiredFile.Filename)); - int tutorialPage = 3; - // Set standard type to None var peptideSettingsUI = ShowDialog(SkylineWindow.ShowPeptideSettingsUI); RunUI(() => peptideSettingsUI.SelectedTab = PeptideSettingsUI.TABS.Modifications); RunUI(() => peptideSettingsUI.SelectedInternalStandardTypeName = Resources.LabelTypeComboDriver_LoadList_none); - PauseForScreenShot("Peptide Settings - Modifications tab", tutorialPage++); + PauseForScreenShot("Peptide Settings - Modifications tab"); var docBeforePeptideSettings = SkylineWindow.Document; OkDialog(peptideSettingsUI, peptideSettingsUI.OkDialog); @@ -134,7 +132,7 @@ private void TestMsFraggerSearch() // Launch the wizard var importPeptideSearchDlg = ShowDialog(SkylineWindow.ShowRunPeptideSearchDlg); - PauseForScreenShot("Import Peptide Search - Select DDA Files to Search page", tutorialPage++); + PauseForScreenShot("Import Peptide Search - Select DDA Files to Search page"); // We're on the "Build Spectral Library" page of the wizard. RunUI(() => @@ -144,13 +142,13 @@ private void TestMsFraggerSearch() importPeptideSearchDlg.BuildPepSearchLibControl.IncludeAmbiguousMatches = false; Assert.AreEqual(ImportPeptideSearchDlg.Workflow.dda, importPeptideSearchDlg.BuildPepSearchLibControl.WorkflowType); }); - PauseForScreenShot("Import Peptide Search - After Selecting DDA Files page", tutorialPage++); + PauseForScreenShot("Import Peptide Search - After Selecting DDA Files page"); if (SearchFiles.Count() > 1) { // Remove prefix/suffix dialog pops up; accept default behavior var removeSuffix = ShowDialog(() => importPeptideSearchDlg.ClickNextButton()); - PauseForScreenShot("Import Results - Common prefix form", tutorialPage++); + PauseForScreenShot("Import Results - Common prefix form"); OkDialog(removeSuffix, () => removeSuffix.YesDialog()); WaitForDocumentLoaded(); } @@ -159,18 +157,18 @@ private void TestMsFraggerSearch() // We're on the "Match Modifications" page. Add SILAC mods and M+16 WaitForConditionUI(() => importPeptideSearchDlg.CurrentPage == ImportPeptideSearchDlg.Pages.match_modifications_page); - PauseForScreenShot("Import Peptide Search - Add Modifications page", tutorialPage++); + PauseForScreenShot("Import Peptide Search - Add Modifications page"); var editHeavyModListUI = ShowDialog, StaticMod>>(importPeptideSearchDlg.MatchModificationsControl.ClickAddHeavyModification); var heavyKDlg = ShowDialog(editHeavyModListUI.AddItem); RunUI(() => heavyKDlg.SetModification(HEAVY_K)); - PauseForScreenShot("Edit Isotope Modification form - K", tutorialPage++); + PauseForScreenShot("Edit Isotope Modification form - K"); OkDialog(heavyKDlg, heavyKDlg.OkDialog); var heavyRDlg = ShowDialog(editHeavyModListUI.AddItem); RunUI(() => heavyRDlg.SetModification(HEAVY_R)); - PauseForScreenShot("Edit Isotope Modification form - R", tutorialPage++); + PauseForScreenShot("Edit Isotope Modification form - R"); OkDialog(heavyRDlg, heavyRDlg.OkDialog); OkDialog(editHeavyModListUI, editHeavyModListUI.OkDialog); @@ -190,13 +188,13 @@ private void TestMsFraggerSearch() OkDialog(editStructModListUI, editStructModListUI.OkDialog); RunUI(() => importPeptideSearchDlg.MatchModificationsControl.ChangeAll(true)); - PauseForScreenShot("Import Peptide Search - After adding modifications page", tutorialPage++); + PauseForScreenShot("Import Peptide Search - After adding modifications page"); RunUI(() => Assert.IsTrue(importPeptideSearchDlg.ClickNextButton())); // We're on the MS1 full scan settings page. Set tolerance to 20ppm WaitForConditionUI(() => importPeptideSearchDlg.CurrentPage == ImportPeptideSearchDlg.Pages.full_scan_settings_page); RunUI(() => importPeptideSearchDlg.FullScanSettingsControl.PrecursorRes = 20); - PauseForScreenShot("Import Peptide Search - Configure MS1 Full-Scan Settings page", tutorialPage++); + PauseForScreenShot("Import Peptide Search - Configure MS1 Full-Scan Settings page"); RunUI(() => Assert.IsTrue(importPeptideSearchDlg.ClickNextButton())); // We're on the "Import FASTA" page. @@ -209,7 +207,7 @@ private void TestMsFraggerSearch() importPeptideSearchDlg.ImportFastaControl.ScrollFastaTextToEnd(); // So that the FASTA file name is visible //importPeptideSearchDlg.ImportFastaControl.SetFastaContent(@"D:\test\Skyline\downloads\Tutorials\DdaSearchMs1Filtering\DdaSearchMS1Filtering\2021-11-09-decoys-2014_01_HUMAN_UPS.fasta"); }); - PauseForScreenShot("Import Peptide Search - Import FASTA page", tutorialPage++); + PauseForScreenShot("Import Peptide Search - Import FASTA page"); RunUI(() => Assert.IsTrue(importPeptideSearchDlg.ClickNextButton())); // We're on the "Adjust Search Settings" page @@ -236,7 +234,7 @@ private void TestMsFraggerSearch() importPeptideSearchDlg.SearchControl.SearchFinished += (success) => searchSucceeded = success; }); - PauseForScreenShot("Import Peptide Search - DDA Search Settings page", tutorialPage++); + PauseForScreenShot("Import Peptide Search - DDA Search Settings page"); // Run the search SkylineWindow.BeginInvoke(new Action(() => Assert.IsTrue(importPeptideSearchDlg.ClickNextButton()))); @@ -249,7 +247,7 @@ private void TestMsFraggerSearch() var msfraggerDownloaderDlg = TryWaitForOpenForm(2000); if (msfraggerDownloaderDlg != null) { - PauseForScreenShot("Import Peptide Search - Download MSFragger", tutorialPage++); // Maybe someday + PauseForScreenShot("Import Peptide Search - Download MSFragger"); // Maybe someday RunUI(() => msfraggerDownloaderDlg.SetValues("Matt Chambers (testing download from Skyline)", "matt.chambers42@gmail.com", "UW")); OkDialog(msfraggerDownloaderDlg, msfraggerDownloaderDlg.ClickAccept); } @@ -257,7 +255,7 @@ private void TestMsFraggerSearch() var downloaderDlg = TryWaitForOpenForm(2000); if (downloaderDlg != null) { - PauseForScreenShot("Import Peptide Search - Download Java and Crux", tutorialPage++); // Maybe someday + PauseForScreenShot("Import Peptide Search - Download Java and Crux"); // Maybe someday OkDialog(downloaderDlg, downloaderDlg.ClickYes); var waitDlg = WaitForOpenForm(); WaitForClosedForm(waitDlg); @@ -270,7 +268,7 @@ private void TestMsFraggerSearch() WaitForConditionUI(() => importPeptideSearchDlg.CurrentPage == ImportPeptideSearchDlg.Pages.dda_search_page); WaitForConditionUI(() => importPeptideSearchDlg.SearchControl.PercentComplete > 25); - PauseForScreenShot("Import Peptide Search - DDA Search Progress page", tutorialPage++); + PauseForScreenShot("Import Peptide Search - DDA Search Progress page"); // Wait for search to finish WaitForConditionUI(60000 * 60, () => searchSucceeded.HasValue); @@ -301,7 +299,7 @@ private void TestMsFraggerSearch() { var ambiguousDlg = ShowDialog(() => importPeptideSearchDlg.ClickNextButton()); RunUIForScreenShot(() => ambiguousDlg.Height = 448); - PauseForScreenShot("Import Peptide Search - Ambiguous Peptides dialog", tutorialPage++); + PauseForScreenShot("Import Peptide Search - Ambiguous Peptides dialog"); RunUI(() => AssertEx.Contains(ambiguousDlg.Message, Resources.BiblioSpecLiteBuilder_AmbiguousMatches_The_library_built_successfully__Spectra_matching_the_following_peptides_had_multiple_ambiguous_peptide_matches_and_were_excluded_)); OkDialog(ambiguousDlg, ambiguousDlg.OkDialog); @@ -355,7 +353,7 @@ private void TestMsFraggerSearch() } } }); - PauseForScreenShot("Import Peptide Search - Associate Proteins dialog", tutorialPage++); + PauseForScreenShot("Import Peptide Search - Associate Proteins dialog"); using (new WaitDocumentChange(null, true, 600 * 1000)) { @@ -376,11 +374,11 @@ private void TestMsFraggerSearch() // Set horizontal scroll position }); WaitForGraphs(); - PauseForScreenShot("Main window with peptide search results", tutorialPage++); + PauseForScreenShot("Main window with peptide search results"); RunUI(() => SkylineWindow.ShowPeakAreaReplicateComparison()); RefreshGraphs(); - PauseForScreenShot("Peak Areas - Replicate Comparison", tutorialPage++); + PauseForScreenShot("Peak Areas - Replicate Comparison"); RunUI(() => { @@ -390,7 +388,7 @@ private void TestMsFraggerSearch() RestoreViewOnScreen(19); RefreshGraphs(); RefreshGraphs(); // For some reason the first time doesn't get the idotp values in the are graph right - PauseForScreenShot("Main window arranged", tutorialPage); + PauseForScreenShot("Main window arranged"); if (IsCoverShotMode) { diff --git a/pwiz_tools/Skyline/TestPerf/DiaSearchTutorialTest.cs b/pwiz_tools/Skyline/TestPerf/DiaSearchTutorialTest.cs index 061cd9acd0..5a15394c1c 100644 --- a/pwiz_tools/Skyline/TestPerf/DiaSearchTutorialTest.cs +++ b/pwiz_tools/Skyline/TestPerf/DiaSearchTutorialTest.cs @@ -226,14 +226,12 @@ private void TestMsFraggerSearch() else FileEx.SafeDelete(Path.Combine(requiredFile.InstallPath, requiredFile.Filename)); - int tutorialPage = 3; - // Set standard type to None var peptideSettingsUI = ShowDialog(SkylineWindow.ShowPeptideSettingsUI); RunUI(() => peptideSettingsUI.SelectedTab = PeptideSettingsUI.TABS.Modifications); RunUI(() => peptideSettingsUI.SelectedInternalStandardTypeName = Resources.LabelTypeComboDriver_LoadList_none); - PauseForScreenShot("Peptide Settings - Modifications tab", tutorialPage++); + PauseForScreenShot("Peptide Settings - Modifications tab"); var docBeforePeptideSettings = SkylineWindow.Document; OkDialog(peptideSettingsUI, peptideSettingsUI.OkDialog); @@ -241,7 +239,7 @@ private void TestMsFraggerSearch() // Launch the wizard var importPeptideSearchDlg = ShowDialog(SkylineWindow.ShowRunPeptideSearchDlg); - PauseForScreenShot("Import Peptide Search - Select DIA Files to Search page", tutorialPage++); + PauseForScreenShot("Import Peptide Search - Select DIA Files to Search page"); // We're on the "Build Spectral Library" page of the wizard. RunUI(() => @@ -251,7 +249,7 @@ private void TestMsFraggerSearch() importPeptideSearchDlg.BuildPepSearchLibControl.IncludeAmbiguousMatches = false; importPeptideSearchDlg.BuildPepSearchLibControl.WorkflowType = ImportPeptideSearchDlg.Workflow.dia; }); - PauseForScreenShot("Import Peptide Search - After Selecting DIA Files page", tutorialPage++); + PauseForScreenShot("Import Peptide Search - After Selecting DIA Files page"); RunUI(() => { @@ -259,7 +257,7 @@ private void TestMsFraggerSearch() Assert.IsTrue(importPeptideSearchDlg.CurrentPage == ImportPeptideSearchDlg.Pages.chromatograms_page); importPeptideSearchDlg.ImportResultsDIAControl.IsGpf = _analysisValues.IsGpfData; }); - PauseForScreenShot("Import Peptide Search - Extract Chromatograms page", tutorialPage++); + PauseForScreenShot("Import Peptide Search - Extract Chromatograms page"); SkylineWindow.BeginInvoke(new Action(() => Assert.IsTrue(importPeptideSearchDlg.ClickNextButton()))); @@ -267,14 +265,14 @@ private void TestMsFraggerSearch() { // Remove prefix/suffix dialog pops up; accept default behavior var removeSuffix = WaitForOpenForm(); - PauseForScreenShot("Import Results - Common prefix form", tutorialPage++); + PauseForScreenShot("Import Results - Common prefix form"); OkDialog(removeSuffix, () => removeSuffix.YesDialog()); WaitForDocumentLoaded(); } // We're on the "Match Modifications" page. Add M+16 WaitForConditionUI(() => importPeptideSearchDlg.CurrentPage == ImportPeptideSearchDlg.Pages.match_modifications_page); - PauseForScreenShot("Import Peptide Search - Add Modifications page", tutorialPage++); + PauseForScreenShot("Import Peptide Search - Add Modifications page"); var editStructModListUI = ShowDialog, StaticMod>>(importPeptideSearchDlg.MatchModificationsControl.ClickAddStructuralModification); @@ -286,7 +284,7 @@ private void TestMsFraggerSearch() OkDialog(editStructModListUI, editStructModListUI.OkDialog); RunUI(() => importPeptideSearchDlg.MatchModificationsControl.ChangeAll(true)); - PauseForScreenShot("Import Peptide Search - After adding modifications page", tutorialPage++); + PauseForScreenShot("Import Peptide Search - After adding modifications page"); RunUI(() => Assert.IsTrue(importPeptideSearchDlg.ClickNextButton())); RunUI(() => @@ -336,9 +334,9 @@ private void TestMsFraggerSearch() Assert.AreEqual(double.Parse(fields[2], CultureInfo.InvariantCulture), isolationWindow.StartMargin ?? 0, 0.01); } }); - PauseForScreenShot("Isolation scheme", tutorialPage++); + PauseForScreenShot("Isolation scheme"); var isolationGraph = ShowDialog(isolationScheme.OpenGraph); - PauseForScreenShot("Isolation scheme graph", tutorialPage++); + PauseForScreenShot("Isolation scheme graph"); OkDialog(isolationGraph, isolationGraph.CloseButton); var okDlgAction = new Action(isolationScheme.OkDialog); @@ -367,7 +365,7 @@ private void TestMsFraggerSearch() RunUI(okDlgAction); WaitForClosedForm(isolationScheme); - PauseForScreenShot("Import Peptide Search - Configure MS1 Full-Scan Settings page", tutorialPage++); + PauseForScreenShot("Import Peptide Search - Configure MS1 Full-Scan Settings page"); RunUI(() => Assert.IsTrue(importPeptideSearchDlg.ClickNextButton())); // We're on the "Import FASTA" page. @@ -378,7 +376,7 @@ private void TestMsFraggerSearch() importPeptideSearchDlg.ImportFastaControl.MaxMissedCleavages = 1; importPeptideSearchDlg.ImportFastaControl.SetFastaContent(GetTestPath(_analysisValues.FastaPath)); }); - PauseForScreenShot("Import Peptide Search - Import FASTA page", tutorialPage++); + PauseForScreenShot("Import Peptide Search - Import FASTA page"); RunUI(() => Assert.IsTrue(importPeptideSearchDlg.ClickNextButton())); // We're on the DIA-Umpire settings page @@ -387,7 +385,7 @@ private void TestMsFraggerSearch() Assert.IsTrue(importPeptideSearchDlg.CurrentPage == ImportPeptideSearchDlg.Pages.converter_settings_page); Assert.IsFalse(importPeptideSearchDlg.ConverterSettingsControl.UseDiaUmpire); }); - PauseForScreenShot("Import Peptide Search - DIA-Umpire Settings page", tutorialPage++); + PauseForScreenShot("Import Peptide Search - DIA-Umpire Settings page"); RunUI(() => Assert.IsTrue(importPeptideSearchDlg.ClickNextButton())); @@ -410,7 +408,7 @@ private void TestMsFraggerSearch() importPeptideSearchDlg.SearchControl.SearchFinished += (success) => searchSucceeded = success; }); - PauseForScreenShot("Import Peptide Search - Search Settings page", tutorialPage++); + PauseForScreenShot("Import Peptide Search - Search Settings page"); WaitForConditionUI(() => _analysisValues.FragmentMzTolerance.Unit == importPeptideSearchDlg.SearchSettingsControl.FragmentTolerance.Unit); @@ -423,8 +421,7 @@ private void TestMsFraggerSearch() var msfraggerDownloaderDlg = TryWaitForOpenForm(2000); if (msfraggerDownloaderDlg != null) { - PauseForScreenShot("Import Peptide Search - Download MSFragger", - tutorialPage++); // Maybe someday + PauseForScreenShot("Import Peptide Search - Download MSFragger"); // Maybe someday RunUI(() => msfraggerDownloaderDlg.SetValues("Matt Chambers (testing download from Skyline)", "matt.chambers42@gmail.com", "UW")); OkDialog(msfraggerDownloaderDlg, msfraggerDownloaderDlg.ClickAccept); @@ -433,8 +430,7 @@ private void TestMsFraggerSearch() var downloaderDlg = TryWaitForOpenForm(2000); if (downloaderDlg != null) { - PauseForScreenShot("Import Peptide Search - Download Java and Crux", - tutorialPage++); // Maybe someday + PauseForScreenShot("Import Peptide Search - Download Java and Crux"); // Maybe someday OkDialog(downloaderDlg, downloaderDlg.ClickYes); var waitDlg = WaitForOpenForm(); WaitForClosedForm(waitDlg); @@ -445,7 +441,7 @@ private void TestMsFraggerSearch() { WaitForConditionUI(() => importPeptideSearchDlg.CurrentPage == ImportPeptideSearchDlg.Pages.dda_search_page); - PauseForScreenShot("Import Peptide Search - Search Progress page", tutorialPage++); + PauseForScreenShot("Import Peptide Search - Search Progress page"); // Wait for search to finish WaitForConditionUI(60000 * 60, () => searchSucceeded.HasValue); @@ -475,7 +471,7 @@ private void TestMsFraggerSearch() else { var ambiguousDlg = ShowDialog(() => importPeptideSearchDlg.ClickNextButton()); - PauseForScreenShot("Import Peptide Search - Ambiguous Peptides dialog", tutorialPage++); + PauseForScreenShot("Import Peptide Search - Ambiguous Peptides dialog"); RunUI(() => AssertEx.Contains(ambiguousDlg.Message, Resources.BiblioSpecLiteBuilder_AmbiguousMatches_The_library_built_successfully__Spectra_matching_the_following_peptides_had_multiple_ambiguous_peptide_matches_and_were_excluded_)); OkDialog(ambiguousDlg, ambiguousDlg.OkDialog); @@ -513,7 +509,7 @@ private void TestMsFraggerSearch() } } }); - PauseForScreenShot("Import Peptide Search - Empty Proteins dialog", tutorialPage++); + PauseForScreenShot("Import Peptide Search - Empty Proteins dialog"); using (new WaitDocumentChange(null, true, 600 * 1000)) { @@ -537,14 +533,13 @@ private void TestMsFraggerSearch() }); //RestoreViewOnScreenNoSelChange(18); WaitForGraphs(); - tutorialPage++; // Docking drag-drop image page - PauseForScreenShot("Manual review window layout with protein selected", tutorialPage++); + PauseForScreenShot("Manual review window layout with protein selected"); try { FindNode(peptideToSelect); WaitForGraphs(); - PauseForScreenShot("Manual review window layout with peptide selected", tutorialPage++); + PauseForScreenShot("Manual review window layout with peptide selected"); } catch (AssertFailedException e) { diff --git a/pwiz_tools/Skyline/TestPerf/DiaSwathTutorialTest.cs b/pwiz_tools/Skyline/TestPerf/DiaSwathTutorialTest.cs index 40d980c071..74c2b9afc7 100644 --- a/pwiz_tools/Skyline/TestPerf/DiaSwathTutorialTest.cs +++ b/pwiz_tools/Skyline/TestPerf/DiaSwathTutorialTest.cs @@ -566,8 +566,7 @@ protected override void DoTest() // Launch the wizard var importPeptideSearchDlg = ShowDialog(SkylineWindow.ShowImportPeptideSearchDlg); - int screenshotPage = IsTtof ? 3 : 4; - PauseForScreenShot("Import Peptide Search - Build Spectral Library empty page", screenshotPage++); + PauseForScreenShot("Import Peptide Search - Build Spectral Library empty page"); // We're on the "Build Spectral Library" page of the wizard. // Add the test xml file to the search files list and try to @@ -600,7 +599,7 @@ protected override void DoTest() cols[0].Width = 175; // just "interact.pep.xml" cols[1].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; // To show the full PeptideProphet confidence }); - PauseForScreenShot("Import Peptide Search - Build Spectral Library populated page", screenshotPage++); + PauseForScreenShot("Import Peptide Search - Build Spectral Library populated page"); AddIrtPeptidesDlg addIrtPeptidesDlg; AddIrtStandardsDlg addIrtStandardsDlg = null; @@ -610,7 +609,7 @@ protected override void DoTest() { addIrtStandardsDlg = ShowDialog(() => importPeptideSearchDlg.ClickNextButton()); RunUI(() => addIrtStandardsDlg.StandardCount = _instrumentValues.ExpectedIrtPeptideCount); - PauseForScreenShot("Add Standard Peptides - Select number of CiRT peptides", screenshotPage); + PauseForScreenShot("Add Standard Peptides - Select number of CiRT peptides"); addIrtPeptidesDlg = ShowDialog(addIrtStandardsDlg.OkDialog); } else @@ -640,12 +639,10 @@ protected override void DoTest() Assert.AreEqual(Resources.AddIrtPeptidesDlg_AddIrtPeptidesDlg_Success, row.Cells[4].Value); addIrtPeptidesDlg.Width = 650; }); - PauseForScreenShot("Add iRT peptides form", screenshotPage); - if (addIrtStandardsDlg != null) - screenshotPage++; + PauseForScreenShot("Add iRT peptides form"); var irtGraph = ShowDialog(() => addIrtPeptidesDlg.ShowRegression(0)); - PauseForScreenShot("iRT regression graph", screenshotPage++); + PauseForScreenShot("iRT regression graph"); OkDialog(irtGraph, irtGraph.CloseDialog); var recalibrateMessage = ShowDialog(addIrtPeptidesDlg.OkDialog); @@ -687,7 +684,7 @@ protected override void DoTest() foreach (var selectedFile in openDataFiles.SelectedFiles) Assert.IsTrue(DiaFiles.Contains(selectedFile)); }); - PauseForScreenShot("Results files form", screenshotPage++); + PauseForScreenShot("Results files form"); OkDialog(openDataFiles, openDataFiles.Open); WaitForConditionUI(() => importPeptideSearchDlg.IsNextButtonEnabled); @@ -696,9 +693,7 @@ protected override void DoTest() foreach (var resultFileName in importResults.FoundResultsFiles) Assert.IsTrue(DiaFiles.Contains(Path.GetFileName(resultFileName.Path))); }); - PauseForScreenShot("Extract chromatograms page with files", screenshotPage++); - if (IsPasef) - screenshotPage++; // Because IPS wizard is so tall with IMS added + PauseForScreenShot("Extract chromatograms page with files"); var importResultsNameDlg = ShowDialog(() => importPeptideSearchDlg.ClickNextButton()); OkDialog(importResultsNameDlg, importResultsNameDlg.YesDialog); @@ -751,7 +746,7 @@ protected override void DoTest() Assert.AreEqual(MzTolerance.Units.mz, importPeptideSearchDlg.TransitionSettingsControl.IonMatchMzTolerance.Unit); // CONSIDER: Not that easy to validate 1, 2 in ion charges. }); - PauseForScreenShot("Transition settings", screenshotPage++); + PauseForScreenShot("Transition settings"); RunUI(() => Assert.IsTrue(importPeptideSearchDlg.ClickNextButton())); // We're on the "Configure Full-Scan Settings" page of the wizard. @@ -804,19 +799,18 @@ protected override void DoTest() Assert.AreEqual(double.Parse(fields[2], CultureInfo.InvariantCulture), isolationWindow.StartMargin ?? 0, 0.01); } }); - screenshotPage++; // One page without a screenshot - PauseForScreenShot("Isolation scheme", screenshotPage++); + PauseForScreenShot("Isolation scheme"); var isolationGraph = ShowDialog(isolationScheme.OpenGraph); - PauseForScreenShot("Isolation scheme graph", screenshotPage++); + PauseForScreenShot("Isolation scheme graph"); OkDialog(isolationGraph, isolationGraph.CloseButton); OkDialog(isolationScheme, isolationScheme.OkDialog); if (IsPasef) - PauseForScreenShot("Import Peptide Search - Configure Full-Scan Settings page", screenshotPage++); + PauseForScreenShot("Import Peptide Search - Configure Full-Scan Settings page"); else - PauseForScreenShot("Import Peptide Search - Configure Full-Scan Settings page", screenshotPage++); + PauseForScreenShot("Import Peptide Search - Configure Full-Scan Settings page"); WaitForConditionUI(() => importPeptideSearchDlg.IsNextButtonEnabled); RunUI(() => Assert.IsTrue(importPeptideSearchDlg.ClickNextButton())); @@ -834,7 +828,7 @@ protected override void DoTest() importPeptideSearchDlg.ImportFastaControl.AutoTrain = true; Assert.IsTrue(importPeptideSearchDlg.ImportFastaControl.ContainsFastaContent); }); - PauseForScreenShot("Import Peptide Search - Import FASTA page", screenshotPage++); + PauseForScreenShot("Import Peptide Search - Import FASTA page"); if (IsRecordMode) Console.WriteLine(); @@ -860,19 +854,19 @@ protected override void DoTest() peptidesPerProteinDlg.NewTargetsFinal(out proteinCount, out peptideCount, out precursorCount, out transitionCount); _testInfo.ValidateTargets(IsRecordMode, _analysisValues.FinalTargetCounts, proteinCount, peptideCount, precursorCount, transitionCount, @"FinalTargetCounts"); }); - PauseForScreenShot("Import FASTA summary form", screenshotPage); + PauseForScreenShot("Import FASTA summary form"); OkDialog(peptidesPerProteinDlg, peptidesPerProteinDlg.OkDialog); var allChrom = WaitForOpenForm(); allChrom.SetFreezeProgressPercent(41, @"00:00:22"); WaitForCondition(() => allChrom.IsProgressFrozen()); - PauseForScreenShot("Loading chromatograms window", screenshotPage++, 30*1000); // 30 second timeout to avoid getting stuck + PauseForScreenShot("Loading chromatograms window", 30*1000); // 30 second timeout to avoid getting stuck allChrom.SetFreezeProgressPercent(null, null); WaitForDocumentChangeLoaded(doc, 20 * 60 * 1000); // 20 minutes var peakScoringModelDlg = WaitForOpenForm(); - PauseForScreenShot("mProphet model form", screenshotPage++); + PauseForScreenShot("mProphet model form"); ValidateCoefficients(peakScoringModelDlg, _analysisValues.ScoringModelCoefficients); OkDialog(peakScoringModelDlg, peakScoringModelDlg.OkDialog); @@ -885,7 +879,7 @@ protected override void DoTest() var documentSettingsDlg = ShowDialog(SkylineWindow.ShowDocumentSettingsDialog); AddReplicateAnnotation(documentSettingsDlg, "Condition", AnnotationDef.AnnotationType.value_list, - new[] { "A", "B" }, screenshotPage++); + new[] { "A", "B" }, true); AddReplicateAnnotation(documentSettingsDlg, "BioReplicate"); @@ -926,7 +920,7 @@ protected override void DoTest() SetClipboardText(TextUtil.LineSeparate(replicateAnnotations.Select(TextUtil.ToEscapedTSV))); RunUI(() => documentGrid.DataGridView.SendPaste()); - PauseForScreenShot("Document Grid - filled", screenshotPage++); + PauseForScreenShot("Document Grid - filled"); RunUI(() => SkylineWindow.ShowDocumentGrid(false)); @@ -966,10 +960,10 @@ protected override void DoTest() rectFrame = rtGraphFrame.Bounds; rtGraphFrame.Activate(); // TODO: Want the graph activated but a screenshot of screen }); - PauseForScreenShot("Docking floating image with cursor", screenshotPage++, null, bmp => + PauseForScreenShot("Docking floating image with cursor", null, bmp => DrawLArrowCursorOnBitmap(ClipDockingRect(bmp, rectFrame), 0.5, 0.155)); BeginDragDisplay(SkylineWindow.GraphRetentionTime, 0.62, 0.11); - PauseForScreenShot("Docking image cursor on upper dock indicator", screenshotPage++, null, bmp => + PauseForScreenShot("Docking image cursor on upper dock indicator", null, bmp => ClipDockingRect(bmp, rectFrame)); EndDragDisplay(); } @@ -991,12 +985,11 @@ protected override void DoTest() RestoreViewOnScreenNoSelChange(18); WaitForGraphs(); - screenshotPage++; // Docking drag-drop image page - PauseForScreenShot("Manual review window layout with protein selected", screenshotPage++); + PauseForScreenShot("Manual review window layout with protein selected"); FindNode(_instrumentValues.ExamplePeptide); WaitForGraphs(); - PauseForScreenShot("Manual review window layout with peptide selected", screenshotPage++); + PauseForScreenShot("Manual review window layout with peptide selected"); FindNode("_HUMAN"); WaitForGraphs(); @@ -1012,9 +1005,8 @@ protected override void DoTest() } var graphChrom = SkylineWindow.GetGraphChrom(firstReplicateName); - PauseForScreenShot(graphChrom, "Snip just one chromatogram pane", - null, null, bmp => DrawHandCursorOnChromBitmap(bmp, - graphChrom, true, clickPoint.X, clickPoint.Y)); + PauseForScreenShot(graphChrom, "Snip just one chromatogram pane", null, bmp => DrawHandCursorOnChromBitmap(bmp, + graphChrom, true, clickPoint.X, clickPoint.Y)); try { @@ -1027,18 +1019,18 @@ protected override void DoTest() "Click on and record a new ChromatogramClickPoint at the peak of that chromatogram.", e); } - PauseForScreenShot("Full-Scan graph window - zoomed", screenshotPage++); + PauseForScreenShot("Full-Scan graph window - zoomed"); if (IsPasef) { RunUI(() => SkylineWindow.GraphFullScan.ShowMobility(true)); WaitForGraphs(); - PauseForScreenShot("Full-Scan graph window - mobility zoomed", screenshotPage++); + PauseForScreenShot("Full-Scan graph window - mobility zoomed"); } RunUI(() => SkylineWindow.GraphFullScan.ZoomToSelection(false)); WaitForGraphs(); - PauseForScreenShot("Full-Scan graph window - unzoomed", screenshotPage++); + PauseForScreenShot("Full-Scan graph window - unzoomed"); RunUI(SkylineWindow.GraphFullScan.Close); RunUI(SkylineWindow.ShowMassErrorHistogramGraph); @@ -1084,11 +1076,11 @@ protected override void DoTest() RunUI(SkylineWindow.ShowRTRegressionGraphScoreToRun); RestoreViewOnScreenNoSelChange(24); WaitForRegression(); - PauseForScreenShot(SkylineWindow.GraphRetentionTime, "Retention time regression graph window - regression", screenshotPage++); + PauseForScreenShot(SkylineWindow.GraphRetentionTime, "Retention time regression graph window - regression"); RunUI(() => SkylineWindow.ShowPlotType(PlotTypeRT.residuals)); WaitForGraphs(); - PauseForScreenShot(SkylineWindow.GraphRetentionTime, "Retention time regression graph window - residuals", screenshotPage++); + PauseForScreenShot(SkylineWindow.GraphRetentionTime, "Retention time regression graph window - residuals"); RunUI(() => SkylineWindow.ShowGraphRetentionTime(false, GraphTypeSummary.score_to_run_regression)); var editGroupComparisonDlg = ShowDialog(SkylineWindow.AddGroupComparison); @@ -1107,7 +1099,7 @@ protected override void DoTest() editGroupComparisonDlg.ShowAdvanced(true); editGroupComparisonDlg.TextBoxQValueCutoff.Text = (0.01).ToString(CultureInfo.CurrentCulture); }); - PauseForScreenShot("Group comparison", screenshotPage++); + PauseForScreenShot("Group comparison"); OkDialog(editGroupComparisonDlg, editGroupComparisonDlg.OkDialog); RunUI(() => SkylineWindow.ShowGroupComparisonWindow(groupComparisonName)); @@ -1125,14 +1117,14 @@ protected override void DoTest() }); WaitForConditionUI(() => 0 != fcGridControl.RowCount, "0 != foldChangeGrid.DataboundGridControl.RowCount"); WaitForConditionUI(() => fcGridControl.IsComplete, "foldChangeGrid.DataboundGridControl.IsComplete"); - PauseForScreenShot("By Condition grid", screenshotPage); + PauseForScreenShot("By Condition grid"); var volcanoPlot = ShowDialog(fcGrid.ShowVolcanoPlot); RestoreViewOnScreenNoSelChange(27); fcGrid = WaitForOpenForm(); WaitForConditionUI(() => fcGrid.DataboundGridControl.IsComplete && fcGrid.DataboundGridControl.RowCount > 11); RunUI(() => fcGrid.DataboundGridControl.DataGridView.FirstDisplayedScrollingRowIndex = 11); // Re-apply scrolling - PauseForScreenShot("By Condition:Volcano Plot - unformatted", screenshotPage++); + PauseForScreenShot("By Condition:Volcano Plot - unformatted"); volcanoPlot = WaitForOpenForm(); // May have changed with RestoreViewsOnScreen WaitForConditionUI(() => volcanoPlot.CurveList.Count == 5); WaitForConditionUI(() => volcanoPlot.CurveList[4].Points.Count > SkylineWindow.Document.MoleculeCount/4); @@ -1148,12 +1140,12 @@ protected override void DoTest() ApplyFormatting(formattingDlg, "ECOLI", "128, 0, 255"); var createExprDlg = ShowDialog(() => formattingDlg.ClickCreateExpression(formattingDlg.ResultList.Count - 1)); - PauseForScreenShot("Create Expression form", screenshotPage++); + PauseForScreenShot("Create Expression form"); OkDialog(createExprDlg, createExprDlg.OkDialog); ApplyFormatting(formattingDlg, "YEAS", "255, 128, 0"); ApplyFormatting(formattingDlg, "HUMAN", "0, 128, 0"); - PauseForScreenShot("Volcano plot formatting form", screenshotPage); + PauseForScreenShot("Volcano plot formatting form"); OkDialog(formattingDlg, formattingDlg.OkDialog); //PauseTest(); WaitForConditionUI(() => volcanoPlot.CurveList.Count == 8 && @@ -1199,7 +1191,7 @@ protected override void DoTest() WaitForBarGraphPoints(barGraph, _analysisValues.DiffPeptideCounts[0] - volcanoBarDelta); SortByFoldChange(fcGridControl, _resultProperty); - PauseForScreenShot("By Condition:Bar Graph - peptides", screenshotPage++); + PauseForScreenShot("By Condition:Bar Graph - peptides"); var changeGroupComparisonSettings = ShowDialog(fcGrid.ShowChangeSettings); RunUI(() => changeGroupComparisonSettings.RadioScopePerProtein.Checked = true); diff --git a/pwiz_tools/Skyline/TestPerf/DiaUmpireTutorialTest.cs b/pwiz_tools/Skyline/TestPerf/DiaUmpireTutorialTest.cs index 841a0d58c7..4f18eff90d 100644 --- a/pwiz_tools/Skyline/TestPerf/DiaUmpireTutorialTest.cs +++ b/pwiz_tools/Skyline/TestPerf/DiaUmpireTutorialTest.cs @@ -362,7 +362,7 @@ protected override void DoTest() // Launch the wizard var importPeptideSearchDlg = ShowDialog(SkylineWindow.ShowRunPeptideSearchDlg); - PauseForScreenShot("Import Peptide Search - Build Spectral Library empty page", 3); + PauseForScreenShot("Import Peptide Search - Build Spectral Library empty page"); // We're on the "Build Spectral Library" page of the wizard. // Add the test xml file to the search files list and try to @@ -399,21 +399,22 @@ protected override void DoTest() // Check default settings shown in the tutorial Assert.IsFalse(importPeptideSearchDlg.BuildPepSearchLibControl.IncludeAmbiguousMatches); }); - PauseForScreenShot("Import Peptide Search - Build Spectral Library populated page", 4); + PauseForScreenShot("Import Peptide Search - Build Spectral Library populated page"); RunUI(() => { Assert.IsTrue(importPeptideSearchDlg.ClickNextButton()); Assert.IsTrue(importPeptideSearchDlg.CurrentPage == ImportPeptideSearchDlg.Pages.chromatograms_page); }); + // TODO: Put this back with tutorial text that explains it - // PauseForScreenShot("Import Peptide Search - Extract chromatograms page", 4); + // PauseForScreenShot("Import Peptide Search - Extract chromatograms page"); // With 2 sources, we get the remove prefix/suffix dialog; accept default behavior if (searchFiles.Length > 1) { var removeSuffix = ShowDialog(() => importPeptideSearchDlg.ClickNextButton()); // now on remove prefix/suffix dialog - PauseForScreenShot("Import Peptide Search - Remove shared prefix/suffix page", 5); + PauseForScreenShot("Import Peptide Search - Remove shared prefix/suffix page"); OkDialog(removeSuffix, () => removeSuffix.YesDialog()); // now on modifications WaitForDocumentLoaded(); } @@ -433,7 +434,7 @@ protected override void DoTest() RunUI(() => importPeptideSearchDlg.MatchModificationsControl.ChangeAll(true)); - PauseForScreenShot("Import Peptide Search - After adding modifications page", 6); + PauseForScreenShot("Import Peptide Search - After adding modifications page"); RunUI(() => Assert.IsTrue(importPeptideSearchDlg.ClickNextButton())); WaitForConditionUI(() => importPeptideSearchDlg.CurrentPage == ImportPeptideSearchDlg.Pages.transition_settings_page); @@ -464,7 +465,7 @@ protected override void DoTest() Assert.AreEqual(MzTolerance.Units.mz, importPeptideSearchDlg.TransitionSettingsControl.IonMatchMzTolerance.Unit); // CONSIDER: Not that easy to validate 1, 2 in ion charges. }); - PauseForScreenShot("Transition settings", 7); + PauseForScreenShot("Transition settings"); RunUI(() => Assert.IsTrue(importPeptideSearchDlg.ClickNextButton())); // We're on the "Configure Full-Scan Settings" page of the wizard. @@ -512,20 +513,20 @@ protected override void DoTest() Assert.AreEqual(double.Parse(fields[2], CultureInfo.InvariantCulture), isolationWindow.StartMargin ?? 0, 0.01); } }); - PauseForScreenShot("Isolation scheme", 8); + PauseForScreenShot("Isolation scheme"); var isolationGraph = ShowDialog(isolationScheme.OpenGraph); - PauseForScreenShot("Isolation scheme graph", 9); + PauseForScreenShot("Isolation scheme graph"); OkDialog(isolationGraph, isolationGraph.CloseButton); OkDialog(isolationScheme, isolationScheme.OkDialog); - PauseForScreenShot("Import Peptide Search - Configure Full-Scan Settings page", 10); + PauseForScreenShot("Import Peptide Search - Configure Full-Scan Settings page"); WaitForConditionUI(() => importPeptideSearchDlg.IsNextButtonEnabled); RunUI(() => Assert.IsTrue(importPeptideSearchDlg.ClickNextButton())); - PauseForScreenShot("Import Peptide Search - Import FASTA page before settings", 11); + PauseForScreenShot("Import Peptide Search - Import FASTA page before settings"); RunUI(() => { Assert.IsTrue(importPeptideSearchDlg.CurrentPage == ImportPeptideSearchDlg.Pages.import_fasta_page); @@ -544,7 +545,7 @@ protected override void DoTest() importPeptideSearchDlg.ImportFastaControl.AutoTrain = true; Assert.IsTrue(importPeptideSearchDlg.ImportFastaControl.ContainsFastaContent); }); - PauseForScreenShot("Import Peptide Search - Import FASTA page after settings", 12); + PauseForScreenShot("Import Peptide Search - Import FASTA page after settings"); RunUI(() => { @@ -555,7 +556,7 @@ protected override void DoTest() importPeptideSearchDlg.ConverterSettingsControl.EstimateBackground = true; //importPeptideSearchDlg.ConverterSettingsControl.AdditionalSettings = _instrumentValues.AdditionalSettings; }); - PauseForScreenShot("Import Peptide Search - DiaUmpire settings page", 14); + PauseForScreenShot("Import Peptide Search - DiaUmpire settings page"); bool? searchSucceeded = null; RunUI(() => @@ -571,7 +572,7 @@ protected override void DoTest() Assert.AreEqual(PropertyNames.CutoffScore_PERCOLATOR_QVALUE, importPeptideSearchDlg.SearchSettingsControl.CutoffLabel); Assert.AreEqual(0.05, importPeptideSearchDlg.SearchSettingsControl.CutoffScore); }); - PauseForScreenShot("Import Peptide Search - DDA search settings", 13); + PauseForScreenShot("Import Peptide Search - DDA search settings"); IDictionary diaUmpireParameters = null; SearchSettingsControl.DdaSearchSettings searchSettings = null; @@ -597,7 +598,7 @@ protected override void DoTest() { WaitForConditionUI(() => importPeptideSearchDlg.CurrentPage == ImportPeptideSearchDlg.Pages.dda_search_page); WaitForConditionUI(() => importPeptideSearchDlg.SearchControl.PercentComplete > 17); - PauseForScreenShot("Import Peptide Search - DDA search progress page", 14); + PauseForScreenShot("Import Peptide Search - DDA search progress page"); WaitForConditionUI(120 * 600000, () => searchSucceeded.HasValue, () => importPeptideSearchDlg.SearchControl.LogText); RunUI(() => Assert.IsTrue(searchSucceeded.Value, importPeptideSearchDlg.SearchControl.LogText)); @@ -631,10 +632,10 @@ protected override void DoTest() Assert.AreEqual(1.0, double.Parse(row.Cells[3].Value.ToString())); Assert.AreEqual(Resources.AddIrtPeptidesDlg_AddIrtPeptidesDlg_Success, row.Cells[4].Value); }); - PauseForScreenShot("Add iRT peptides form", 15); + PauseForScreenShot("Add iRT peptides form"); var irtGraph = ShowDialog(() => addIrtDlg.ShowRegression(0)); - PauseForScreenShot("iRT regression graph", 15); + PauseForScreenShot("iRT regression graph"); OkDialog(irtGraph, irtGraph.CloseDialog); var recalibrateMessage = ShowDialog(addIrtDlg.OkDialog); @@ -673,19 +674,19 @@ protected override void DoTest() peptidesPerProteinDlg.NewTargetsFinal(out proteinCount, out peptideCount, out precursorCount, out transitionCount); ValidateTargets(ref _analysisValues.FinalTargetCounts, proteinCount, peptideCount, precursorCount, transitionCount, @"FinalTargetCounts"); }); - PauseForScreenShot("Import FASTA summary form", 16); + PauseForScreenShot("Import FASTA summary form"); OkDialog(peptidesPerProteinDlg, peptidesPerProteinDlg.OkDialog); var allChrom = WaitForOpenForm(); allChrom.SetFreezeProgressPercent(41, @"00:00:22"); WaitForCondition(() => allChrom.IsProgressFrozen()); - PauseForScreenShot("Loading chromatograms window", 13, 30*1000); // 30 second timeout to avoid getting stuck + PauseForScreenShot("Loading chromatograms window", 30*1000); // 30 second timeout to avoid getting stuck allChrom.SetFreezeProgressPercent(null, null); WaitForDocumentChangeLoaded(doc, 15 * 60 * 1000); // 15 minutes var peakScoringModelDlg = WaitForOpenForm(); ValidateCoefficients(peakScoringModelDlg, _analysisValues.ScoringModelCoefficients); - PauseForScreenShot("mProphet model form", 17); + PauseForScreenShot("mProphet model form"); OkDialog(peakScoringModelDlg, peakScoringModelDlg.OkDialog); @@ -727,10 +728,10 @@ protected override void DoTest() rectFrame = rtGraphFrame.Bounds; rtGraphFrame.Activate(); // TODO: Want the graph activated but a screenshot of screen }); - PauseForScreenShot("Docking floating image with cursor", 18, null, bmp => + PauseForScreenShot("Docking floating image with cursor", null, bmp => DrawLArrowCursorOnBitmap(ClipDockingRect(bmp, rectFrame), 0.5, 0.155)); BeginDragDisplay(SkylineWindow.GraphRetentionTime, 0.62, 0.11); - PauseForScreenShot("Docking image cursor on upper dock indicator", 18, null, bmp => + PauseForScreenShot("Docking image cursor on upper dock indicator", null, bmp => ClipDockingRect(bmp, rectFrame)); EndDragDisplay(); } @@ -752,27 +753,27 @@ protected override void DoTest() RestoreViewOnScreenNoSelChange(18); WaitForGraphs(); RunUIForScreenShot(() => SkylineWindow.SequenceTree.TopNode = SkylineWindow.SequenceTree.SelectedNode); - PauseForScreenShot("Manual review window layout with protein selected", 19); + PauseForScreenShot("Manual review window layout with protein selected"); FindNode("TDINQALNR"); WaitForGraphs(); - PauseForScreenShot("Manual review window layout with peptide selected", 20); + PauseForScreenShot("Manual review window layout with peptide selected"); FindNode("_HUMAN"); WaitForGraphs(); FindNode("TDINQALNR"); RunUI(SkylineWindow.AutoZoomBestPeak); WaitForGraphs(); - PauseForChromGraphScreenShot("Snip just one chromatogram pane", "1_SW-A", 21); + PauseForChromGraphScreenShot("Snip just one chromatogram pane", "1_SW-A"); ClickChromatogram(SkylineWindow.Document.MeasuredResults.Chromatograms[0].Name, _analysisValues.ChromatogramClickPoint.X, _analysisValues.ChromatogramClickPoint.Y); - PauseForScreenShot("Full-Scan graph window - zoomed", 21); + PauseForScreenShot("Full-Scan graph window - zoomed"); RunUI(() => SkylineWindow.GraphFullScan.ZoomToSelection(false)); WaitForGraphs(); - PauseForScreenShot("Full-Scan graph window - unzoomed", 22); + PauseForScreenShot("Full-Scan graph window - unzoomed"); RunUI(SkylineWindow.GraphFullScan.Close); RunUI(SkylineWindow.ShowMassErrorHistogramGraph); @@ -787,7 +788,7 @@ protected override void DoTest() ValidateMassErrors(massErrorPane, massErrorStatsIndex++); // CONSIDER: No way to specify mass error graph window in PauseForScreenShot or ShowDialog - PauseForMassErrorGraphScreenShot("Mass errors histogram graph window", 23); + PauseForMassErrorGraphScreenShot("Mass errors histogram graph window"); // Review single replicates RunUI(SkylineWindow.ShowSingleReplicate); @@ -816,11 +817,11 @@ protected override void DoTest() RunUI(SkylineWindow.ShowRTRegressionGraphScoreToRun); WaitForGraphs(); RestoreViewOnScreenNoSelChange(24); - PauseForRetentionTimeGraphScreenShot("Retention time regression graph window - regression", 24); + PauseForRetentionTimeGraphScreenShot("Retention time regression graph window - regression"); RunUI(() => SkylineWindow.ShowPlotType(PlotTypeRT.residuals)); WaitForGraphs(); - PauseForRetentionTimeGraphScreenShot("Retention time regression graph window - residuals", 25); + PauseForRetentionTimeGraphScreenShot("Retention time regression graph window - residuals"); RunUI(() => SkylineWindow.ShowGraphRetentionTime(false, GraphTypeSummary.score_to_run_regression)); if (IsCoverShotMode) diff --git a/pwiz_tools/Skyline/TestPerf/DriftTimePredictorTutorialTest.cs b/pwiz_tools/Skyline/TestPerf/DriftTimePredictorTutorialTest.cs index 79388014a4..8732535872 100644 --- a/pwiz_tools/Skyline/TestPerf/DriftTimePredictorTutorialTest.cs +++ b/pwiz_tools/Skyline/TestPerf/DriftTimePredictorTutorialTest.cs @@ -106,14 +106,14 @@ protected override void DoTest() var document = WaitForDocumentChangeLoaded(oldDoc,240*1000); // 4 minutes RunUI(() => SkylineWindow.Size = new Size(880, 560)); RestoreViewOnScreen(2); - PauseForScreenShot("Document open - full window", 2); + PauseForScreenShot("Document open - full window"); AssertEx.IsDocumentState(document, null, 1, 34, 38, 404); { var transitionSettingsUI = ShowDialog(() => SkylineWindow.ShowTransitionSettingsUI(TransitionSettingsUI.TABS.FullScan)); - PauseForScreenShot("Full-scan settings", 3); + PauseForScreenShot("Full-scan settings"); RunUI(() => { @@ -133,7 +133,7 @@ protected override void DoTest() var importResults = ShowDialog(askDecoysDlg.ClickNo); RunUI(() => importResults.ImportSimultaneousIndex = 2); - PauseForScreenShot("Import results form", 4); + PauseForScreenShot("Import results form"); // Importing raw data from a sample which is a mixture of yeast and BSA @@ -144,7 +144,7 @@ protected override void DoTest() openDataSourceDialog.CurrentDirectory = new MsDataFilePath(DataPath); openDataSourceDialog.SelectAllFileType(".d"); }); - PauseForScreenShot("Import results files", 5); + PauseForScreenShot("Import results files"); OkDialog(openDataSourceDialog, openDataSourceDialog.Open); } @@ -152,7 +152,7 @@ protected override void DoTest() string yeastReplicateName = Path.GetFileNameWithoutExtension(Yeast_BSA); var allChromGraph = WaitForOpenForm(); WaitForConditionUI(() => allChromGraph.ProgressTotalPercent > 35); - PauseForScreenShot("Importing results form", 6); + PauseForScreenShot("Importing results form"); WaitForDocumentChangeLoaded(document, 1000 * 60 * 60 * 10); // 10 minutes @@ -170,10 +170,10 @@ protected override void DoTest() RunUI(() => SkylineWindow.Size = new Size(1075, 799)); RestoreViewOnScreen(7); - PauseForScreenShot("Zoomed split graph panes only", 7, null, ClipChromatograms); + PauseForScreenShot("Zoomed split graph panes only", null, ClipChromatograms); RunUI(() => SkylineWindow.AutoZoomNone()); - PauseForScreenShot("Unzoomed split graph panes only", 8, null, ClipChromatograms); + PauseForScreenShot("Unzoomed split graph panes only", null, ClipChromatograms); const int wideWidth = 1547; RunUI(() => @@ -188,20 +188,20 @@ protected override void DoTest() SkylineWindow.Size = new Size(wideWidth, 855); }); RestoreViewOnScreen(9); - PauseForScreenShot("Full window", 9); + PauseForScreenShot("Full window"); FindNode("TCVADESHAGCEK"); var noteDlg = ShowDialog(SkylineWindow.EditNote); RunUI(() => noteDlg.NoteText = "Lost in yeast samples"); - PauseForScreenShot("Peptide note", 10); + PauseForScreenShot("Peptide note"); OkDialog(noteDlg, noteDlg.OkDialog); FindNode("NECFLSHKDDSPDLPK"); RestoreViewOnScreen(11); const int narrowWidth = 1350; RunUI(() => SkylineWindow.Width = narrowWidth); - PauseForScreenShot("Yeast chromatograms and RT only - prtsc-paste-edit", 11, null, bmp => + PauseForScreenShot("Yeast chromatograms and RT only - prtsc-paste-edit", null, bmp => { bmp = ClipSkylineWindowShotWithForms(bmp, new DockableForm[] { @@ -221,7 +221,7 @@ protected override void DoTest() MouseOverChromatogram(BSAFragName, clickTime1, clickIntensity, PaneKey.PRECURSORS); var graphChrom = SkylineWindow.GetGraphChrom(BSAFragName); - PauseForScreenShot(graphChrom,"Hover over BSA in water chromatogram - prtsc-paste-edit", 12, null, bmp => + PauseForScreenShot(graphChrom,"Hover over BSA in water chromatogram - prtsc-paste-edit", null, bmp => ClipBitmap(DrawHandCursorOnChromBitmap(bmp, graphChrom, true, clickTime1, clickIntensity, PaneKey.PRECURSORS), new Rectangle(0, 0, bmp.Width, (int)(bmp.Height * 0.515)))); @@ -229,23 +229,23 @@ protected override void DoTest() RestoreViewOnScreen(13); { ClickChromatogram(BSAFragName, clickTime1, clickIntensity, PaneKey.PRECURSORS); - PauseForFullScanGraphScreenShot("Full scan 2D MS1 graph", 13); + PauseForFullScanGraphScreenShot("Full scan 2D MS1 graph"); var fullScanGraph = FindOpenForm(); RunUI(() => fullScanGraph.SetSpectrum(false)); - PauseForFullScanGraphScreenShot("Full scan 3D MS1 graph", 13); + PauseForFullScanGraphScreenShot("Full scan 3D MS1 graph"); ValidateClickTime(fullScanGraph, clickTime1); RunUI(() => fullScanGraph.SetZoom(false)); - PauseForFullScanGraphScreenShot("Full scan unzoomed 3D MS1 graph", 14); + PauseForFullScanGraphScreenShot("Full scan unzoomed 3D MS1 graph"); const double clickTime2 = 41.02; RunUI(() => fullScanGraph.SetZoom(true)); ClickChromatogram(clickTime2, 5.8E+4, PaneKey.PRODUCTS); - PauseForFullScanGraphScreenShot("Full scan 3D MS/MS graph", 15); + PauseForFullScanGraphScreenShot("Full scan 3D MS/MS graph"); ValidateClickTime(fullScanGraph, clickTime2); RunUI(() => fullScanGraph.SetZoom(false)); - PauseForFullScanGraphScreenShot("Full scan unzoomed 3D MS/MS graph", 15); + PauseForFullScanGraphScreenShot("Full scan unzoomed 3D MS/MS graph"); if (IsCoverShotMode) { @@ -273,7 +273,7 @@ protected override void DoTest() const double clickTime3 = 41.48; ClickChromatogram(yeastReplicateName, clickTime3, 3.14E+4, PaneKey.PRODUCTS); - PauseForFullScanGraphScreenShot("Interference full scan unzoomed 3D MS/MS graph", 16); + PauseForFullScanGraphScreenShot("Interference full scan unzoomed 3D MS/MS graph"); ValidateClickTime(fullScanGraph, clickTime3); RunUI(SkylineWindow.HideFullScanGraph); @@ -296,7 +296,7 @@ protected override void DoTest() .IonMobilityWindowWidthType.resolving_power; transitionSettingsUI.IonMobilityControl.IonMobilityFilterResolvingPower = 50; }); - PauseForScreenShot("Setting ion mobility filter width calculation values", 17); + PauseForScreenShot("Setting ion mobility filter width calculation values"); var editIonMobilityLibraryDlg = ShowDialog(transitionSettingsUI.IonMobilityControl.AddIonMobilityLibrary); @@ -311,14 +311,14 @@ protected override void DoTest() editIonMobilityLibraryDlg.GetIonMobilitiesFromResults(); }); - PauseForScreenShot("Edit ion mobility library form", 18); + PauseForScreenShot("Edit ion mobility library form"); // Check that a new value was calculated for all precursors RunUI(() => Assert.AreEqual(SkylineWindow.Document.MoleculeTransitionGroupCount, editIonMobilityLibraryDlg.LibraryMobilitiesFlatCount)); OkDialog(editIonMobilityLibraryDlg, () => editIonMobilityLibraryDlg.OkDialog()); - PauseForScreenShot("Transition Settings - Ion Mobility", 19); + PauseForScreenShot("Transition Settings - Ion Mobility"); RunUI(() => { @@ -326,12 +326,12 @@ protected override void DoTest() transitionSettingsUI.SetRetentionTimeFilter(RetentionTimeFilterType.scheduling_windows, 3); }); - PauseForScreenShot("Transition Settings - Full-Scan", 20); + PauseForScreenShot("Transition Settings - Full-Scan"); OkDialog(transitionSettingsUI, transitionSettingsUI.OkDialog); var peptideSettingsUI = ShowDialog(SkylineWindow.ShowPeptideSettingsUI); RunUI(() => peptideSettingsUI.SelectedTab = PeptideSettingsUI.TABS.Prediction); - PauseForScreenShot("Peptide Settings - Prediction", 21); + PauseForScreenShot("Peptide Settings - Prediction"); RunUI(() => { Assert.IsTrue(peptideSettingsUI.IsUseMeasuredRT); @@ -344,7 +344,7 @@ protected override void DoTest() using (new WaitDocumentChange(1, true, 1000 * 60 * 60 * 5)) { var choosePredictionReplicates = ShowDialog(SkylineWindow.ImportResults); - PauseForScreenShot("Choose Replicates form", 22); + PauseForScreenShot("Choose Replicates form"); RunUI(() => choosePredictionReplicates.SelectOrDeselectAll(true)); var importResults = ShowDialog(choosePredictionReplicates.OkDialog); @@ -374,7 +374,7 @@ protected override void DoTest() panePrec.XAxis.Scale.Max = paneProd.XAxis.Scale.Max = 44.2; }); } - PauseForScreenShot("Yeast chromatogram and RTs - prtsc-paste-edit", 23, null, bmp => + PauseForScreenShot("Yeast chromatogram and RTs - prtsc-paste-edit", null, bmp => ClipSkylineWindowShotWithForms(bmp, new DockableForm[] { SkylineWindow.GetGraphChrom(Path.GetFileNameWithoutExtension(Yeast_BSA)), @@ -388,7 +388,7 @@ protected override void DoTest() var fullScanGraph = FindOpenForm(); RunUI(() => fullScanGraph.SetZoom(true)); RunUI(() => fullScanGraph.Parent.Parent.Size = new Size(671, 332)); - PauseForFullScanGraphScreenShot("Full-scan graph zoomed", 24); + PauseForFullScanGraphScreenShot("Full-scan graph zoomed"); RunUI(() => Assert.IsTrue(fullScanGraph.TitleText.Contains(clickTime.ToString(CultureInfo.CurrentCulture)))); RunUI(SkylineWindow.HideFullScanGraph); } @@ -402,7 +402,7 @@ protected override void DoTest() SkylineWindow.ShowPeakAreaLegend(true); }); RestoreViewOnScreen(25); - PauseForScreenShot("Chromatograms and Peak Areas - prtsc-paste-edit", 25, null, bmp => + PauseForScreenShot("Chromatograms and Peak Areas - prtsc-paste-edit", null, bmp => ClipSkylineWindowShotWithForms(bmp, new DockableForm[] { SkylineWindow.GetGraphChrom(BSAFragName), diff --git a/pwiz_tools/Skyline/TestPerf/EncyclopeDiaSearchTutorialTest.cs b/pwiz_tools/Skyline/TestPerf/EncyclopeDiaSearchTutorialTest.cs index 225a15846f..0c7f3092b4 100644 --- a/pwiz_tools/Skyline/TestPerf/EncyclopeDiaSearchTutorialTest.cs +++ b/pwiz_tools/Skyline/TestPerf/EncyclopeDiaSearchTutorialTest.cs @@ -196,8 +196,7 @@ protected override void DoTest() var searchDlg = ShowDialog(SkylineWindow.ShowEncyclopeDiaSearchDlg); RunUI(() => searchDlg.ImportFastaControl.SetFastaContent(fastaFilepath)); - var screenshotPage = 5; - PauseForScreenShot("Fasta Settings page", screenshotPage++); + PauseForScreenShot("Fasta Settings page"); // copy expected blib to actual blib path so it will be re-used and Koina won't be called string persistentBlibFilepath = TestFilesDir.GetTestPath(_analysisValues.BlibPath); @@ -221,7 +220,7 @@ protected override void DoTest() //searchDlg.MaxMz = 551; searchDlg.ImportFastaControl.MaxMissedCleavages = 2; }); - PauseForScreenShot("Koina Settings page", screenshotPage++); + PauseForScreenShot("Koina Settings page"); RunUI(searchDlg.NextPage); // now on narrow fractions var browseNarrowDlg = ShowDialog(() => searchDlg.NarrowWindowResults.Browse()); @@ -230,9 +229,9 @@ protected override void DoTest() browseNarrowDlg.CurrentDirectory = new MsDataFilePath(workingDir); browseNarrowDlg.SelectAllFileType("mzML", s => _analysisValues.NarrowWindowDiaFiles.Contains(s)); }); - PauseForScreenShot("Narrow Window Results - Browse for Results Files form", screenshotPage++); + PauseForScreenShot("Narrow Window Results - Browse for Results Files form"); OkDialog(browseNarrowDlg, browseNarrowDlg.Open); - PauseForScreenShot("Narrow Window Results page", screenshotPage++); + PauseForScreenShot("Narrow Window Results page"); RunUI(searchDlg.NextPage); // now on wide fractions var browseWideDlg = ShowDialog(() => searchDlg.WideWindowResults.Browse()); @@ -241,9 +240,9 @@ protected override void DoTest() browseWideDlg.CurrentDirectory = new MsDataFilePath(workingDir); browseWideDlg.SelectAllFileType("mzML", s => _analysisValues.WideWindowDiaFiles.Contains(s)); }); - PauseForScreenShot("Wide Window Results - Browse for Results Files form", screenshotPage++); + PauseForScreenShot("Wide Window Results - Browse for Results Files form"); OkDialog(browseWideDlg, browseWideDlg.Open); - PauseForScreenShot("Wide Window Results page", screenshotPage++); + PauseForScreenShot("Wide Window Results page"); RunUI(searchDlg.NextPage); // now on EncyclopeDia settings RunUI(() => @@ -257,7 +256,7 @@ protected override void DoTest() //searchDlg.SetAdditionalSetting("FilterPeaklists", "true"); //searchDlg.SetAdditionalSetting("NumberOfThreadsUsed", "16"); }); - PauseForScreenShot("EncyclopeDIA Settings page", screenshotPage++); + PauseForScreenShot("EncyclopeDIA Settings page"); RunUI(searchDlg.NextPage); // start search var downloaderDlg = TryWaitForOpenForm(2000); @@ -273,7 +272,7 @@ protected override void DoTest() bool? searchSucceeded = null; searchDlg.SearchControl.SearchFinished += (success) => searchSucceeded = success; - PauseForScreenShot("Search Progress page", screenshotPage++); + PauseForScreenShot("Search Progress page"); try { @@ -372,14 +371,13 @@ protected override void DoTest() }); //RestoreViewOnScreenNoSelChange(18); WaitForGraphs(); - screenshotPage++; // Docking drag-drop image page - PauseForScreenShot("Manual review window layout with protein selected", screenshotPage++); + PauseForScreenShot("Manual review window layout with protein selected"); try { FindNode(peptideToSelect); WaitForGraphs(); - PauseForScreenShot("Manual review window layout with peptide selected", screenshotPage++); + PauseForScreenShot("Manual review window layout with peptide selected"); } catch (AssertFailedException e) { @@ -389,7 +387,7 @@ protected override void DoTest() RunUI(SkylineWindow.AutoZoomBestPeak); WaitForGraphs(); - PauseForScreenShot("Snip just one chromatogram pane", screenshotPage++); + PauseForScreenShot("Snip just one chromatogram pane"); try { @@ -404,12 +402,12 @@ protected override void DoTest() "Click on and record a new ChromatogramClickPoint at the peak of that chromatogram.", e); } - PauseForScreenShot("Full-Scan graph window - zoomed", screenshotPage++); + PauseForScreenShot("Full-Scan graph window - zoomed"); RunUI(() => SkylineWindow.GraphFullScan.ZoomToSelection(false)); WaitForGraphs(); - PauseForScreenShot("Full-Scan graph window - unzoomed", screenshotPage++); + PauseForScreenShot("Full-Scan graph window - unzoomed"); RunUI(SkylineWindow.GraphFullScan.Close); RunUI(SkylineWindow.ShowMassErrorHistogramGraph); @@ -425,7 +423,7 @@ protected override void DoTest() ValidateMassErrors(massErrorPane, massErrorStatsIndex++); // CONSIDER: No way to specify mass error graph window in PauseForScreenShot or ShowDialog - PauseForScreenShot("Mass errors histogram graph window", screenshotPage++); + PauseForScreenShot("Mass errors histogram graph window"); // Review single replicates RunUI(SkylineWindow.ShowSingleReplicate); diff --git a/pwiz_tools/Skyline/TestPerf/HiResMetabolomicsTutorial.cs b/pwiz_tools/Skyline/TestPerf/HiResMetabolomicsTutorial.cs index bc087a2a84..3b53ee0a4c 100644 --- a/pwiz_tools/Skyline/TestPerf/HiResMetabolomicsTutorial.cs +++ b/pwiz_tools/Skyline/TestPerf/HiResMetabolomicsTutorial.cs @@ -105,7 +105,7 @@ protected override void DoTest() transitionSettingsUI.FragmentMassType = MassType.Monoisotopic; transitionSettingsUI.SetAutoSelect = true; }); - PauseForScreenShot("Transition Settings -Filter tab", 4); + PauseForScreenShot("Transition Settings -Filter tab"); RunUI(() => { // Full Scan Settings @@ -117,7 +117,7 @@ protected override void DoTest() transitionSettingsUI.PrecursorResMz = 200; transitionSettingsUI.RetentionTimeFilterType = RetentionTimeFilterType.none; }); - PauseForScreenShot("Transition Settings -Full Scan tab", 5); + PauseForScreenShot("Transition Settings -Full Scan tab"); OkDialog(transitionSettingsUI, transitionSettingsUI.OkDialog); var docTargets = WaitForDocumentChange(doc); @@ -125,7 +125,7 @@ protected override void DoTest() var importDialog = ShowDialog(SkylineWindow.ShowPasteTransitionListDlg); RunUIForScreenShot(() => ResizeFormOnScreen(importDialog, 600, 300)); - PauseForScreenShot("Insert Transition List ready to accept paste of transition list", 6); + PauseForScreenShot("Insert Transition List ready to accept paste of transition list"); var text = GetCsvFileText(GetTestPath("PUFA_TransitionList.csv")); var col4Dlg = ShowDialog(() => importDialog.TransitionListText = text); @@ -138,20 +138,20 @@ protected override void DoTest() col4Dlg.SetColumnWidth(2, 120); // To show "Molecule Formula" fully col4Dlg.SetColumnWidth(5, 135); // To reduce wrapping to just 2 rows }); - PauseForScreenShot("Insert Transition List column picker", 6); + PauseForScreenShot("Insert Transition List column picker"); var errDlg = ShowDialog(col4Dlg.CheckForErrors); RunUI(() => errDlg.Size = new Size(680, 250)); - PauseForScreenShot("Check For Errors dialog showing charge problem", 7); + PauseForScreenShot("Check For Errors dialog showing charge problem"); OkDialog(errDlg, errDlg.OkDialog); RunUI(() => col4Dlg.ComboBoxes[4].SelectedIndex = 0); // Set the Precursor charge column to "ignore" - PauseForScreenShot("Paste Dialog with validated contents", 7); + PauseForScreenShot("Paste Dialog with validated contents"); OkDialog(col4Dlg, col4Dlg.OkDialog); var autoSelectDlg = WaitForOpenForm(); - PauseForScreenShot("Auto-select query", 8); + PauseForScreenShot("Auto-select query"); OkDialog(autoSelectDlg, autoSelectDlg.OkDialog); docTargets = WaitForDocumentChange(docTargets); @@ -168,7 +168,7 @@ protected override void DoTest() }); RestoreViewOnScreen(5); - PauseForScreenShot("Skyline with 14 transition", 9); + PauseForScreenShot("Skyline with 14 transition"); // Set the standard type of the surrogate standards to StandardType.SURROGATE_STANDARD SelectNode(SrmDocument.Level.Molecules, 3); @@ -224,7 +224,7 @@ protected override void DoTest() openDataSourceDialog1.CurrentDirectory = new MsDataFilePath(Path.Combine(TestFilesDirs.First().PersistentFilesDir, GetDataFolder())); openDataSourceDialog1.SelectAllFileType(ExtWatersRaw); }); - PauseForScreenShot("Import Results Files form", 10); + PauseForScreenShot("Import Results Files form"); OkDialog(openDataSourceDialog1, openDataSourceDialog1.Open); OkDialog(importResultsDlg1,importResultsDlg1.OkDialog); } @@ -232,7 +232,7 @@ protected override void DoTest() SelectNode(SrmDocument.Level.Molecules, 0); SelectNode(SrmDocument.Level.MoleculeGroups, 0); RunUI(SkylineWindow.CollapsePrecursors); - PauseForScreenShot("Skyline window multi-target graph", 11); + PauseForScreenShot("Skyline window multi-target graph"); var docResults = SkylineWindow.Document; @@ -275,7 +275,7 @@ protected override void DoTest() RunUI(() => documentGrid.DataboundGridControl.ChooseView(new ViewName(ViewGroup.BUILT_IN.Id, Resources.SkylineViewContext_GetDocumentGridRowSources_Molecules))); } - PauseForScreenShot("Skyline window multi-replicate layout", 12); + PauseForScreenShot("Skyline window multi-replicate layout"); if (IsCoverShotMode) { @@ -322,7 +322,7 @@ protected override void DoTest() peptideSettingsUI.QuantUnits = "uM"; }); - PauseForScreenShot("Molecule Settings - Quantitation", 13); + PauseForScreenShot("Molecule Settings - Quantitation"); OkDialog(peptideSettingsUI, peptideSettingsUI.OkDialog); } @@ -353,7 +353,7 @@ protected override void DoTest() // Make sure the edits have flowed to the document WaitForConditionUI(() => SkylineWindow.DocumentUI.Settings.MeasuredResults.Chromatograms.Where(c => c.Name.StartsWith("GW")).All(c => c.SampleType.Equals(SampleType.QC))); RestoreViewOnScreen(14); - PauseForScreenShot("Document Grid - replicates", 14); + PauseForScreenShot("Document Grid - replicates"); // Finish setting up quant var documentGrid3 = FindOpenForm(); @@ -379,12 +379,12 @@ protected override void DoTest() }); RestoreViewOnScreen(15); - PauseForScreenShot("Document Grid - molecule quant again", 15); + PauseForScreenShot("Document Grid - molecule quant again"); RunUI(() => SkylineWindow.ShowCalibrationForm()); SelectNode(SrmDocument.Level.Molecules, 0); WaitForGraphs(); - PauseForScreenShot("Calibration curve", 15); + PauseForScreenShot("Calibration curve"); } } } diff --git a/pwiz_tools/Skyline/TestPerf/OrbiPrmTutorialTest.cs b/pwiz_tools/Skyline/TestPerf/OrbiPrmTutorialTest.cs index aa199b9c37..7e99cc5068 100644 --- a/pwiz_tools/Skyline/TestPerf/OrbiPrmTutorialTest.cs +++ b/pwiz_tools/Skyline/TestPerf/OrbiPrmTutorialTest.cs @@ -181,13 +181,13 @@ private void PrepareTargets() // Have to open the start page from within Skyline to ensure audit logging starts up correctly var startPage = ShowDialog(SkylineWindow.OpenStartPage); - PauseForScreenShot("Import Peptide List icon", 1); + PauseForScreenShot("Import Peptide List icon"); var startPageSettings = ShowDialog(() => startPage.ClickWizardAction(Resources.SkylineStartup_SkylineStartup_Import_Peptide_List)); RunUI(() => startPageSettings.IsIntegrateAll = true); - PauseForScreenShot("Settings form", 2); + PauseForScreenShot("Settings form"); RunDlg(startPageSettings.ResetDefaults, dlg => dlg.OkDialog()); @@ -214,7 +214,7 @@ private void PrepareTargets() var messageRepeats = ShowDialog(() => proteomeDlg.AddFastaFile(GetTestPath("uniprot-mouse.fasta"))); - PauseForScreenShot("Repeats message", 3); + PauseForScreenShot("Repeats message"); OkDialog(messageRepeats, messageRepeats.OkDialog); @@ -223,7 +223,7 @@ private void PrepareTargets() OkDialog(proteomeDlg, proteomeDlg.OkDialog); - PauseForScreenShot("Peptide Settings - Digestion tab", 4); + PauseForScreenShot("Peptide Settings - Digestion tab"); RunUI(() => { @@ -231,7 +231,7 @@ private void PrepareTargets() peptideSettingsUI.TimeWindow = 5; }); - PauseForScreenShot("Peptide Settings - Prediction tab", 5); + PauseForScreenShot("Peptide Settings - Prediction tab"); RunUI(() => { @@ -241,7 +241,7 @@ private void PrepareTargets() peptideSettingsUI.TextExcludeAAs = 0; }); - PauseForScreenShot("Peptide Settings - Filter tab", 7); + PauseForScreenShot("Peptide Settings - Filter tab"); RunUI(() => { @@ -281,7 +281,7 @@ private void PrepareTargets() peptideSettingsUI.PickedLibraries = new[] { SHOTGUN_LIBRARY, HEAVY_LIBRARY }; }); - PauseForScreenShot("Peptide Settings - Library tab", 8); + PauseForScreenShot("Peptide Settings - Library tab"); RunUI(() => { @@ -296,7 +296,7 @@ private void PrepareTargets() AddHeavyMod(modHeavyR, peptideSettingsUI, "Edit Isotope Modification form", 9); RunUI(() => peptideSettingsUI.PickedHeavyMods = new[] { HEAVY_K, HEAVY_R }); - PauseForScreenShot("Peptide Settings - Modifications tab", 10); + PauseForScreenShot("Peptide Settings - Modifications tab"); RunUI(() => @@ -307,7 +307,7 @@ private void PrepareTargets() peptideSettingsUI.QuantUnits = QUANT_UNITS; }); - PauseForScreenShot("Peptide Settings - Quantification tab", 10); + PauseForScreenShot("Peptide Settings - Quantification tab"); using (new WaitDocumentChange(null, true)) { @@ -321,7 +321,7 @@ private void PrepareTargets() transitionSettingsUI.SelectedTab = TransitionSettingsUI.TABS.Prediction; }); - PauseForScreenShot("Transition Settings - Prediction tab", 11); + PauseForScreenShot("Transition Settings - Prediction tab"); RunUI(() => { @@ -335,7 +335,7 @@ private void PrepareTargets() transitionSettingsUI.ExclusionWindow = 5; }); - PauseForScreenShot("Transition Settings - Filter tab", 12); + PauseForScreenShot("Transition Settings - Filter tab"); RunUI(() => { @@ -346,7 +346,7 @@ private void PrepareTargets() transitionSettingsUI.Filtered = true; }); - PauseForScreenShot("Transition Settings - Library tab", 13); + PauseForScreenShot("Transition Settings - Library tab"); RunUI(() => { @@ -355,7 +355,7 @@ private void PrepareTargets() transitionSettingsUI.MaxMz = 1200; }); - PauseForScreenShot("Transition Settings - Instrument tab", 14); + PauseForScreenShot("Transition Settings - Instrument tab"); RunUI(() => { @@ -366,7 +366,7 @@ private void PrepareTargets() transitionSettingsUI.RetentionTimeFilterType = RetentionTimeFilterType.none; }); - PauseForScreenShot("Transition Settings - Full-Scan tab", 15); + PauseForScreenShot("Transition Settings - Full-Scan tab"); OkDialog(transitionSettingsUI, transitionSettingsUI.OkDialog); @@ -378,7 +378,7 @@ private void PrepareTargets() SetClipboardText(GetPeptideList()); pasteDlg.PastePeptides(); }); - PauseForScreenShot("Insert Peptide List", 16); // Not L10N + PauseForScreenShot("Insert Peptide List"); // Not L10N OkDialog(pasteDlg, pasteDlg.OkDialog); } @@ -387,7 +387,7 @@ private void PrepareTargets() RestoreViewOnScreen(17); RunUI(() => SkylineWindow.Size = new Size(1100, 657)); - PauseForScreenShot("Main window with peptide selected and Library Match view", 17); + PauseForScreenShot("Main window with peptide selected and Library Match view"); SaveBackup("PRM_Proteome"); } @@ -423,7 +423,7 @@ private void ExportMethodReport() Assert.AreEqual(3, viewEditor.ChooseColumnsTab.ColumnCount); // viewEditor.ChooseColumnsTab.ScrollTreeToTop(); }); - PauseForScreenShot("Edit Report form", 18); + PauseForScreenShot("Edit Report form"); var previewReportDlg = ShowDialog(viewEditor.ShowPreview); WaitForConditionUI(() => previewReportDlg.IsComplete); @@ -470,7 +470,7 @@ private void OpenFile(OpenDataSourceDialog openDataSourceDialog, params string[] private void ExportScheduledMethodReport() { var importResultsDlg = ShowDialog(SkylineWindow.ImportResults); - PauseForScreenShot("Import Results form", 19); + PauseForScreenShot("Import Results form"); using (new WaitDocumentChange(null, true)) { @@ -527,7 +527,7 @@ private void ExportScheduledMethodReport() } }); - PauseForScreenShot("Skyline main window", 20); + PauseForScreenShot("Skyline main window"); RunUI(SkylineWindow.CollapsePeptides); SaveBackup("PRM_Scheduled"); @@ -542,7 +542,7 @@ private void ExportScheduledMethodReport() OkDialog(schedulingProps, schedulingProps.OkDialog); WaitForGraphs(); RestoreViewOnScreen(21); - PauseForScreenShot("Schedule graph metafile", 21); + PauseForScreenShot("Schedule graph metafile"); var exportReportDlg = ShowDialog(SkylineWindow.ShowExportReportDialog); var editReportListDlg = ShowDialog(exportReportDlg.EditList); @@ -660,7 +660,7 @@ private void ImportReplicates() RunUI(() => SkylineWindow.Size = new Size(1276, 840)); RestoreViewOnScreen(24); RunUI(SkylineWindow.SequenceTree.ScrollLeft); - PauseForScreenShot("Skyline main window", 24); + PauseForScreenShot("Skyline main window"); RunUI(() => { @@ -670,7 +670,7 @@ private void ImportReplicates() SkylineWindow.AutoZoomBestPeak(); }); - PauseForScreenShot("Skyline main window - split graph", 25); + PauseForScreenShot("Skyline main window - split graph"); RunUI(() => { @@ -681,7 +681,7 @@ private void ImportReplicates() SelectNode(SrmDocument.Level.TransitionGroups, 0); RunUI(SkylineWindow.SequenceTree.ScrollLeft); - PauseForScreenShot("Skyline main window - normalized", 26); + PauseForScreenShot("Skyline main window - normalized"); } private void SetNamedPathSets(ImportResultsDlg importResultsDlg, string folderName) @@ -705,7 +705,7 @@ private void RefineTransitions() pickList.SetItemChecked(7, false); pickList.AutoManageChildren = false; // TODO: Because calling SetItemChecked does not do this }); - PauseForScreenShot("Transitions picklist", 27); + PauseForScreenShot("Transitions picklist"); RunUI(pickList.OnOk); expectedTransitionCount -= 6; RunUI(() => Assert.AreEqual(expectedTransitionCount, SkylineWindow.DocumentUI.MoleculeTransitionCount)); @@ -760,7 +760,7 @@ private void InternalSinglePointCalibration() foreach (DataGridViewRow row in documentGridForm.DataGridView.Rows) AssertEx.Contains(row.Cells[quantColumn.Index].Value.ToString(), expectedPrefix); }); - PauseForScreenShot("Document Grid - Peptide Ratio Results view", 29); + PauseForScreenShot("Document Grid - Peptide Ratio Results view"); RunUI(() => documentGridForm.ChooseView(Resources.Resources_ReportSpecList_GetDefaults_Peptide_Quantification)); WaitForConditionUI(() => documentGridForm.IsComplete && documentGridForm.DataGridView.RowCount == 31 && documentGridForm.DataGridView.ColumnCount == 9); @@ -783,7 +783,7 @@ private void InternalSinglePointCalibration() Assert.AreEqual(appendixConcentrations[iRow], (double)documentGridForm.DataGridView.Rows[iRow].Cells[concentrationColumn.Index].Value); }); - PauseForScreenShot("Document Grid - Peptide Quantification view - filled", 30); + PauseForScreenShot("Document Grid - Peptide Quantification view - filled"); RunUI(() => documentGridForm.ChooseView(Resources.ReportSpecList_GetDefaults_Peptide_Ratio_Results)); WaitForConditionUI(() => documentGridForm.IsComplete && documentGridForm.DataGridView.RowCount == 279 && documentGridForm.DataGridView.ColumnCount == 7); @@ -797,7 +797,7 @@ private void InternalSinglePointCalibration() documentGridForm.DataGridView.CurrentCell = documentGridForm.DataGridView.Rows[0].Cells[0]; }); - PauseForScreenShot("Document Grid - Peptide Ratio Results view - calculated", 30); + PauseForScreenShot("Document Grid - Peptide Ratio Results view - calculated"); OkDialog(documentGridForm, () => SkylineWindow.ShowDocumentGrid(false)); } @@ -808,10 +808,10 @@ private void AnnotateReplicates() var documentSettingsDlg = ShowDialog(SkylineWindow.ShowDocumentSettingsDialog); AddReplicateAnnotation(documentSettingsDlg, "Condition", AnnotationDef.AnnotationType.value_list, - conditionNames, 31); + conditionNames, true); AddReplicateAnnotation(documentSettingsDlg, "BioReplicate", AnnotationDef.AnnotationType.number, - null, 32); + null, true); RunUI(() => { @@ -819,7 +819,7 @@ private void AnnotateReplicates() documentSettingsDlg.AnnotationsCheckedListBox.SetItemChecked(1, true); }); - PauseForScreenShot("Annotation Settings form with MSstats annotations", 33); + PauseForScreenShot("Annotation Settings form with MSstats annotations"); OkDialog(documentSettingsDlg, documentSettingsDlg.OkDialog); @@ -854,7 +854,7 @@ private void AnnotateReplicates() RunUI(() => documentGridForm.DataGridView.CurrentCell = documentGridForm.DataGridView.Rows[rowCount - 1].Cells[cellCount - 1]); - PauseForScreenShot("Document Grid with replicate annotations", 34); + PauseForScreenShot("Document Grid with replicate annotations"); OkDialog(documentGridForm, () => SkylineWindow.ShowDocumentGrid(false)); RunUI(() => @@ -864,7 +864,7 @@ private void AnnotateReplicates() }); SelectNode(SrmDocument.Level.Molecules, 0); - PauseForScreenShot("Peak Areas and RT Replicate Comparison graph metafiles", 35); + PauseForScreenShot("Peak Areas and RT Replicate Comparison graph metafiles"); SaveBackup("PRM_Annotated"); } @@ -897,12 +897,12 @@ private void GroupComparison() const string identityAnnotation = "BioReplicate"; const string comparisonName1 = "G2M-vs-G1"; const string caseValue1 = "G2M"; - AddGroupComparison(documentSettingsDlg, comparisonName1, controlAnnotation, controlValue, caseValue1, identityAnnotation, 35); + AddGroupComparison(documentSettingsDlg, comparisonName1, controlAnnotation, controlValue, caseValue1, identityAnnotation); const string comparisonName2 = "S-vs-G1"; const string caseValue2 = "S"; - AddGroupComparison(documentSettingsDlg, comparisonName2, controlAnnotation, controlValue, caseValue2, identityAnnotation, 36); + AddGroupComparison(documentSettingsDlg, comparisonName2, controlAnnotation, controlValue, caseValue2, identityAnnotation); RunUI(() => documentSettingsDlg.Height = 310); - PauseForScreenShot("Document Settings", 37); + PauseForScreenShot("Document Settings"); OkDialog(documentSettingsDlg, documentSettingsDlg.OkDialog); var docAfterComparison = WaitForDocumentChange(docBeforeComparison); var groupComparisonDefs = docAfterComparison.Settings.DataSettings.GroupComparisonDefs; @@ -914,14 +914,14 @@ private void GroupComparison() WaitForConditionUI(() => 19 == foldChangeGrid1.DataboundGridControl.RowCount); VerifyFoldChangeValues(foldChangeGrid1, _g2mVsG1ExpectedValues, nameof(_g2mVsG1ExpectedValues)); RunUI(() => foldChangeGrid1.Parent.Parent.Width = 383); - PauseForScreenShot(comparisonName1 + ":Grid", 37); + PauseForScreenShot(comparisonName1 + ":Grid"); OkDialog(foldChangeGrid1, () => foldChangeGrid1.Close()); var foldChangeGrid2 = ShowDialog(() => SkylineWindow.ShowGroupComparisonWindow(comparisonName2)); WaitForConditionUI(() => 19 == foldChangeGrid2.DataboundGridControl.RowCount); VerifyFoldChangeValues(foldChangeGrid2, _sVsG1ExpectedValues, nameof(_sVsG1ExpectedValues)); RunUI(() => foldChangeGrid2.Parent.Parent.Width = 383); - PauseForScreenShot(comparisonName2 + ":Grid", 37); + PauseForScreenShot(comparisonName2 + ":Grid"); OkDialog(foldChangeGrid2, () => foldChangeGrid2.Close()); var foldChangeGridWithGraph = ShowDialog(() => SkylineWindow.ShowGroupComparisonWindow(comparisonName1)); @@ -935,7 +935,7 @@ private void GroupComparison() Assert.AreEqual(foldChangeGridWithGraph.DataboundGridControl.RowCount, foldChangeGraph.ZedGraphControl.GraphPane.CurveList.First().Points.Count); }); - PauseForScreenShot(comparisonName1 + ":Graph metafile", 38); + PauseForScreenShot(comparisonName1 + ":Graph metafile"); foldChangeGridWithGraph = WaitForOpenForm(); WaitForConditionUI(() => foldChangeGridWithGraph.IsComplete); @@ -947,7 +947,7 @@ private void GroupComparison() foldChangeGridWithGraph.DataboundGridControl.DataGridView.Sort(foldChangeResultColumn, ListSortDirection.Ascending); }); RestoreViewOnScreen(39); - PauseForScreenShot(comparisonName1 + ":Grid and Graph window", 39); + PauseForScreenShot(comparisonName1 + ":Grid and Graph window"); OkDialog(foldChangeGridWithGraph, () => foldChangeGridWithGraph.Close()); OkDialog(foldChangeGraph, () => foldChangeGraph.Close()); @@ -966,7 +966,7 @@ private static void ValidateGroupComparison(string comparisonName1, GroupCompari } private void AddGroupComparison(DocumentSettingsDlg documentSettingsDlg, string comparisonName, - string controlAnnotation, string controlValue, string caseValue, string identityAnnotation, int pageNum) + string controlAnnotation, string controlValue, string caseValue, string identityAnnotation) { var editGroupComparisonDlg = ShowDialog(documentSettingsDlg.AddGroupComparison); RunUI(() => @@ -990,7 +990,7 @@ private void AddGroupComparison(DocumentSettingsDlg documentSettingsDlg, string editGroupComparisonDlg.ShowAdvanced(true); editGroupComparisonDlg.ComboSummaryMethod.SelectedItem = SummarizationMethod.MEDIANPOLISH; }); - PauseForScreenShot("Edit Group Comparison", pageNum); + PauseForScreenShot("Edit Group Comparison"); OkDialog(editGroupComparisonDlg, editGroupComparisonDlg.OkDialog); } @@ -1014,7 +1014,7 @@ private void ExportResultsReport() viewEditor.ViewEditorWidgets.OfType().First().SetPivotReplicate(true); // viewEditor.ChooseColumnsTab.ScrollTreeToTop(); }); - PauseForScreenShot("Edit Report form", 40); + PauseForScreenShot("Edit Report form"); var previewReportDlg = ShowDialog(viewEditor.ShowPreview); WaitForConditionUI(() => previewReportDlg.IsComplete); diff --git a/pwiz_tools/Skyline/TestPerf/SmallMolLibrariesTutorialTest.cs b/pwiz_tools/Skyline/TestPerf/SmallMolLibrariesTutorialTest.cs index 506d7b1117..f4d702796d 100644 --- a/pwiz_tools/Skyline/TestPerf/SmallMolLibrariesTutorialTest.cs +++ b/pwiz_tools/Skyline/TestPerf/SmallMolLibrariesTutorialTest.cs @@ -103,7 +103,7 @@ protected override void DoTest() transitionSettingsUI.Left = SkylineWindow.Right + 20; }); // • The Transition Settings form should now look like this: - PauseForScreenShot("Transition Settings: Filter", 3); + PauseForScreenShot("Transition Settings: Filter"); RunUI(() => { @@ -126,7 +126,7 @@ protected override void DoTest() }); // The Transition Settings form should look like this: - PauseForScreenShot("Transition Settings - Full-Scan", 4); + PauseForScreenShot("Transition Settings - Full-Scan"); // • Click the OK button. OkDialog(transitionSettingsUI, transitionSettingsUI.OkDialog); doc = WaitForDocumentChange(doc); @@ -168,7 +168,7 @@ protected override void DoTest() peptideSettingsUI.Left = SkylineWindow.Right + 20; }); // The Molecule Settings form should now look like: - PauseForScreenShot("Molecule Settings - Library", 6); + PauseForScreenShot("Molecule Settings - Library"); // • Click the OK button in the Molecule Settings form. OkDialog(peptideSettingsUI, peptideSettingsUI.OkDialog); doc = WaitForDocumentChangeLoaded(doc); @@ -185,7 +185,7 @@ protected override void DoTest() }); // The library explorer should now resemble the image below: - PauseForScreenShot("Library Explorer", 7); + PauseForScreenShot("Library Explorer"); // To add all the molecules in the library to your target list: // • Click the Add All button. @@ -203,7 +203,7 @@ protected override void DoTest() // Your Skyline window should now resemble: RunUI(() => SkylineWindow.Size = new Size(951, 607)); FocusDocument(); - PauseForScreenShot("Populated Skyline window", 8); + PauseForScreenShot("Populated Skyline window"); //Importing Results Chromatogram.Data // In this section, you will import the Drosophila data without utilizing IMS filtering. This is an initial look at the data to see the impact of interference among lipids and their shared fragments. To import the data, perform the following steps: @@ -224,7 +224,7 @@ protected override void DoTest() importResultsDlg1.Top = SkylineWindow.Top; importResultsDlg1.Left = SkylineWindow.Right + 20; }); - PauseForScreenShot("Import Results", 9); + PauseForScreenShot("Import Results"); var openDataSourceDialog1 = ShowDialog(() => importResultsDlg1.NamedPathSets = importResultsDlg1.GetDataSourcePathsFile(null)); // • Click the OK button. @@ -238,7 +238,7 @@ protected override void DoTest() openDataSourceDialog1.Left = importResultsDlg1.Left; openDataSourceDialog1.Top = importResultsDlg1.Bottom + 10; }); - PauseForScreenShot("Import Results Files selection form", 10); + PauseForScreenShot("Import Results Files selection form"); OkDialog(openDataSourceDialog1, openDataSourceDialog1.Open); // • Click the Open button. @@ -253,7 +253,7 @@ protected override void DoTest() allChromatograms.Left = SkylineWindow.Right + 20; }); WaitForConditionUI(() => allChromatograms.ProgressTotalPercent > 40); - PauseForScreenShot("Importing results form", 11); + PauseForScreenShot("Importing results form"); } WaitForGraphs(); @@ -284,13 +284,13 @@ protected override void DoTest() }); // • Select the molecule PC(16:0_18:1) and your spectra should appear as: FindNode("PC(16:0_18:1)"); - PauseForScreenShot("Chromatograms", 12, null, ClipChromatograms); + PauseForScreenShot("Chromatograms", null, ClipChromatograms); RestoreViewOnScreen(13); WaitForGraphs(); var libraryMatchView = WaitForOpenForm(); RunUI(() => libraryMatchView.ZoomXAxis(100, 400)); - PauseForScreenShot("Library Match", 13); + PauseForScreenShot("Library Match"); //Since there are only 38 precursors in this document, you may want to review all 38 to get an overall feel for how the XIC look prior to IMS filtering.Before starting this review, do the following: // • On the View menu, choose Retention Times and click Replicate Comparison (F8). @@ -320,7 +320,7 @@ protected override void DoTest() WaitForGraphs(); RunUI(() => SkylineWindow.SequenceTree.SelectedNode = selectedNode); WaitForGraphs(); - PauseForScreenShot("Main window", 14); + PauseForScreenShot("Main window"); } //Skyline often does a good job picking peaks and most integration boundaries do not need to be edited.However, there are a few isomer pairs that require some manual peak picking. @@ -348,7 +348,7 @@ protected override void DoTest() MouseOverChromatogram(firstReplicateName, clickPoint.X, clickPoint.Y, PaneKey.PRECURSORS); } var graphChrom = SkylineWindow.GetGraphChrom(firstReplicateName); - PauseForScreenShot(graphChrom,"Chromatogram", 15, null, bmp => + PauseForScreenShot(graphChrom,"Chromatogram", null, bmp => ClipBitmap(DrawHandCursorOnChromBitmap(bmp, graphChrom, true, clickPoint.X, clickPoint.Y, PaneKey.PRECURSORS), new Rectangle(0, 0, bmp.Width, (int)(bmp.Height * 0.515)))); @@ -357,15 +357,15 @@ protected override void DoTest() // This should bring up the Full-Scan view showing a familiar two-dimensional spectrum in profile mode: RunUI(() => SkylineWindow.GraphFullScan.SetSpectrum(true)); RunUI(() => SkylineWindow.GraphFullScan.ZoomToSelection(true)); - PauseForFullScanGraphScreenShot("2D plot", 16); + PauseForFullScanGraphScreenShot("2D plot"); // • Click the Show 2D Spectrum button to change the plot to a three-dimensional spectrum with drift time. RunUI(() => SkylineWindow.GraphFullScan.SetSpectrum(false)); - PauseForFullScanGraphScreenShot("3D plot", 16); + PauseForFullScanGraphScreenShot("3D plot"); // • Click the Zoom to Selection button to see the entire 3D MS1 spectrum at the selected retention time. RunUI(() => SkylineWindow.GraphFullScan.ZoomToSelection(false)); - PauseForFullScanGraphScreenShot("3D plot full range", 17); + PauseForFullScanGraphScreenShot("3D plot full range"); // This is a fairly typical MS1 spectrum for IMS-MS lipidomics data.You can get a better sense of the data by zooming into multiple areas on this plot.You can also select other lipids and click on the blue circle at the apex of each precursor chromatogram peak to see how this plot can differ with retention time. An interesting example is PE(O-18:0/16:1), which has distinct ion distributions showing correlations between m/z and drift time for different lipid classes. // To inspect a relevant MS/MS spectrum: @@ -378,13 +378,13 @@ protected override void DoTest() ClickChromatogram(F_A_018, 14.83, 120.5E3, PaneKey.PRODUCTS); // The Full-Scan graph should change to: RunUI(() => SkylineWindow.GraphFullScan.ZoomToSelection(true)); - PauseForFullScanGraphScreenShot("3D plot MSMS zoomed", 18); + PauseForFullScanGraphScreenShot("3D plot MSMS zoomed"); //You can see that at least three visible ions are contributing to the extracted intensities at 33, 37, and 44 ms.This goes back to the nature of lipid fragmentation as previously discussed, where most lipids with an 18:3 fatty acyl chain will share this fragment.The complexity is increased for fatty acyl chains fragments with fewer double bonds, such as 18:2 at m/z 279, which may have multiple ions as well as isotopic overlap from the abundant 18:3 fragment at m/z 277 contributing to the extracted intensity.A similar observation can be made with the FA 16:1(+O) fragment. // • Click the Zoom to Selection button again to see the entire 3D MS/MS spectrum. RunUI(() => SkylineWindow.GraphFullScan.ZoomToSelection(false)); - PauseForFullScanGraphScreenShot("3D plot MSMS full range", 18); + PauseForFullScanGraphScreenShot("3D plot MSMS full range"); // Reimporting Data with Drift Time Filtering @@ -413,7 +413,7 @@ protected override void DoTest() transitionSettingsUI.Left = SkylineWindow.Right + 20; }); // • The Transition Settings form should now look like this: - PauseForScreenShot("Transition Settings: IonMobility", 20); //The Transition Settings should now look like: + PauseForScreenShot("Transition Settings: IonMobility"); //The Transition Settings should now look like: // • Click the OK button. @@ -457,7 +457,7 @@ protected override void DoTest() return; } - PauseForFullScanGraphScreenShot("Full scan graph with IM filtering", 21); + PauseForFullScanGraphScreenShot("Full scan graph with IM filtering"); // Note that if you were interested in lipids that are not present in the current spectral library, you can add to it manually or using LipidCreator. To access the LipidCreator plugin, do the following: // • From the Tools menu, click Tool Store. @@ -476,7 +476,7 @@ protected override void DoTest() pick.SelectTool("LipidCreator"); pick.Left = SkylineWindow.Right + 20; }); - PauseForScreenShot("LipidCreator in tool store", 22); + PauseForScreenShot("LipidCreator in tool store"); OkDialog(pick, pick.CancelDialog); OkDialog(configureToolsDlg, configureToolsDlg.Cancel); // • Click the Install button. diff --git a/pwiz_tools/Skyline/TestRunner/Program.cs b/pwiz_tools/Skyline/TestRunner/Program.cs index 4510a02154..fd87352fa1 100644 --- a/pwiz_tools/Skyline/TestRunner/Program.cs +++ b/pwiz_tools/Skyline/TestRunner/Program.cs @@ -246,11 +246,11 @@ public LeakTracking Min(LeakTracking lastDeltas) static readonly string commandLineOptions = "?;/?;-?;help;skylinetester;debug;results;" + "test;skip;filter;form;" + - "loop=0;repeat=1;pause=0;startingpage=1;random=off;offscreen=on;multi=1;wait=off;internet=off;originalurls=off;" + + "loop=0;repeat=1;pause=0;startingshot=1;random=off;offscreen=on;multi=1;wait=off;internet=off;originalurls=off;" + "parallelmode=off;workercount=0;waitforworkers=off;keepworkerlogs=off;checkdocker=on;workername;queuehost;workerport;workertimeout;alwaysupcltpassword;" + "coverage=off;dotcoverexe=jetbrains.dotcover.commandlinetools\\2023.3.3\\tools\\dotCover.exe;" + "maxsecondspertest=-1;" + - "demo=off;showformnames=off;showpages=off;status=off;buildcheck=0;" + + "demo=off;showformnames=off;status=off;buildcheck=0;" + "quality=off;pass0=off;pass1=off;pass2=on;" + "perftests=off;" + "retrydatadownloads=off;" + @@ -1366,14 +1366,13 @@ private static bool RunTestPasses( bool useVendorReaders = commandLineArgs.ArgAsBool("vendors"); bool showStatus = commandLineArgs.ArgAsBool("status"); bool showFormNames = commandLineArgs.ArgAsBool("showformnames"); - bool showMatchingPages = commandLineArgs.ArgAsBool("showpages"); bool qualityMode = commandLineArgs.ArgAsBool("quality"); bool pass0 = commandLineArgs.ArgAsBool("pass0"); bool pass1 = commandLineArgs.ArgAsBool("pass1"); bool pass2 = commandLineArgs.ArgAsBool("pass2"); int timeoutMultiplier = (int) commandLineArgs.ArgAsLong("multi"); int pauseSeconds = (int) commandLineArgs.ArgAsLong("pause"); - int pauseStartingPage = (int)commandLineArgs.ArgAsLong("startingpage"); + int pauseStartingScreenshot = (int)commandLineArgs.ArgAsLong("startingshot"); var formList = commandLineArgs.ArgAsString("form"); if (!formList.IsNullOrEmpty()) perftests = true; @@ -1440,7 +1439,7 @@ private static bool RunTestPasses( demoMode, buildMode, offscreen, internet, useOriginalURLs, showStatus, perftests, runsmallmoleculeversions, recordauditlogs, teamcityTestDecoration, retrydatadownloads, - pauseDialogs, pauseSeconds, pauseStartingPage, useVendorReaders, timeoutMultiplier, + pauseDialogs, pauseSeconds, pauseStartingScreenshot, useVendorReaders, timeoutMultiplier, results, log, verbose, clientMode); var timer = new Stopwatch(); @@ -1529,8 +1528,6 @@ private static bool RunTestPasses( if (showFormNames) runTests.Skyline.Set("ShowFormNames", true); - if (showMatchingPages) - runTests.Skyline.Set("ShowMatchingPages", true); var removeList = new List(); diff --git a/pwiz_tools/Skyline/TestRunnerLib/PInvoke/User32TestExtensions.cs b/pwiz_tools/Skyline/TestRunnerLib/PInvoke/User32TestExtensions.cs index db183b18c3..eef040c0f5 100644 --- a/pwiz_tools/Skyline/TestRunnerLib/PInvoke/User32TestExtensions.cs +++ b/pwiz_tools/Skyline/TestRunnerLib/PInvoke/User32TestExtensions.cs @@ -8,16 +8,18 @@ namespace TestRunnerLib.PInvoke public static class User32TestExtensions { /// - /// Adjust z-order without activating + /// Adjust z-order without activating. /// - public static void BringWindowToSameLevelWithoutActivating(this Form form, Form formInsertAfter) + /// The form for which to change z-order + /// The handle of the form to place the other form behind. It is important that this form is specified by its handle to avoid CrossThreadOperationException + public static void BringWindowToSameLevelWithoutActivating(this Form form, IntPtr formInsertAfterHandle) { const User32.SetWindowPosFlags flags = User32.SetWindowPosFlags.NOMOVE | User32.SetWindowPosFlags.NOSIZE | User32.SetWindowPosFlags.NOACTIVATE | User32.SetWindowPosFlags.SHOWWINDOW; - User32.SetWindowPos(form.Handle, formInsertAfter.Handle, 0, 0, 0, 0, flags); + User32.SetWindowPos(form.Handle, formInsertAfterHandle, 0, 0, 0, 0, flags); } public static void HideCaret(this ComboBox comboBox) diff --git a/pwiz_tools/Skyline/TestRunnerLib/RunTests.cs b/pwiz_tools/Skyline/TestRunnerLib/RunTests.cs index 1fc7899e2c..a8f8b3a605 100644 --- a/pwiz_tools/Skyline/TestRunnerLib/RunTests.cs +++ b/pwiz_tools/Skyline/TestRunnerLib/RunTests.cs @@ -173,7 +173,7 @@ public RunTests( bool retrydatadownloads, IEnumerable pauseForms, int pauseSeconds = 0, - int pauseStartingPage = 1, + int pauseStartingScreenshot = 1, bool useVendorReaders = true, int timeoutMultiplier = 1, string results = null, @@ -222,7 +222,7 @@ public RunTests( Skyline.Set("NoSaveSettings", true); Skyline.Set("UnitTestTimeoutMultiplier", timeoutMultiplier); Skyline.Set("PauseSeconds", pauseSeconds); - Skyline.Set("PauseStartingPage", pauseStartingPage); + Skyline.Set("PauseStartingScreenshot", pauseStartingScreenshot); Skyline.Set("PauseForms", pauseForms != null ? pauseForms.ToList() : null); Skyline.Set("Log", (Action)(s => Log(s))); Skyline.Run("Init"); diff --git a/pwiz_tools/Skyline/TestTutorial/AbsoluteQuantTutorialTest.cs b/pwiz_tools/Skyline/TestTutorial/AbsoluteQuantTutorialTest.cs index 44e7a34236..eecaa5b9c0 100644 --- a/pwiz_tools/Skyline/TestTutorial/AbsoluteQuantTutorialTest.cs +++ b/pwiz_tools/Skyline/TestTutorial/AbsoluteQuantTutorialTest.cs @@ -89,7 +89,7 @@ protected override void DoTest() transitionSettingsUI.RegressionCEName = "Thermo TSQ Vantage"; transitionSettingsUI.RegressionDPName = Resources.SettingsList_ELEMENT_NONE_None; }); - PauseForScreenShot("Transition Settings - Prediction tab", 5); + PauseForScreenShot("Transition Settings - Prediction tab"); RunUI(() => { @@ -102,7 +102,7 @@ protected override void DoTest() transitionSettingsUI.RangeTo = Resources.TransitionFilter_FragmentEndFinders_last_ion_minus_1; transitionSettingsUI.SpecialIons = new string[0]; }); - PauseForScreenShot("Transition Settings - Filter tab", 6); + PauseForScreenShot("Transition Settings - Filter tab"); OkDialog(transitionSettingsUI, transitionSettingsUI.OkDialog); WaitForDocumentChange(doc); @@ -116,7 +116,7 @@ protected override void DoTest() LabelAtoms.C13 | LabelAtoms.N15, RelativeRT.Matching, null, null, null); AddHeavyMod(modHeavyK, peptideSettingsUi, "Edit Isotope Modification over Transition Settings", 7); RunUI(() => peptideSettingsUi.PickedHeavyMods = new[] { modHeavyK.Name }); - PauseForScreenShot("Peptide Settings - Modification tab with mod added", 8); + PauseForScreenShot("Peptide Settings - Modification tab with mod added"); OkDialog(peptideSettingsUi, peptideSettingsUi.OkDialog); @@ -128,7 +128,7 @@ protected override void DoTest() RunUI(pasteDlg.PastePeptides); WaitForProteinMetadataBackgroundLoaderCompletedUI(); RunUI(() => pasteDlg.Size = new Size(700, 210)); - PauseForScreenShot("Insert Peptide List", 9); + PauseForScreenShot("Insert Peptide List"); OkDialog(pasteDlg, pasteDlg.OkDialog); } @@ -138,7 +138,7 @@ protected override void DoTest() WaitForCondition(() => File.Exists(GetTestPath(folderAbsoluteQuant + @"test_file.sky"))); RunUI( () => SkylineWindow.Size = new Size(840, 410)); - PauseForScreenShot("Main window with Targets view", 9); + PauseForScreenShot("Main window with Targets view"); // Exporting a transition list p. 10 { @@ -150,7 +150,7 @@ protected override void DoTest() exportMethodDlg.OptimizeType = ExportOptimize.NONE; exportMethodDlg.MethodType = ExportMethodType.Standard; }); - PauseForScreenShot("Export Transition List", 10); + PauseForScreenShot("Export Transition List"); OkDialog(exportMethodDlg, () => exportMethodDlg.OkDialog(GetTestPath("Quant_Abs_Thermo_TSQ_Vantage.csv"))); @@ -158,7 +158,7 @@ protected override void DoTest() // Importing RAW files into Skyline p. 11, 12 var importResultsDlg = ShowDialog(SkylineWindow.ImportResults); - PauseForScreenShot("Import Results", 11); + PauseForScreenShot("Import Results"); var importResultsFilesDlg = ShowDialog(importResultsDlg.OkDialog); RunUI(() => @@ -169,7 +169,7 @@ protected override void DoTest() importResultsFilesDlg.SelectFile(rawFile.GetFileName()); } }); - PauseForScreenShot("Import Results Files", 12); + PauseForScreenShot("Import Results Files"); RunDlg(importResultsFilesDlg.Open, importResultsNameDlg => importResultsNameDlg.NoDialog()); @@ -197,7 +197,7 @@ protected override void DoTest() WaitForCondition(10 * 60 * 1000, // ten minutes () => SkylineWindow.Document.Settings.HasResults && SkylineWindow.Document.Settings.MeasuredResults.IsLoaded); FocusDocument(); - PauseForScreenShot("Main window with imported data", 13); + PauseForScreenShot("Main window with imported data"); // Analyzing SRM Data from FOXN1-GST Sample p. 14 RunDlg(SkylineWindow.ImportResults, @@ -244,7 +244,7 @@ protected override void DoTest() RunUI(() => SkylineWindow.Size = new Size(1470, 656)); RestoreViewOnScreen(14); FocusDocument(); - PauseForScreenShot("Main window with Peak Areas, Retention Times and FOXN1-GST for light", 14); + PauseForScreenShot("Main window with Peak Areas, Retention Times and FOXN1-GST for light"); RunUI(() => SkylineWindow.SelectedPath = SkylineWindow.DocumentUI.GetPathTo((int)SrmDocument.Level.TransitionGroups, 1)); WaitForGraphs(); @@ -254,7 +254,7 @@ protected override void DoTest() int transitionCount = SkylineWindow.DocumentUI.PeptideTransitionGroups.ToArray()[1].TransitionCount; CheckGstGraphs(transitionCount, transitionCount); }); - PauseForScreenShot("Main window with Peak Areas, Retention Times and FOXN1-GST for heavy", 14); + PauseForScreenShot("Main window with Peak Areas, Retention Times and FOXN1-GST for heavy"); RunUI(() => SkylineWindow.SelectedPath = SkylineWindow.DocumentUI.GetPathTo((int)SrmDocument.Level.Molecules, 0)); WaitForGraphs(); @@ -266,7 +266,7 @@ protected override void DoTest() int transitionGroupCount = SkylineWindow.DocumentUI.Peptides.First().TransitionGroupCount; CheckGstGraphs(transitionGroupCount, transitionGroupCount - 1); }); - PauseForScreenShot("Main window with totals graphs for light and heavy and FOXN1-GST", 15); + PauseForScreenShot("Main window with totals graphs for light and heavy and FOXN1-GST"); // Peptide Quantitification Settings p. 16 peptideSettingsUi = ShowDialog(SkylineWindow.ShowPeptideSettingsUI); @@ -278,7 +278,7 @@ protected override void DoTest() peptideSettingsUi.QuantNormalizationMethod = new NormalizationMethod.RatioToLabel(IsotopeLabelType.heavy); peptideSettingsUi.QuantUnits = quantUnits; }); - PauseForScreenShot("Peptide Settings Quantification Tab", 16); + PauseForScreenShot("Peptide Settings Quantification Tab"); OkDialog(peptideSettingsUi, peptideSettingsUi.OkDialog); // Specify analyte concentrations of external standards @@ -320,7 +320,7 @@ protected override void DoTest() gridFloatingWindow.Top = SkylineWindow.Top; gridFloatingWindow.Left = SkylineWindow.Right + 20; }); - PauseForScreenShot("Document grid with concentrations filled in", 17); + PauseForScreenShot("Document grid with concentrations filled in"); } // View the calibration curve p. 18 @@ -360,7 +360,7 @@ protected override void DoTest() calibrationFloatingWindow.Left = SkylineWindow.Right + 20; }); JiggleSelection(); // Otherwise, plot shows two legends - PauseForScreenShot("View calibration curve", 18); + PauseForScreenShot("View calibration curve"); } Assert.AreEqual(CalibrationCurveFitter.AppendUnits(QuantificationStrings.Analyte_Concentration, quantUnits), calibrationForm.ZedGraphControl.GraphPane.XAxis.Title.Text); diff --git a/pwiz_tools/Skyline/TestTutorial/AuditLogTutorialTest.cs b/pwiz_tools/Skyline/TestTutorial/AuditLogTutorialTest.cs index 362e0044ed..7b7f8521bd 100644 --- a/pwiz_tools/Skyline/TestTutorial/AuditLogTutorialTest.cs +++ b/pwiz_tools/Skyline/TestTutorial/AuditLogTutorialTest.cs @@ -79,7 +79,7 @@ public void TestAuditLogTutorial() // Set true to look at tutorial screenshots. // IsPauseForScreenShots = true; -// PauseStartingPage = 16; +// PauseStartingScreenshot = 16; // IsCoverShotMode = true; CoverShotName = "AuditLog"; @@ -95,6 +95,8 @@ public void TestAuditLogTutorial() @"TestTutorial\AuditLogViews.zip" }; + AuditLogEntry.TimeProvider = new TestTimeProvider(); + RunFunctionalTest(); } @@ -111,7 +113,7 @@ protected override void DoTest() SkylineWindow.NewDocument(); }); ShowAndPositionAuditLog(false); - PauseForScreenShot("Empty Audit Log form.", 2); + PauseForScreenShot("Empty Audit Log form."); // Configuring Settings for Inserting a New Peptide, p. 3 { @@ -139,7 +141,7 @@ protected override void DoTest() OkDialog(peptideSettingsUi, peptideSettingsUi.OkDialog); - PauseForScreenShot("Audit Log form with settings modifications.", 4); + PauseForScreenShot("Audit Log form with settings modifications."); RunUI(() => { @@ -148,15 +150,15 @@ protected override void DoTest() }); RunUIForScreenShot(() => SkylineWindow.ShowUndo()); - PauseForScreenShot("Undo list expanded.", 4, null, bmp => - ClipBitmap(bmp, new Rectangle(0, 0, 713, 131))); + PauseForScreenShot("Undo list expanded.", null, bmp => + ClipBitmap(bmp.CleanupBorder(), new Rectangle(0, 0, 713, 131))); RunUIForScreenShot(() => SkylineWindow.ShowUndo(false)); RunUI(SkylineWindow.Undo); RunUIForScreenShot(() => SkylineWindow.ShowRedo()); - PauseForScreenShot("Redo list expanded.", 5, null, bmp => - ClipBitmap(bmp, new Rectangle(0, 0, 743, 127))); + PauseForScreenShot("Redo list expanded.", null, bmp => + ClipBitmap(bmp.CleanupBorder(), new Rectangle(0, 0, 743, 127))); RunUIForScreenShot(() => SkylineWindow.ShowRedo(false)); RunUI(SkylineWindow.Redo); @@ -169,12 +171,8 @@ protected override void DoTest() var pasteDlg = ShowDialog(SkylineWindow.ShowPastePeptidesDlg); RunUI(() => SetClipboardText("IEAIPQIDK\tGST-tag")); RunUI(pasteDlg.PastePeptides); - RunUI(() => - { - pasteDlg.Size = new Size(700, 210); - pasteDlg.Top = SkylineWindow.Bottom + 20; - }); - PauseForScreenShot("Insert Peptide List", 6); + RunUIForScreenShot(() => pasteDlg.Size = new Size(700, 210)); + PauseForScreenShot("Insert Peptide List"); using (new WaitDocumentChange()) { @@ -190,12 +188,12 @@ protected override void DoTest() SkylineWindow.Height = 390; }); - PauseForScreenShot("Targets view", 6); + PauseForScreenShot("Targets view"); ShowAndPositionAuditLog(true); - PauseForScreenShot("Audit Log form with inserted peptide.", 7); + PauseForScreenShot("Audit Log form with inserted peptide."); - ShowLastExtraInfo("Extra info form with inserted peptide info.", 7); + ShowLastExtraInfo("Extra info form with inserted peptide info."); string documentPath = GetTestPath("AuditLogTutorial" + SrmDocument.EXT); RunUI(() => SkylineWindow.SaveDocument(documentPath)); @@ -230,9 +228,9 @@ protected override void DoTest() WaitForCondition(10 * 60 * 1000, // ten minutes () => SkylineWindow.Document.Settings.HasResults && SkylineWindow.Document.Settings.MeasuredResults.IsLoaded); - PauseForScreenShot("Audit Log form with imported data files.", 9); + PauseForScreenShot("Audit Log form with imported data files."); - ShowLastExtraInfo("Extra info form for the import.", 9); + ShowLastExtraInfo("Extra info form for the import."); // Peptide Quantitification Settings p. 9 peptideSettingsUi = ShowDialog(SkylineWindow.ShowPeptideSettingsUI); @@ -246,7 +244,7 @@ protected override void DoTest() }); OkDialog(peptideSettingsUi, peptideSettingsUi.OkDialog); - PauseForScreenShot("Audit Log form with quantification settings.", 10); + PauseForScreenShot("Audit Log form with quantification settings."); // Specify analyte concentrations of external standards RunUI(()=> @@ -285,13 +283,13 @@ protected override void DoTest() gridFloatingWindow.Size = new Size(370, 315); gridFloatingWindow.Top = SkylineWindow.Bottom + 20; }); - PauseForScreenShot("Document grid with concentrations filled in", 11); + PauseForScreenShot("Document grid with concentrations filled in"); RunUI(documentGridForm.Close); ShowAndPositionAuditLog(true); - PauseForScreenShot("Audit Log form with grid changes", 12); + PauseForScreenShot("Audit Log form with grid changes"); - ShowLastExtraInfo("Extra Info for the analyte data import.", 12); + ShowLastExtraInfo("Extra Info for the analyte data import."); RunUI(SkylineWindow.AuditLogForm.Close); const string unknownReplicate = "FOXN1-GST"; @@ -301,7 +299,7 @@ protected override void DoTest() RunUI(() => SkylineWindow.Size = new Size(936, 527)); WaitForGraphs(); - PauseForScreenShot("Heavy precursor chromatogram", 13); + PauseForScreenShot("Heavy precursor chromatogram"); RunUI(()=> { @@ -333,7 +331,7 @@ protected override void DoTest() ShowAndPositionAuditLog(true, 50, 200); WaitForConditionUI(500, () => SkylineWindow.AuditLogForm.DataGridView.Rows.Count > 0); - PauseForScreenShot("Audit Log form with changed integration boundary.", 14); + PauseForScreenShot("Audit Log form with changed integration boundary."); int reasonIndex = 2; using (new WaitDocumentChange()) { @@ -348,7 +346,7 @@ protected override void DoTest() } RunUI(() => SkylineWindow.AuditLogForm.DataGridView.AutoResizeColumn(reasonIndex)); SetGridFormToFullWidth(SkylineWindow.AuditLogForm); - PauseForScreenShot("Audit Log form with updated reason.", 14); + PauseForScreenShot("Audit Log form with updated reason."); // View the calibration curve p. 15 RunUI(()=>SkylineWindow.ShowCalibrationForm()); @@ -365,7 +363,7 @@ protected override void DoTest() }); JiggleSelection(); - PauseForScreenShot("Calibration curve zoomed", 15); + PauseForScreenShot("Calibration curve zoomed"); RunUI(() => { priorZoomState?.ApplyState(calibrationForm.ZedGraphControl.GraphPane); @@ -385,12 +383,12 @@ protected override void DoTest() RunUI(() => VerifyCalibrationCurve(calibrationForm, 5.52E-1, -6.3678E-1, 1)); OkDialog(calibrationForm, calibrationForm.Close); - PauseForScreenShot("Audit Log with excluded standard records", 16); + PauseForScreenShot("Audit Log with excluded standard records"); RunUIForScreenShot(() => SkylineWindow.AuditLogForm.Parent.Parent.Width += 100); // Wider to remove the horizontal scrollbar ShowReportsDropdown(AuditLogStrings.AuditLogForm_AuditLogForm_All_Info); - PauseForScreenShot("Audit Log Reports menu", 16, null, bmp => - ClipBitmap(bmp, new Rectangle(0, 0, 503, bmp.Height))); + PauseForScreenShot("Audit Log Reports menu", null, bmp => + ClipBitmap(bmp.CleanupBorder(true), new Rectangle(0, 0, 503, bmp.Height))); HideReportsDropdown(); // TODO(nicksh): Audit log reason field does not currently support fill down @@ -417,7 +415,7 @@ protected override void DoTest() floatingWindow.Height = 334; floatingWindow.Width -= 15; }); - PauseForScreenShot("Audit Log with UndoRedo view.", 17); + PauseForScreenShot("Audit Log with UndoRedo view."); if (IsCoverShotMode) { RunUI(() => @@ -462,22 +460,22 @@ protected override void DoTest() customizeDialog.Height = 370; }); - PauseForScreenShot("Custom Columns report template", 17); + PauseForScreenShot("Custom Columns report template"); OkDialog(customizeDialog, customizeDialog.OkDialog); SetGridFormToFullWidth(SkylineWindow.AuditLogForm); RunUIForScreenShot(() => { var floatingForm = SkylineWindow.AuditLogForm.Parent.Parent; - floatingForm.Width = 1130; // Wider for Skyline Version and User columns + floatingForm.Width = 1140; // Wider for Skyline Version and User columns floatingForm.Height += 10; // Extra for 2-line headers }); - PauseForScreenShot("Audit Log with custom view.", 18); + PauseForScreenShot("Audit Log with custom view."); var registrationDialog = ShowDialog(() => SkylineWindow.ShowPublishDlg(null)); - PauseForScreenShot("Upload confirmation dialog.", 19); + PauseForScreenShot("Upload confirmation dialog."); var loginDialog = ShowDialog(registrationDialog.ClickNo); - PauseForScreenShot("Login dialog.", 20); + PauseForScreenShot("Login dialog."); RunUI(() => { @@ -499,7 +497,7 @@ protected override void DoTest() { publishDialog.SelectItem(testFolderName); }); - PauseForScreenShot("Folder selection dialog.", 21); + PauseForScreenShot("Folder selection dialog."); var shareTypeDlg = ShowDialog(publishDialog.OkDialog); var browserConfirmationDialog = ShowDialog(shareTypeDlg.OkDialog); OkDialog(browserConfirmationDialog, browserConfirmationDialog.ClickYes); @@ -561,25 +559,16 @@ private static void ShowAndPositionAuditLog(bool verticalScrollbar, int messageE if (Program.SkylineOffscreen) return; + const int timeExtra = 10; const int spacing = 20; - int formWidth = 772 + messageExtra; + int formWidth = 772 + messageExtra + timeExtra; if (verticalScrollbar) formWidth += spacing; RunUI(() => { var floatingWindow = auditLogForm.Parent.Parent; floatingWindow.Size = new Size(formWidth, height ?? 354); - var screen = Screen.FromControl(SkylineWindow); - if (screen.Bounds.Right > SkylineWindow.Right + spacing + floatingWindow.Width) - { - floatingWindow.Top = SkylineWindow.Top; - floatingWindow.Left = SkylineWindow.Right + spacing; - } - else - { - floatingWindow.Top = SkylineWindow.Bottom + spacing; - floatingWindow.Left = (screen.Bounds.Left + screen.Bounds.Right) / 2 - floatingWindow.Width / 2; - } + auditLogForm.DataGridView.Columns[0].Width += timeExtra; if (messageExtra > 0) { var pathMessage = PropertyPath.Parse("Details!*.AllInfoMessage"); @@ -605,7 +594,7 @@ private static void CheckGstGraphs(int rtCurveCount, int areaCurveCount) /*** * Shows AuditLogExtraInfoForm for the most recently performed operation if it is available. */ - private void ShowLastExtraInfo(string message, int? pageNum = null) + private void ShowLastExtraInfo(string message) { WaitForConditionUI(() => { @@ -620,13 +609,7 @@ private void ShowLastExtraInfo(string message, int? pageNum = null) var extraInfoDialog = ShowDialog(() => ((TextImageCell)SkylineWindow.AuditLogForm.DataGridView.Rows[0].Cells[1]).ClickImage(0)); - RunUI(() => - { - var logFloatingWindow = SkylineWindow.AuditLogForm.Parent.Parent; - extraInfoDialog.Left = logFloatingWindow.Left; - extraInfoDialog.Top = logFloatingWindow.Bottom + 20; - }); - PauseForScreenShot(message, pageNum); + PauseForScreenShot(message); OkDialog(extraInfoDialog, extraInfoDialog.OkDialog); } @@ -670,4 +653,28 @@ private void PanoramaSetup() } } } + + public class TestTimeProvider : AuditLogEntry.ITimeProvider + { + private readonly DateTime _startTime; + private TimeSpan _elapsedTime = TimeSpan.Zero; + private Random _random = new Random(1); // A consistent random series + + public TestTimeProvider() + { + // Start with a consistent local time of 2025-1-1 at 9:35 AM + var localTime = new DateTime(2025, 1, 1, 9, 35, 0, DateTimeKind.Local); + // The audit logging system expects a UTC time. + _startTime = localTime.ToUniversalTime(); + } + + public DateTime Now + { + get + { + _elapsedTime += TimeSpan.FromSeconds(_random.Next(2, 10)); // Random time from 2 to 10 seconds + return _startTime.Add(_elapsedTime); + } + } + } } diff --git a/pwiz_tools/Skyline/TestTutorial/CEOptimizationTutorialTest.cs b/pwiz_tools/Skyline/TestTutorial/CEOptimizationTutorialTest.cs index 287dd2e6a4..ad17c343a4 100644 --- a/pwiz_tools/Skyline/TestTutorial/CEOptimizationTutorialTest.cs +++ b/pwiz_tools/Skyline/TestTutorial/CEOptimizationTutorialTest.cs @@ -113,7 +113,7 @@ protected override void DoTest() RunUI(() => editList.SelectItem("Thermo")); // Not L10N EditCEDlg editItem = ShowDialog(editList.EditItem); - PauseForScreenShot("Edit Collision Energy Equation form", 3); + PauseForScreenShot("Edit Collision Energy Equation form"); ChargeRegressionLine regressionLine2 = new ChargeRegressionLine(2, 0.034, 3.314); ChargeRegressionLine regressionLine3 = new ChargeRegressionLine(3, 0.044, 3.314); @@ -139,7 +139,7 @@ protected override void DoTest() exportMethodDlg.MethodType = ExportMethodType.Standard; }); - PauseForScreenShot("Export Transition List form", 4); + PauseForScreenShot("Export Transition List form"); OkDialog(exportMethodDlg,() => exportMethodDlg.OkDialog(GetTestPath("CE_Vantage_15mTorr_unscheduled.csv"))); // Not L10N } @@ -177,7 +177,7 @@ protected override void DoTest() }); RestoreViewOnScreen(5); - PauseForScreenShot("Main Skyline window", 5); + PauseForScreenShot("Main Skyline window"); // Creating Optimization Methods, p. 5 { @@ -192,7 +192,7 @@ protected override void DoTest() exportMethodDlg.MethodType = ExportMethodType.Scheduled; }); - PauseForScreenShot("Export Transition List form", 6); + PauseForScreenShot("Export Transition List form"); OkDialog(exportMethodDlg ,() => exportMethodDlg.OkDialog(GetTestPath("CE_Vantage_15mTorr.csv"))); // Not L10N } @@ -229,7 +229,7 @@ protected override void DoTest() RestoreViewOnScreen(8); RunUI(SkylineWindow.FocusDocument); RunUI(() => SkylineWindow.Size = new Size(984, 553)); - PauseForScreenShot("Main Skyline window", 8); + PauseForScreenShot("Main Skyline window"); if (IsCoverShotMode) { @@ -257,7 +257,7 @@ protected override void DoTest() RunUI(() => SkylineWindow.NormalizeAreaGraphTo(NormalizeOption.TOTAL)); - PauseForScreenShot("Main Skyline window", 9); + PauseForScreenShot("Main Skyline window"); RunUI(SkylineWindow.EditDelete); @@ -275,7 +275,7 @@ protected override void DoTest() var graphRegression = ShowDialog(addItem.ShowGraph); - PauseForGraphScreenShot("Collision Energy Regression graphs", 10); + PauseForGraphScreenShot("Collision Energy Regression graphs"); var graphDatas = graphRegression.RegressionGraphDatas.ToArray(); Assert.AreEqual(2, graphDatas.Length); diff --git a/pwiz_tools/Skyline/TestTutorial/CustomReportsTutorialTest.cs b/pwiz_tools/Skyline/TestTutorial/CustomReportsTutorialTest.cs index 77859207e2..a3dce9fb6d 100644 --- a/pwiz_tools/Skyline/TestTutorial/CustomReportsTutorialTest.cs +++ b/pwiz_tools/Skyline/TestTutorial/CustomReportsTutorialTest.cs @@ -112,13 +112,13 @@ protected void DoCreatingASimpleReport() { // Creating a Simple Custom Report, p. 3 var exportReportDlg = ShowDialog(SkylineWindow.ShowExportReportDialog); - PauseForScreenShot("Export Report form", 3); + PauseForScreenShot("Export Report form"); // p. 4 var editReportListDlg = ShowDialog(exportReportDlg.EditList); var viewEditor = ShowDialog(editReportListDlg.AddView); RunUI(() => viewEditor.ViewName = customReportName); - PauseForScreenShot("Edit Report form", 4); + PauseForScreenShot("Edit Report form"); // p. 5 RunUI(() => @@ -131,7 +131,7 @@ protected void DoCreatingASimpleReport() viewEditor.ChooseColumnsTab.AddSelectedColumn(); viewEditor.ChooseColumnsTab.ScrollTreeToTop(); }); - PauseForScreenShot("Edit Report form", 5); + PauseForScreenShot("Edit Report form"); // p. 7 RunUI(() => @@ -152,7 +152,7 @@ protected void DoCreatingASimpleReport() viewEditor.ViewEditorWidgets.OfType().First().SetPivotReplicate(true); viewEditor.ChooseColumnsTab.ScrollTreeToTop(); }); - PauseForScreenShot("Edit Report form", 7); + PauseForScreenShot("Edit Report form"); // p. 8 { var previewReportDlg = ShowDialog(viewEditor.ShowPreview); @@ -162,17 +162,17 @@ protected void DoCreatingASimpleReport() Assert.AreEqual(20, previewReportDlg.RowCount); Assert.AreEqual(58, previewReportDlg.ColumnCount); }); - PauseForScreenShot("Preview form", 8); + PauseForScreenShot("Preview form"); OkDialog(previewReportDlg, previewReportDlg.Close); } // p. 9-10 OkDialog(viewEditor, viewEditor.OkDialog); - PauseForScreenShot("Edit Reports form", 9); + PauseForScreenShot("Edit Reports form"); OkDialog(editReportListDlg, editReportListDlg.OkDialog); - PauseForScreenShot("Export Report form", 10); + PauseForScreenShot("Export Report form"); OkDialog(exportReportDlg, exportReportDlg.CancelClick); } @@ -193,7 +193,7 @@ protected void DoSharingManagingModifyingReportTemplates() var exportReportDlg1 = ShowDialog(SkylineWindow.ShowExportReportDialog); { var manageViewsForm = ShowDialog(exportReportDlg1.EditList); - PauseForScreenShot("Save Report Definitions form", 11); + PauseForScreenShot("Save Report Definitions form"); RunUI(() => { @@ -210,11 +210,11 @@ protected void DoSharingManagingModifyingReportTemplates() { editReportListDlg0.SelectView(customReportName); }); - PauseForScreenShot("Edit Reports form", 12); + PauseForScreenShot("Edit Reports form"); RunUI(() => editReportListDlg0.Remove(false)); OkDialog(editReportListDlg0, editReportListDlg0.OkDialog); - PauseForScreenShot("Export Report form", 13); + PauseForScreenShot("Export Report form"); { var manageViewsForm = ShowDialog(exportReportDlg1.EditList); @@ -236,7 +236,7 @@ protected void DoSharingManagingModifyingReportTemplates() var editReportListDlg1 = ShowDialog(exportReportDlg1.EditList); RunUI(() => editReportListDlg1.SelectView(customReportName)); // Not L10N var viewEditor = ShowDialog(editReportListDlg1.CopyView); - PauseForScreenShot("Edit Report form", 14); + PauseForScreenShot("Edit Report form"); RunUI(() => { @@ -277,7 +277,7 @@ protected void DoSharingManagingModifyingReportTemplates() pivotWidget.SetPivotReplicate(false); viewEditor.Height = 627; }); - PauseForScreenShot("Edit Report form expanded to show selected columns", 16); + PauseForScreenShot("Edit Report form expanded to show selected columns"); int columnCount = 0; int rowCount = 0; @@ -313,14 +313,14 @@ protected void DoSharingManagingModifyingReportTemplates() } Assert.IsTrue(foundHeightCol); }); - PauseForScreenShot("Adjust the scrollbar so that the first displayed column is \"light Height\" and the last displayed column is \"heavy Product Mz\"", 17); + PauseForScreenShot("Adjust the scrollbar so that the first displayed column is \"light Height\" and the last displayed column is \"heavy Product Mz\""); OkDialog(previewReportDlg, previewReportDlg.Close); } RunUI(() => viewEditor.ChooseColumnsTab.RemoveColumn(PropertyPath.Parse("IsotopeLabelType"))); OkDialog(viewEditor, viewEditor.OkDialog); OkDialog(editReportListDlg1, editReportListDlg1.OkDialog); - PauseForScreenShot("Export Report form", 18); + PauseForScreenShot("Export Report form"); OkDialog(exportReportDlg1, exportReportDlg1.CancelClick); } @@ -339,13 +339,13 @@ protected bool DoQualityControlSummaryReports() RunUI(() => manageViewsForm.ImportViews(TestFilesDir.GetTestPath(@"CustomReports\Summary_stats.skyr")) ); - PauseForScreenShot("Manage Reports form", 20); + PauseForScreenShot("Manage Reports form"); OkDialog(manageViewsForm, manageViewsForm.Close); var formRectNext = Rectangle.Empty; if (IsPauseForScreenShots) { formRectNext = ShowReportsDropdown("Summary Statistics"); - PauseForScreenShot("Click the Reports dropdown and highlight 'Summary Statistics'", 21); + PauseForScreenShot("Click the Reports dropdown and highlight 'Summary Statistics'"); HideReportsDropdown(); RunUI(() => documentGridForm.NavBar.ReportsButton.HideDropDown()); @@ -360,7 +360,7 @@ protected bool DoQualityControlSummaryReports() ConfigureDataGridColumns(); }); - PauseForScreenShot("Document Grid with summary statistics", 21, processShot: bmp => + PauseForScreenShot("Document Grid with summary statistics", processShot: bmp => { // Clean-up the border in the normal way bmp = bmp.CleanupBorder(true); @@ -418,7 +418,7 @@ protected bool DoQualityControlSummaryReports() Assert.IsFalse(indexCvTotalArea < 0, "{0} < 0", indexCvTotalArea); viewEditor.ChooseColumnsTab.ActivateColumn(indexCvTotalArea); }); - PauseForScreenShot("Customize View form", 22); + PauseForScreenShot("Customize View form"); RunUI(() => { viewEditor.TabControl.SelectTab(1); @@ -427,11 +427,11 @@ protected bool DoQualityControlSummaryReports() viewEditor.FilterTab.SetFilterOperand(0, .2.ToString(CultureInfo.CurrentCulture)); viewEditor.FilterTab.AvailableFieldsTree.SetScrollPos(Orientation.Horizontal, 45); }); - PauseForScreenShot("Customize View - Filter tab", 23); + PauseForScreenShot("Customize View - Filter tab"); OkDialog(viewEditor, viewEditor.OkDialog); RunUIForScreenShot(ConfigureDataGridColumns); - PauseForScreenShot("Document Grid filtered", 24); + PauseForScreenShot("Document Grid filtered"); RunUI(documentGridForm.Close); RunDlg(SkylineWindow.ShowFindNodeDlg, findPeptideDlg => { @@ -462,9 +462,9 @@ protected void DoResultsGridView() foregroundWindow.Left = SkylineWindow.Right - foregroundWindow.Width - 34; }); - PauseForScreenShot(SkylineWindow, "Main window under floating windows", 26); + PauseForScreenShot(SkylineWindow, "Main window under floating windows"); RestoreViewOnScreen(27); - PauseForScreenShot(SkylineWindow, "Main window layout", 27); + PauseForScreenShot(SkylineWindow, "Main window layout"); // Not understood: WaitForOpenForm occasionally hangs in nightly test runs. Fixed it by calling // ShowDialog when LiveResultsGrid cannot be found. @@ -496,7 +496,7 @@ protected void DoResultsGridView() WaitForGraphs(); RunUI(() => SkylineWindow.SelectedResultsIndex = 1); WaitForGraphs(); - PauseForScreenShot("Results Grid view subsection", 28); + PauseForScreenShot("Results Grid view subsection"); RunDlg(resultsGridForm.NavBar.CustomizeView, resultsGridViewEditor => { @@ -532,12 +532,12 @@ var column in defineAnnotationDlg.AnnotationType = AnnotationDef.AnnotationType.true_false; defineAnnotationDlg.AnnotationTargets = AnnotationDef.AnnotationTargetSet.Singleton(AnnotationDef.AnnotationTarget.precursor_result); }); - PauseForScreenShot("Define Annotation form", 29); + PauseForScreenShot("Define Annotation form"); OkDialog(defineAnnotationDlg, defineAnnotationDlg.OkDialog); OkDialog(editListDlg, editListDlg.OkDialog); RunUI(() => chooseAnnotationsDlg.AnnotationsCheckedListBox.SetItemChecked(0, true)); - PauseForScreenShot("Annotation Settings form", 30); + PauseForScreenShot("Annotation Settings form"); OkDialog(chooseAnnotationsDlg, chooseAnnotationsDlg.OkDialog); @@ -551,10 +551,10 @@ var column in PropertyPath.Root.Property(AnnotationDef.ANNOTATION_PREFIX + "Tailing"))); viewEditor.ChooseColumnsTab.AddSelectedColumn(); }); - PauseForScreenShot("Customize Report form showing Tailing annotation checked", 31); + PauseForScreenShot("Customize Report form showing Tailing annotation checked"); OkDialog(viewEditor, viewEditor.OkDialog); RunUI(() => SkylineWindow.FocusDocument()); - PauseForScreenShot(SkylineWindow, "Main window with Tailing column added to Results Grid", 32); + PauseForScreenShot(SkylineWindow, "Main window with Tailing column added to Results Grid"); } private string GetLocalizedCaption(string caption) { diff --git a/pwiz_tools/Skyline/TestTutorial/DiaTutorialTest.cs b/pwiz_tools/Skyline/TestTutorial/DiaTutorialTest.cs index 25c1d2e12f..10cf6f1422 100644 --- a/pwiz_tools/Skyline/TestTutorial/DiaTutorialTest.cs +++ b/pwiz_tools/Skyline/TestTutorial/DiaTutorialTest.cs @@ -105,12 +105,12 @@ protected override void DoTest() transitionSettings.ProductMassAnalyzer = FullScanMassAnalyzerType.centroided; transitionSettings.ProductRes = 20; }); - PauseForScreenShot("Transition Settings - Full-Scan", 5); + PauseForScreenShot("Transition Settings - Full-Scan"); // Set up isolation scheme var isolationSchemeDlg = ShowDialog(transitionSettings.AddIsolationScheme); - PauseForScreenShot("Edit Isolation Scheme form", 6); + PauseForScreenShot("Edit Isolation Scheme form"); RunUI(() => { @@ -125,12 +125,12 @@ protected override void DoTest() calculateIsolationDlg.End = 900; calculateIsolationDlg.OptimizeWindowPlacement = true; }); - PauseForScreenShot("Calculate Isolation Scheme form", 9); + PauseForScreenShot("Calculate Isolation Scheme form"); OkDialog(calculateIsolationDlg, calculateIsolationDlg.OkDialog); - PauseForScreenShot("Edit Isolation Scheme Dialog Filled", 10); + PauseForScreenShot("Edit Isolation Scheme Dialog Filled"); var isolationSchemeGraphDlg = ShowDialog(isolationSchemeDlg.OpenGraph); - PauseForScreenShot("Graph of Isolation Scheme", 11); + PauseForScreenShot("Graph of Isolation Scheme"); OkDialog(isolationSchemeGraphDlg, isolationSchemeGraphDlg.CloseButton); const string isolationSchemeName = "500 to 900 by 20"; RunUI(() => isolationSchemeDlg.IsolationSchemeName = isolationSchemeName); @@ -140,14 +140,14 @@ protected override void DoTest() // Export isolation scheme var exportIsolationDlg = ShowDialog(() => SkylineWindow.ShowExportMethodDialog(ExportFileType.IsolationList)); RunUI(() => exportIsolationDlg.InstrumentType = ExportInstrumentType.THERMO_Q_EXACTIVE); - PauseForScreenShot("Export Isolation List form", 12); + PauseForScreenShot("Export Isolation List form"); OkDialog(exportIsolationDlg, () => exportIsolationDlg.OkDialog(GetTestPath("DIA_tutorial_isolation_list.csv"))); RunUI(() => SkylineWindow.SaveDocument(GetTestPath(DIA_TUTORIAL_CHECKPOINT))); // "Build Spectral Library" page var importPeptideSearchDlg = ShowDialog(() => SkylineWindow.ShowImportPeptideSearchDlg()); - PauseForScreenShot("Spectral Library page", 15); + PauseForScreenShot("Spectral Library page"); RunUI(() => { Assert.IsTrue(importPeptideSearchDlg.CurrentPage == ImportPeptideSearchDlg.Pages.spectra_page); @@ -155,7 +155,7 @@ protected override void DoTest() importPeptideSearchDlg.BuildPepSearchLibControl.WorkflowType = ImportPeptideSearchDlg.Workflow.dia; }); WaitForConditionUI(() => importPeptideSearchDlg.IsNextButtonEnabled); - PauseForScreenShot("Spectral Library page - input files", 17); + PauseForScreenShot("Spectral Library page - input files"); using (new WaitDocumentChange(1, true)) { @@ -182,10 +182,10 @@ protected override void DoTest() string diaDir = Path.Combine(baseDir, "DIA-20_2"); var openDataFiles = ShowDialog(() => importResults.Browse(diaDir)); RunUI(() => openDataFiles.SelectAllFileType(ExtensionTestContext.ExtThermoRaw)); - PauseForScreenShot("Browse for Results Files form", 18); + PauseForScreenShot("Browse for Results Files form"); OkDialog(openDataFiles, openDataFiles.Open); - PauseForScreenShot("Extract Chromatograms page", 19); + PauseForScreenShot("Extract Chromatograms page"); var importResultsNameDlg = ShowDialog(importPeptideSearchDlg.ClickNextButtonNoCheck); @@ -195,7 +195,7 @@ protected override void DoTest() Assert.IsTrue(prefix.EndsWith(prefixKeep)); importResultsNameDlg.Prefix = prefix.Substring(0, prefix.Length - prefixKeep.Length); }); - PauseForScreenShot("Import Results names form", 20); + PauseForScreenShot("Import Results names form"); OkDialog(importResultsNameDlg, importResultsNameDlg.YesDialog); } @@ -233,13 +233,13 @@ protected override void DoTest() // importPeptideSearchDlg.TransitionSettingsControl.IonCount = 6; // importPeptideSearchDlg.TransitionSettingsControl.MinIonCount = 6; // }); - PauseForScreenShot("Transition Settings page", 21); + PauseForScreenShot("Transition Settings page"); RunUI(() => Assert.IsTrue(importPeptideSearchDlg.ClickNextButton())); WaitForConditionUI(() => importPeptideSearchDlg.CurrentPage == ImportPeptideSearchDlg.Pages.full_scan_settings_page); // "Configure Full-Scan Settings" page - PauseForScreenShot("Full-Scan Settings page", 23); + PauseForScreenShot("Full-Scan Settings page"); RunUI(() => Assert.IsTrue(importPeptideSearchDlg.ClickNextButton())); // "Import FASTA" page @@ -248,11 +248,11 @@ protected override void DoTest() importPeptideSearchDlg.ImportFastaControl.SetFastaContent(GetTestPath("pituitary_database.fasta")); importPeptideSearchDlg.ImportFastaControl.DecoyGenerationMethod = string.Empty; }); - PauseForScreenShot("Fasta page", 24); + PauseForScreenShot("Fasta page"); var peptidesPerProteinDlg = ShowDialog(() => importPeptideSearchDlg.ClickNextButton()); WaitForCondition(() => peptidesPerProteinDlg.DocumentFinalCalculated); - PauseForScreenShot("Peptides per protein form", 25); + PauseForScreenShot("Peptides per protein form"); RunUI(() => { int proteinCount, peptideCount, precursorCount, transitionCount; @@ -326,7 +326,7 @@ protected override void DoTest() }); RestoreViewOnScreen(27); - PauseForScreenShot("Skyline window", 27); + PauseForScreenShot("Skyline window"); RunUI(() => { @@ -334,7 +334,7 @@ protected override void DoTest() SkylineWindow.ChangeMassErrorTransition(TransitionMassError.all); }); WaitForGraphs(); - PauseForGraphScreenShot("Mass Errors: Histogram metafile", FindGraphSummaryByGraphType(), 28); + PauseForGraphScreenShot("Mass Errors: Histogram metafile", FindGraphSummaryByGraphType()); RunUI(() => { ValidateMassErrorStatistics(2.7, 3.3); @@ -357,7 +357,7 @@ protected override void DoTest() RunUI(() => SkylineWindow.SequenceTree.SelectedNode = SkylineWindow.SelectedNode.Nodes[0]); WaitForGraphs(); SetPeakAreasMaxes(6 * Math.Pow(10, 9), 7 * Math.Pow(10, 8)); - PauseForScreenShot("Skyline window - with manual integration and ID times", 29); + PauseForScreenShot("Skyline window - with manual integration and ID times"); RunUI(() => { @@ -366,7 +366,7 @@ protected override void DoTest() }); RestoreViewOnScreen(31); SelectNode(SrmDocument.Level.Molecules, 1); // 2nd peptide - PauseForGraphScreenShot("Chromatogram graph metafile", SkylineWindow.GetGraphChrom("Pit01"), 31); + PauseForGraphScreenShot("Chromatogram graph metafile", SkylineWindow.GetGraphChrom("Pit01")); RestoreViewOnScreen(27); RunUI(() => @@ -377,7 +377,7 @@ protected override void DoTest() SelectNode(SrmDocument.Level.TransitionGroups, 1); // 2nd peptide - first precursor WaitForGraphs(); SetPeakAreasMaxes(1 * Math.Pow(10, 9), 6 * Math.Pow(10, 7)); - PauseForScreenShot("Skyline window", 32); + PauseForScreenShot("Skyline window"); SelectNode(SrmDocument.Level.Transitions, 22); @@ -387,8 +387,8 @@ protected override void DoTest() SkylineWindow.Height = 463; }); - PauseForGraphScreenShot("Product ion chromatogram graph metafile 1", SkylineWindow.GetGraphChrom("Pit01"), 33); - PauseForGraphScreenShot("Product ion chromatogram graph metafile 2", SkylineWindow.GetGraphChrom("Pit02"), 33); + PauseForGraphScreenShot("Product ion chromatogram graph metafile 1", SkylineWindow.GetGraphChrom("Pit01")); + PauseForGraphScreenShot("Product ion chromatogram graph metafile 2", SkylineWindow.GetGraphChrom("Pit02")); RunUI(() => { @@ -408,11 +408,11 @@ protected override void DoTest() FindGraphSummaryByGraphType() }); - PauseForScreenShot("Chromatograms and peak areas", 34, null, clipChromAndPeakAreas); + PauseForScreenShot("Chromatograms and peak areas", null, clipChromAndPeakAreas); SelectNode(SrmDocument.Level.TransitionGroups, 13); - PauseForScreenShot("Chromatograms and peak areas", 35, null, clipChromAndPeakAreas); + PauseForScreenShot("Chromatograms and peak areas", null, clipChromAndPeakAreas); if (IsCoverShotMode) { @@ -464,14 +464,14 @@ protected override void DoTest() RestoreViewOnScreen(36); ClickChromatogram("Pit01", 70.19, 169.5E+06, PaneKey.PRECURSORS); - PauseForGraphScreenShot("Full-Scan MS1 spectrum metafile", SkylineWindow.GraphFullScan, 36); + PauseForGraphScreenShot("Full-Scan MS1 spectrum metafile", SkylineWindow.GraphFullScan); ClickChromatogram("Pit01", 70.79, 4.9E+05, PaneKey.PRODUCTS); - PauseForGraphScreenShot("Full-Scan MS/MS spectrum y10 metafile", SkylineWindow.GraphFullScan, 37); + PauseForGraphScreenShot("Full-Scan MS/MS spectrum y10 metafile", SkylineWindow.GraphFullScan); ClickChromatogram("Pit01", 70.79, 3.25E+05, PaneKey.PRODUCTS); - PauseForGraphScreenShot("Full-Scan MS/MS spectrum y10++ metafile", SkylineWindow.GraphFullScan, 38); + PauseForGraphScreenShot("Full-Scan MS/MS spectrum y10++ metafile", SkylineWindow.GraphFullScan); FindNode("K.ELVYETVR.V [73, 80]"); WaitForGraphs(); @@ -487,13 +487,13 @@ protected override void DoTest() graphControl.Invalidate(); SkylineWindow.GraphFullScan.Parent.Parent.Height -= 15; // Not quite as tall to fit 3 into one page }); - PauseForGraphScreenShot("Full-Scan MS1 spectrum metafile (1/3)", SkylineWindow.GraphFullScan, 39); + PauseForGraphScreenShot("Full-Scan MS1 spectrum metafile (1/3)", SkylineWindow.GraphFullScan); MoveNextScan(41.68); - PauseForGraphScreenShot("Full-Scan MS1 spectrum metafile (2/3)", SkylineWindow.GraphFullScan, 39); + PauseForGraphScreenShot("Full-Scan MS1 spectrum metafile (2/3)", SkylineWindow.GraphFullScan); MoveNextScan(41.7); - PauseForGraphScreenShot("Full-Scan MS1 spectrum metafile (3/3)", SkylineWindow.GraphFullScan, 39); + PauseForGraphScreenShot("Full-Scan MS1 spectrum metafile (3/3)", SkylineWindow.GraphFullScan); } // Clear all the settings lists that were defined in this tutorial diff --git a/pwiz_tools/Skyline/TestTutorial/ExistingExperimentsTutorialTest.cs b/pwiz_tools/Skyline/TestTutorial/ExistingExperimentsTutorialTest.cs index 2afe97b205..ec4cd392ec 100644 --- a/pwiz_tools/Skyline/TestTutorial/ExistingExperimentsTutorialTest.cs +++ b/pwiz_tools/Skyline/TestTutorial/ExistingExperimentsTutorialTest.cs @@ -130,7 +130,7 @@ private void DoMrmerTest() peptideSettingsUI.SelectedTab = PeptideSettingsUI.TABS.Library; peptideSettingsUI.SetSelectedLibrary("Yeast_mini"); }); - PauseForScreenShot("Peptide Settings - Library tab", 4); + PauseForScreenShot("Peptide Settings - Library tab"); RunUI(() => peptideSettingsUI.SelectedTab = PeptideSettingsUI.TABS.Digest); RunDlg(peptideSettingsUI.ShowBuildBackgroundProteomeDlg, @@ -140,7 +140,7 @@ private void DoMrmerTest() buildBackgroundProteomeDlg.BackgroundProteomePath = GetTestPath(@"MRMer\Yeast_MRMer_mini.protdb"); // Not L10N buildBackgroundProteomeDlg.OkDialog(); }); - PauseForScreenShot("Peptide Settings - Digestion tab", 5); + PauseForScreenShot("Peptide Settings - Digestion tab"); var modHeavyK = new StaticMod(HEAVY_K, "K", ModTerminus.C, false, null, LabelAtoms.C13 | LabelAtoms.N15, // Not L10N RelativeRT.Matching, null, null, null); @@ -160,13 +160,13 @@ private void DoMrmerTest() { var importDialog = ShowDialog(SkylineWindow.ShowPasteTransitionListDlg); RunUI(() => importDialog.Size = new Size(600, 300)); - PauseForScreenShot("Insert Transition List form", 8); + PauseForScreenShot("Insert Transition List form"); var filePath = GetTestPath(@"MRMer\silac_1_to_4.xls"); // Not L10N string text1 = GetExcelFileText(filePath, "Fixed", 3, false); // Not L10N var colDlg = ShowDialog(() => importDialog.TransitionListText = text1); WaitForConditionUI(() => colDlg.AssociateProteinsPreviewCompleted); // Wait for associate proteins to complete Assert.IsTrue(colDlg.checkBoxAssociateProteins.Checked); - PauseForScreenShot("Insert Transition List column selection form", 9); + PauseForScreenShot("Insert Transition List column selection form"); OkDialog(colDlg, colDlg.OkDialog); } @@ -179,7 +179,7 @@ private void DoMrmerTest() SkylineWindow.Size = new Size(1035, 511); }); FocusDocument(); - PauseForScreenShot("Main window with transitions added", 10); + PauseForScreenShot("Main window with transitions added"); FindNode("LWDVAT"); RunUI(() => @@ -211,7 +211,7 @@ private void DoMrmerTest() SkylineWindow.SequenceTree.TopNode = SkylineWindow.SequenceTree.Nodes[5]; }); FocusDocument(); - PauseForScreenShot("Main window with data imported", 13); + PauseForScreenShot("Main window with data imported"); RunUI(() => { @@ -225,7 +225,7 @@ private void DoMrmerTest() Assert.IsTrue(Equals(SkylineWindow.SequenceTree.SelectedNode.StateImageIndex, (int)SequenceTree.StateImageId.no_peak)); }); - PauseForScreenShot("Main window", 14); + PauseForScreenShot("Main window"); // Removing a Transition with Interference FindNode(string.Format("{0:F04}", 504.2664)); // I18N @@ -279,7 +279,7 @@ private void DoMrmerTest() } }); RestoreViewOnScreen(15); - PauseForScreenShot("Main window", 16); + PauseForScreenShot("Main window"); FindNode("YVDP"); RunUI(() => @@ -346,7 +346,7 @@ private void DoStudy7Test() // We expect this to fail due to instrument settings rather than format issues eg "The product m/z 1519.78 is out of range for the instrument settings, in the peptide sequence YEVQGEVFTKPQLWP. Check the Instrument tab in the Transition Settings." { var transitionSelectdgl = ShowDialog(SkylineWindow.Paste); - PauseForScreenShot("Column list selection form", 20); + PauseForScreenShot("Column list selection form"); var messageDlg = ShowDialog(transitionSelectdgl.AcceptButton.PerformClick); AssertEx.AreComparableStrings(TextUtil.SpaceSeparate(Resources.MassListRowReader_CalcTransitionExplanations_The_product_m_z__0__is_out_of_range_for_the_instrument_settings__in_the_peptide_sequence__1_, @@ -354,7 +354,7 @@ private void DoStudy7Test() messageDlg.ErrorList[0].ErrorMessage, 2); RunUI(() => messageDlg.Size = new Size(838, 192)); - PauseForScreenShot("Error message form (expected)", 20); + PauseForScreenShot("Error message form (expected)"); OkDialog(messageDlg, messageDlg.CancelButton.PerformClick); // Acknowledge the error but decline to proceed with import OkDialog(transitionSelectdgl, transitionSelectdgl.CancelDialog); // Cancel the import @@ -369,12 +369,12 @@ private void DoStudy7Test() }); PasteTransitionListSkipColumnSelect(); RunUI(SkylineWindow.CollapsePeptides); - PauseForScreenShot("Targets tree (selected from main window)", 21, null, + PauseForScreenShot("Targets tree (selected from main window)", null, bmp => ClipTargets(bmp, 19)); // Adjusting Modifications Manually, p. 19. AdjustModifications("AGLCQTFVYGGCR", true, 'V', 747.348); - PauseForScreenShot("Targets tree clipped from main window", 24, null, + PauseForScreenShot("Targets tree clipped from main window", null, bmp => ClipTargets(bmp, 21)); AdjustModifications("IVGGWECEK", true, 'V', 541.763); @@ -393,7 +393,7 @@ private void DoStudy7Test() if (UseRawFilesOrFullData) { var importResultsSamplesDlg = ShowDialog(openDataSourceDialog1.Open); - PauseForScreenShot("Choose Samples form", 25); + PauseForScreenShot("Choose Samples form"); RunUI(() => { @@ -436,7 +436,7 @@ private void DoStudy7Test() { var importResultsNameDlg = ShowDialog(importResultsDlg1.OkDialog); - PauseForScreenShot("Import Results Common prefix form", 26); + PauseForScreenShot("Import Results Common prefix form"); OkDialog(importResultsNameDlg, importResultsNameDlg.YesDialog); } @@ -460,7 +460,7 @@ private void DoStudy7Test() FocusDocument(); JiggleSelection(); - PauseForScreenShot("Main window with peaks and retention times showing", 27); + PauseForScreenShot("Main window with peaks and retention times showing"); RunUI(SkylineWindow.EditDelete); FindNode("IVGGWECEK"); // Not L10N @@ -503,7 +503,7 @@ private void DoStudy7Test() } } }); - PauseForScreenShot("Main window", 29); + PauseForScreenShot("Main window"); // Data Inspection with Peak Areas View, p. 29. RestoreViewOnScreen(28); @@ -585,7 +585,7 @@ private void DoStudy7Test() } }); WaitForGraphs(); - PauseForScreenShot("Document grid filled (scrolled to the end)", 36); + PauseForScreenShot("Document grid filled (scrolled to the end)"); RunUI(() => documentGrid.Close()); FindNode("SSDLVALSGGHTFGK"); // Not L10N @@ -696,12 +696,12 @@ private void AdjustModifications(string peptideSeq, bool removeCTerminalMod, cha { var editStaticModDlg = ShowDialog(() => editPepModsDlg.AddNewModification(sequence.IndexOf(aa13C), IsotopeLabelType.heavy)); RunUI(() => editStaticModDlg.Modification = new StaticMod("Label:13C", null, null, LabelAtoms.C13)); // Not L10N - PauseForScreenShot("Edit Isotope Modification form", 22); + PauseForScreenShot("Edit Isotope Modification form"); OkDialog(editStaticModDlg, editStaticModDlg.OkDialog); // Make sure the right combo has the focus for the screen shot RunUI(() => editPepModsDlg.SelectModification(IsotopeLabelType.heavy, sequence.IndexOf(aa13C), "Label:13C")); // Not L10N - PauseForScreenShot("Edit Modifications form", 23); + PauseForScreenShot("Edit Modifications form"); } var doc = SkylineWindow.Document; OkDialog(editPepModsDlg, editPepModsDlg.OkDialog); diff --git a/pwiz_tools/Skyline/TestTutorial/GroupedStudies1TutorialTest.cs b/pwiz_tools/Skyline/TestTutorial/GroupedStudies1TutorialTest.cs index 2845de961a..506e38a057 100644 --- a/pwiz_tools/Skyline/TestTutorial/GroupedStudies1TutorialTest.cs +++ b/pwiz_tools/Skyline/TestTutorial/GroupedStudies1TutorialTest.cs @@ -114,15 +114,13 @@ protected override void DoTest() SimpleGroupComparisons(); } - private int _pageNum = 3; - private void OpenImportArrange() { // Open the file RunUI(() => SkylineWindow.OpenFile(GetHfRawTestPath("Rat_plasma.sky"))); var docInitial = WaitForDocumentLoaded(); AssertEx.IsDocumentState(docInitial, null, 49, 137, 137, 789); - PauseForScreenShot("Status bar", _pageNum++, null, ClipSelectionStatus); + PauseForScreenShot("Status bar", null, ClipSelectionStatus); var documentGrid = ShowDialog(() => SkylineWindow.ShowDocumentGrid(true)); var pathLibraryName = PropertyPath.Parse("LibraryName"); @@ -150,7 +148,7 @@ private void OpenImportArrange() RunUI(() => Assert.AreEqual(137, documentGrid.RowCount)); - PauseForScreenShot("Document grid toolbar", _pageNum++, null, ClipGridToolbarSelection); + PauseForScreenShot("Document grid toolbar", null, ClipGridToolbarSelection); RunUI(() => { @@ -202,7 +200,7 @@ private void OpenImportArrange() allChrom.SetFreezeProgressPercent(72, @"00:00:06"); WaitForCondition(() => allChrom.IsProgressFrozen()); - PauseForScreenShot("Loading Chromatograms form", _pageNum++); + PauseForScreenShot("Loading Chromatograms form"); allChrom.SetFreezeProgressPercent(null, null); } @@ -223,7 +221,7 @@ private void OpenImportArrange() if (IsPauseForScreenShots) WaitForDocumentLoaded(); // Screenshots should be taken with a fully loaded document. BeginDragDisplay(SkylineWindow.GraphRetentionTime, 0.5, 0.9); - PauseForScreenShot("Docking Retention Times view", _pageNum++); + PauseForScreenShot("Docking Retention Times view"); EndDragDisplay(); RestoreViewOnScreen(7); @@ -231,13 +229,13 @@ private void OpenImportArrange() JiggleSelection(); PlaceTargetsAndGraph(SkylineWindow.GraphPeakArea); BeginDragDisplay(SkylineWindow.GraphPeakArea, 0.53, 0.83); - PauseForScreenShot("Docking Peak Areas view", _pageNum++); + PauseForScreenShot("Docking Peak Areas view"); EndDragDisplay(); RestoreViewOnScreen(8); PlaceTargetsAndGraph(null); BeginDragDisplay(SkylineWindow.SequenceTree, 0.03, 0.42); - PauseForScreenShot("Docking Targets view", _pageNum++); + PauseForScreenShot("Docking Targets view"); EndDragDisplay(); RestoreViewOnScreen(9); @@ -249,7 +247,7 @@ private void OpenImportArrange() arrangeGraphsDlg.GroupOrder = GroupGraphsOrder.Document; }); - PauseForScreenShot("Arrange Graphs Grouped form", _pageNum); + PauseForScreenShot("Arrange Graphs Grouped form"); OkDialog(arrangeGraphsDlg, arrangeGraphsDlg.OkDialog); @@ -273,7 +271,7 @@ private void OpenImportArrange() WaitForDocumentLoaded(10 * 60 * 1000); // 10 minutes FocusDocument(); - PauseForScreenShot("Skyline window maximized", _pageNum++); + PauseForScreenShot("Skyline window maximized"); if (!IsFullData) TestApplyToAll(); @@ -309,32 +307,32 @@ private void ExploreTopPeptides() // // RunUI(() => SkylineWindow.SetIntegrateAll(true)); - PauseForRetentionTimeGraphScreenShot("Retention Times graph", _pageNum++); + PauseForRetentionTimeGraphScreenShot("Retention Times graph"); SelectNode(SrmDocument.Level.Molecules, 0); RunUI(SkylineWindow.EditDelete); // Delete first peptide - PauseForRetentionTimeGraphScreenShot("Retention Times graph for second peptide", _pageNum); + PauseForRetentionTimeGraphScreenShot("Retention Times graph for second peptide"); RestoreViewOnScreen(12); JiggleSelection(); - PauseForPeakAreaGraphScreenShot("Peak Areas graph", _pageNum++); + PauseForPeakAreaGraphScreenShot("Peak Areas graph"); RunUI(() => SkylineWindow.NormalizeAreaGraphTo(NormalizeOption.TOTAL)); JiggleSelection(); - PauseForPeakAreaGraphScreenShot("Peak Areas graph (normalized to total)", _pageNum++); + PauseForPeakAreaGraphScreenShot("Peak Areas graph (normalized to total)"); RestoreViewOnScreen(13); ActivateReplicate("D_103_REP3"); - PauseForChromGraphScreenShot("Chromatogram graph for D_103_REP3", "D_103_REP3", _pageNum); + PauseForChromGraphScreenShot("Chromatogram graph for D_103_REP3", "D_103_REP3"); ChangePeakBounds("D_103_REP3", 30.11, 30.43); ActivateReplicate("H_162_REP1"); - PauseForChromGraphScreenShot("Chromatogram graph for H_162_REP1", "H_162_REP1", _pageNum++); + PauseForChromGraphScreenShot("Chromatogram graph for H_162_REP1", "H_162_REP1"); ActivateReplicate("D_108_REP2"); @@ -353,8 +351,7 @@ private void ExploreTopPeptides() .ChangeCustomFinders(Finders.ListAllFinders().Where(f => f is TruncatedPeakFinder)); }); - _pageNum++; // Page without figures - PauseForScreenShot("Find form", _pageNum); + PauseForScreenShot("Find form"); RunUI(findDlg.FindAll); @@ -375,7 +372,7 @@ private void ExploreTopPeptides() findView.ListView.Focus(); findView.ListView.Items[0].Selected = true; }); - PauseForScreenShot("Find Results view", _pageNum++); + PauseForScreenShot("Find Results view"); } var documentGrid = ShowDialog(() => SkylineWindow.ShowDocumentGrid(true)); @@ -390,7 +387,7 @@ private void ExploreTopPeptides() FindNode("DFATVYVDAVK"); ActivateReplicate("D_196_REP3"); - PauseForChromGraphScreenShot("Chromatogram graph", "D_196_REP3", _pageNum++); + PauseForChromGraphScreenShot("Chromatogram graph", "D_196_REP3"); RestoreViewOnScreen(10); // Same layout for RT graph as on page 10 @@ -399,7 +396,7 @@ private void ExploreTopPeptides() RunUI(() => Assert.AreEqual("R.LGGEEVSVACK.L [238, 248]", SkylineWindow.SelectedNode.Text)); - PauseForRetentionTimeGraphScreenShot("Retention Times graph for LGGEEVSVACK peptide", _pageNum++); + PauseForRetentionTimeGraphScreenShot("Retention Times graph for LGGEEVSVACK peptide"); RestoreViewOnScreen(12); // Same layout for Peak Areas graph as on page 12 @@ -408,7 +405,7 @@ private void ExploreTopPeptides() RunUI(() => SkylineWindow.NormalizeAreaGraphTo(NormalizeOption.NONE)); - PauseForPeakAreaGraphScreenShot("Peak Areas graph with dotps", _pageNum++); + PauseForPeakAreaGraphScreenShot("Peak Areas graph with dotps"); var areaProps = ShowDialog(SkylineWindow.ShowAreaPropertyDlg); RunUI(() => @@ -428,23 +425,23 @@ private void ExploreTopPeptides() SkylineWindow.AutoZoomBestPeak(); }); - PauseForChromGraphScreenShot("Chromatogram graph zoomed", "D_172_REP2", _pageNum); + PauseForChromGraphScreenShot("Chromatogram graph zoomed", "D_172_REP2"); ActivateReplicate("D_138_REP1"); - PauseForChromGraphScreenShot("Chromatogram graph zoomed - interference", "D_138_REP1", _pageNum++); + PauseForChromGraphScreenShot("Chromatogram graph zoomed - interference", "D_138_REP1"); SelectNode(SrmDocument.Level.Molecules, 2); ActivateReplicate("D_154_REP1"); - PauseForChromGraphScreenShot("Chromatogram graph zoomed - nice signal", "D_154_REP1", _pageNum); + PauseForChromGraphScreenShot("Chromatogram graph zoomed - nice signal", "D_154_REP1"); RestoreViewOnScreen(12); // Same layout for Peak Areas graph as on page 12 SelectNode(SrmDocument.Level.Molecules, 2); ActivateReplicate("D_154_REP1"); - PauseForPeakAreaGraphScreenShot("Peak Areas graph - consistent abundances", _pageNum++); + PauseForPeakAreaGraphScreenShot("Peak Areas graph - consistent abundances"); RestoreViewOnScreen(13); // Same layout for chromatogram graphs as before on page 13 @@ -457,11 +454,11 @@ private void ExploreTopPeptides() SkylineWindow.AutoZoomNone(); }); - PauseForChromGraphScreenShot("Chromatogram graph - langscape", "D_103_REP1", _pageNum++); + PauseForChromGraphScreenShot("Chromatogram graph - langscape", "D_103_REP1"); ActivateReplicate("D_103_REP3"); - PauseForChromGraphScreenShot("Chromatogram graph - missing peak", "D_103_REP3", _pageNum); + PauseForChromGraphScreenShot("Chromatogram graph - missing peak", "D_103_REP3"); RestoreViewOnScreen(12); // Same layout for Peak Areas graph as on page 12 @@ -483,7 +480,7 @@ private void ExploreTopPeptides() RemovePeak("D_103_REP3", pathGroupRemove, nodeGroupRemove); - PauseForPeakAreaGraphScreenShot("Peak Areas graph - removed peak", _pageNum++); + PauseForPeakAreaGraphScreenShot("Peak Areas graph - removed peak"); RestoreViewOnScreen(13); // Same layout for chromatogram graphs as before on page 13 @@ -497,7 +494,7 @@ private void ExploreTopPeptides() RunUI(() => SkylineWindow.ActivateReplicate("H_148_REP2")); - PauseForChromGraphScreenShot("Chromatogram graph - truncated peak", "H_148_REP2", _pageNum); + PauseForChromGraphScreenShot("Chromatogram graph - truncated peak", "H_148_REP2"); RestoreViewOnScreen(12); // Same layout for Peak Areas graph as on page 12 @@ -514,14 +511,14 @@ private void ExploreTopPeptides() ActivateReplicate("H_162_REP3"); - PauseForPeakAreaGraphScreenShot("Peak Areas graph - removed peaks", _pageNum++); + PauseForPeakAreaGraphScreenShot("Peak Areas graph - removed peaks"); RestoreViewOnScreen(10); // Same layout for RT graph as on page 10 SelectNode(SrmDocument.Level.Molecules, 3); ActivateReplicate("D_103_REP3"); - PauseForRetentionTimeGraphScreenShot("Retention Times graph - removed peaks", _pageNum++); + PauseForRetentionTimeGraphScreenShot("Retention Times graph - removed peaks"); RunUI(() => { @@ -531,11 +528,11 @@ private void ExploreTopPeptides() Assert.IsTrue(SkylineWindow.SelectedNode.Text.Contains("TSDQIHFFFAK")); }); - PauseForRetentionTimeGraphScreenShot("Retention Times graph - strange variance", _pageNum); + PauseForRetentionTimeGraphScreenShot("Retention Times graph - strange variance"); RunUI(() => SkylineWindow.ShowReplicateOrder(SummaryReplicateOrder.time)); - PauseForRetentionTimeGraphScreenShot("Retention Times graph - acquired time order", _pageNum++); + PauseForRetentionTimeGraphScreenShot("Retention Times graph - acquired time order"); RestoreViewOnScreen(28); @@ -545,17 +542,17 @@ private void ExploreTopPeptides() ChangePeakBounds("D_108_REP2", 26.8, 27.4); - PauseForChromGraphScreenShot("Chromatogram graph - peak truncation", "D_108_REP2", _pageNum); + PauseForChromGraphScreenShot("Chromatogram graph - peak truncation", "D_108_REP2"); ActivateReplicate("H_162_REP3"); - PauseForChromGraphScreenShot("Chromatogram graph - peak truncation noisy", "H_162_REP3", _pageNum); + PauseForChromGraphScreenShot("Chromatogram graph - peak truncation noisy", "H_162_REP3"); RestoreViewOnScreen(12); // Same layout for Peak Areas graph as on page 12 FindNode("FGLYSDQMR"); - PauseForPeakAreaGraphScreenShot("Peak Areas graph - inconsistent ion abundance", _pageNum++); + PauseForPeakAreaGraphScreenShot("Peak Areas graph - inconsistent ion abundance"); RunUI(SkylineWindow.EditDelete); } @@ -583,7 +580,7 @@ private void AddTruncatedPrecursorsView(DocumentGridForm documentGrid, bool init }); if (initialTestExecution) - PauseForScreenShot("Customize Report form", _pageNum++); + PauseForScreenShot("Customize Report form"); RunUI(() => { @@ -598,7 +595,7 @@ private void AddTruncatedPrecursorsView(DocumentGridForm documentGrid, bool init }); if (initialTestExecution) - PauseForScreenShot("Customize Report - Filter tab", _pageNum++); + PauseForScreenShot("Customize Report - Filter tab"); OkDialog(viewEditor, viewEditor.OkDialog); @@ -625,7 +622,7 @@ private void AddTruncatedPrecursorsView(DocumentGridForm documentGrid, bool init }); if (initialTestExecution) - PauseForScreenShot("Document Grid", _pageNum); + PauseForScreenShot("Document Grid"); } private void ExploreGlobalStandards() @@ -653,19 +650,19 @@ private void ExploreGlobalStandards() string.Format("{0} does not contain VVLSGSDATLAYSAFK", SkylineWindow.SequenceTree.SelectedNode.Text)); }); - PauseForRetentionTimeGraphScreenShot("Retention Times graph for VVLSGSDATLAYSAFK", _pageNum++); + PauseForRetentionTimeGraphScreenShot("Retention Times graph for VVLSGSDATLAYSAFK"); RestoreViewOnScreen(12); // Same layout for Peak Areas graph as on page 12 SelectNode(SrmDocument.Level.Molecules, peptideCount - 2); - PauseForPeakAreaGraphScreenShot("Peak Areas graph for VVLSGSDATLAYSAFK", _pageNum); + PauseForPeakAreaGraphScreenShot("Peak Areas graph for VVLSGSDATLAYSAFK"); SelectNode(SrmDocument.Level.Molecules, peptideCount - 3); RunUI(() => Assert.IsTrue(SkylineWindow.SequenceTree.SelectedNode.Text.Contains("HLNGFSVPR"), string.Format("{0} does not contain HLNGFSVPR", SkylineWindow.SequenceTree.SelectedNode.Text))); - PauseForPeakAreaGraphScreenShot("Peak Areas graph for HLNGFSVPR", _pageNum++); + PauseForPeakAreaGraphScreenShot("Peak Areas graph for HLNGFSVPR"); RestoreViewOnScreen(13); // Same layout for chromatogram graphs as before on page 13 @@ -677,7 +674,7 @@ private void ExploreGlobalStandards() SkylineWindow.AutoZoomBestPeak(); }); - PauseForChromGraphScreenShot("Chromatogram graph with interference", "H_159_REP2", _pageNum++); + PauseForChromGraphScreenShot("Chromatogram graph with interference", "H_159_REP2"); RunUI(() => SkylineWindow.NormalizeAreaGraphTo(NormalizeOption.NONE)); @@ -686,13 +683,13 @@ private void ExploreGlobalStandards() WaitForGraphs(); RunUI(() => SetXScale(SkylineWindow.GetGraphChrom("D_102_REP1")?.GraphControl, 12, 29)); - PauseForChromGraphScreenShot("Multi-peptide chromatogram graph for S", "D_102_REP1", _pageNum); + PauseForChromGraphScreenShot("Multi-peptide chromatogram graph for S", "D_102_REP1"); RunUI(SkylineWindow.SelectAll); WaitForGraphs(); RunUI(() => SetXScale(SkylineWindow.GetGraphChrom("D_102_REP1")?.GraphControl, 10, 45)); - PauseForChromGraphScreenShot("All multi-peptide chromatogram graph", "D_102_REP1", _pageNum++); + PauseForChromGraphScreenShot("All multi-peptide chromatogram graph", "D_102_REP1"); RunUI(() => { @@ -714,7 +711,7 @@ private void ExploreGlobalStandards() SelectNode(SrmDocument.Level.Molecules, peptideCount - 3); - PauseForPeakAreaGraphScreenShot("Peak areas peptide comparison graph with CV values", _pageNum++); + PauseForPeakAreaGraphScreenShot("Peak areas peptide comparison graph with CV values"); RestoreViewOnScreen(12); // Same layout for Peak Areas graph as on page 12 @@ -722,7 +719,7 @@ private void ExploreGlobalStandards() RunUI(SkylineWindow.ShowPeakAreaReplicateComparison); JiggleSelection(); - PauseForPeakAreaGraphScreenShot("Peak area replicate comparison graph for LGPLVEDQGR", _pageNum); + PauseForPeakAreaGraphScreenShot("Peak area replicate comparison graph for LGPLVEDQGR"); RunUI(() => { @@ -730,7 +727,7 @@ private void ExploreGlobalStandards() SkylineWindow.NormalizeAreaGraphTo(NormalizeOption.TOTAL); }); - PauseForPeakAreaGraphScreenShot("Peak area graph for LGPLVEDQR normalized", _pageNum++); + PauseForPeakAreaGraphScreenShot("Peak area graph for LGPLVEDQR normalized"); } private static void SetXScale(ZedGraphControl graphControl, double? min, double? max) @@ -780,14 +777,14 @@ private void ExploreBottomPeptides() SkylineWindow.AutoZoomNone(); }); - PauseForChromGraphScreenShot("Chromatogram graph - truncated peak", "H_146_REP1", _pageNum++); + PauseForChromGraphScreenShot("Chromatogram graph - truncated peak", "H_146_REP1"); RestoreViewOnScreen(10); // Same layout for RT graph as on page 10 SelectNode(SrmDocument.Level.Molecules, i); ActivateReplicate("H_146_REP1"); - PauseForRetentionTimeGraphScreenShot("Retention Times graph - wide peaks", _pageNum); + PauseForRetentionTimeGraphScreenShot("Retention Times graph - wide peaks"); RestoreViewOnScreen(36); SelectNode(SrmDocument.Level.Molecules, i); @@ -808,7 +805,7 @@ private void ExploreBottomPeptides() { SetXScale(chromGraph?.GraphControl, 13.2, 15.8); } - PauseForScreenShot("Chromatogram graphs - use zoom and pan to set up", _pageNum++, null, + PauseForScreenShot("Chromatogram graphs - use zoom and pan to set up", null, bmp => ClipSkylineWindowShotWithForms(bmp, chromGraphs)); RunUI(() => SkylineWindow.Size = new Size(974, 640)); @@ -817,13 +814,13 @@ private void ExploreBottomPeptides() i = SelectPeptidesUpUntil("MLSGFIPLKPTVK"); - PauseForPeakAreaGraphScreenShot("Peak Areas graph - variance", _pageNum); + PauseForPeakAreaGraphScreenShot("Peak Areas graph - variance"); RestoreViewOnScreen(13); // Same layout for chromatogram graphs as before on page 13 SelectNode(SrmDocument.Level.Molecules, i); ActivateReplicate("D_138_REP1"); - PauseForChromGraphScreenShot("Chromatogram graph - y7 with no coeluting", "D_138_REP1", _pageNum++); + PauseForChromGraphScreenShot("Chromatogram graph - y7 with no coeluting", "D_138_REP1"); RestoreViewOnScreen(36); // Chromatogram graphs as on page 36 @@ -839,7 +836,7 @@ private void ExploreBottomPeptides() ActivateReplicate("H_148_REP2"); ActivateReplicate("H_148_REP3"); - PauseForScreenShot("Chromatogram graphs - showing coelution", _pageNum, null, bmp => ClipSkylineWindowShotWithForms(bmp, new DockableForm[] + PauseForScreenShot("Chromatogram graphs - showing coelution", null, bmp => ClipSkylineWindowShotWithForms(bmp, new DockableForm[] { SkylineWindow.GetGraphChrom("H_148_REP1"), SkylineWindow.GetGraphChrom("H_148_REP2"), @@ -851,13 +848,13 @@ private void ExploreBottomPeptides() RestoreViewOnScreen(10); // Same layout for RT graph as on page 10 SelectNode(SrmDocument.Level.Molecules, i); - PauseForRetentionTimeGraphScreenShot("Retention Times graph - misintegrated peaks", _pageNum++, null, bmp => + PauseForRetentionTimeGraphScreenShot("Retention Times graph - misintegrated peaks", null, bmp => bmp.DrawArrowOnBitmap(new PointF(0.85F, 0.8F), new PointF(0.78F, 0.65F))); RestoreViewOnScreen(12); // Same layout for Peak Areas graph as on page 12 SelectNode(SrmDocument.Level.Molecules, i); - PauseForPeakAreaGraphScreenShot("Peak Areas graph - no normalization", _pageNum, null, bmp => + PauseForPeakAreaGraphScreenShot("Peak Areas graph - no normalization", null, bmp => { float xPos = 0.735F; return bmp.DrawArrowOnBitmap(new PointF(xPos, 0.42F), new PointF(xPos, 0.6F)); @@ -870,7 +867,7 @@ private void ExploreBottomPeptides() SelectNode(SrmDocument.Level.Molecules, i); ActivateReplicate("D_154_REP3"); - PauseForChromGraphScreenShot("Chromatogram graph - mispicked peak", "D_154_REP3", _pageNum++); + PauseForChromGraphScreenShot("Chromatogram graph - mispicked peak", "D_154_REP3"); ChangePeakBounds("D_154_REP3", 23, 23.5); } @@ -884,8 +881,7 @@ private void ExploreBottomPeptides() i = SelectPeptidesUpUntil("ETGLMAFTNLK"); ActivateReplicate("D_103_REP1"); - _pageNum++; // Page without figures - PauseForChromGraphScreenShot("Chromatogram graph - interference outside peak", "D_103_REP1", _pageNum); + PauseForChromGraphScreenShot("Chromatogram graph - interference outside peak", "D_103_REP1"); RestoreViewOnScreen(12); // Same layout for Peak Areas graph as on page 12 @@ -900,14 +896,14 @@ private void ExploreBottomPeptides() VerifyLowDotProducts(0.35); - PauseForPeakAreaGraphScreenShot("Peak Areas graph - poor library correlation", _pageNum++); + PauseForPeakAreaGraphScreenShot("Peak Areas graph - poor library correlation"); RestoreViewOnScreen(13); // Same layout for chromatogram graphs as before on page 13 SelectNode(SrmDocument.Level.Molecules, i); ActivateReplicate("D_196_REP1"); - PauseForChromGraphScreenShot("Chromatogram graph - poor library correlation", "D_196_REP1", _pageNum++); + PauseForChromGraphScreenShot("Chromatogram graph - poor library correlation", "D_196_REP1"); if (IsFullData) { @@ -923,28 +919,28 @@ private void ExploreBottomPeptides() SelectNode(SrmDocument.Level.Molecules, i); ActivateReplicate("D_154_REP1"); - PauseForPeakAreaGraphScreenShot("Peak Areas graph - poor run-to-run correlation", _pageNum); + PauseForPeakAreaGraphScreenShot("Peak Areas graph - poor run-to-run correlation"); RunUI(() => SkylineWindow.ShowReplicateOrder(SummaryReplicateOrder.document)); - PauseForPeakAreaGraphScreenShot("Peak Areas graph - poor run-to-run correlation - logical order", _pageNum++); + PauseForPeakAreaGraphScreenShot("Peak Areas graph - poor run-to-run correlation - logical order"); RestoreViewOnScreen(10); // Same layout for RT graph as on page 10 SelectNode(SrmDocument.Level.Molecules, i); ActivateReplicate("D_154_REP1"); - PauseForRetentionTimeGraphScreenShot("Retention Times graph - poor run-to-run correlation - logical order", _pageNum); + PauseForRetentionTimeGraphScreenShot("Retention Times graph - poor run-to-run correlation - logical order"); RestoreViewOnScreen(44); SelectNode(SrmDocument.Level.Molecules, i); ActivateReplicate("D_102_REP3"); - PauseForChromGraphScreenShot("Cromatogram graph (A) - no peak - Format width 3.2", "D_102_REP3", _pageNum); + PauseForChromGraphScreenShot("Cromatogram graph (A) - no peak - Format width 3.2", "D_102_REP3"); ActivateReplicate("D_108_REP1"); - PauseForChromGraphScreenShot("Cromatogram graph (B) - no peak - Format width 3.2", "D_108_REP1", _pageNum++); + PauseForChromGraphScreenShot("Cromatogram graph (B) - no peak - Format width 3.2", "D_108_REP1"); int count = IsFullData ? 15 : 10; AssertUserSetCount(count); @@ -972,7 +968,7 @@ private void ExploreBottomPeptides() SkylineWindow.NormalizeAreaGraphTo(NormalizeOption.NONE); SkylineWindow.ShowReplicateOrder(SummaryReplicateOrder.time); }); - PauseForPeakAreaGraphScreenShot("Peak Areas graph - no normalization", _pageNum++, null, bmp => + PauseForPeakAreaGraphScreenShot("Peak Areas graph - no normalization", null, bmp => { float xFirst = 0.398F; var ptTail = new PointF(xFirst, 0.3F); @@ -1020,11 +1016,11 @@ private void PrepareForStatistics() Settings.Default.AnnotationDefList.Clear(); var documentSettingsDlg = ShowDialog(SkylineWindow.ShowDocumentSettingsDialog); - AddReplicateAnnotation(documentSettingsDlg, "SubjectId", AnnotationDef.AnnotationType.text, null, _pageNum++); + AddReplicateAnnotation(documentSettingsDlg, "SubjectId", AnnotationDef.AnnotationType.text, null, true); RunUI(() => documentSettingsDlg.AnnotationsCheckedListBox.SetItemChecked(0, true)); - PauseForScreenShot("Annotation Settings form with SubjectId", _pageNum++); + PauseForScreenShot("Annotation Settings form with SubjectId"); OkDialog(documentSettingsDlg, documentSettingsDlg.OkDialog); } @@ -1036,7 +1032,7 @@ private void PrepareForStatistics() RunUI(() => toolStoreDlg.SelectTool("MSstats")); WaitForConditionUI(() => !toolStoreDlg.IsIconDownloading); - PauseForScreenShot("Tool Store form - showing MSstats tool details", _pageNum++); + PauseForScreenShot("Tool Store form - showing MSstats tool details"); OkDialog(toolStoreDlg, toolStoreDlg.CancelButton.PerformClick); } @@ -1045,10 +1041,10 @@ private void PrepareForStatistics() var documentSettingsDlg = ShowDialog(SkylineWindow.ShowDocumentSettingsDialog); AddReplicateAnnotation(documentSettingsDlg, "BioReplicate", AnnotationDef.AnnotationType.text, - null, _pageNum); + null, true); AddReplicateAnnotation(documentSettingsDlg, "Condition", AnnotationDef.AnnotationType.value_list, - new[] {"Healthy", "Diseased"}, _pageNum); + new[] {"Healthy", "Diseased"}, true); RunUI(() => { @@ -1056,7 +1052,7 @@ private void PrepareForStatistics() documentSettingsDlg.AnnotationsCheckedListBox.SetItemChecked(2, true); }); - PauseForScreenShot("Annotation Settings form with MSstats annotations", _pageNum++); + PauseForScreenShot("Annotation Settings form with MSstats annotations"); OkDialog(documentSettingsDlg, documentSettingsDlg.OkDialog); } @@ -1073,7 +1069,7 @@ private void PrepareForStatistics() documentGrid.FindColumn(pathSubjectId) != null)); // Let it initialize RestoreViewOnScreen(50); - PauseForScreenShot("Document Grid - replicates", _pageNum++); + PauseForScreenShot("Document Grid - replicates"); // In case the layout was restored, the old document grid reference may no longer be valid documentGrid = WaitForOpenForm(); @@ -1086,14 +1082,14 @@ private void PrepareForStatistics() gridView.CurrentCell = gridView.Rows[0].Cells[columnSubjectId.Index]; }); - PauseForScreenShot("Document Grid - SubjectId column selected", _pageNum); + PauseForScreenShot("Document Grid - SubjectId column selected"); var filePath = GetTestPath(@"Heart Failure\raw\Annotations.xlsx"); SetExcelFileClipboardText(filePath, "Sheet1", 3, true); RunUI(() => documentGrid.DataGridView.SendPaste()); - PauseForScreenShot("Document Grid - filled", _pageNum++); + PauseForScreenShot("Document Grid - filled"); RunUI(() => SkylineWindow.ShowDocumentGrid(false)); } @@ -1102,11 +1098,11 @@ private void PrepareForStatistics() var documentSettingsDlg = ShowDialog(SkylineWindow.ShowDocumentSettingsDialog); AddAnnotation(documentSettingsDlg, "MissingData", AnnotationDef.AnnotationType.true_false, null, - AnnotationDef.AnnotationTargetSet.Singleton(AnnotationDef.AnnotationTarget.peptide), _pageNum++); + AnnotationDef.AnnotationTargetSet.Singleton(AnnotationDef.AnnotationTarget.peptide)); RunUI(() => documentSettingsDlg.AnnotationsCheckedListBox.SetItemChecked(3, true)); - PauseForScreenShot("Annotations form with all annotations checked", _pageNum++); + PauseForScreenShot("Annotations form with all annotations checked"); OkDialog(documentSettingsDlg, documentSettingsDlg.OkDialog); } @@ -1128,7 +1124,7 @@ private void PrepareForStatistics() viewEditor.ChooseColumnsTab.AddSelectedColumn(); }); - PauseForScreenShot("Customize View form with MissingData annotation checked", _pageNum++); + PauseForScreenShot("Customize View form with MissingData annotation checked"); OkDialog(viewEditor, viewEditor.OkDialog); @@ -1147,7 +1143,7 @@ private void PrepareForStatistics() }); WaitForConditionUI(() => documentGrid.IsComplete); - PauseForScreenShot("Document Grid with MissingData field", _pageNum); + PauseForScreenShot("Document Grid with MissingData field"); int expectedRows = IsFullData ? 222 : 149; const int expectedRowsAbbreviated = 221; // When not all of the tests are run @@ -1164,7 +1160,7 @@ private void PrepareForStatistics() gridView.CurrentCell = gridView.Rows[1].Cells[columnSubjectId.Index]; }); - PauseForScreenShot("Document Grid with MissingData field checked", _pageNum++); + PauseForScreenShot("Document Grid with MissingData field checked"); string linesTrue = TextUtil.LineSeparate(new string[expectedRows].Select(v => "TRUE")); RunUI(() => @@ -1195,7 +1191,7 @@ private void PrepareForStatistics() SkylineWindow.SequenceTree.TopNode = SkylineWindow.SequenceTree.TopNode.NextVisibleNode; }); - PauseForScreenShot("Targets NP_036870 and peptides", _pageNum++, null, bmp => ClipTargets(bmp, 3)); + PauseForScreenShot("Targets NP_036870 and peptides", null, bmp => ClipTargets(bmp, 3)); } { @@ -1216,7 +1212,7 @@ private void PrepareForStatistics() viewEditor.Height = 410; }); - PauseForScreenShot("Missing Peaks report", _pageNum++); + PauseForScreenShot("Missing Peaks report"); RunUI(() => { @@ -1229,7 +1225,7 @@ private void PrepareForStatistics() viewEditor.FilterTab.AvailableFieldsTree.SetScrollPos(Orientation.Horizontal, 60); }); - PauseForScreenShot("Filter tab of column editor", _pageNum); + PauseForScreenShot("Filter tab of column editor"); OkDialog(viewEditor, viewEditor.OkDialog); OkDialog(viewManager, viewManager.AcceptButton.PerformClick); @@ -1288,7 +1284,7 @@ private void ReviewStatistics() FormEx.GetParentForm(documentGrid).Size = new Size(756, 352); }); - PauseForScreenShot("Missing Peaks view in document grid", _pageNum++); + PauseForScreenShot("Missing Peaks view in document grid"); RunUI(() => { @@ -1318,8 +1314,7 @@ private void ReviewStatistics() ActivateReplicate("D_102_REP1"); - _pageNum++; // Page without figures - PauseForPeakAreaGraphScreenShot("By SubjectId CV peak area ratio to global standard", _pageNum++); + PauseForPeakAreaGraphScreenShot("By SubjectId CV peak area ratio to global standard"); RestoreViewOnScreen(60); @@ -1331,34 +1326,34 @@ private void ReviewStatistics() FindNode("IAELFSDLEER"); - PauseForPeakAreaGraphScreenShot("IAELFSDLEER mean peak area ratio to global standard by condition", _pageNum); + PauseForPeakAreaGraphScreenShot("IAELFSDLEER mean peak area ratio to global standard by condition"); FindNode("FSISTDYSLK"); - PauseForPeakAreaGraphScreenShot("FSISTDYSLK mean peak area ratio to global standard by condition", _pageNum); + PauseForPeakAreaGraphScreenShot("FSISTDYSLK mean peak area ratio to global standard by condition"); FindNode("EVLPELGIK"); - PauseForPeakAreaGraphScreenShot("EVLPELGIK mean peak area ratio to global standard by condition", _pageNum++); + PauseForPeakAreaGraphScreenShot("EVLPELGIK mean peak area ratio to global standard by condition"); FindNode("SVVDIGLIK"); - PauseForPeakAreaGraphScreenShot("SVVDIGLIK mean peak area ratio to global standard by condition", _pageNum); + PauseForPeakAreaGraphScreenShot("SVVDIGLIK mean peak area ratio to global standard by condition"); if (IsPauseForScreenShots) RunUI(() => FindFloatingWindow(SkylineWindow.GraphPeakArea).Width += 50); FindNode("LQTEGDGIYTLNSEK"); - PauseForPeakAreaGraphScreenShot("LQTEGDGIYTLNSEK mean peak area ratio to global standard by condition", _pageNum); + PauseForPeakAreaGraphScreenShot("LQTEGDGIYTLNSEK mean peak area ratio to global standard by condition"); FindNode("CSSLLWAGAAWLR"); - PauseForPeakAreaGraphScreenShot("CSSLLWAGAAWLR mean peak area ratio to global standard by condition", _pageNum); + PauseForPeakAreaGraphScreenShot("CSSLLWAGAAWLR mean peak area ratio to global standard by condition"); FindNode("NLGVVVAPHALR"); - PauseForPeakAreaGraphScreenShot("NLGVVVAPHALR mean peak area ratio to global standard by condition", _pageNum++); + PauseForPeakAreaGraphScreenShot("NLGVVVAPHALR mean peak area ratio to global standard by condition"); } private static int SelectPeptidesUpUntil(string sequence) @@ -1458,11 +1453,10 @@ private void SimpleGroupComparisons() editGroupComparisonDlg.TextBoxConfidenceLevel.Text = 99.ToString(CultureInfo.CurrentCulture); editGroupComparisonDlg.RadioScopePerProtein.Checked = true; }); - _pageNum++; // Page without figures - PauseForScreenShot("Edit Group Comparison", _pageNum); + PauseForScreenShot("Edit Group Comparison"); OkDialog(editGroupComparisonDlg, editGroupComparisonDlg.OkDialog); RunUI(() => documentSettingsDlg.Height = 310); - PauseForScreenShot("Document Settings", _pageNum++); + PauseForScreenShot("Document Settings"); OkDialog(documentSettingsDlg, documentSettingsDlg.OkDialog); var docAfterComparison = WaitForDocumentChange(docBeforeComparison); var groupComparisonDefs = docAfterComparison.Settings.DataSettings.GroupComparisonDefs; @@ -1490,13 +1484,13 @@ private void SimpleGroupComparisons() "0 != foldChangeGrid.DataboundGridControl.RowCount"); WaitForConditionUI(() => foldChangeGridControl.IsComplete, "foldChangeGrid.DataboundGridControl.IsComplete"); - PauseForScreenShot("Healthy v. Diseased:Grid", _pageNum++); + PauseForScreenShot("Healthy v. Diseased:Grid"); RunUI(() => { foldChangeGrid.ShowGraph(); foldChangeGrid.Parent.Parent.Size = new Size(837, 476); }); - PauseForScreenShot("Healthy v Diseased:Graph", _pageNum++); + PauseForScreenShot("Healthy v Diseased:Graph"); if (!IsCoverShotMode) RestoreViewOnScreen(67); else @@ -1542,7 +1536,7 @@ private void SimpleGroupComparisons() scale.MajorStep = 2; scale.MinorStep = 0.5; }); - PauseForGraphScreenShot("Copy protein bar graph metafile", FindOpenForm(), _pageNum++); + PauseForGraphScreenShot("Copy protein bar graph metafile", FindOpenForm()); if (IsCoverShotMode) { @@ -1604,7 +1598,7 @@ private void SimpleGroupComparisons() OkDialog(quickFilterForm, quickFilterForm.OkDialog); } WaitForConditionUI(() => 92 == foldChangeGrid.DataboundGridControl.RowCount); - PauseForGraphScreenShot("Copy peptide bar graph metafile", FindOpenForm(), _pageNum++); + PauseForGraphScreenShot("Copy peptide bar graph metafile", FindOpenForm()); RunUI(() => { @@ -1619,9 +1613,9 @@ private void SimpleGroupComparisons() }); OkDialog(settingsForm, () => settingsForm.Close()); - PauseForScreenShot("Healthy v. Diseased:Grid", _pageNum); + PauseForScreenShot("Healthy v. Diseased:Grid"); var messageDlg = ShowDialog(foldChangeGrid.FoldChangeBindingSource.ViewContext.Delete); - PauseForScreenShot("Are you sure you want to delete...", _pageNum++); + PauseForScreenShot("Are you sure you want to delete..."); var docBefore = SkylineWindow.Document; OkDialog(messageDlg, messageDlg.BtnYesClick); WaitForDocumentChange(docBefore); // Avoid tearing down the test before the deletion is complete diff --git a/pwiz_tools/Skyline/TestTutorial/IrtTutorialTest.cs b/pwiz_tools/Skyline/TestTutorial/IrtTutorialTest.cs index 77d5d97b00..394f5fc0f1 100644 --- a/pwiz_tools/Skyline/TestTutorial/IrtTutorialTest.cs +++ b/pwiz_tools/Skyline/TestTutorial/IrtTutorialTest.cs @@ -88,7 +88,7 @@ protected override void DoTest() string unschedHuman1Name = unschedHuman1Fileroot.Substring(41, 7); const string unschedHuman2Fileroot = "A_D110907_SiRT_HELA_11_nsMRM_150selected_2_30min-5-35"; // Not L10N string unschedHuman2Name = unschedHuman2Fileroot.Substring(41, 7); - ImportNewResults(new[] { unschedHuman1Fileroot, unschedHuman2Fileroot }, 5, false, true, "Names form", 3); + ImportNewResults(new[] { unschedHuman1Fileroot, unschedHuman2Fileroot }, 5, false, true, "Names form"); var docCalibrate = WaitForProteinMetadataBackgroundLoaderCompletedUI(); const int pepCount = 11, tranCount = 33; AssertEx.IsDocumentState(docCalibrate, null, 1, pepCount, pepCount, tranCount); @@ -110,7 +110,7 @@ protected override void DoTest() }); // Page 3. - PauseForRetentionTimeGraphScreenShot("RT graph metafile", 3); // Peptide RT graph + PauseForRetentionTimeGraphScreenShot("RT graph metafile"); // Peptide RT graph RunUI(() => { @@ -123,7 +123,7 @@ protected override void DoTest() WaitForGraphs(); RestoreViewOnScreen(5); - PauseForScreenShot("Main window showing chromatograms and RT graph", 5); // Skyline window with docked RT replicate comparison graph + PauseForScreenShot("Main window showing chromatograms and RT graph"); // Skyline window with docked RT replicate comparison graph RunUI(() => { @@ -179,7 +179,7 @@ protected override void DoTest() } }); - PauseForScreenShot("Calibrate iRT Calculator form", 6); // Calibrate iRT Calculator form + PauseForScreenShot("Calibrate iRT Calculator form"); // Calibrate iRT Calculator form RunDlg(calibrateDlg.GraphRegression, dlg => dlg.CloseDialog()); RunDlg(calibrateDlg.GraphIrts, dlg => dlg.CloseDialog()); @@ -191,7 +191,7 @@ protected override void DoTest() if (IsPauseForScreenShots) { RunUI(() => editIrtCalc1.CalcPath = irtCalcPathScreenShot); - PauseForScreenShot("Edit iRT Calculator form", 7); // Edit iRT Calculator form + PauseForScreenShot("Edit iRT Calculator form"); // Edit iRT Calculator form RunUI(() => editIrtCalc1.CalcPath = irtCalcPath); } @@ -224,7 +224,7 @@ protected override void DoTest() WaitForRegression(); RestoreViewOnScreen(9); - PauseForRetentionTimeGraphScreenShot("Retention Times Regression graph metafile", 9); // RT Regression graph + PauseForRetentionTimeGraphScreenShot("Retention Times Regression graph metafile"); // RT Regression graph RunUI(() => { @@ -298,7 +298,7 @@ protected override void DoTest() regressionDlg.SetTimeWindow(5); }); - PauseForScreenShot("Edit Retention Time Predictor form", 11); // Edit retention time predictor form + PauseForScreenShot("Edit Retention Time Predictor form"); // Edit retention time predictor form OkDialog(regressionDlg, regressionDlg.OkDialog); OkDialog(peptideSettingsUI1, peptideSettingsUI2.OkDialog); @@ -317,7 +317,7 @@ protected override void DoTest() exportMethodDlg.MaxTransitions = 335; }); - PauseForScreenShot("Export Transition List form", 12); + PauseForScreenShot("Export Transition List form"); OkDialog(exportMethodDlg, () => exportMethodDlg.OkDialog(GetTestPath(calibrateBasename + TextUtil.EXT_CSV))); @@ -333,7 +333,7 @@ protected override void DoTest() RunUI(SkylineWindow.ShowRTRegressionGraphScoreToRun); WaitForRegression(); - PauseForRetentionTimeGraphScreenShot("RT Regression graph metafile", 14); + PauseForRetentionTimeGraphScreenShot("RT Regression graph metafile"); RunUI(() => { @@ -351,7 +351,7 @@ protected override void DoTest() .ChangeCustomFinders(Finders.ListAllFinders().Where(f => f is UnintegratedTransitionFinder)); }); - PauseForScreenShot("Find form", 15); + PauseForScreenShot("Find form"); RestoreViewOnScreen(15); @@ -363,7 +363,7 @@ protected override void DoTest() WaitForClosedForm(findDlg); } - PauseForScreenShot("Find Results pane", 15); + PauseForScreenShot("Find Results pane"); var findAllForm = WaitForOpenForm(); @@ -438,7 +438,7 @@ protected override void DoTest() RunUI(() => Assert.AreEqual(0, editIrtCalc2.LibraryPeptideCount)); var addPeptidesDlg = ShowDialog(editIrtCalc2.AddResults); - PauseForScreenShot("Add Peptides form", 17); + PauseForScreenShot("Add Peptides form"); RunUI(() => { @@ -452,7 +452,7 @@ protected override void DoTest() if (IsPauseForScreenShots) { RunUI(() => editIrtCalc2.CalcPath = irtCalcPathScreenShot); - PauseForScreenShot("Edit iRT Calculator form", 18); // Edit iRT Calculator form + PauseForScreenShot("Edit iRT Calculator form"); // Edit iRT Calculator form RunUI(() => editIrtCalc2.CalcPath = irtCalcPath); } @@ -464,7 +464,7 @@ protected override void DoTest() // Check the RT regression, p. 19 WaitForRegression(); - PauseForRetentionTimeGraphScreenShot("RT Regression graph metafile", 19); + PauseForRetentionTimeGraphScreenShot("RT Regression graph metafile"); RunUI(() => { @@ -495,7 +495,7 @@ protected override void DoTest() peptideSettingsUI.TimeWindow = 5; }); - PauseForScreenShot("Peptide Settings - Prediction tab", 21); + PauseForScreenShot("Peptide Settings - Prediction tab"); OkDialog(peptideSettingsUI, peptideSettingsUI.OkDialog); WaitForClosedForm(peptideSettingsUI); @@ -509,7 +509,7 @@ protected override void DoTest() // Verify regression graph, p. 19 RunUI(SkylineWindow.ShowRTRegressionGraphScoreToRun); WaitForRegression(); - PauseForRetentionTimeGraphScreenShot("RT Regression graph metafile", 22); + PauseForRetentionTimeGraphScreenShot("RT Regression graph metafile"); RunUI(() => { VerifyRTRegression(0.40, 24.77, 0.9998); @@ -525,7 +525,7 @@ protected override void DoTest() }); WaitForGraphs(); - PauseForRetentionTimeGraphScreenShot("RT Scheduling graph metafile", 23); + PauseForRetentionTimeGraphScreenShot("RT Scheduling graph metafile"); // Export new 90-minute scheduled transition list, p. 22 const string scheduledBasename = "iRT Human+Standard"; // Not L10N @@ -538,7 +538,7 @@ protected override void DoTest() exportMethodDlg.MethodType = ExportMethodType.Scheduled; }); - PauseForScreenShot("Export Transition List form", 24); + PauseForScreenShot("Export Transition List form"); OkDialog(exportMethodDlg,() => exportMethodDlg.OkDialog(GetTestPath(scheduledBasename + TextUtil.EXT_CSV))); } @@ -560,7 +560,7 @@ protected override void DoTest() RunUI(SkylineWindow.ShowRTRegressionGraphScoreToRun); WaitForRegression(); - PauseForRetentionTimeGraphScreenShot("RT Regression graph metafile", 26); + PauseForRetentionTimeGraphScreenShot("RT Regression graph metafile"); // Review regression and outliers, p. 24 RunUI(() => @@ -576,7 +576,7 @@ protected override void DoTest() }); WaitForRegression(); - PauseForRetentionTimeGraphScreenShot("RT Regression graph metafile", 27); + PauseForRetentionTimeGraphScreenShot("RT Regression graph metafile"); // Verify 2 outliers highlighted and removed, p. 25 WaitForConditionUI(() => SkylineWindow.RTGraphController.Outliers.Length == 2); @@ -589,7 +589,7 @@ protected override void DoTest() }); WaitForRegression(); - PauseForRetentionTimeGraphScreenShot("RT Regression graph metafile", 28); + PauseForRetentionTimeGraphScreenShot("RT Regression graph metafile"); if (IsCoverShotMode) { @@ -678,7 +678,7 @@ protected override void DoTest() addLibraryDlg.FilePathFocus(); }); - PauseForScreenShot("Add Spectral Library form", 31); + PauseForScreenShot("Add Spectral Library form"); // Verify converted peptide iRT values and OK dialogs, p. 31 var addPeptidesDlg = ShowDialog(addLibraryDlg.OkDialog); @@ -689,7 +689,7 @@ protected override void DoTest() Assert.AreEqual(3, addPeptidesDlg.KeepPeptidesCount); }); - PauseForScreenShot("Add Peptides form", 31); + PauseForScreenShot("Add Peptides form"); var recalibrateDlg = ShowDialog(addPeptidesDlg.OkDialog); OkDialog(recalibrateDlg, recalibrateDlg.Btn1Click); @@ -726,7 +726,7 @@ protected override void DoTest() SkylineWindow.Size = new Size(1250, 660); }); FocusDocument(); - PauseForScreenShot("Main window", 33); + PauseForScreenShot("Main window"); // Add results and verify add dialog counts, p. 33 { @@ -744,7 +744,7 @@ protected override void DoTest() addPeptidesDlg.Left = SkylineWindow.Right + 20; }); - PauseForScreenShot ("Add Peptides form", 34); + PauseForScreenShot ("Add Peptides form"); var recalibrateDlg = ShowDialog(addPeptidesDlg.OkDialog); OkDialog(recalibrateDlg, recalibrateDlg.Btn1Click); @@ -769,7 +769,7 @@ private static void CommitIrtCalcChange(EditIrtCalcDlg editIrtCalc) } private void ImportNewResults(IEnumerable baseNames, int suffixLength, bool multiFile, - bool? removeFix = null, string pauseText = null, int? pausePage = null) + bool? removeFix = null, string pauseText = null) { var listNamedPathSets = new List>(); var listPaths = new List(); @@ -780,7 +780,7 @@ private void ImportNewResults(IEnumerable baseNames, int suffixLength, b listPaths.Add(fileName); else listNamedPathSets.Add(new KeyValuePair(baseName, new[] { MsDataFileUri.Parse(fileName)})); - } + } if (multiFile) listNamedPathSets.Add(new KeyValuePair(Resources.ImportResultsDlg_DefaultNewName_Default_Name, listPaths.Select(MsDataFileUri.Parse).ToArray())); @@ -801,12 +801,12 @@ private void ImportNewResults(IEnumerable baseNames, int suffixLength, b resultsNames.Suffix = resultsNames.Suffix.Substring(resultsNames.Suffix.Length - suffixLength); }); - if (pauseText != null && pausePage.HasValue) - PauseForScreenShot(pauseText, pausePage.Value); + if (pauseText != null) + PauseForScreenShot(pauseText); - if (removeFix.Value) + if (removeFix.Value) OkDialog(resultsNames, resultsNames.YesDialog); - else + else OkDialog(resultsNames, resultsNames.NoDialog); } else diff --git a/pwiz_tools/Skyline/TestTutorial/LibraryExplorerTutorialTest.cs b/pwiz_tools/Skyline/TestTutorial/LibraryExplorerTutorialTest.cs index 5563bc2374..890d072534 100644 --- a/pwiz_tools/Skyline/TestTutorial/LibraryExplorerTutorialTest.cs +++ b/pwiz_tools/Skyline/TestTutorial/LibraryExplorerTutorialTest.cs @@ -86,7 +86,7 @@ protected override void DoTest() peptideSettingsUI.SelectedTab = PeptideSettingsUI.TABS.Library; peptideSettingsUI.PickedLibraries = new[] {"Experiment 15N"}; }); - PauseForScreenShot("Peptide Settings - Library tab", 3); + PauseForScreenShot("Peptide Settings - Library tab"); // Modifications Tab in peptideSttingsUI to check "Carbamidomethyl Cysteine" const string carbamidoName = StaticModList.DEFAULT_NAME; @@ -95,7 +95,7 @@ protected override void DoTest() peptideSettingsUI.SelectedTab = PeptideSettingsUI.TABS.Modifications; peptideSettingsUI.PickedStaticMods = new[] {carbamidoName}; }); - PauseForScreenShot("Peptide Settings - Modifications tab", 4); + PauseForScreenShot("Peptide Settings - Modifications tab"); OkDialog(peptideSettingsUI, peptideSettingsUI.OkDialog); @@ -108,7 +108,7 @@ protected override void DoTest() var matchedPepsDlg = WaitForOpenForm(); OkDialog(matchedPepsDlg, matchedPepsDlg.CancelDialog); RunUIForScreenShot(() => viewLibraryDlg.Size = new Size(775, 463)); - PauseForScreenShot("Library Explorer", 5); + PauseForScreenShot("Library Explorer"); // Types text in Peptide textbox in the Spectral Library Explorer Window RunUI(() => @@ -116,7 +116,7 @@ protected override void DoTest() viewLibraryDlg.FilterString = "Q"; // Not L10N Assert.AreEqual(7, viewLibraryDlg.PeptideDisplayCount); }); - PauseForScreenShot("Library Explorer filtered for peptides beginning with Q", 6); + PauseForScreenShot("Library Explorer filtered for peptides beginning with Q"); RunUI(() => { @@ -133,7 +133,7 @@ protected override void DoTest() viewLibraryDlg.GraphSettings.ShowCharge2 = true; Assert.AreEqual(35, viewLibraryDlg.GraphItem.IonLabels.Count()); }); - PauseForScreenShot("Library Explorer showing ISERT peptide with b and charge 2 ions", 7); + PauseForScreenShot("Library Explorer showing ISERT peptide with b and charge 2 ions"); // Right click on spectrum chart and select Observed m/z Values RunUI(() => @@ -172,7 +172,7 @@ protected override void DoTest() var mod15N = UniMod.GetModification(label15NName, out _); AddHeavyMod(mod15N, peptideSettingsUI1, "Edit Structural Modification form", 9); RunUI(() => peptideSettingsUI1.PickedHeavyMods = new[] { label15NName }); - PauseForScreenShot("Peptide Settings - Modificatoins tab", 10); + PauseForScreenShot("Peptide Settings - Modificatoins tab"); OkDialog(peptideSettingsUI1, peptideSettingsUI1.OkDialog); @@ -186,7 +186,7 @@ protected override void DoTest() viewLibraryDlg.SelectedIndex = entryCount - 1; viewLibraryDlg.SelectedIndex = entryCount - 19; }); - PauseForScreenShot(viewLibraryDlg.ListControl,"Peptide list clipped from Library Explorer", 11); + PauseForScreenShot(viewLibraryDlg.ListControl,"Peptide list clipped from Library Explorer"); if (IsCoverShotMode) { @@ -212,7 +212,7 @@ protected override void DoTest() }); { var msgDlg = ShowDialog(viewLibraryDlg.AddPeptide); - PauseForScreenShot("Filter peptides form", 11); + PauseForScreenShot("Filter peptides form"); OkDialog(msgDlg, msgDlg.OkDialog); } @@ -249,7 +249,7 @@ protected override void DoTest() locationSaved = viewLibraryDlg.Location; viewLibraryDlg.Location = new Point(SkylineWindow.Right + 20, SkylineWindow.Top); }); - PauseForScreenShot("Main window", 12); + PauseForScreenShot("Main window"); RunUIForScreenShot(() => viewLibraryDlg.Location = locationSaved); // Adding DNAGAATEEFIKR++ (has ok) @@ -296,7 +296,7 @@ protected override void DoTest() settingsUI.PickedHeavyMods = new string[0]; settingsUI.PickedLibraries = new string[0]; }); - PauseForScreenShot("Peptide Settings - Modifications tab", 14); + PauseForScreenShot("Peptide Settings - Modifications tab"); var editListUI1 = ShowDialog, LibrarySpec>>(settingsUI.EditLibraryList); @@ -313,11 +313,11 @@ protected override void DoTest() settingsUI.SelectedTab = PeptideSettingsUI.TABS.Library; settingsUI.PickedLibraries = new[] {humanPhosphoLibName}; }); - PauseForScreenShot("Peptide Settings - Library tab", 15); + PauseForScreenShot("Peptide Settings - Library tab"); { var msgDlg = ShowDialog(() => settingsUI.ShowViewLibraryDlg()); - PauseForScreenShot("Save changes", 15); + PauseForScreenShot("Save changes"); OkDialog(msgDlg, msgDlg.Btn0Click); } @@ -343,14 +343,14 @@ protected override void DoTest() }); RunUIForScreenShot(() => viewLibraryDlg1.Width -= 185); LimitXAxis(viewLibraryDlg1); - PauseForGraphScreenShot("Spectrum graph metafile", viewLibraryDlg1.GraphExtensionControl, 16); // p. 16, figure 1a + PauseForGraphScreenShot("Spectrum graph metafile", viewLibraryDlg1.GraphExtensionControl); // p. 16, figure 1a RunUI(() => { viewLibraryDlg1.SelectedIndex = 1; Assert.AreEqual(countLabels2, viewLibraryDlg1.GraphItem.IonLabels.Count()); }); LimitXAxis(viewLibraryDlg1); - PauseForGraphScreenShot("Spectrum graph metafile", viewLibraryDlg1.GraphExtensionControl, 16); // p. 16, figure 1b + PauseForGraphScreenShot("Spectrum graph metafile", viewLibraryDlg1.GraphExtensionControl); // p. 16, figure 1b docInitial = SkylineWindow.Document; @@ -388,7 +388,7 @@ protected override void DoTest() Assert.AreEqual(countLabels1 + countLossLabels1 + countPrecursors1, labelsPhospho.Count); }); LimitXAxis(viewLibraryDlg1); - PauseForGraphScreenShot("Spectrum graph metafile", viewLibraryDlg1.GraphExtensionControl, 18); // p. 18, figure 1a. + PauseForGraphScreenShot("Spectrum graph metafile", viewLibraryDlg1.GraphExtensionControl); // p. 18, figure 1a. RunUI(() => { @@ -399,7 +399,7 @@ protected override void DoTest() Assert.AreEqual(countLabels2 + countLossLabels2 + countPrecursors2, labelsPhospho.Count); }); LimitXAxis(viewLibraryDlg1); - PauseForGraphScreenShot("Spectrum graph metafile", viewLibraryDlg1.GraphExtensionControl, 18); // p. 18, figure 1b. + PauseForGraphScreenShot("Spectrum graph metafile", viewLibraryDlg1.GraphExtensionControl); // p. 18, figure 1b. // Matching Library Peptides to Proteins p. 18 var peptideSettingsUI3 = ShowDialog(SkylineWindow.ShowPeptideSettingsUI); @@ -411,7 +411,7 @@ protected override void DoTest() buildBackgroundProteomeDlg.BackgroundProteomeName = "Human (mini)"; buildBackgroundProteomeDlg.SelToEndBackgroundProteomePath(); }); - PauseForScreenShot("Edit Background Proteome", 19); // p. 19 + PauseForScreenShot("Edit Background Proteome"); // p. 19 OkDialog(buildBackgroundProteomeDlg, buildBackgroundProteomeDlg.OkDialog); @@ -454,11 +454,11 @@ protected override void DoTest() Assert.AreEqual(163, filterMatchedPeptidesDlg.DuplicateMatchesCount); Assert.AreEqual(2, filterMatchedPeptidesDlg.UnmatchedCount); }); - PauseForScreenShot("Filter Peptides", 20); // p. 20, figure 1 + PauseForScreenShot("Filter Peptides"); // p. 20, figure 1 { var msgDlg = ShowDialog(filterMatchedPeptidesDlg.OkDialog); - PauseForScreenShot("Message form", 20); // p. 20, figure 2 + PauseForScreenShot("Message form"); // p. 20, figure 2 OkDialog(msgDlg, msgDlg.Btn1Click); } @@ -470,7 +470,7 @@ protected override void DoTest() RestoreViewOnScreen(21); RunUIForScreenShot(() => SkylineWindow.SequenceTree.SetScrollPos(Orientation.Horizontal, 0)); - PauseForScreenShot("Main window", 21); + PauseForScreenShot("Main window"); OkDialog(viewLibraryDlg, viewLibraryDlg.Close); } diff --git a/pwiz_tools/Skyline/TestTutorial/MethodEditTutorialTest.cs b/pwiz_tools/Skyline/TestTutorial/MethodEditTutorialTest.cs index 8d6e38b7b9..0995d324f0 100644 --- a/pwiz_tools/Skyline/TestTutorial/MethodEditTutorialTest.cs +++ b/pwiz_tools/Skyline/TestTutorial/MethodEditTutorialTest.cs @@ -104,7 +104,7 @@ protected override void DoTest() RunUI(SkylineWindow.RemoveLibraryBuildNotification); WaitForConditionUI(() => FindOpenForm() == null); } - PauseForScreenShot("Peptide Settings - Library tab", 4); // Not L10N + PauseForScreenShot("Peptide Settings - Library tab"); // Not L10N RunUI(() => peptideSettingsUI1.SelectedTab = PeptideSettingsUI.TABS.Digest); WaitForOpenForm(); // To show Digestion tab for Forms testing @@ -120,11 +120,11 @@ protected override void DoTest() }); AddFastaToBackgroundProteome(buildBackgroundProteomeDlg, TestFilesDirs[0].GetTestPath(@"MethodEdit\FASTA\sgd_yeast.fasta"), 61); RunUI(buildBackgroundProteomeDlg.SelToEndBackgroundProteomePath); - PauseForScreenShot("Edit Background Proteome form", 5); // Not L10N + PauseForScreenShot("Edit Background Proteome form"); // Not L10N OkDialog(buildBackgroundProteomeDlg, buildBackgroundProteomeDlg.OkDialog); - PauseForScreenShot("Peptide Settings - Digestion tab", 6); // Not L10N + PauseForScreenShot("Peptide Settings - Digestion tab"); // Not L10N var docB = SkylineWindow.Document; OkDialog(peptideSettingsUI, peptideSettingsUI.OkDialog); @@ -179,7 +179,7 @@ protected override void DoTest() SkylineWindow.Size = new Size(1035, 511); }); RestoreViewOnScreen(07); - PauseForScreenShot("Main window", 7); // Not L10N + PauseForScreenShot("Main window"); // Not L10N RunUI(() => { @@ -188,7 +188,7 @@ protected override void DoTest() SkylineWindow.SequenceTree.SelectedNode = SkylineWindow.SequenceTree.SelectedNode.Nodes[0].Nodes[1]; }); - PauseForScreenShot("Main window showing effect of selection on Library Match graph", 8); // Not L10N + PauseForScreenShot("Main window showing effect of selection on Library Match graph"); // Not L10N CheckTransitionCount("VDIIANDQGNR", 3); // Not L10N @@ -203,16 +203,16 @@ protected override void DoTest() transitionSettingsUI.FragmentTypes = "y, b"; // Not L10N }); WaitForOpenForm(); // To show Filter tab for Forms testing - PauseForScreenShot("Transition Settings - Filter tab", 9); // Not L10N + PauseForScreenShot("Transition Settings - Filter tab"); // Not L10N RunUI(() => { transitionSettingsUI.SelectedTab = TransitionSettingsUI.TABS.Library; transitionSettingsUI.IonCount = 5; }); - PauseForScreenShot("Transition Settings - Library tab", 10); // Not L10N + PauseForScreenShot("Transition Settings - Library tab"); // Not L10N OkDialog(transitionSettingsUI, transitionSettingsUI.OkDialog); } - PauseForScreenShot("Targets tree clipped from main window", 11, null, + PauseForScreenShot("Targets tree clipped from main window", null, bmp => ClipTargets(bmp)); // Not L10N if (IsCoverShotMode) @@ -252,7 +252,7 @@ protected override void DoTest() peptideSettingsUI.SelectedTab = PeptideSettingsUI.TABS.Library; peptideSettingsUI.PickedLibraries = new[] {YEAST_ATLAS, YEAST_GPM}; }); - PauseForScreenShot("Peptide Settings - Library tab", 12); // Not L10N + PauseForScreenShot("Peptide Settings - Library tab"); // Not L10N OkDialog(peptideSettingsUI, peptideSettingsUI.OkDialog); Assert.IsTrue(WaitForCondition( () => @@ -301,7 +301,7 @@ protected override void DoTest() pasteProteinsDlg.SelectCell(17, 0); pasteProteinsDlg.SetColumnWidths(-1, 220, 500, 0, 0, 0, 0); }); - PauseForScreenShot("Insert Protein List - For Screenshot, select last (empty) item in list", 14); // Not L10N + PauseForScreenShot("Insert Protein List - For Screenshot, select last (empty) item in list"); // Not L10N OkDialog(pasteProteinsDlg, pasteProteinsDlg.OkDialog); } @@ -331,7 +331,7 @@ protected override void DoTest() RunUI(() => SkylineWindow.SequenceTree.Nodes[0].Text = @"Primary Peptides"); FindNode("TLTAQSMQNSTQSAPNK"); // Not L10N - PauseForScreenShot("Main window", 16); // Not L10N + PauseForScreenShot("Main window"); // Not L10N using (new CheckDocumentState(35, 70, 70, 338, null, true)) { @@ -343,7 +343,7 @@ protected override void DoTest() pastePeptidesDlg.SelectCell(12, 0); pastePeptidesDlg.Height = 437; }); - PauseForScreenShot("Insert Peptide List - For screenshot, select last (empty) line in list", 17); // Not L10N + PauseForScreenShot("Insert Peptide List - For screenshot, select last (empty) line in list"); // Not L10N OkDialog(pastePeptidesDlg, pastePeptidesDlg.OkDialog); } @@ -355,7 +355,7 @@ protected override void DoTest() findPeptideDlg.FindNext(); findPeptideDlg.Close(); }); - PauseForGraphScreenShot("Library Match graph metafile", SkylineWindow.GraphSpectrum, 18); // Not L10N + PauseForGraphScreenShot("Library Match graph metafile", SkylineWindow.GraphSpectrum); // Not L10N using (new CheckDocumentState(35, 64, 64, 320, null, true)) { @@ -363,7 +363,7 @@ protected override void DoTest() PauseForForm(typeof(RefineDlg.DocumentTab)); RunUI(() => refineDlg.MinTransitions = 5); OkDialog(refineDlg, refineDlg.OkDialog); - PauseForScreenShot("29/35 prot 50/64 pep 50/64 prec 246/320 tran", 18, null, + PauseForScreenShot("29/35 prot 50/64 pep 50/64 prec 246/320 tran", null, ClipSelectionStatus); // Not L10N } @@ -386,7 +386,7 @@ protected override void DoTest() uniquePeptidesDlg.SplitHeight = 58; uniquePeptidesDlg.Height = 292; }); - PauseForScreenShot("Unique Peptides form", 19); // Not L10N + PauseForScreenShot("Unique Peptides form"); // Not L10N var oldDoc = SkylineWindow.Document; OkDialog(uniquePeptidesDlg, uniquePeptidesDlg.OkDialog); RunUI(() => Assert.AreSame(oldDoc, SkylineWindow.DocumentUI)); @@ -394,12 +394,12 @@ protected override void DoTest() } // Protein Name Auto-Completion - TestAutoComplete("ybl087", 0, 20, 51); // Not L10N + TestAutoComplete("ybl087", 0, true, 51); // Not L10N var peptideGroups = new List(Program.ActiveDocument.PeptideGroups); Assert.AreEqual("YBL087C", peptideGroups[peptideGroups.Count - 1].Name); // Not L10N // Protein Description Auto-Completion - TestAutoComplete("eft2", 0, 20, 83); // Sorting logic puts this at the 0th entry in the list - Not L10N + TestAutoComplete("eft2", 0, true, 83); // Sorting logic puts this at the 0th entry in the list - Not L10N peptideGroups = new List(Program.ActiveDocument.PeptideGroups); Assert.AreEqual("YDR385W", peptideGroups[peptideGroups.Count - 1].Name); // Not L10N @@ -408,7 +408,7 @@ protected override void DoTest() var peptides = new List(Program.ActiveDocument.Peptides); Assert.AreEqual("K.AYLPVNESFGFTGELR.Q [770, 785]", peptides[peptides.Count - 1].Peptide.ToString()); // Not L10N RestoreViewOnScreen(21); - PauseForScreenShot("(fig. 1) - Added targets", 21, null, + PauseForScreenShot("(fig. 1) - Added targets", null, bmp => ClipTargets(bmp, 10, true, true)); // Not L10N // Pop-up Pick-Lists, p. 21 @@ -426,7 +426,7 @@ protected override void DoTest() pickList.SetItemChecked(8, true, true); pickList.AutoManageChildren = false; // TODO: Because calling SetItemChecked does not do this }); - PauseForScreenShot("(fig. 2) - YBL087C Peptides picklist", 21); // Not L10N + PauseForScreenShot("(fig. 2) - YBL087C Peptides picklist"); // Not L10N RunUI(pickList.OnOk); } @@ -451,7 +451,7 @@ protected override void DoTest() pickList1.SetItemChecked(4, true); pickList1.SetItemChecked(6, true, true); }); - PauseForScreenShot("b ++ filtered picklist", 22); // Not L10N + PauseForScreenShot("b ++ filtered picklist"); // Not L10N RunUI(pickList1.OnOk); } @@ -467,8 +467,8 @@ protected override void DoTest() }); FindNode(string.Format("L [b5] - {0:F04}+", 484.3130)); // Not L10N - may be localized " (rank 3)" - ShowNodeTip("YBL087C", 23); - ShowNodeTip(string.Format("{0:F04}+++", 672.6716), 23); + ShowNodeTip("YBL087C", true); + ShowNodeTip(string.Format("{0:F04}+++", 672.6716), true); ShowNodeTip(null); // Preparing to Measure, p. 25 @@ -490,7 +490,7 @@ protected override void DoTest() exportDialog.IgnoreProteins = true; exportDialog.MaxTransitions = 75; }); - PauseForScreenShot("Export Transition List form", 25); // Not L10N + PauseForScreenShot("Export Transition List form"); // Not L10N const string basename = "Yeast_list"; // Not L10N OkDialog(exportDialog, () => exportDialog.OkDialog(TestFilesDirs[0].GetTestPath(basename))); // write Yeast_list_000n.csv @@ -522,7 +522,7 @@ private void VerifyPrecursorLibrary(int indexPrecursor, string libraryName, doub }); } - private void ShowNodeTip(string nodeText, int? pageNumPause = null) + private void ShowNodeTip(string nodeText, bool pause = false) { RunUI(() => { @@ -542,9 +542,9 @@ private void ShowNodeTip(string nodeText, int? pageNumPause = null) }); WaitForConditionUI(NodeTip.TipDelayMs * 10, () => SkylineWindow.SequenceTree.IsTipVisible); - if (pageNumPause != null) + if (pause) { - PauseForScreenShot("Tip for " + nodeText, pageNumPause.Value, null, + PauseForScreenShot("Tip for " + nodeText, null, bmp => { var cropRect = SkylineWindow.SequenceTree.TipRect; @@ -584,7 +584,7 @@ private void SetClipboardFileText(string filepath) SetClipboardTextUI(File.ReadAllText(TestFilesDirs[0].GetTestPath(filepath))); } - private void TestAutoComplete(string text, int index, int? pageNum = null, int aboveAutoComplete = 0) + private void TestAutoComplete(string text, int index, bool pause = false, int aboveAutoComplete = 0) { var doc = WaitForDocumentLoaded(); RunUI(() => @@ -596,17 +596,32 @@ private void TestAutoComplete(string text, int index, int? pageNum = null, int a }); var statementCompletionForm = WaitForOpenForm(); Assert.IsNotNull(statementCompletionForm); - if (pageNum != null) + if (pause) { RunUI(() => SkylineWindow.SequenceTree.StatementCompletionEditBox.SelectWithoutChoosing(0)); - PauseForScreenShot("Auto-complete " + text, pageNum.Value, null, + PauseForScreenShot("Auto-complete " + text, null, bmp => { - var completeRect = FindOpenForm().Bounds; - var skylineRect = SkylineWindow.Bounds; + var completeRect = statementCompletionForm.Bounds; + var skylineRect = ScreenshotManager.GetFramedWindowBounds(SkylineWindow); + bmp = bmp.CleanupBorder(skylineRect, ScreenshotProcessingExtensions.CornerForm, completeRect); + int top = completeRect.Top - aboveAutoComplete; - int bottom = Math.Max(skylineRect.Bottom - 7, completeRect.Bottom); - var cropRect = new Rectangle(skylineRect.Left + 7, top, 735, bottom - top); + int bottom = Math.Max(skylineRect.Bottom, completeRect.Bottom); + var cropRect = new Rectangle(skylineRect.Left, top, 735, bottom - top); + if (skylineRect.Bottom < bottom) + { + var bmpClipped = ClipRegionAndEraseBackground(bmp, + new Control[] { statementCompletionForm, SkylineWindow }, + Array.Empty(), + Color.White); + + // The final clipping expects a full screen bitmap + var bmpNew = new Bitmap(bmp.Width, bmp.Height); + using var g = Graphics.FromImage(bmpNew); + g.DrawImageUnscaled(bmpClipped, skylineRect.X, skylineRect.Y); + bmp = bmpNew; + } return ClipBitmap(bmp, cropRect); }); } diff --git a/pwiz_tools/Skyline/TestTutorial/MethodRefinementTutorialTest.cs b/pwiz_tools/Skyline/TestTutorial/MethodRefinementTutorialTest.cs index c88703f294..c43adbbc34 100644 --- a/pwiz_tools/Skyline/TestTutorial/MethodRefinementTutorialTest.cs +++ b/pwiz_tools/Skyline/TestTutorial/MethodRefinementTutorialTest.cs @@ -102,7 +102,7 @@ protected override void DoTest() Assert.AreEqual(SkylineWindow.SequenceTree.SelectedNode.Text, "YLGAYLLATLGGNASPSAQDVLK"); // Not L10N }); - PauseForScreenShot("Main window", 3); + PauseForScreenShot("Main window"); // Unrefined Methods, p. 4 { @@ -114,7 +114,7 @@ protected override void DoTest() exportDlg.OptimizeType = ExportOptimize.NONE; exportDlg.MaxTransitions = 59; }); - PauseForScreenShot("Export Transition List form", 5); // Not L10N + PauseForScreenShot("Export Transition List form"); // Not L10N OkDialog(exportDlg, () => exportDlg.OkDialog(TestFilesDirs[1].GetTestPath(folderMethodRefine + @"\worm"))); // Not L10N } @@ -152,7 +152,7 @@ protected override void DoTest() var allChrom = WaitForOpenForm(); // To make the AllChromatogramsGraph form accessible to the SkylineTester forms tab allChrom.SetFreezeProgressPercent(98, @"00:00:01"); WaitForConditionUI(() => allChrom.IsProgressFrozen()); - PauseForScreenShot("Loading Chromatograms: Take screenshot at about 25% loaded...", 7); + PauseForScreenShot("Loading Chromatograms: Take screenshot at about 25% loaded..."); allChrom.SetFreezeProgressPercent(null, null); WaitForCondition(15*60*1000, () => SkylineWindow.Document.Settings.MeasuredResults.IsLoaded); // 15 minutes @@ -173,7 +173,7 @@ protected override void DoTest() RunUI(SkylineWindow.AutoZoomNone); RestoreViewOnScreen(8); - PauseForGraphScreenShot("Chromatogram graph metafile", SkylineWindow.GetGraphChrom(replicateName), 8); + PauseForGraphScreenShot("Chromatogram graph metafile", SkylineWindow.GetGraphChrom(replicateName)); if (IsCoverShotMode) { @@ -204,7 +204,7 @@ protected override void DoTest() Assert.AreEqual(SkylineWindow.SequenceTree.Nodes[0].GetNodeCount(false), startingNodeCount - 1); Assert.AreEqual("VLEAGGLDCDMENANSVVDALK", SkylineWindow.SequenceTree.Nodes[0].Nodes[0].Text); // Not L10N RestoreViewOnScreen(9); - PauseForGraphScreenShot("Retention Times Regression plot metafile", SkylineWindow.GraphRetentionTime, 9); + PauseForGraphScreenShot("Retention Times Regression plot metafile", SkylineWindow.GraphRetentionTime); RunDlg(SkylineWindow.ShowRegressionRTThresholdDlg, rtThresholdDlg => { @@ -212,7 +212,7 @@ protected override void DoTest() rtThresholdDlg.OkDialog(); }); WaitForRegression(); - PauseForGraphScreenShot("Retention Times Regression plot metafile with 0.95 threshold", SkylineWindow.GraphRetentionTime, 9); // Not L10N + PauseForGraphScreenShot("Retention Times Regression plot metafile with 0.95 threshold", SkylineWindow.GraphRetentionTime); // Not L10N TestRTResidualsSwitch(); @@ -225,7 +225,7 @@ protected override void DoTest() RunUI(() => SkylineWindow.ShowGraphRetentionTime(false)); RunUI(SkylineWindow.AutoZoomNone); - PauseForGraphScreenShot("Chromatogram graph metafile zoomed out", SkylineWindow.GetGraphChrom(replicateName), 10); // Not L10N + PauseForGraphScreenShot("Chromatogram graph metafile zoomed out", SkylineWindow.GetGraphChrom(replicateName)); // Not L10N // Missing Data, p. 10 RunUI(() => @@ -239,7 +239,7 @@ protected override void DoTest() FindNode("YLAEVASEDR"); RunUI(() => SkylineWindow.SequenceTree.TopNode = SkylineWindow.SequenceTree.Nodes[0].Nodes[153]); - PauseForScreenShot("Targets view clipped from the main window", 12); + PauseForScreenShot("Targets view clipped from the main window"); RunUI(() => { @@ -257,7 +257,7 @@ protected override void DoTest() SkylineWindow.AutoZoomNone(); }); RestoreViewOnScreen(13); - PauseForScreenShot("Unrefined chromatogram graph page clipped from main window", 13); // Not L10N + PauseForScreenShot("Unrefined chromatogram graph page clipped from main window"); // Not L10N // foreach (var peptideDocNode in SkylineWindow.Document.Peptides) // { @@ -279,10 +279,10 @@ protected override void DoTest() }); RunUI(SkylineWindow.AutoZoomBestPeak); - PauseForScreenShot("Targets view clipped", 14); - PauseForGraphScreenShot("Chromatogram graph", SkylineWindow.GetGraphChrom(replicateName), 14); + PauseForScreenShot("Targets view clipped"); + PauseForGraphScreenShot("Chromatogram graph", SkylineWindow.GetGraphChrom(replicateName)); RestoreViewOnScreen(16); - PauseForGraphScreenShot("Library Match plot metafile", SkylineWindow.GraphSpectrum, 16); + PauseForGraphScreenShot("Library Match plot metafile", SkylineWindow.GraphSpectrum); RunUI(() => { @@ -293,7 +293,7 @@ protected override void DoTest() SkylineWindow.SelectedPath = SkylineWindow.Document.GetPathTo((int)SrmDocument.Level.Molecules, 0); }); - PauseForScreenShot("Targets view clipped", 16); // Not L10N + PauseForScreenShot("Targets view clipped"); // Not L10N RunUI(() => { @@ -353,8 +353,8 @@ protected override void DoTest() RunUI(SkylineWindow.AutoZoomBestPeak); RestoreViewOnScreen(17); - PauseForScreenShot("Targets view clipped", 17); - PauseForGraphScreenShot("Chromatogram graph", SkylineWindow.GetGraphChrom(replicateName), 17); + PauseForScreenShot("Targets view clipped"); + PauseForGraphScreenShot("Chromatogram graph", SkylineWindow.GetGraphChrom(replicateName)); // Automated Refinement, p. 16 var refineDlgLoose = ShowDialog(SkylineWindow.ShowRefineDlg); @@ -460,7 +460,7 @@ protected override void DoTest() var exportDlg = ShowDialog(() => SkylineWindow.ShowExportMethodDialog(ExportFileType.List)); PauseForForm(typeof(ExportMethodDlg.TransitionListView)); // For form testing RunUI(() => exportDlg.MaxTransitions = 130); - PauseForScreenShot("Export Transition List form", 20); + PauseForScreenShot("Export Transition List form"); OkDialog(exportDlg, () => exportDlg.OkDialog(TestFilesDirs[1].FullPath + "\\unscheduled")); // Not L10N } /////////////////////// @@ -478,7 +478,7 @@ protected override void DoTest() RunUI(() => SkylineWindow.Size = new Size(1060, 550)); RestoreViewOnScreen(21); FocusDocument(); - PauseForScreenShot("Main window", 21); // Not L10N + PauseForScreenShot("Main window"); // Not L10N RTScheduleGraphPane pane = null; RunUI(() => @@ -495,7 +495,7 @@ protected override void DoTest() Assert.AreEqual(93, GetMaxPoint(pane.CurveList[2])); }); - PauseForGraphScreenShot("Retention Times - Scheduling graph metafile", SkylineWindow.GraphRetentionTime, 22); + PauseForGraphScreenShot("Retention Times - Scheduling graph metafile", SkylineWindow.GraphRetentionTime); RestoreViewOnScreen(22); @@ -508,7 +508,7 @@ protected override void DoTest() peptideSettingsUI.TimeWindow = 4; }); PauseForForm(typeof(PeptideSettingsUI.PredictionTab)); // For Form testing - PauseForScreenShot("Peptide Settings - Prediction tab", 23); + PauseForScreenShot("Peptide Settings - Prediction tab"); OkDialog(peptideSettingsUI, peptideSettingsUI.OkDialog); // Not L10N } @@ -520,7 +520,7 @@ protected override void DoTest() exportMethodDlg1.MethodType = ExportMethodType.Scheduled; }); // TODO: Update tutorial to mention the scheduling options dialog. - PauseForScreenShot("Export Transition List form", 24); // Not L10N + PauseForScreenShot("Export Transition List form"); // Not L10N RunDlg(exportMethodDlg1.ShowSchedulingGraph, dlg => { @@ -574,7 +574,7 @@ protected override void DoTest() RestoreViewOnScreen(26); WaitForGraphs(); FocusDocument(); - PauseForScreenShot("Main window", 26); // Not L10N + PauseForScreenShot("Main window"); // Not L10N // Show the RefineDlg.ConsistencyTab for localization text review var refineDlgConsistency = ShowDialog(SkylineWindow.ShowRefineDlg); diff --git a/pwiz_tools/Skyline/TestTutorial/Ms1FullScanFilteringTutorial.cs b/pwiz_tools/Skyline/TestTutorial/Ms1FullScanFilteringTutorial.cs index 0ec5116d9b..2686c817de 100644 --- a/pwiz_tools/Skyline/TestTutorial/Ms1FullScanFilteringTutorial.cs +++ b/pwiz_tools/Skyline/TestTutorial/Ms1FullScanFilteringTutorial.cs @@ -166,8 +166,7 @@ protected override void DoTest() foreach (var searchFile in searchFiles) Assert.IsTrue(File.Exists(searchFile), string.Format("File {0} does not exist.", searchFile)); - int tutorialPage = 3; - PauseForScreenShot("Import Peptide Search - Build Spectral Library empty page", tutorialPage++); + PauseForScreenShot("Import Peptide Search - Build Spectral Library empty page"); RunUI(() => { @@ -185,7 +184,7 @@ protected override void DoTest() importPeptideSearchDlg.BuildPepSearchLibControl.DebugMode = true; }); WaitForConditionUI(() => importPeptideSearchDlg.IsNextButtonEnabled); - PauseForScreenShot("Import Peptide Search - Build Spectral Library populated page", tutorialPage++); + PauseForScreenShot("Import Peptide Search - Build Spectral Library populated page"); var ambiguousDlg = ShowDialog(() => importPeptideSearchDlg.ClickNextButton()); RunUI(() => AssertEx.Contains(ambiguousDlg.Message, @@ -261,11 +260,10 @@ protected override void DoTest() PathsMessage("File names do not have a common prefix.", resultsNames)); Assert.AreEqual("100803_000", commonPrefix); }); - tutorialPage++; - PauseForScreenShot("Import Peptide Search - Extract Chromatograms page", tutorialPage++); + PauseForScreenShot("Import Peptide Search - Extract Chromatograms page"); var importResultsNameDlg = ShowDialog(() => importPeptideSearchDlg.ClickNextButton()); - PauseForScreenShot("Import Results - Common prefix form", tutorialPage++); + PauseForScreenShot("Import Results - Common prefix form"); OkDialog(importResultsNameDlg, importResultsNameDlg.YesDialog); @@ -277,7 +275,7 @@ protected override void DoTest() { importPeptideSearchDlg.MatchModificationsControl.CheckedModifications = modsToCheck; }); - PauseForScreenShot("Import Peptide Search - Add Modifications page", tutorialPage++); + PauseForScreenShot("Import Peptide Search - Add Modifications page"); RunUI(() => Assert.IsTrue(importPeptideSearchDlg.ClickNextButton())); // We're on the "Configure MS1 Full-Scan Settings" page of the wizard. @@ -295,7 +293,7 @@ protected override void DoTest() Assert.AreEqual(RetentionTimeFilterType.ms2_ids, importPeptideSearchDlg.FullScanSettingsControl.RetentionTimeFilterType); Assert.AreEqual(5, importPeptideSearchDlg.FullScanSettingsControl.TimeAroundMs2Ids); }); - PauseForScreenShot("Import Peptide Search - Configure MS1 Full-Scan Settings page", tutorialPage++); + PauseForScreenShot("Import Peptide Search - Configure MS1 Full-Scan Settings page"); RunUI(() => Assert.IsTrue(importPeptideSearchDlg.ClickNextButton())); @@ -309,11 +307,10 @@ protected override void DoTest() importPeptideSearchDlg.ImportFastaControl.SetFastaContent(fastaPath); Assert.IsFalse(importPeptideSearchDlg.ImportFastaControl.DecoyGenerationEnabled); }); - tutorialPage += 2; - PauseForScreenShot("Import Peptide Search - Import FASTA page", tutorialPage++); + PauseForScreenShot("Import Peptide Search - Import FASTA page"); var peptidesPerProteinDlg = ShowDialog(() => importPeptideSearchDlg.ClickNextButton()); - PauseForScreenShot("Associate Proteins", tutorialPage++); + PauseForScreenShot("Associate Proteins"); WaitForCondition(() => peptidesPerProteinDlg.DocumentFinalCalculated); RunUI(() => { @@ -338,12 +335,12 @@ protected override void DoTest() allChromGraph.Activate(); }); WaitForConditionUI(() => allChromGraph.ProgressTotalPercent > 24); - PauseForScreenShot("Loading chromatograms window", tutorialPage++); + PauseForScreenShot("Loading chromatograms window"); WaitForDocumentChangeLoaded(doc, 8 * 60 * 1000); // 10 minutes var libraryExplorer = ShowDialog(() => SkylineWindow.OpenLibraryExplorer(documentBaseName)); var matchedPepModsDlg = WaitForOpenForm(); - PauseForScreenShot("Add mods alert", tutorialPage++); + PauseForScreenShot("Add mods alert"); RunUI(() => { Assert.AreEqual(13, matchedPepModsDlg.NumMatched); @@ -359,7 +356,7 @@ protected override void DoTest() libraryExplorer.GraphSettings.ShowPrecursorIon = true; }); RunUIForScreenShot(() => libraryExplorer.Height = 475); - PauseForScreenShot("Spectral Library Explorer", tutorialPage++); + PauseForScreenShot("Spectral Library Explorer"); RunUI(() => { const string sourceFirst = "100803_0005b_MCF7_TiTip3.wiff"; @@ -414,7 +411,7 @@ protected override void DoTest() } }); RestoreViewOnScreen(13); - PauseForScreenShot("Main window with imported data", tutorialPage++); + PauseForScreenShot("Main window with imported data"); // RunUIWithDocumentWait(() => // { @@ -459,7 +456,7 @@ protected override void DoTest() subMenuStrip.Closing += DenyMenuClosing; }); - PauseForScreenShot("Peak Areas view (show context menu)", tutorialPage++, null, + PauseForScreenShot("Peak Areas view (show context menu)", null, bmp => ClipRegionAndEraseBackground(bmp, new Control[] { peakAreas }, new[] { menuStrip, subMenuStrip }, Color.White)); @@ -482,7 +479,7 @@ protected override void DoTest() }); FocusDocument(); JiggleSelection(); - PauseForScreenShot("Main window layout", tutorialPage++); + PauseForScreenShot("Main window layout"); int atest = 0; @@ -491,9 +488,8 @@ protected override void DoTest() RunUI(() => SkylineWindow.CollapsePeptides()); RunUI(() => SkylineWindow.ShowAlignedPeptideIDTimes(true)); ChangePeakBounds(TIB_L, pepIndex, 38.79, 39.385); - tutorialPage++; - PauseForScreenShot("Chromatogram graphs clipped from main window", tutorialPage++, null, ClipChromatograms); + PauseForScreenShot("Chromatogram graphs clipped from main window", null, ClipChromatograms); CheckAnnotations(TIB_L, pepIndex, atest++); var alignmentForm = ShowDialog(() => SkylineWindow.ShowRetentionTimeAlignmentForm()); @@ -507,10 +503,10 @@ protected override void DoTest() alignmentForm.Splitter.SplitterDistance = 75; alignmentForm.ComboAlignAgainst.SelectedIndex = 0; // to match what's in the tutorial doc }); - PauseForScreenShot("Retention time alignment form", tutorialPage++); + PauseForScreenShot("Retention time alignment form"); OkDialog(alignmentForm, alignmentForm.Close); - PauseForScreenShot("Status bar clipped from main window - 4/50 pep 4/51 prec 10/153 tran", tutorialPage++, null, bmp => + PauseForScreenShot("Status bar clipped from main window - 4/50 pep 4/51 prec 10/153 tran", null, bmp => { bmp = ClipSelectionStatus(bmp); return bmp.DrawAnnotationRectOnBitmap(new RectangleF(0.23F, 0, 0.23F, 1), 2).Inflate(1.5F); @@ -534,13 +530,13 @@ protected override void DoTest() pepIndex = JumpToPeptide("SSKASLGSLEGEAEAEASSPK"); RunUI(() => SkylineWindow.ShowChromatogramLegends(true)); Assert.IsTrue(8 == pepIndex); - PauseForChromGraphScreenShot("Chromatogram graph metafile TiTip3 for 9th peptide", TIP_NAME, tutorialPage); - PauseForChromGraphScreenShot("Chromatogram graph metafile TIB_L for 9th peptide", TIB_NAME, tutorialPage); + PauseForChromGraphScreenShot("Chromatogram graph metafile TiTip3 for 9th peptide", TIP_NAME); + PauseForChromGraphScreenShot("Chromatogram graph metafile TIB_L for 9th peptide", TIB_NAME); CheckAnnotations(TIB_L, pepIndex, atest++); ZoomSingle(TIP3,31.8, 42.2, 280); // simulate the wheel scroll described in tutorial PauseForChromGraphScreenShot("Chromatogram graph metafile showing all peaks for 1_MCF_TiB_L", - SkylineWindow.Document.Settings.MeasuredResults.Chromatograms[TIB_L].Name, tutorialPage++); + SkylineWindow.Document.Settings.MeasuredResults.Chromatograms[TIB_L].Name); CheckAnnotations(TIB_L, pepIndex, atest++); // current TIB_L peak should have idotp .87 and ppm -6.9 @@ -558,11 +554,11 @@ protected override void DoTest() RunUIForScreenShot(() => SkylineWindow.Size = new Size(skylineWindowWidth + 100, skylineWindowHeight + 5)); PickPeakBoth(pepIndex, 40.471035, 40.8134); // select peak for both chromatograms at these respective retention times - PauseForPeakAreaGraphScreenShot("Peak Areas graph metafile", tutorialPage++); + PauseForPeakAreaGraphScreenShot("Peak Areas graph metafile"); RunUIForScreenShot(() => SkylineWindow.Size = new Size(skylineWindowWidth, skylineWindowHeight)); int[] m1Thru4 = {1,2,3,4,5}; - PickTransitions(pepIndex, m1Thru4, "Transition pick list filtered", tutorialPage++, "Transition pick list unfiltered", 26); // turn on chromatograms + PickTransitions(pepIndex, m1Thru4, "Transition pick list filtered", "Transition pick list unfiltered"); // turn on chromatograms PickPeakBoth(pepIndex, 36.992836, 37.3896027); // select peak for both chromatograms at these respective retention times ZoomSingle(TIP3, 32.4, 42.2, 520); // set the view for screenshot RunUI(() => @@ -571,7 +567,7 @@ protected override void DoTest() SkylineWindow.ArrangeGraphsTabbed(); }); ActivateReplicate(TIP_NAME); - PauseForChromGraphScreenShot("Chromatogram graph metafile comparing 33 and 37 minute peaks", TIP_NAME, tutorialPage++); + PauseForChromGraphScreenShot("Chromatogram graph metafile comparing 33 and 37 minute peaks", TIP_NAME); CheckAnnotations(TIB_L, pepIndex, atest++); CheckAnnotations(TIP3, pepIndex, atest++); @@ -579,9 +575,9 @@ protected override void DoTest() ActivateReplicate(TIP_NAME); ClickChromatogram(TIP_NAME, 37.35, 151, titleTime: 37.32); // Click to the right of the point, or it will often end up 37.14 - PauseForFullScanGraphScreenShot("MS1 spectrum graph 37.32 minutes", tutorialPage++); + PauseForFullScanGraphScreenShot("MS1 spectrum graph 37.32 minutes"); ClickChromatogram(TIP_NAME, 33.19, 328.1, titleTime: 33.19); - PauseForFullScanGraphScreenShot("MS1 spectrum graph 33.19 minutes", tutorialPage++); + PauseForFullScanGraphScreenShot("MS1 spectrum graph 33.19 minutes"); if (PreferWiff) { @@ -614,21 +610,21 @@ protected override void DoTest() }); pepIndex = JumpToPeptide("ASLGSLEGEAEAEASSPKGK"); // Not L10N Assert.IsTrue(10 == pepIndex); - PauseForChromGraphScreenShot("upper - Chromatogram graph meta file for peptide ASLGSLEGEAEAEASSPKGK", TIP_NAME, tutorialPage++); - PauseForChromGraphScreenShot("lower - Chromatogram graph meta file for peptide ASLGSLEGEAEAEASSPKGK", TIB_NAME, tutorialPage); + PauseForChromGraphScreenShot("upper - Chromatogram graph meta file for peptide ASLGSLEGEAEAEASSPKGK", TIP_NAME); + PauseForChromGraphScreenShot("lower - Chromatogram graph meta file for peptide ASLGSLEGEAEAEASSPKGK", TIB_NAME); CheckAnnotations(TIB_L, pepIndex, atest++); CheckAnnotations(TIP3, pepIndex, atest++); PickTransitions(pepIndex, m1Thru4); // turn on M+3 and M+4 ChangePeakBounds(TIP3, pepIndex, 37.35, 38.08); ZoomSingle(TIP3, 36.65, 39.11, 300); // simulate the wheel scroll described in tutorial - PauseForChromGraphScreenShot("upper - Chromatogram graph metafile for peptide ASLGSLEGEAEAEASSPKGK with adjusted integration", TIP_NAME, tutorialPage); + PauseForChromGraphScreenShot("upper - Chromatogram graph metafile for peptide ASLGSLEGEAEAEASSPKGK with adjusted integration", TIP_NAME); CheckAnnotations(TIP3, pepIndex, atest++); RevertDoc(undoIndex); // undo changes pepIndex = JumpToPeptide("AEGEWEDQEALDYFSDKESGK"); // Not L10N - PauseForChromGraphScreenShot("upper - Chromatogram graph metafile for peptide AEGEWEDQEALDYFSDKESGK", TIP_NAME, tutorialPage++); - PauseForChromGraphScreenShot("lower - Chromatogram graph metafile for peptide AEGEWEDQEALDYFSDKESGK", TIB_NAME, tutorialPage); + PauseForChromGraphScreenShot("upper - Chromatogram graph metafile for peptide AEGEWEDQEALDYFSDKESGK", TIP_NAME); + PauseForChromGraphScreenShot("lower - Chromatogram graph metafile for peptide AEGEWEDQEALDYFSDKESGK", TIB_NAME); CheckAnnotations(TIB_L, pepIndex, atest++); CheckAnnotations(TIP3, pepIndex, atest++); @@ -636,14 +632,14 @@ protected override void DoTest() PickTransitions(pepIndex, m1Thru5); // turn on M+3 M+4 and M+5 if (Equals("ja", CultureInfo.CurrentCulture.TwoLetterISOLanguageName)) RunUIForScreenShot(() => SkylineWindow.Width += 12); // Japanese needs to be a bit wider for the next 4 screenshots - PauseForChromGraphScreenShot("upper - Chromatogram graph metafile with M+3, M+4 and M+5 added", TIP_NAME, tutorialPage++); - PauseForChromGraphScreenShot("lower - Chromatogram graph metafile with M+3, M+4 and M+5 added", TIB_NAME, tutorialPage); + PauseForChromGraphScreenShot("upper - Chromatogram graph metafile with M+3, M+4 and M+5 added", TIP_NAME); + PauseForChromGraphScreenShot("lower - Chromatogram graph metafile with M+3, M+4 and M+5 added", TIB_NAME); CheckAnnotations(TIB_L, pepIndex, atest++); CheckAnnotations(TIP3, pepIndex, atest++); JumpToPeptide("ALVEFESNPEETREPGSPPSVQR"); // Not L10N - PauseForChromGraphScreenShot("upper - Chromatogram graph metafile for peptide ALVEFESNPEETREPGSPPSVQR", TIP_NAME, tutorialPage++); - PauseForChromGraphScreenShot("lower - Chromatogram graph metafile for peptide ALVEFESNPEETREPGSPPSVQR", TIB_NAME, tutorialPage); + PauseForChromGraphScreenShot("upper - Chromatogram graph metafile for peptide ALVEFESNPEETREPGSPPSVQR", TIP_NAME); + PauseForChromGraphScreenShot("lower - Chromatogram graph metafile for peptide ALVEFESNPEETREPGSPPSVQR", TIB_NAME); pepIndex = JumpToPeptide("YGPADVEDTTGSGATDSKDDDDIDLFGSDDEEESEEAKR"); // Not L10N if (IsPauseForScreenShots) @@ -651,12 +647,12 @@ protected override void DoTest() RestoreViewOnScreen(34); RunUI(() => FindFloatingWindow(SkylineWindow.GraphPeakArea).Width = 380); JiggleSelection(); - PauseForPeakAreaGraphScreenShot("upper - Peak Areas graph metafile for peptide YGPADVEDTTGSGATDSKDDDDIDLFGSDDEEESEEAKR", tutorialPage); + PauseForPeakAreaGraphScreenShot("upper - Peak Areas graph metafile for peptide YGPADVEDTTGSGATDSKDDDDIDLFGSDDEEESEEAKR"); } int[] m1Thru7 = { 1, 2, 3, 4, 5, 6, 7, 8 }; PickTransitions(pepIndex, m1Thru7); // enable [M+3] [M+4] [M+5] [M+6] [M+7] - PauseForPeakAreaGraphScreenShot("lower - Peak Areas graph metafile with M+3 through M+7 added", tutorialPage++); + PauseForPeakAreaGraphScreenShot("lower - Peak Areas graph metafile with M+3 through M+7 added"); CheckAnnotations(TIB_L, pepIndex, atest++); CheckAnnotations(TIP3, pepIndex, atest++); @@ -676,10 +672,10 @@ protected override void DoTest() SkylineWindow.Width = skylineWindowWidth; SkylineWindow.Height = 720; }); - PauseForScreenShot("Chromatogram graphs clipped from main window with synchronized zooming", tutorialPage++, null, ClipChromatograms); + PauseForScreenShot("Chromatogram graphs clipped from main window with synchronized zooming", null, ClipChromatograms); ClickChromatogram(TIP_NAME, 37.5, 1107.3); - PauseForFullScanGraphScreenShot("MS1 spectrum graph 37.50 minutes", tutorialPage++); + PauseForFullScanGraphScreenShot("MS1 spectrum graph 37.50 minutes"); RunUI(() => SkylineWindow.HideFullScanGraph()); RunUI(() => @@ -690,15 +686,15 @@ protected override void DoTest() }); RestoreViewOnScreen(36); // float the Library Match window RunUI(() => SkylineWindow.GraphSpectrum.SelectSpectrum(new SpectrumIdentifier(MsDataFileUri.Parse(Tip3Filename), 37.6076f))); // set the Library Match view - PauseForLibrarySpectrumGraphScreenShot("Library Match graph metafile - 5b_MCF7_TiTip3 (37.61 Min)", tutorialPage); + PauseForLibrarySpectrumGraphScreenShot("Library Match graph metafile - 5b_MCF7_TiTip3 (37.61 Min)"); RunUI(() => SkylineWindow.GraphSpectrum.SelectSpectrum(new SpectrumIdentifier(MsDataFileUri.Parse(Tib_LFilename), 37.0335f))); // set the Library Match view - PauseForLibrarySpectrumGraphScreenShot("Library Match graph metafile - 1_MCF_TiB_L (37.03 min)", tutorialPage++); + PauseForLibrarySpectrumGraphScreenShot("Library Match graph metafile - 1_MCF_TiB_L (37.03 min)"); RestoreViewOnScreen(37); // back to normal view /* pepIndex = */ JumpToPeptide("DQVANSAFVER"); // Not L10N - PauseForChromGraphScreenShot("upper - Chromatogram graph metafile for peptide DQVANSAFVER", TIP_NAME, tutorialPage++); - PauseForChromGraphScreenShot("lower - Chromatogram graph metafile for peptide DQVANSAFVER", TIB_NAME, tutorialPage); + PauseForChromGraphScreenShot("upper - Chromatogram graph metafile for peptide DQVANSAFVER", TIP_NAME); + PauseForChromGraphScreenShot("lower - Chromatogram graph metafile for peptide DQVANSAFVER", TIB_NAME); // int[] m1 = {2}; // PickTransitions(pepIndex, m1); // enable [M+1] only @@ -749,7 +745,7 @@ protected override void DoTest() minimizeResultsDlg.LimitNoiseTime = true; minimizeResultsDlg.NoiseTimeRange = 2; // Not L10N }); - PauseForScreenShot("Minimize Results form (percentages vary slightly)", tutorialPage++); // old p. 23 + PauseForScreenShot("Minimize Results form (percentages vary slightly)"); // old p. 23 OkDialog(minimizeResultsDlg, () => minimizeResultsDlg.MinimizeToFile(minimizedFile)); WaitForCondition(() => File.Exists(cacheFile)); @@ -980,8 +976,7 @@ private void CheckAnnotations(int chromIndex, int pepIndex, int annotIndex) AssertEx.AreEqualLines(EXPECTED_ANNOTATIONS[annotIndex], annotations); } - private void PickTransitions(int pepIndex, int[] transIndexes, - string screenshotPromptA = null, int? pageA = null, string screenshotPromptB = null, int? pageB = null) + private void PickTransitions(int pepIndex, int[] transIndexes, string screenshotPromptA = null, string screenshotPromptB = null) { var doc = SkylineWindow.Document; var pepPath = doc.GetPathTo((int)SrmDocument.Level.Molecules, pepIndex); @@ -990,10 +985,10 @@ private void PickTransitions(int pepIndex, int[] transIndexes, RunUI(() => SkylineWindow.SequenceTree.SelectedPath = groupPath); var popupPickList = ShowDialog(SkylineWindow.ShowPickChildrenInTest); if (screenshotPromptA != null) - PauseForScreenShot(screenshotPromptA, pageA); + PauseForScreenShot(screenshotPromptA); RunUI(() => popupPickList.ApplyFilter(false)); // clear the filter if (screenshotPromptB != null) - PauseForScreenShot(screenshotPromptB, pageB); + PauseForScreenShot(screenshotPromptB); RunUI(() => { for (int i = 0; i < popupPickList.ItemNames.Count(); i++) diff --git a/pwiz_tools/Skyline/TestTutorial/PeakPickingTutorialTest.cs b/pwiz_tools/Skyline/TestTutorial/PeakPickingTutorialTest.cs index 2592901824..d6106e81f7 100644 --- a/pwiz_tools/Skyline/TestTutorial/PeakPickingTutorialTest.cs +++ b/pwiz_tools/Skyline/TestTutorial/PeakPickingTutorialTest.cs @@ -118,7 +118,7 @@ protected override void DoTest() generateDecoysDlg.DecoysMethod = DecoyGeneration.REVERSE_SEQUENCE; generateDecoysDlg.NumDecoys = 29; }); - PauseForScreenShot("Add Decoy Peptides form", 2); + PauseForScreenShot("Add Decoy Peptides form"); OkDialog(generateDecoysDlg, generateDecoysDlg.OkDialog); @@ -149,7 +149,7 @@ protected override void DoTest() importResultsDlg.NamedPathSets = path; }); var importResultsNameDlg = ShowDialog(importResultsDlg.OkDialog); - PauseForScreenShot("Import Results common prefix form", 4); + PauseForScreenShot("Import Results common prefix form"); RunUI(() => { string prefix = importResultsNameDlg.Prefix; @@ -178,7 +178,7 @@ protected override void DoTest() // dlg.FontSize = GraphFontSize.LARGE; // dlg.OkDialog(); // }); - PauseForScreenShot("Main window", 5); + PauseForScreenShot("Main window"); // Test different point types on RTLinearRegressionGraph RunUI(() => @@ -196,10 +196,10 @@ protected override void DoTest() // Train the peak scoring model var reintegrateDlg = ShowDialog(SkylineWindow.ShowReintegrateDialog); - PauseForScreenShot("Reintegrate form", 6); + PauseForScreenShot("Reintegrate form"); var editDlg = ShowDialog(reintegrateDlg.AddPeakScoringModel); RunUI(() => editDlg.TrainModel()); - PauseForScreenShot("Edit Peak Scoring Model form trained model", 6); + PauseForScreenShot("Edit Peak Scoring Model form trained model"); RunUI(() => Assert.AreEqual(0.5893, editDlg.PeakCalculatorsGrid.Items[3].PercentContribution ?? 0, 0.005)); Control selectedGraphControl = null; @@ -219,7 +219,7 @@ protected override void DoTest() RunUI(() => editDlg.SelectedGraphTab = 1); RunUI(() => editDlg.PeakCalculatorsGrid.SelectRow(2)); - PauseForScreenShot("Edit Peak Scoring Model form library dotp feature score", 10); + PauseForScreenShot("Edit Peak Scoring Model form library dotp feature score"); RunUI(() => { @@ -234,7 +234,7 @@ protected override void DoTest() editDlg.PeakScoringModelName = "test1"; }); RunUIForScreenShot(() => editDlg.ShowFindButton(true)); - PauseForScreenShot(editDlg.GraphsControl, "Edit Peak Scoring Model form find missing scores", null, null, bmp => + PauseForScreenShot(editDlg.GraphsControl, "Edit Peak Scoring Model form find missing scores", null, bmp => DrawLArrowCursorOnBitmap(bmp, 0.88, 0.7)); RunUIForScreenShot(() => editDlg.ShowFindButton(false)); @@ -249,7 +249,7 @@ protected override void DoTest() findResultsForm.ActivateItem(0); findResultsForm.Focus(); }); - PauseForScreenShot("Find Results view clipped from main window", 12); + PauseForScreenShot("Find Results view clipped from main window"); RunUIForScreenShot(() => SkylineWindow.Height = oldSkylineWindowHeight); // Remove the peptide with no library dot product, and train again @@ -314,7 +314,7 @@ protected override void DoTest() } editDlgLibrary.TrainModel(true); }); - PauseForScreenShot("Edit Peak Scoring Model form with library score", 13); + PauseForScreenShot("Edit Peak Scoring Model form with library score"); RunUI(() => { @@ -343,7 +343,7 @@ protected override void DoTest() // Check that these cells are still active even though they've been unchecked Assert.IsTrue(editDlgNew.IsActiveCell(6, 0)); }); - PauseForScreenShot("Edit Peak Scoring Model form with second best", 15); + PauseForScreenShot("Edit Peak Scoring Model form with second best"); OkDialog(editDlgNew, editDlgNew.CancelDialog); OkDialog(editListLibrary, editListLibrary.OkDialog); @@ -355,7 +355,7 @@ protected override void DoTest() reintegrateDlgNew.ReintegrateAll = true; reintegrateDlgNew.OverwriteManual = true; }); - PauseForScreenShot("Reintegrate form", 16); + PauseForScreenShot("Reintegrate form"); OkDialog(reintegrateDlgNew, reintegrateDlgNew.OkDialog); RunUI(() => @@ -393,13 +393,13 @@ protected override void DoTest() SkylineWindow.GetGraphChrom(screenshotReplicate).ZoomTo(17.5, 18.4, 2E+5); SkylineWindow.Width = 863; }); - PauseForScreenShot("Main window with interference on transition", 19); + PauseForScreenShot("Main window with interference on transition"); // Export the mProphet features var mProphetExportDlg = ShowDialog(SkylineWindow.ShowMProphetFeaturesDialog); RunUI(() => mProphetExportDlg.BestScoresOnly = true); - PauseForScreenShot("Export mProphet Features form", 20); + PauseForScreenShot("Export mProphet Features form"); // TODO: actually write the features here using WriteFeatures OkDialog(mProphetExportDlg, mProphetExportDlg.CancelDialog); @@ -411,14 +411,14 @@ protected override void DoTest() var reportExportDlg = ShowDialog(SkylineWindow.ShowExportReportDialog); var manageViewsForm = ShowDialog(reportExportDlg.EditList); RunUI(() => manageViewsForm.SelectView(reportName)); - PauseForScreenShot("Edit Reports form", 21); + PauseForScreenShot("Edit Reports form"); var customizeViewDlg = ShowDialog(manageViewsForm.EditView); - PauseForScreenShot("Edit Report form", 22); + PauseForScreenShot("Edit Report form"); RunUI(() => customizeViewDlg.ChooseColumnsTab.AddColumn(PropertyPath.Parse("Proteins!*.Peptides!*.Precursors!*.Results!*.Value") .Property(AnnotationDef.ANNOTATION_PREFIX + qvalueHeader))); - PauseForScreenShot("Edit Report form with selected columns", 23); + PauseForScreenShot("Edit Report form with selected columns"); OkDialog(customizeViewDlg, customizeViewDlg.OkDialog); OkDialog(manageViewsForm, manageViewsForm.Close); @@ -450,10 +450,10 @@ protected override void DoTest() // Perform re-score of DIA data var manageResults = ShowDialog(SkylineWindow.ManageResults); - PauseForScreenShot("Manage Results form", 25); + PauseForScreenShot("Manage Results form"); var rescoreResultsDlg = ShowDialog(manageResults.Rescore); - PauseForScreenShot("Re-score Results form", 25); + PauseForScreenShot("Re-score Results form"); RunUI(() => rescoreResultsDlg.Rescore(false)); WaitForCondition(10 * 60 * 1000, () => SkylineWindow.Document.Settings.MeasuredResults.IsLoaded); // 10 minutes (usually needs less, but code coverage analysis can be slow) @@ -470,7 +470,7 @@ protected override void DoTest() reintegrateDlgDia.EditPeakScoringModel); RunUI(() => editListDia.SelectItem("test1")); var editDlgFromSrm = ShowDialog(editListDia.EditItem); - PauseForScreenShot("Edit Peak Scoring Model form SRM model applied to DIA data", 26); + PauseForScreenShot("Edit Peak Scoring Model form SRM model applied to DIA data"); RunUI(() => { ValidateCoefficients(editDlgFromSrm, 0); @@ -508,7 +508,7 @@ protected override void DoTest() RunUI(() => ValidateCoefficients(editDlgDia, 1)); - PauseForScreenShot("Edit Peak Scoring Model form DIA peak scoring dialog with second best", 27); + PauseForScreenShot("Edit Peak Scoring Model form DIA peak scoring dialog with second best"); RunUI(() => { diff --git a/pwiz_tools/Skyline/TestTutorial/SRMTutorialTest.cs b/pwiz_tools/Skyline/TestTutorial/SRMTutorialTest.cs index 9fb645b74d..817433f2f9 100644 --- a/pwiz_tools/Skyline/TestTutorial/SRMTutorialTest.cs +++ b/pwiz_tools/Skyline/TestTutorial/SRMTutorialTest.cs @@ -115,11 +115,11 @@ protected override void DoTest() ShowDialog, StaticMod>>(pepSettings.EditHeavyMods); var addDlgOne = ShowDialog(editHeavyModListDlg.AddItem); RunUI(() => addDlgOne.SetModification("Label:13C(6)15N(2) (C-term K)")); - PauseForScreenShot("Isotope modification 1", 3); + PauseForScreenShot("Isotope modification 1"); OkDialog(addDlgOne, addDlgOne.OkDialog); var addDlgTwo = ShowDialog(editHeavyModListDlg.AddItem); RunUI(() => addDlgTwo.SetModification("Label:13C(6)15N(4) (C-term R)")); - PauseForScreenShot("Isotope modification 2", 3); + PauseForScreenShot("Isotope modification 2"); OkDialog(addDlgTwo, addDlgTwo.OkDialog); OkDialog(editHeavyModListDlg, editHeavyModListDlg.OkDialog); RunUI(() => @@ -128,15 +128,15 @@ protected override void DoTest() pepSettings.SetIsotopeModifications(1, true); }); RunUI(() => pepSettings.SelectedTab = PeptideSettingsUI.TABS.Digest); - PauseForScreenShot("Digestion tab", 4); + PauseForScreenShot("Digestion tab"); RunUI(() => pepSettings.SelectedTab = PeptideSettingsUI.TABS.Prediction); - PauseForScreenShot("Prediction tab", 4); + PauseForScreenShot("Prediction tab"); RunUI(() => pepSettings.SelectedTab = PeptideSettingsUI.TABS.Filter); - PauseForScreenShot("Filter tab", 4); + PauseForScreenShot("Filter tab"); RunUI(() => pepSettings.SelectedTab = PeptideSettingsUI.TABS.Library); - PauseForScreenShot("Library tab", 4); + PauseForScreenShot("Library tab"); RunUI(() => pepSettings.SelectedTab = PeptideSettingsUI.TABS.Modifications); - PauseForScreenShot("Modifications tab", 4); + PauseForScreenShot("Modifications tab"); var docBeforePeptideSettings = SkylineWindow.Document; OkDialog(pepSettings, pepSettings.OkDialog); @@ -181,13 +181,13 @@ protected override void DoTest() }); RunUI(() => transitionDlg.SelectedTab = TransitionSettingsUI.TABS.Prediction); - PauseForScreenShot("Prediction Tab", 7); + PauseForScreenShot("Prediction Tab"); RunUI(() => transitionDlg.SelectedTab = TransitionSettingsUI.TABS.Filter); - PauseForScreenShot("Filter Tab", 7); + PauseForScreenShot("Filter Tab"); RunUI(() => transitionDlg.SelectedTab = TransitionSettingsUI.TABS.Library); - PauseForScreenShot("Library Tab", 7); + PauseForScreenShot("Library Tab"); RunUI(() => transitionDlg.SelectedTab = TransitionSettingsUI.TABS.Instrument); - PauseForScreenShot("Instrument Tab", 7); + PauseForScreenShot("Instrument Tab"); var docBeforeTransitionSettings = SkylineWindow.Document; OkDialog(transitionDlg, transitionDlg.OkDialog); WaitForDocumentChangeLoaded(docBeforeTransitionSettings); @@ -203,7 +203,7 @@ protected override void DoTest() var docBeforePaste = SkylineWindow.Document; var peptidePasteDlg = ShowDialog(SkylineWindow.ShowPastePeptidesDlg); var matchingDlg = ShowDialog(peptidePasteDlg.PastePeptides); - PauseForScreenShot("Filter Peptides", 1); + PauseForScreenShot("Filter Peptides"); OkDialog(matchingDlg, matchingDlg.OkDialog); OkDialog(peptidePasteDlg, peptidePasteDlg.OkDialog); @@ -217,7 +217,7 @@ protected override void DoTest() SkylineWindow.ExpandPrecursors(); SkylineWindow.SequenceTree.SelectedNode = SkylineWindow.SequenceTree.Nodes[0].FirstNode.FirstNode; }); - PauseForScreenShot("Skyline Window", 2); + PauseForScreenShot("Skyline Window"); // Test min ion count setting RunDlg(SkylineWindow.ShowTransitionSettingsUI, dlg => @@ -255,10 +255,10 @@ protected override void DoTest() exportDlg.ExportStrategy = ExportStrategy.Single; exportDlg.DwellTime = 20; }); - PauseForScreenShot("Export Transition List", 3); + PauseForScreenShot("Export Transition List"); var declusteringWarningDlg = ShowDialog( () => exportDlg.OkDialog(GetTestPath("Tutorial-2_TransitionList\\SRMcourse_20140210_MtbProteomeLib_TransList.csv"))); - PauseForScreenShot("Decluster Window", 3); + PauseForScreenShot("Decluster Window"); OkDialog(declusteringWarningDlg, declusteringWarningDlg.Btn1Click); WaitForClosedForm(exportDlg); @@ -272,7 +272,7 @@ protected override void DoTest() buildLibraryDlg.LibraryPath = GetTestPath("Skyline"); buildLibraryDlg.LibraryName = "Mtb_hDP_20140210"; }); - PauseForScreenShot("Build Library Window", 2); + PauseForScreenShot("Build Library Window"); RunUI(() => { buildLibraryDlg.OkWizardPage(); @@ -280,7 +280,7 @@ protected override void DoTest() }); WaitForConditionUI(() => buildLibraryDlg.Grid.ScoreTypesLoaded); RunUI(() => buildLibraryDlg.Grid.SetScoreThreshold(0.9)); - PauseForScreenShot("Build Library Window Next", 2); + PauseForScreenShot("Build Library Window Next"); OkDialog(buildLibraryDlg, buildLibraryDlg.OkWizardPage); RunUI(() => { @@ -296,7 +296,7 @@ protected override void DoTest() var libraryExpl = ShowDialog(SkylineWindow.ViewSpectralLibraries); var messageWarning = WaitForOpenForm(); OkDialog(messageWarning, messageWarning.OkDialogAll); - PauseForScreenShot("Spectral Library Explorer Window", 3); + PauseForScreenShot("Spectral Library Explorer Window"); OkDialog(libraryExpl, libraryExpl.Close); var exportDlg2 = ShowDialog(SkylineWindow.ShowExportTransitionListDlg); @@ -335,7 +335,7 @@ protected override void DoTest() editCollisionEnergy.StepSize = 2; editCollisionEnergy.StepCount = 5; }); - PauseForScreenShot("Edit Collision Energy Equation Window", 2); + PauseForScreenShot("Edit Collision Energy Equation Window"); OkDialog(editCollisionEnergy, editCollisionEnergy.OkDialog); OkDialog(transitionSettings, transitionSettings.OkDialog); @@ -362,7 +362,7 @@ protected override void DoTest() exportDlg3.MethodType = ExportMethodType.Standard; exportDlg2.DwellTime = 20; }); - PauseForScreenShot("Export Transition List", 3); + PauseForScreenShot("Export Transition List"); var defaultWaringDlg = ShowDialog( () => exportDlg3.OkDialog(GetTestPath("Tutorial-4_Parameters\\SRMcourse_20140211_Parameters_CEO.csv"))); OkDialog(defaultWaringDlg, defaultWaringDlg.Btn1Click); @@ -378,7 +378,7 @@ protected override void DoTest() RestoreViewOnScreen(43); RunUI(() => SkylineWindow.ShowChromatogramLegends(false)); - PauseForScreenShot("Skyline Window", 3); + PauseForScreenShot("Skyline Window"); ImportResults("", new[] { @@ -392,7 +392,7 @@ protected override void DoTest() SkylineWindow.NormalizeAreaGraphTo(NormalizeOption.MAXIMUM); }); RestoreViewOnScreen(44); - PauseForScreenShot("Skyline Window", 4); + PauseForScreenShot("Skyline Window"); var transitionSettings2 = ShowDialog(SkylineWindow.ShowTransitionSettingsUI); RunUI(() => { transitionSettings2.SelectedTab = TransitionSettingsUI.TABS.Prediction; }); @@ -403,7 +403,7 @@ protected override void DoTest() addCollisionEnergyDlg.RegressionName = "SRMcourse_20140211_Parameters_custom-CE-equation"; }); var equationGraphDlg = ShowDialog(addCollisionEnergyDlg.ShowGraph); - PauseForScreenShot("Collision Energy Equation Graph", 6); + PauseForScreenShot("Collision Energy Equation Graph"); OkDialog(equationGraphDlg, equationGraphDlg.CloseDialog); OkDialog(addCollisionEnergyDlg, addCollisionEnergyDlg.OkDialog); RunUI(() => @@ -412,7 +412,7 @@ protected override void DoTest() transitionSettings2.SelectedTab = TransitionSettingsUI.TABS.Instrument; transitionSettings2.MZMatchTolerance = 0.01; }); - PauseForScreenShot("Instrument Tab", 7); + PauseForScreenShot("Instrument Tab"); OkDialog(transitionSettings2, transitionSettings2.OkDialog); //Tutorial 4-B @@ -431,7 +431,7 @@ protected override void DoTest() ImportResults("", paths2, null, false); RestoreViewOnScreen(48); RunUI(() => SkylineWindow.AutoZoomBestPeak()); - PauseForScreenShot("Skyline Window", 8); + PauseForScreenShot("Skyline Window"); } private void ImportResults(string prefix, string[] paths, string optimization, bool addNew = true) diff --git a/pwiz_tools/Skyline/TestTutorial/SmallMolMethodDevCEOptTutorial.cs b/pwiz_tools/Skyline/TestTutorial/SmallMolMethodDevCEOptTutorial.cs index 088e69edd9..976a7a9f83 100644 --- a/pwiz_tools/Skyline/TestTutorial/SmallMolMethodDevCEOptTutorial.cs +++ b/pwiz_tools/Skyline/TestTutorial/SmallMolMethodDevCEOptTutorial.cs @@ -94,7 +94,7 @@ protected override void DoTest() if (Equals("en", CultureInfo.CurrentCulture.TwoLetterISOLanguageName)) { RunUIForScreenShot(() => ResizeFormOnScreen(confirmHeadersDlg, 1070, null)); - PauseForScreenShot("Confirming column headers", 5); + PauseForScreenShot("Confirming column headers"); } OkDialog(confirmHeadersDlg, confirmHeadersDlg.OkDialog); @@ -103,7 +103,7 @@ protected override void DoTest() AdjustSequenceTreePanelWidth(); }); FocusDocument(); - PauseForScreenShot("Main window after paste from csv", 5); + PauseForScreenShot("Main window after paste from csv"); var docTargets = WaitForDocumentChange(doc); @@ -118,7 +118,7 @@ protected override void DoTest() transitionSettingsUI.SelectedTab = TransitionSettingsUI.TABS.Prediction; transitionSettingsUI.RegressionCEName = "Waters Xevo"; // Collision Energy }); - PauseForScreenShot("Transition Settings - Prediction tab", 6); + PauseForScreenShot("Transition Settings - Prediction tab"); RunUI(() => @@ -129,7 +129,7 @@ protected override void DoTest() transitionSettingsUI.SmallMoleculeFragmentAdducts = Adduct.M_MINUS.AdductFormula; transitionSettingsUI.SmallMoleculeFragmentTypes = TransitionFilter.SMALL_MOLECULE_FRAGMENT_CHAR; }); - PauseForScreenShot("Transition Settings -Filter tab", 7); + PauseForScreenShot("Transition Settings -Filter tab"); OkDialog(transitionSettingsUI, transitionSettingsUI.OkDialog); WaitForDocumentChange(docTargets); @@ -148,7 +148,7 @@ protected override void DoTest() exportMethodDlg2.RunLength = 2; exportMethodDlg2.SetTemplateFile("VerifyETemplate.exp"); }); - PauseForScreenShot("Exporting 2 minute method", 9); + PauseForScreenShot("Exporting 2 minute method"); OkDialog(exportMethodDlg2, exportMethodDlg2.CancelDialog); } @@ -161,7 +161,7 @@ protected override void DoTest() exportTransitionList.MethodType = ExportMethodType.Standard; exportTransitionList.RunLength = 2; }); - PauseForScreenShot("Exporting transition list", 10); + PauseForScreenShot("Exporting transition list"); OkDialog(exportTransitionList, exportTransitionList.CancelDialog); } @@ -175,11 +175,11 @@ protected override void DoTest() openDataSourceDialog1.CurrentDirectory = new MsDataFilePath(GetTestPath("Unscheduled")); openDataSourceDialog1.SelectAllFileType(ExtWatersRaw); }); - PauseForScreenShot("Import Results Files form", 11); + PauseForScreenShot("Import Results Files form"); OkDialog(openDataSourceDialog1, openDataSourceDialog1.Open); var importResultsNameDlg = ShowDialog(importResultsDlg1.OkDialog); - PauseForScreenShot("Import Results common name form", 12); + PauseForScreenShot("Import Results common name form"); OkDialog(importResultsNameDlg, importResultsNameDlg.OkDialog); OkDialog(importResultsDlg1,importResultsDlg1.OkDialog); } @@ -188,7 +188,7 @@ protected override void DoTest() SelectNode(SrmDocument.Level.MoleculeGroups, 0); FocusDocument(); - PauseForScreenShot("Skyline window multi-target graph", 13); + PauseForScreenShot("Skyline window multi-target graph"); // Renaming replicates { @@ -209,14 +209,14 @@ protected override void DoTest() var renameDlg = ShowDialog(manageResultsDlg.RenameResult); RunUI(() => renameDlg.ReplicateName = repNames[i]); if (i == 0) - PauseForScreenShot("Manage Results and Rename Replicate (PrtScn and select in Paint)", 14); + PauseForScreenShot("Manage Results and Rename Replicate (PrtScn and select in Paint)"); OkDialog(renameDlg, renameDlg.OkDialog); } OkDialog(manageResultsDlg, manageResultsDlg.OkDialog); } FocusDocument(); - PauseForScreenShot("Skyline window (renamed)", 15); + PauseForScreenShot("Skyline window (renamed)"); var docResults = SkylineWindow.Document; @@ -249,7 +249,7 @@ protected override void DoTest() AdjustSequenceTreePanelWidth(true); }); - PauseForScreenShot("Skyline window multi-replicate layout", 16); + PauseForScreenShot("Skyline window multi-replicate layout"); // Set zoom to show better peak separation in 5 minute run for (var i = 0; i < 2; i++) @@ -258,7 +258,7 @@ protected override void DoTest() RunUI(() => SkylineWindow.GraphChromatograms.ToArray()[i].ZoomTo(.8, 1.8, 1.39e+8)); WaitForGraphs(); } - PauseForScreenShot("Skyline window showing relative peak separation", 17); + PauseForScreenShot("Skyline window showing relative peak separation"); // Set time window { @@ -269,7 +269,7 @@ protected override void DoTest() peptideSettingsDlg.SelectedTab = PeptideSettingsUI.TABS.Prediction; //regular enum does not work because of the hidden tabs in the Small Molecule mode. peptideSettingsDlg.TimeWindow = 1; }); - PauseForScreenShot("Setting scheduled transition list time window", 18); + PauseForScreenShot("Setting scheduled transition list time window"); OkDialog(peptideSettingsDlg, peptideSettingsDlg.OkDialog); } @@ -282,7 +282,7 @@ protected override void DoTest() exportTransitionList.MethodType = ExportMethodType.Scheduled; exportTransitionList.OptimizeType = ExportOptimize.NONE; }); - PauseForScreenShot("Exporting scheduled transition list", 19); + PauseForScreenShot("Exporting scheduled transition list"); var schedulingOptionsDlg = ShowDialog(() => exportTransitionList.OkDialog(GetTestPath("EnergyMet_5minutes_scheduled.csv"))); RunUI(() => @@ -290,7 +290,7 @@ protected override void DoTest() schedulingOptionsDlg.Algorithm = ExportSchedulingAlgorithm.Single; schedulingOptionsDlg.ReplicateNum = 1; // 5 min }); - PauseForScreenShot("Exporting scheduled transition list - choose replicate", 19); + PauseForScreenShot("Exporting scheduled transition list - choose replicate"); OkDialog(schedulingOptionsDlg, schedulingOptionsDlg.OkDialog); WaitForClosedForm(exportTransitionList); } @@ -309,7 +309,7 @@ protected override void DoTest() var importResultsNameDlg = ShowDialog(importResultsDlg1.OkDialog); RunUI(() => importResultsNameDlg.IsRemove = false); - PauseForScreenShot("Import Results common name form, not changing names", 20); + PauseForScreenShot("Import Results common name form, not changing names"); OkDialog(importResultsNameDlg, importResultsNameDlg.OkDialog); } @@ -320,7 +320,7 @@ protected override void DoTest() var manageResultsDlg = ShowDialog(SkylineWindow.ManageResults); SelectReplicate(manageResultsDlg, 0); - PauseForScreenShot("Manage Results removing 2 min", 21); + PauseForScreenShot("Manage Results removing 2 min"); RunUI(manageResultsDlg.RemoveReplicates); @@ -334,7 +334,7 @@ protected override void DoTest() }); } - PauseForScreenShot("Manage Results replicate renamed", 22); + PauseForScreenShot("Manage Results replicate renamed"); OkDialog(manageResultsDlg, manageResultsDlg.OkDialog); } @@ -349,7 +349,7 @@ protected override void DoTest() SkylineWindow.ArrangeGraphsTabbed(); }); FocusDocument(); - PauseForScreenShot("Skyline window with calibration data", 23); + PauseForScreenShot("Skyline window with calibration data"); // Linearity var documentGrid = ShowDialog(() => SkylineWindow.ShowDocumentGrid(true)); @@ -366,7 +366,7 @@ protected override void DoTest() gridFloatingWindow.Top = SkylineWindow.Top; gridFloatingWindow.Left = SkylineWindow.Right + 20; }); - PauseForScreenShot("Document Grid - sample types and concentrations ", 23); + PauseForScreenShot("Document Grid - sample types and concentrations "); RunUI(() => SkylineWindow.ShowDocumentGrid(false)); using (new WaitDocumentChange(1, true)) @@ -384,7 +384,7 @@ protected override void DoTest() peptideSettingsUI.QuantUnits = "ratio to heavy"; }); - PauseForScreenShot("Peptide Settings - Quantitation", 24); + PauseForScreenShot("Peptide Settings - Quantitation"); OkDialog(peptideSettingsUI, peptideSettingsUI.OkDialog); } @@ -396,7 +396,7 @@ protected override void DoTest() calibrationFloatingWindow.Top = SkylineWindow.Top; calibrationFloatingWindow.Left = SkylineWindow.Right + 20; }); - PauseForScreenShot("Calibration Curve ", 25); + PauseForScreenShot("Calibration Curve "); OkDialog(calibrationForm, calibrationForm.Close); // Hide the calibration window { @@ -408,7 +408,7 @@ protected override void DoTest() editCurrentCE.StepSize = 2; editCurrentCE.StepCount = 5; }); - PauseForScreenShot("Edit Collision Energy Equation form", 26); + PauseForScreenShot("Edit Collision Energy Equation form"); OkDialog(editCurrentCE, editCurrentCE.OkDialog); RunUI(() => @@ -416,7 +416,7 @@ protected override void DoTest() transitionSettingsUI.UseOptimized = true; transitionSettingsUI.OptimizeType = OptimizedMethodType.Transition.GetLocalizedString(); }); - PauseForScreenShot("Transition Settings - Prediction tab", 27); + PauseForScreenShot("Transition Settings - Prediction tab"); OkDialog(transitionSettingsUI, transitionSettingsUI.OkDialog); } @@ -432,10 +432,10 @@ protected override void DoTest() exportTransitionList.MethodType = ExportMethodType.Scheduled; exportTransitionList.OptimizeType = ExportOptimize.CE; }); - PauseForScreenShot("Exporting scheduled transition list", 28); + PauseForScreenShot("Exporting scheduled transition list"); var scheduleDlg = ShowDialog(() => exportTransitionList.OkDialog(GetTestPath("EnergyMet_5minutes_ceopt.csv"))); - PauseForScreenShot("Scheduling", 29); + PauseForScreenShot("Scheduling"); OkDialog(scheduleDlg, scheduleDlg.OkDialog); } @@ -451,18 +451,18 @@ protected override void DoTest() importResultsDlg1.OptimizationName = ExportOptimize.CE; importResultsDlg1.ReplicateName = "CE Optimization"; }); - PauseForScreenShot("Setting new replicate name to CE Optimization", 30); + PauseForScreenShot("Setting new replicate name to CE Optimization"); var openDataSourceDialog1 = ShowDialog(() => importResultsDlg1.OkDialog()); RunUI(() => { openDataSourceDialog1.CurrentDirectory = new MsDataFilePath(GetTestPath("CE Optimization")); openDataSourceDialog1.SelectAllFileType(ExtWatersRaw); }); - PauseForScreenShot("Import Results Files form", 31); + PauseForScreenShot("Import Results Files form"); OkDialog(openDataSourceDialog1, openDataSourceDialog1.Open); } FocusDocument(); - PauseForScreenShot("Skyline shows new replicate \"CE Optimization\"", 32); + PauseForScreenShot("Skyline shows new replicate \"CE Optimization\""); RunUI(() => { SkylineWindow.Size = new Size(1600, 960); @@ -474,19 +474,19 @@ protected override void DoTest() }); RestoreViewOnScreen(33); FocusDocument(); - PauseForScreenShot("Split graph", 33); + PauseForScreenShot("Split graph"); RunUI(() => { SkylineWindow.ShowPeakAreaLegend(false); }); - PauseForScreenShot("No legend", 34); + PauseForScreenShot("No legend"); TestAsymmetricOptimization(); // Show Pentose-P SelectNode(SrmDocument.Level.Molecules, 6); - PauseForScreenShot("Pentose-P", 35); + PauseForScreenShot("Pentose-P"); if (IsCoverShotMode) { @@ -514,10 +514,10 @@ protected override void DoTest() exportTransitionList.InstrumentType = ExportInstrumentType.WATERS_XEVO_TQ; exportTransitionList.MethodType = ExportMethodType.Scheduled; }); - PauseForScreenShot("Exporting final optimized transition list", 36); + PauseForScreenShot("Exporting final optimized transition list"); var scheduleDlg = ShowDialog(() => exportTransitionList.OkDialog(GetTestPath("EnergyMet_5minutes_optimal.csv"))); - PauseForScreenShot("Final Scheduling", 37); + PauseForScreenShot("Final Scheduling"); OkDialog(scheduleDlg, scheduleDlg.OkDialog); } } diff --git a/pwiz_tools/Skyline/TestTutorial/SmallMoleculesQuantificationTutorial.cs b/pwiz_tools/Skyline/TestTutorial/SmallMoleculesQuantificationTutorial.cs index b92a7d5d0b..641f0bcefd 100644 --- a/pwiz_tools/Skyline/TestTutorial/SmallMoleculesQuantificationTutorial.cs +++ b/pwiz_tools/Skyline/TestTutorial/SmallMoleculesQuantificationTutorial.cs @@ -93,7 +93,7 @@ protected override void DoTest() var importDialog = ShowDialog(SkylineWindow.ShowPasteTransitionListDlg); RunUIForScreenShot(() => ResizeFormOnScreen(importDialog, 600, 300)); - PauseForScreenShot("Insert Transition List form", 4); + PauseForScreenShot("Insert Transition List form"); var text = "DrugX,Drug,light,283.04,1,129.96,1,26,16,2.7\r\nDrugX,Drug,heavy,286.04,1,133.00,1,26,16,2.7\r\n"; text = text.Replace(',', TextUtil.CsvSeparator).Replace(".", LocalizationHelper.CurrentCulture.NumberFormat.NumberDecimalSeparator); @@ -102,7 +102,7 @@ protected override void DoTest() RunUI(() => { col4Dlg.radioMolecule.PerformClick(); }); - PauseForScreenShot("Insert Transition List form before columns selected", 5); + PauseForScreenShot("Insert Transition List form before columns selected"); RunUI(() => { var comboBoxes = col4Dlg.ComboBoxes; comboBoxes[0].SelectedIndex = comboBoxes[1].FindStringExact(Resources.ImportTransitionListColumnSelectDlg_ComboChanged_Molecule_List_Name); @@ -117,7 +117,7 @@ protected override void DoTest() comboBoxes[9].SelectedIndex = comboBoxes[1].FindStringExact(Resources.PasteDlg_UpdateMoleculeType_Explicit_Retention_Time); }); - PauseForScreenShot("Column Select Dialog with identified columns", 6); + PauseForScreenShot("Column Select Dialog with identified columns"); OkDialog(col4Dlg, col4Dlg.OkDialog); @@ -135,7 +135,7 @@ protected override void DoTest() SelectNode(SrmDocument.Level.Transitions, 1); SelectNode(SrmDocument.Level.Molecules, 0); FocusDocument(); - PauseForScreenShot("Skyline with small molecule targets", 7); + PauseForScreenShot("Skyline with small molecule targets"); var transitionSettingsUI = ShowDialog(SkylineWindow.ShowTransitionSettingsUI); RunUI(() => @@ -152,7 +152,7 @@ protected override void DoTest() transitionSettingsUI.UseOptimized = true; transitionSettingsUI.OptimizeType = OptimizedMethodType.Transition.GetLocalizedString(); }); - PauseForScreenShot("Transition Settings - Prediction tab", 8); + PauseForScreenShot("Transition Settings - Prediction tab"); RunUI(() => @@ -166,7 +166,7 @@ protected override void DoTest() transitionSettingsUI.FragmentMassType = MassType.Monoisotopic; transitionSettingsUI.SetAutoSelect = true; }); - PauseForScreenShot("Transition Settings -Filter tab", 9); + PauseForScreenShot("Transition Settings -Filter tab"); RunUI(() => @@ -179,7 +179,7 @@ protected override void DoTest() transitionSettingsUI.MinTime = null; transitionSettingsUI.MaxTime = null; }); - PauseForScreenShot("Transition Settings - Instrument tab", 10); + PauseForScreenShot("Transition Settings - Instrument tab"); OkDialog(transitionSettingsUI, transitionSettingsUI.OkDialog); WaitForDocumentChange(docTargets); @@ -191,7 +191,7 @@ protected override void DoTest() SelectNode(SrmDocument.Level.Transitions, 1); SelectNode(SrmDocument.Level.Molecules, 0); FocusDocument(); - PauseForScreenShot("Skyline window multi-precursor graph", 13); + PauseForScreenShot("Skyline window multi-precursor graph"); var docResults = SkylineWindow.Document; @@ -234,15 +234,15 @@ protected override void DoTest() RunUIForScreenShot(() => SkylineWindow.Height -= 200); JiggleSelection(); FocusDocument(); - PauseForScreenShot("Skyline window multi-replicate layout", 14); + PauseForScreenShot("Skyline window multi-replicate layout"); // Peak integration correction ActivateReplicate("DoubleBlank1"); // First with mismatched RT - PauseForScreenShot("Selected replicate with unexpected RT", 15); + PauseForScreenShot("Selected replicate with unexpected RT"); ChangePeakBounds("DoubleBlank2", 26.5, 27.5); ChangePeakBounds("DoubleBlank3", 26.5, 27.5); ChangePeakBounds("DoubleBlank1", 26.5, 27.5); - PauseForScreenShot("Adjusted peak boundaries", 16); + PauseForScreenShot("Adjusted peak boundaries"); using (new WaitDocumentChange(1, true)) { @@ -259,7 +259,7 @@ protected override void DoTest() peptideSettingsUI.QuantMsLevel = null; // All peptideSettingsUI.QuantUnits = "uM"; }); - PauseForScreenShot("Molecule Settings - Quantification", 17); + PauseForScreenShot("Molecule Settings - Quantification"); OkDialog(peptideSettingsUI, peptideSettingsUI.OkDialog); } @@ -267,7 +267,7 @@ protected override void DoTest() WaitForClosedForm(); var documentGrid = ShowDialog(() => SkylineWindow.ShowDocumentGrid(true)); RunUI(() => documentGrid.ChooseView(Resources.SkylineViewContext_GetDocumentGridRowSources_Replicates)); - PauseForScreenShot("Document Grid - replicates", 18); + PauseForScreenShot("Document Grid - replicates"); /*IDictionary> sampleTypes = new Dictionary> { @@ -335,7 +335,7 @@ protected override void DoTest() RunUIForScreenShot(() => ResizeFloatingFrame(documentGrid, null, 857)); //SetDocumentGridSampleTypesAndConcentrations(sampleTypes); - PauseForScreenShot("Document Grid - sample types - enlarge for screenshot so rows 95_0_1_1_00_1021523636 to end can be seen", 22); + PauseForScreenShot("Document Grid - sample types - enlarge for screenshot so rows 95_0_1_1_00_1021523636 to end can be seen"); foreach (var chromatogramSet in SkylineWindow.Document.MeasuredResults.Chromatograms) { if (chromatogramSet.Name.StartsWith("DoubleBlank")) @@ -361,7 +361,7 @@ protected override void DoTest() } RunUI(() => SkylineWindow.ShowCalibrationForm()); - PauseForGraphScreenShot("Calibration Curve ", 23); + PauseForGraphScreenShot("Calibration Curve "); EnableDocumentGridColumns(documentGrid, Resources.SkylineViewContext_GetDocumentGridRowSources_Replicates, 47, new[] @@ -370,10 +370,10 @@ protected override void DoTest() "Proteins!*.Peptides!*.Results!*.Value.ExcludeFromCalibration" }, "Replicates_custom_quant"); - PauseForScreenShot("Custom document grid -scroll to end so same rows are in screenshot", 23); + PauseForScreenShot("Custom document grid -scroll to end so same rows are in screenshot"); SetDocumentGridExcludeFromCalibration(); - PauseForGraphScreenShot("Calibration Curve - outliers disabled", 24); + PauseForGraphScreenShot("Calibration Curve - outliers disabled"); if (IsCoverShotMode) { @@ -410,7 +410,7 @@ protected override void DoTest() }); RunUIForScreenShot(() => ResizeFloatingFrame(documentGrid, 780, null)); - PauseForScreenShot("Document Grid - Molecule Ratio Results", 25); + PauseForScreenShot("Document Grid - Molecule Ratio Results"); RunUI(() => { Settings.Default.CalibrationCurveOptions = Settings.Default.CalibrationCurveOptions @@ -420,7 +420,7 @@ protected override void DoTest() var calibrationForm = FindOpenForm(); RunUI(() => calibrationForm.UpdateUI(false)); - PauseForGraphScreenShot("Calibration Curve: Log", 26); + PauseForGraphScreenShot("Calibration Curve: Log"); } } @@ -432,7 +432,7 @@ private void ImportReplicates(bool isFirstPass) var importResultsDlg1 = ShowDialog(SkylineWindow.ImportResults); if (isFirstPass) { - PauseForScreenShot("Import Results form", 11); + PauseForScreenShot("Import Results form"); } var openDataSourceDialog1 = ShowDialog(() => importResultsDlg1.NamedPathSets = importResultsDlg1.GetDataSourcePathsFile(null)); @@ -459,8 +459,7 @@ private void ImportReplicates(bool isFirstPass) if (isFirstPass) { PauseForScreenShot( - "Open Data Source Files form - Use horizontal scrollbar to show the already selected files before screenshot", - 8); + "Open Data Source Files form - Use horizontal scrollbar to show the already selected files before screenshot"); } OkDialog(openDataSourceDialog1, openDataSourceDialog1.Open); OkDialog(importResultsDlg1, importResultsDlg1.OkDialog); diff --git a/pwiz_tools/Skyline/TestTutorial/SmallMoleculesTutorial.cs b/pwiz_tools/Skyline/TestTutorial/SmallMoleculesTutorial.cs index 696567900b..db04a64920 100644 --- a/pwiz_tools/Skyline/TestTutorial/SmallMoleculesTutorial.cs +++ b/pwiz_tools/Skyline/TestTutorial/SmallMoleculesTutorial.cs @@ -111,7 +111,7 @@ protected override void DoTest() var altered = lines.Select(l => l.Substring(0,l.LastIndexOf(TextUtil.CsvSeparator))).ToArray(); impliedLabeled = TextUtil.LineSeparate(altered); } - PauseForScreenShot("ImportTransitionDlg ready for paste", 5); + PauseForScreenShot("ImportTransitionDlg ready for paste"); var col4Dlg = ShowDialog(() => importDialog3.TransitionListText = impliedLabeled); RunUI(() => { col4Dlg.radioMolecule.PerformClick(); @@ -121,7 +121,7 @@ protected override void DoTest() comboBoxes[9].SelectedIndex = comboBoxes[1].FindStringExact(Resources.ImportTransitionListColumnSelectDlg_PopulateComboBoxes_Label_Type); } }); - PauseForScreenShot("Column Select Dlg with column headers selected", 6); + PauseForScreenShot("Column Select Dlg with column headers selected"); OkDialog(col4Dlg, col4Dlg.OkDialog); var docTargets = WaitForDocumentChange(doc); @@ -135,7 +135,7 @@ protected override void DoTest() SkylineWindow.Size = new Size(957, 654); }); RestoreViewOnScreen(5); - PauseForScreenShot("Skyline with small molecule targets", 6); + PauseForScreenShot("Skyline with small molecule targets"); RunUI(() => SkylineWindow.SaveDocument(GetTestPath("Amino Acid Metabolism.sky"))); @@ -149,7 +149,7 @@ protected override void DoTest() openDataSourceDialog1.CurrentDirectory = new MsDataFilePath(GetTestPath()); openDataSourceDialog1.SelectAllFileType(ExtWatersRaw); }); - PauseForScreenShot("Import Results Files form", 7); + PauseForScreenShot("Import Results Files form"); OkDialog(openDataSourceDialog1, openDataSourceDialog1.Open); var importResultsNameDlg = ShowDialog(importResultsDlg1.OkDialog); @@ -158,7 +158,7 @@ protected override void DoTest() SelectNode(SrmDocument.Level.MoleculeGroups, 0); FocusDocument(); - PauseForScreenShot("Skyline window multi-target graph", 9); + PauseForScreenShot("Skyline window multi-target graph"); var docResults = SkylineWindow.Document; @@ -197,7 +197,7 @@ protected override void DoTest() if (!string.IsNullOrEmpty(msg)) Assert.IsTrue(string.IsNullOrEmpty(msg), msg); RestoreViewOnScreen(9); - PauseForScreenShot("Skyline window multi-replicate layout", 10); + PauseForScreenShot("Skyline window multi-replicate layout"); if (IsCoverShotMode) { diff --git a/pwiz_tools/Skyline/TestTutorial/TargetedMSMSTutorialTest.cs b/pwiz_tools/Skyline/TestTutorial/TargetedMSMSTutorialTest.cs index 1f2596d56e..bfe5d0f3f6 100644 --- a/pwiz_tools/Skyline/TestTutorial/TargetedMSMSTutorialTest.cs +++ b/pwiz_tools/Skyline/TestTutorial/TargetedMSMSTutorialTest.cs @@ -156,13 +156,13 @@ private void LowResTestPartOne(RefinementSettings.ConvertToSmallMoleculesMode as RunUI(() => SkylineWindow.SelectedPath = document.GetPathTo((int) SrmDocument.Level.Molecules, 0)); RunUI(() => SkylineWindow.Size = new Size(820, 554)); RestoreViewOnScreen(3); - PauseForScreenShot("Main window", 3); + PauseForScreenShot("Main window"); // p. 4 Configure Document for Thermo raw files { var transitionSettingsUI = ShowDialog(SkylineWindow.ShowTransitionSettingsUI); RunUI(() => transitionSettingsUI.SelectedTab = TransitionSettingsUI.TABS.FullScan); - PauseForScreenShot("Peptide Settings - Full-Scan tab blank", 5); + PauseForScreenShot("Peptide Settings - Full-Scan tab blank"); RunUI(() => { @@ -171,7 +171,7 @@ private void LowResTestPartOne(RefinementSettings.ConvertToSmallMoleculesMode as transitionSettingsUI.PrecursorMassAnalyzer = FullScanMassAnalyzerType.qit; transitionSettingsUI.AcquisitionMethod = FullScanAcquisitionMethod.PRM; }); - PauseForScreenShot("Peptide Settings - Full-Scan tab low res", 6); + PauseForScreenShot("Peptide Settings - Full-Scan tab low res"); RunUI(() => { @@ -183,7 +183,7 @@ private void LowResTestPartOne(RefinementSettings.ConvertToSmallMoleculesMode as transitionSettingsUI.FocusIonMatchTolerance(); }); PauseForScreenShot( - "Transition Settings - Library tab match tolerance same as MS/MS resolution", 8); + "Transition Settings - Library tab match tolerance same as MS/MS resolution"); RunUI(() => { @@ -192,7 +192,7 @@ private void LowResTestPartOne(RefinementSettings.ConvertToSmallMoleculesMode as Assert.IsTrue(transitionSettingsUI.FragmentTypes.Contains("p")); // Should be added automatically Assert.IsTrue(transitionSettingsUI.SmallMoleculeFragmentTypes.Contains("p")); // Should be added automatically }); - PauseForScreenShot("Transition Settings - Filter tab", 9); + PauseForScreenShot("Transition Settings - Filter tab"); OkDialog(transitionSettingsUI, transitionSettingsUI.OkDialog); @@ -228,7 +228,7 @@ private void LowResTestPartOne(RefinementSettings.ConvertToSmallMoleculesMode as }); if (!pausedForScreenShot) { - PauseForScreenShot("Transitions popup pick-list", 10); + PauseForScreenShot("Transitions popup pick-list"); pausedForScreenShot = true; } OkDialog(picklist, picklist.OnOk); @@ -252,14 +252,14 @@ private void LowResTestPartOne(RefinementSettings.ConvertToSmallMoleculesMode as exportMethodDlg.SetMethodType(ExportMethodType.Standard); exportMethodDlg.SetTemplateFile(GetTestPath(@"Low Res\TargetedMSMS_template.meth"), true); }); - PauseForScreenShot("Export Method form", 11); + PauseForScreenShot("Export Method form"); // p. 10 Ok the error box. { var messageDlg = ShowDialog( () => exportMethodDlg.OkDialog(GetTestPath(@"Low Res\TargetedMSMS_BSA_Protea.meth"))); RunUI(() => messageDlg.Height = 210); - PauseForScreenShot("Error message (expected)", 12); + PauseForScreenShot("Error message (expected)"); OkDialog(messageDlg, messageDlg.OkDialog); } @@ -287,7 +287,7 @@ private void LowResTestPartOne(RefinementSettings.ConvertToSmallMoleculesMode as } Assert.AreEqual(4, viewEditor.ChooseColumnsTab.ColumnCount); }); - PauseForScreenShot("Edit Report form", 13); + PauseForScreenShot("Edit Report form"); { var previewReportDlg = ShowDialog(viewEditor.ShowPreview); @@ -311,7 +311,7 @@ private void LowResTestPartOne(RefinementSettings.ConvertToSmallMoleculesMode as previewReportDlg.Size = new Size(460, 330); previewReportDlg.Left = SkylineWindow.Right + 20; }); - PauseForScreenShot("Preview New Report window", 14); + PauseForScreenShot("Preview New Report window"); OkDialog(previewReportDlg, previewReportDlg.Close); } @@ -354,7 +354,7 @@ private void LowResTest() var importPeptideSearchDlg = ShowDialog(SkylineWindow.ShowImportPeptideSearchDlg); RunUI(() => importPeptideSearchDlg.BuildPepSearchLibControl.WorkflowType = ImportPeptideSearchDlg.Workflow.prm); - PauseForScreenShot("Import Peptide Search Build Spectral Library blank page", 15); + PauseForScreenShot("Import Peptide Search Build Spectral Library blank page"); const int prefixLen = 35; const string lowResDir = "Low Res"; @@ -383,7 +383,7 @@ private void LowResTest() importPeptideSearchDlg.BuildPepSearchLibControl.FilterForDocumentPeptides = true; }); WaitForConditionUI(() => importPeptideSearchDlg.IsNextButtonEnabled); - PauseForScreenShot("Import Peptide Search Build Spectral Library with files page", 16); + PauseForScreenShot("Import Peptide Search Build Spectral Library with files page"); RunDlg(importPeptideSearchDlg.ClickNextButtonNoCheck, dlg => dlg.OkDialog()); doc = WaitForDocumentChangeLoaded(doc, WAIT_TIME*2); // double wait time, becuase of intermittent failures on nightly runs @@ -403,7 +403,7 @@ private void LowResTest() var librarySettings = SkylineWindow.Document.Settings.PeptideSettings.Libraries; Assert.IsTrue(librarySettings.HasDocumentLibrary); - PauseForScreenShot("Import Peptide Search Extract Chromatograms page", 17); + PauseForScreenShot("Import Peptide Search Extract Chromatograms page"); // We're on the "Extract Chromatograms" page of the wizard. // All the test results files are in the same directory as the @@ -467,7 +467,7 @@ private void LowResTest() RunUI(() => allChromGraph.Left = SkylineWindow.Right + 20); WaitForConditionUI(() => allChromGraph.ProgressTotalPercent >= 15); - PauseForScreenShot("Loading chromatograms window", 19); + PauseForScreenShot("Loading chromatograms window"); WaitForDocumentChangeLoaded(doc, 15 * 60 * 1000); // 15 minutes WaitForClosedAllChromatogramsGraph(); @@ -504,7 +504,7 @@ private void LowResTest() WaitForGraphs(); RunUI(() => SkylineWindow.Width = 1050); RestoreViewOnScreen(20); - PauseForScreenShot("Main window with data imported", 20); + PauseForScreenShot("Main window with data imported"); if (AsSmallMoleculesTestMode != RefinementSettings.ConvertToSmallMoleculesMode.masses_only) { TestPropertySheet(); @@ -527,7 +527,7 @@ private void LowResTest() RunUI(() => SkylineWindow.AutoZoomBestPeak()); // Ensure Graphs look like p21. (checked) WaitForGraphs(); - PauseForScreenShot("Chromatogram graphs clipped from main window with zoomed peaks", 21, null, + PauseForScreenShot("Chromatogram graphs clipped from main window with zoomed peaks", null, bmp => ClipSkylineWindowShotWithForms(bmp, new DockableForm[] { @@ -542,7 +542,7 @@ private void LowResTest() SkylineWindow.GraphSpectrum.SelectSpectrum(new SpectrumIdentifier(lowRes20FileRaw, 77.7722)); SkylineWindow.GraphSpectrum.Focus(); }); - PauseForScreenShot("Library Match view clipped from main window with noisy spectrum", 22); + PauseForScreenShot("Library Match view clipped from main window with noisy spectrum"); RunUI(() => { @@ -650,7 +650,7 @@ private void LowResTest() Settings.Default.ChromatogramFontSize = 14; SkylineWindow.ShowGraphPeakArea(false); }); - PauseForScreenShot("Chromatogram graphs clipped from main window with split graphs", 26, null, + PauseForScreenShot("Chromatogram graphs clipped from main window with split graphs", null, bmp => ClipSkylineWindowShotWithForms(bmp, new DockableForm[] { @@ -807,7 +807,7 @@ private void TofTest() transitionSettingsUI.ProductMassAnalyzer = FullScanMassAnalyzerType.centroided; transitionSettingsUI.ProductRes = 20; }); - PauseForScreenShot("Transition Settings - Full-Scan tab for TOF", 29); + PauseForScreenShot("Transition Settings - Full-Scan tab for TOF"); RunUI(() => { @@ -849,8 +849,8 @@ private void TofTest() } } RestoreViewOnScreen(30); - PauseForScreenShot("Targets View tree clipped from main window", 30, - processShot:bmp => ClipTargets(bmp, 12)); + PauseForScreenShot("Targets View tree clipped from main window", + processShot: bmp => ClipTargets(bmp, 12)); RunDlg(SkylineWindow.ImportResults, importResultsDlg2 => { @@ -896,7 +896,7 @@ private void TofTest() { SkylineWindow.FocusDocument(); }); - PauseForScreenShot("Main window", 31); + PauseForScreenShot("Main window"); // if (AsSmallMoleculesTestMode != RefinementSettings.ConvertToSmallMoleculesMode.masses_only) // No formula means no isotopes, so this check is not applicable // ValidatePeakRanks(18, 270, false); @@ -941,7 +941,7 @@ private void TofTest() PauseForScreenShot("Targets View tree clipped from main window", processShot: bmp => ClipTargets(bmp, 12)); // p. 34 - PauseForScreenShot("Chromatogram graphs clipped from main window zoomed", 34, null, + PauseForScreenShot("Chromatogram graphs clipped from main window zoomed", null, bmp => ClipSkylineWindowShotWithForms(bmp, new DockableForm[] { diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/en/TestDiaQeDiaUmpireTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/en/TestDiaQeDiaUmpireTutorialExtra.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/en/TestDiaQeDiaUmpireTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/en/TestDiaQeDiaUmpireTutorialExtra.log diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/en/TestDiaQeFullSearchTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/en/TestDiaQeFullSearchTutorialExtra.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/en/TestDiaQeFullSearchTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/en/TestDiaQeFullSearchTutorialExtra.log diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/en/TestDiaSearchQeTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/en/TestDiaSearchQeTutorialDraft.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/en/TestDiaSearchQeTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/en/TestDiaSearchQeTutorialDraft.log diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/en/TestDiaSearchStellarTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/en/TestDiaSearchStellarTutorialDraft.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/en/TestDiaSearchStellarTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/en/TestDiaSearchStellarTutorialDraft.log diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/en/TestDiaTtofFullSearchTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/en/TestDiaTtofFullSearchTutorialExtra.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/en/TestDiaTtofFullSearchTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/en/TestDiaTtofFullSearchTutorialExtra.log diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/en/TestEncyclopeDiaSearchTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/en/TestEncyclopeDiaSearchTutorialDraft.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/en/TestEncyclopeDiaSearchTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/en/TestEncyclopeDiaSearchTutorialDraft.log diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/en/TestOrbiPrmTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/en/TestOrbiPrmTutorialDraft.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/en/TestOrbiPrmTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/en/TestOrbiPrmTutorialDraft.log diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/fr/TestDiaQeDiaUmpireTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/fr/TestDiaQeDiaUmpireTutorialExtra.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/fr/TestDiaQeDiaUmpireTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/fr/TestDiaQeDiaUmpireTutorialExtra.log diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/fr/TestDiaQeFullSearchTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/fr/TestDiaQeFullSearchTutorialExtra.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/fr/TestDiaQeFullSearchTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/fr/TestDiaQeFullSearchTutorialExtra.log diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/fr/TestDiaSearchQeTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/fr/TestDiaSearchQeTutorialDraft.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/fr/TestDiaSearchQeTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/fr/TestDiaSearchQeTutorialDraft.log diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/fr/TestDiaSearchStellarTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/fr/TestDiaSearchStellarTutorialDraft.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/fr/TestDiaSearchStellarTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/fr/TestDiaSearchStellarTutorialDraft.log diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/fr/TestDiaTtofFullSearchTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/fr/TestDiaTtofFullSearchTutorialExtra.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/fr/TestDiaTtofFullSearchTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/fr/TestDiaTtofFullSearchTutorialExtra.log diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/fr/TestEncyclopeDiaSearchTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/fr/TestEncyclopeDiaSearchTutorialDraft.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/fr/TestEncyclopeDiaSearchTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/fr/TestEncyclopeDiaSearchTutorialDraft.log diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/fr/TestOrbiPrmTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/fr/TestOrbiPrmTutorialDraft.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/fr/TestOrbiPrmTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/fr/TestOrbiPrmTutorialDraft.log diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/ja/TestDiaQeDiaUmpireTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/ja/TestDiaQeDiaUmpireTutorialExtra.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/ja/TestDiaQeDiaUmpireTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/ja/TestDiaQeDiaUmpireTutorialExtra.log diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/ja/TestDiaQeFullSearchTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/ja/TestDiaQeFullSearchTutorialExtra.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/ja/TestDiaQeFullSearchTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/ja/TestDiaQeFullSearchTutorialExtra.log diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/ja/TestDiaSearchQeTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/ja/TestDiaSearchQeTutorialDraft.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/ja/TestDiaSearchQeTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/ja/TestDiaSearchQeTutorialDraft.log diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/ja/TestDiaSearchStellarTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/ja/TestDiaSearchStellarTutorialDraft.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/ja/TestDiaSearchStellarTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/ja/TestDiaSearchStellarTutorialDraft.log diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/ja/TestDiaTtofFullSearchTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/ja/TestDiaTtofFullSearchTutorialExtra.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/ja/TestDiaTtofFullSearchTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/ja/TestDiaTtofFullSearchTutorialExtra.log diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/ja/TestEncyclopeDiaSearchTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/ja/TestEncyclopeDiaSearchTutorialDraft.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/ja/TestEncyclopeDiaSearchTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/ja/TestEncyclopeDiaSearchTutorialDraft.log diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/ja/TestOrbiPrmTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/ja/TestOrbiPrmTutorialDraft.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/ja/TestOrbiPrmTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/ja/TestOrbiPrmTutorialDraft.log diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/tr/TestDiaQeDiaUmpireTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/tr/TestDiaQeDiaUmpireTutorialExtra.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/tr/TestDiaQeDiaUmpireTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/tr/TestDiaQeDiaUmpireTutorialExtra.log diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/tr/TestDiaQeFullSearchTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/tr/TestDiaQeFullSearchTutorialExtra.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/tr/TestDiaQeFullSearchTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/tr/TestDiaQeFullSearchTutorialExtra.log diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/tr/TestDiaSearchQeTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/tr/TestDiaSearchQeTutorialDraft.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/tr/TestDiaSearchQeTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/tr/TestDiaSearchQeTutorialDraft.log diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/tr/TestDiaSearchStellarTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/tr/TestDiaSearchStellarTutorialDraft.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/tr/TestDiaSearchStellarTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/tr/TestDiaSearchStellarTutorialDraft.log diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/tr/TestDiaTtofFullSearchTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/tr/TestDiaTtofFullSearchTutorialExtra.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/tr/TestDiaTtofFullSearchTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/tr/TestDiaTtofFullSearchTutorialExtra.log diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/tr/TestEncyclopeDiaSearchTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/tr/TestEncyclopeDiaSearchTutorialDraft.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/tr/TestEncyclopeDiaSearchTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/tr/TestEncyclopeDiaSearchTutorialDraft.log diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/tr/TestOrbiPrmTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/tr/TestOrbiPrmTutorialDraft.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/tr/TestOrbiPrmTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/tr/TestOrbiPrmTutorialDraft.log diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/zh/TestDiaQeDiaUmpireTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/zh/TestDiaQeDiaUmpireTutorialExtra.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/zh/TestDiaQeDiaUmpireTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/zh/TestDiaQeDiaUmpireTutorialExtra.log diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/zh/TestDiaQeFullSearchTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/zh/TestDiaQeFullSearchTutorialExtra.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/zh/TestDiaQeFullSearchTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/zh/TestDiaQeFullSearchTutorialExtra.log diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/zh/TestDiaSearchQeTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/zh/TestDiaSearchQeTutorialDraft.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/zh/TestDiaSearchQeTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/zh/TestDiaSearchQeTutorialDraft.log diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/zh/TestDiaSearchStellarTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/zh/TestDiaSearchStellarTutorialDraft.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/zh/TestDiaSearchStellarTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/zh/TestDiaSearchStellarTutorialDraft.log diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/zh/TestDiaTtofFullSearchTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/zh/TestDiaTtofFullSearchTutorialExtra.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/zh/TestDiaTtofFullSearchTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/zh/TestDiaTtofFullSearchTutorialExtra.log diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/zh/TestEncyclopeDiaSearchTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/zh/TestEncyclopeDiaSearchTutorialDraft.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/zh/TestEncyclopeDiaSearchTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/zh/TestEncyclopeDiaSearchTutorialDraft.log diff --git a/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/zh/TestOrbiPrmTutorial.log b/pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/zh/TestOrbiPrmTutorialDraft.log similarity index 100% rename from pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/zh/TestOrbiPrmTutorial.log rename to pwiz_tools/Skyline/TestTutorial/TutorialAuditLogs/zh/TestOrbiPrmTutorialDraft.log diff --git a/pwiz_tools/Skyline/TestUtil/AbstractFunctionalTestEx.cs b/pwiz_tools/Skyline/TestUtil/AbstractFunctionalTestEx.cs index 9382eaabab..4ef34a3254 100644 --- a/pwiz_tools/Skyline/TestUtil/AbstractFunctionalTestEx.cs +++ b/pwiz_tools/Skyline/TestUtil/AbstractFunctionalTestEx.cs @@ -660,11 +660,11 @@ public void AddReplicateAnnotation(DocumentSettingsDlg documentSettingsDlg, string annotationName, AnnotationDef.AnnotationType annotationType = AnnotationDef.AnnotationType.text, IList annotationValues = null, - int? pausePage = null) + bool pause = false) { AddAnnotation(documentSettingsDlg, annotationName, annotationType, annotationValues, AnnotationDef.AnnotationTargetSet.Singleton(AnnotationDef.AnnotationTarget.replicate), - pausePage); + pause); } public void AddAnnotation(DocumentSettingsDlg documentSettingsDlg, @@ -672,7 +672,7 @@ public void AddAnnotation(DocumentSettingsDlg documentSettingsDlg, AnnotationDef.AnnotationType annotationType, IList annotationValues, AnnotationDef.AnnotationTargetSet annotationTargets, - int? pausePage = null) + bool pause = false) { var annotationsListDlg = ShowDialog, AnnotationDef>> (documentSettingsDlg.EditAnnotationList); @@ -688,10 +688,10 @@ public void AddAnnotation(DocumentSettingsDlg documentSettingsDlg, annotationDefDlg.AnnotationTargets = annotationTargets; }); - if (pausePage.HasValue) + if (pause) { RunUI(() => annotationDefDlg.Height = 442); // Shorter for screenshots - PauseForScreenShot("Define Annotation form - " + annotationName, pausePage.Value); + PauseForScreenShot("Define Annotation form - " + annotationName); } OkDialog(annotationDefDlg, annotationDefDlg.OkDialog); diff --git a/pwiz_tools/Skyline/TestUtil/MultiFormActivator.cs b/pwiz_tools/Skyline/TestUtil/MultiFormActivator.cs index 3c7ba59b66..caa62c29c6 100644 --- a/pwiz_tools/Skyline/TestUtil/MultiFormActivator.cs +++ b/pwiz_tools/Skyline/TestUtil/MultiFormActivator.cs @@ -98,16 +98,21 @@ private void FormActivated(object sender, EventArgs e) if (!activatedForm.IsHandleCreated) return; + // Record the handle value for the activated form while on its thread. + // It will not be possible to get this handle from the Form object on + // any other thread without causing a CrossThreadOperationException + var activatedFormHandle = activatedForm.Handle; + lock (_formsToActivate) { foreach (var form in _formsToActivate.Where(form => !ReferenceEquals(form, activatedForm))) { - ActionUtil.RunAsync(() => ShowForm(form, activatedForm)); + ActionUtil.RunAsync(() => ShowForm(form, activatedFormHandle)); } } } - private void ShowForm(Form form, Form referenceForm) + private void ShowForm(Form form, IntPtr referenceFormHandle) { if (!form.IsHandleCreated) return; @@ -116,7 +121,7 @@ private void ShowForm(Form form, Form referenceForm) form.Invoke((Action)(() => { if (form.Visible) - form.BringWindowToSameLevelWithoutActivating(referenceForm); + form.BringWindowToSameLevelWithoutActivating(referenceFormHandle); })); } diff --git a/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.cs b/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.cs index c26419409c..fa6ab51005 100644 --- a/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.cs +++ b/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.cs @@ -44,7 +44,6 @@ public partial class PauseAndContinueForm : Form, IPauseTestController private string _imageUrl; private string _fileToShow; private string _fileToSave; - private bool _showMatchingPage; // Information for taking a screenshot private Control _screenshotForm; private bool _fullScreen; @@ -88,14 +87,14 @@ public static void Show(string description) /// /// Shows this form. Called from the "Functional test" thread. Blocks until Continue is clicked. /// - public void Show(string description, int screenshotNum, bool showMatchingPages, int? timeout, + public void Show(string description, int screenshotNum, int? timeout, Control screenshotForm, bool fullScreen, Func processShot) { ShowInternal(_screenshotManager.ScreenshotDescription(screenshotNum, description), - screenshotNum, showMatchingPages, timeout, screenshotForm, fullScreen, processShot); + screenshotNum, timeout, screenshotForm, fullScreen, processShot); } - private void ShowInternal(string description, int screenshotNum = 0, bool showMatchingPages = false, int? timeout = null, + private void ShowInternal(string description, int screenshotNum = 0, int? timeout = null, Control screenshotForm = null, bool fullScreen = false, Func processShot = null) { _screenshotNum = screenshotNum; @@ -104,7 +103,6 @@ private void ShowInternal(string description, int screenshotNum = 0, bool showMa _fileToSave = _screenshotManager?.ScreenshotDestFile(screenshotNum); _linkUrl = _screenshotManager?.ScreenshotUrl(screenshotNum); _imageUrl = _screenshotManager?.ScreenshotImgUrl(screenshotNum); - _showMatchingPage = showMatchingPages; _screenshotForm = screenshotForm; _fullScreen = fullScreen; _processShot = processShot; @@ -208,9 +206,6 @@ private void RefreshAndShow() _screenshotPreviewForm.ShowOrUpdate(); } - - if (_showMatchingPage) - GotoLink(); } private void UpdateButtonVisibility() diff --git a/pwiz_tools/Skyline/TestUtil/ScreenshotManager.cs b/pwiz_tools/Skyline/TestUtil/ScreenshotManager.cs index d5c4ca814a..d6b5e993b4 100644 --- a/pwiz_tools/Skyline/TestUtil/ScreenshotManager.cs +++ b/pwiz_tools/Skyline/TestUtil/ScreenshotManager.cs @@ -116,7 +116,7 @@ private static Rectangle GetFramedWindowBoundsInternal(Control ctrl) // The drop shadow + border are 1/2 the difference between the window width and the client rect width // A border width is removed to keep the border around the window int borderOutsideClient = SystemInformation.BorderSize.Width; - if (ctrl is FloatingWindow) + if (ctrl is FloatingWindow || ctrl.Size == ctrl.ClientRectangle.Size) borderOutsideClient = 0; int dropShadowWidth = (width - ctrl.ClientRectangle.Width) / 2 - borderOutsideClient; Size imageSize; diff --git a/pwiz_tools/Skyline/TestUtil/ScreenshotPreviewForm.cs b/pwiz_tools/Skyline/TestUtil/ScreenshotPreviewForm.cs index 30889a5637..a7db38fadd 100644 --- a/pwiz_tools/Skyline/TestUtil/ScreenshotPreviewForm.cs +++ b/pwiz_tools/Skyline/TestUtil/ScreenshotPreviewForm.cs @@ -25,6 +25,7 @@ using System.Net; using System.Threading; using System.Windows.Forms; +using DigitalRune.Windows.Docking; using pwiz.Skyline.Alerts; using pwiz.Skyline.Util; using pwiz.Skyline.Util.Extensions; @@ -190,11 +191,25 @@ public void ShowOrUpdate() // Ideally, this would use FormUtil.OpenForms, but this works pretty well and including // all open forms gets tricky with cross-thread operations and choosing top level forms - _activator.Reset(this, _pauseTestController.ScreenshotControl.FindForm()); + var activationForm = ActivationForm; + _activator.Reset(this, activationForm); + if (activationForm is FloatingWindow) + _activator.AddForm(activationForm.Owner); // Add the SkylineWindow too FormStateChangedBackground(); } + private Form ActivationForm + { + get + { + var parentForm = _pauseTestController.ScreenshotControl.FindForm(); + if (parentForm is DockableForm dockableForm) // A dockable form is never the top level + parentForm = dockableForm.Pane.FindForm(); + return parentForm; + } + } + protected override bool ShowWithoutActivation { get { return true; } // Don't take activation away from SkylineWindow diff --git a/pwiz_tools/Skyline/TestUtil/ScreenshotProcessingExtensions.cs b/pwiz_tools/Skyline/TestUtil/ScreenshotProcessingExtensions.cs index d2fb09f7d9..3c9a211f0c 100644 --- a/pwiz_tools/Skyline/TestUtil/ScreenshotProcessingExtensions.cs +++ b/pwiz_tools/Skyline/TestUtil/ScreenshotProcessingExtensions.cs @@ -43,12 +43,18 @@ public static class ScreenshotProcessingExtensions /// private static readonly Color INTERIOR_BORDER_COLOR = Color.FromArgb(0xA0, 0xA0, 0xA0); + public const int CORNER_FORM_WINDOWS11 = 8; + public const int CORNER_TOOL_WINDOW_WINDOWS11 = 4; + + public static int CornerForm => IsWindows11() ? CORNER_FORM_WINDOWS11 : 0; + public static int CornerToolWindow => IsWindows11() ? CORNER_TOOL_WINDOW_WINDOWS11 : 0; + public static Bitmap CleanupBorder(this Bitmap bmp, bool toolWindow = false) { bool isWindows11 = IsWindows11(); if (!toolWindow) { - return bmp.CleanupBorder(new Rectangle(0, 0, bmp.Width, bmp.Height), isWindows11 ? 8 : 0); + return bmp.CleanupBorder(new Rectangle(0, 0, bmp.Width, bmp.Height), isWindows11 ? CORNER_FORM_WINDOWS11 : 0); } else if (!isWindows11) { @@ -58,20 +64,18 @@ public static Bitmap CleanupBorder(this Bitmap bmp, bool toolWindow = false) else { // Floating dockable forms in Windows 11 have a 4 pixel corner radius - return bmp.CleanupBorder(new Rectangle(0, 0, bmp.Width, bmp.Height), 4); + return bmp.CleanupBorder(new Rectangle(0, 0, bmp.Width, bmp.Height), CORNER_TOOL_WINDOW_WINDOWS11); } } - public static Bitmap CleanupBorder(this Bitmap bmp, Rectangle rectWindow, int cornerRadius) + public static Bitmap CleanupBorder(this Bitmap bmp, Rectangle rectWindow, int cornerRadius, Rectangle? excludeRect = null) { - return bmp.CleanupBorder(STANDARD_BORDER_COLOR, rectWindow, cornerRadius); + return bmp.CleanupBorder(STANDARD_BORDER_COLOR, rectWindow, cornerRadius, excludeRect); } - private static Bitmap CleanupBorder(this Bitmap bmp, Color? color, Rectangle rect, int cornerRadius) + private static Bitmap CleanupBorder(this Bitmap bmp, Color? color, Rectangle rect, int cornerRadius, Rectangle? excludeRect) { - var colorCounts = new Dictionary(); - foreach (var point in RectPoints(rect)) - AddPixel(point, bmp, colorCounts); + var colorCounts = GetColorCounts(bmp, rect); // If no color is specified, use the most common color in the border. // This is dependent on the screen background color. So, it should not @@ -80,7 +84,8 @@ private static Bitmap CleanupBorder(this Bitmap bmp, Color? color, Rectangle rec var maxColorCount = colorCounts.Values.Max(); var bestBorderColor = colorCounts.FirstOrDefault(kvp => kvp.Value == maxColorCount).Key; // All white border means it is actually a graph so don't draw anything on it - if (bestBorderColor.ToArgb() == Color.White.ToArgb()) + // Only when the rectangle is the full area of the bitmap + if (bestBorderColor.ToArgb() == Color.White.ToArgb() && rect == new Rectangle(0, 0, bmp.Width, bmp.Height)) return bmp; // If there is supposed to be a corner curve but there is just one color, avoid // drawing a curved corner on top of the otherwise rectangular border. @@ -94,20 +99,33 @@ private static Bitmap CleanupBorder(this Bitmap bmp, Color? color, Rectangle rec bestBorderColor == INTERIOR_BORDER_COLOR) { color = bestBorderColor; + if (cornerRadius != CORNER_TOOL_WINDOW_WINDOWS11) + cornerRadius = 0; // No arched corners on interior borders } - return bmp.CleanupBorderInternal(color ?? bestBorderColor, rect, cornerRadius); + return bmp.CleanupBorderInternal(color ?? bestBorderColor, rect, cornerRadius, excludeRect); } - private static Bitmap CleanupBorderInternal(this Bitmap bmp, Color color, Rectangle rect, int cornerRadius) + private static IDictionary GetColorCounts(Bitmap bmp, Rectangle rect) { - return IsWindows11() - ? bmp.CleanupBorder11(color, rect, cornerRadius) - : bmp.CleanupBorder10(color, rect); + var colorCounts = new Dictionary(); + foreach (var point in RectPoints(rect)) + AddPixel(point, bmp, colorCounts); + return colorCounts; } - private static Bitmap CleanupBorder10(this Bitmap bmp, Color color, Rectangle rect) + private static Bitmap CleanupBorderInternal(this Bitmap bmp, Color color, Rectangle rect, int cornerRadius, + Rectangle? excludeRect) + { + return IsWindows11() && cornerRadius != 0 + ? bmp.CleanupBorder11(color, rect, cornerRadius, excludeRect) + : bmp.CleanupBorder10(color, rect, excludeRect); + } + + private static Bitmap CleanupBorder10(this Bitmap bmp, Color color, Rectangle rect, Rectangle? excludeRect) { using var g = Graphics.FromImage(bmp); + ExcludeClip(g, excludeRect); + using var pen = new Pen(color); if (rect.Height == 1) g.DrawLine(pen, rect.Location, new Point(rect.Right, rect.Top)); @@ -116,19 +134,21 @@ private static Bitmap CleanupBorder10(this Bitmap bmp, Color color, Rectangle re return bmp; } - private static Bitmap CleanupBorder11(this Bitmap bmp, Color color, Rectangle rect, int cornerRadius) + private static Bitmap CleanupBorder11(this Bitmap bmp, Color color, Rectangle rect, int cornerRadius, + Rectangle? excludeRect) { var result = new Bitmap(bmp.Width, bmp.Height); using var g = Graphics.FromImage(result); using var backgroundBrush = new SolidBrush(Color.White); - g.FillRectangle(backgroundBrush, 0, 0, result.Width, result.Height); + g.FillRectangle(backgroundBrush, rect); using var pathClippingOuter = new GraphicsPath(); AddRoundedRectangle(pathClippingOuter, rect, cornerRadius); using var controlBrush = new SolidBrush(SystemColors.Control); g.SmoothingMode = SmoothingMode.AntiAlias; g.SetClip(pathClippingOuter); + ExcludeClip(g, excludeRect); g.FillRectangle(controlBrush, rect); g.ResetClip(); @@ -137,6 +157,7 @@ private static Bitmap CleanupBorder11(this Bitmap bmp, Color color, Rectangle re rect.Height--; AddRoundedRectangle(pathDrawing, rect, cornerRadius); using var pen = new Pen(color); + ExcludeClip(g, excludeRect); g.DrawPath(pen, pathDrawing); rect.Width++; rect.Height++; @@ -149,11 +170,24 @@ private static Bitmap CleanupBorder11(this Bitmap bmp, Color color, Rectangle re AddRoundedRectangle(pathClipping, rect, cornerRadius + cornerRadius/2); g.SmoothingMode = SmoothingMode.None; g.SetClip(pathClipping); - g.DrawImage(bmp, new Point(0, 0)); + ExcludeClip(g, excludeRect); + g.DrawImage(bmp, rect, rect, GraphicsUnit.Pixel); + if (excludeRect.HasValue) + { + // If a rectangle was excluded from the border drawing, it needs to be copied now. + g.ResetClip(); + g.DrawImage(bmp, excludeRect.Value, excludeRect.Value, GraphicsUnit.Pixel); + } return result; } + private static void ExcludeClip(Graphics g, Rectangle? excludeRect) + { + if (excludeRect.HasValue) + g.ExcludeClip(excludeRect.Value); + } + /// /// Adds a rounded rectangle to a GraphicsPath. /// diff --git a/pwiz_tools/Skyline/TestUtil/TestFunctional.cs b/pwiz_tools/Skyline/TestUtil/TestFunctional.cs index b3be08fc40..b2334469fa 100644 --- a/pwiz_tools/Skyline/TestUtil/TestFunctional.cs +++ b/pwiz_tools/Skyline/TestUtil/TestFunctional.cs @@ -1345,7 +1345,7 @@ private string GetCoverShotPath(string folderPath = null, string suffix = null) return Path.Combine(folderPath, CoverShotName + suffix + cultureSuffix + ".png"); } - public int PauseStartingPage { get; set; } + public int PauseStartingScreenshot { get; set; } public static bool IsPauseForAuditLog { get; set; } @@ -1391,7 +1391,7 @@ public bool IsRecordAuditLogForTutorials get { return IsTutorial && RecordAuditLogs; } } - public static bool IsShowMatchingTutorialPages { get; set; } + public bool IsTestAuditLogPlacement => false; public static bool IsDemoMode { get { return Program.DemoMode; } } @@ -1699,17 +1699,17 @@ protected GraphSummary FindGraphSummaryByGraphType() where TGraphPan .FirstOrDefault(graphSummary => graphSummary.TryGetGraphPane(out TGraphPane _)); } - public void PauseForScreenShot(string description = null, int? pageNum = null, int? timeout = null, Func processShot = null) + public void PauseForScreenShot(string description = null, int? timeout = null, Func processShot = null) { PauseForScreenShotInternal(description, null, null, timeout, processShot); } - public void PauseForScreenShot(Control screenshotForm, string description = null, int? pageNum = null, int ? timeout = null, Func processShot = null) + public void PauseForScreenShot(Control screenshotForm, string description = null, int? timeout = null, Func processShot = null) { PauseForScreenShotInternal(description, null, screenshotForm, timeout, processShot); } - public void PauseForScreenShot(string description, int? pageNum = null, int ? timeout = null, Func processShot = null) + public void PauseForScreenShot(string description, int? timeout = null, Func processShot = null) where TView : IFormView { PauseForScreenShotInternal(description, typeof(TView), null, timeout, processShot); @@ -1721,19 +1721,19 @@ public void PauseForTargetsScreenShot(string description, bool clipped = false, PauseForScreenShot(description); else { - PauseForScreenShot(description, null, null, bmp => + PauseForScreenShot(description, null, bmp => ClipTargets(bmp, countTargets, fromBottom, includeNewItem)); } } - public void PauseForGraphScreenShot(string description, int? pageNum = null, int? timeout = null, Func processShot = null) + public void PauseForGraphScreenShot(string description, int? timeout = null, Func processShot = null) where TForm : Form { var form = WaitForOpenForm(); - PauseForGraphScreenShot(description, form, pageNum, timeout, processShot); + PauseForGraphScreenShot(description, form, timeout, processShot); } - public void PauseForGraphScreenShot(string description, Control graphContainer, int? pageNum = null, int? timeout = null, Func processShot = null) + public void PauseForGraphScreenShot(string description, Control graphContainer, int? timeout = null, Func processShot = null) { if (!IsPauseForScreenShots) return; @@ -1744,12 +1744,12 @@ public void PauseForGraphScreenShot(string description, Control graphContainer, PauseForScreenShotInternal(description, null, zedGraph, timeout, processShot); } - public void PauseForPeakAreaGraphScreenShot(string description, int? pageNum = null, int? timeout = null, Func processShot = null) + public void PauseForPeakAreaGraphScreenShot(string description, int? timeout = null, Func processShot = null) { - PauseForGraphScreenShot(description, SkylineWindow.GraphPeakArea, pageNum, timeout, processShot); + PauseForGraphScreenShot(description, SkylineWindow.GraphPeakArea, timeout, processShot); } - public void PauseForRetentionTimeGraphScreenShot(string description, int? pageNum = null, int? timeout = null, Func processShot = null) + public void PauseForRetentionTimeGraphScreenShot(string description, int? timeout = null, Func processShot = null) { if (!IsPauseForScreenShots) return; @@ -1757,29 +1757,29 @@ public void PauseForRetentionTimeGraphScreenShot(string description, int? pageNu var graphRt = SkylineWindow.GraphRetentionTime; if (graphRt.TryGetGraphPane(out _)) WaitForRegression(); - PauseForGraphScreenShot(description, graphRt, pageNum, timeout, processShot); + PauseForGraphScreenShot(description, graphRt, timeout, processShot); } - public void PauseForMassErrorGraphScreenShot(string description, int? pageNum = null, int? timeout = null, Func processShot = null) + public void PauseForMassErrorGraphScreenShot(string description, int? timeout = null, Func processShot = null) { - PauseForGraphScreenShot(description, SkylineWindow.GraphMassError, pageNum, timeout, processShot); + PauseForGraphScreenShot(description, SkylineWindow.GraphMassError, timeout, processShot); } - public void PauseForFullScanGraphScreenShot(string description, int? pageNum = null, int? timeout = null, Func processShot = null) + public void PauseForFullScanGraphScreenShot(string description, int? timeout = null, Func processShot = null) { - PauseForGraphScreenShot(description, SkylineWindow.GraphFullScan, pageNum, timeout, processShot); + PauseForGraphScreenShot(description, SkylineWindow.GraphFullScan, timeout, processShot); } - public void PauseForLibrarySpectrumGraphScreenShot(string description, int? pageNum = null, int? timeout = null, Func processShot = null) + public void PauseForLibrarySpectrumGraphScreenShot(string description, int? timeout = null, Func processShot = null) { - PauseForGraphScreenShot(description, SkylineWindow.GraphSpectrum, pageNum, timeout, processShot); + PauseForGraphScreenShot(description, SkylineWindow.GraphSpectrum, timeout, processShot); } - public void PauseForChromGraphScreenShot(string description, string replicateName = null, int? pageNum = null, int? timeout = null, Func processShot = null) + public void PauseForChromGraphScreenShot(string description, string replicateName = null, int? timeout = null, Func processShot = null) { if (replicateName == null) RunUI(() => replicateName = SkylineWindow.SelectedGraphChromName); - PauseForGraphScreenShot(description, SkylineWindow.GetGraphChrom(replicateName), pageNum, timeout, processShot); + PauseForGraphScreenShot(description, SkylineWindow.GetGraphChrom(replicateName), timeout, processShot); } protected ZedGraphControl FindZedGraph(Control graphContainer) @@ -1837,7 +1837,7 @@ private void PauseForScreenShotInternal(string description, Type formType = null Thread.Sleep(3 * 1000); else if (Program.PauseSeconds > 0) Thread.Sleep(Program.PauseSeconds * 1000); - else if ((IsPauseForScreenShots || IsAutoScreenShotMode) && Math.Max(PauseStartingPage, Program.PauseStartingPage) <= ScreenshotCounter) + else if ((IsPauseForScreenShots || IsAutoScreenShotMode) && Math.Max(PauseStartingScreenshot, Program.PauseStartingScreenshot) <= ScreenshotCounter) { WaitForGraphs(); // Screenshots always need graphs to be fully updated @@ -1864,9 +1864,8 @@ private void PauseForScreenShotInternal(string description, Type formType = null } else { - bool showMatchingPages = IsShowMatchingTutorialPages || Program.ShowMatchingPages; _pauseAndContinueForm ??= new PauseAndContinueForm(_shotManager); - _pauseAndContinueForm.Show(description, ScreenshotCounter, showMatchingPages, timeout, screenshotForm, fullScreen, processShot); + _pauseAndContinueForm.Show(description, ScreenshotCounter, timeout, screenshotForm, fullScreen, processShot); } } else @@ -1969,6 +1968,12 @@ protected void RunFunctionalTest(string defaultUiMode = UiModes.PROTEOMIC) { return; // Don't want to run this lengthy test right now } + if (IsTestAuditLogPlacement) + { + // Just testing if audit logs are where they are expected to be + AssertAuditLogCorrectlyPlaced(); + return; + } RunFunctionalTestAttempt(defaultUiMode); @@ -2180,16 +2185,14 @@ private void VerifyAuditLogCorrect() return; // Ensure expected tutorial log file exists unless recording - var projectFile = GetLogFilePath(AuditLogTutorialDir); - bool existsInProject = File.Exists(projectFile); if (!IsRecordAuditLogForTutorials) { - Assert.IsTrue(existsInProject, - "Log file for test \"{0}\" does not exist at \"{1}\", set IsRecordAuditLogForTutorials=true to create it", - TestContext.TestName, projectFile); + AssertProjectLogFileExists(); } // Compare file contents + var projectFile = GetLogFilePath(AuditLogTutorialDir); + bool existsInProject = File.Exists(projectFile); var expected = existsInProject ? ReadTextWithNormalizedLineEndings(projectFile) : string.Empty; var actual = ReadTextWithNormalizedLineEndings(recordedFile); if (AreEquivalentAuditLogs(expected, actual)) @@ -2239,6 +2242,28 @@ private void VerifyAuditLogCorrect() } } + private void AssertAuditLogCorrectlyPlaced() + { + if (AuditLogCompareLogs) + { + AssertProjectLogFileExists(); + + Console.Write(@" found audit log "); + } + else + { + Console.Write(@" no audit log comparison "); + } + } + + private void AssertProjectLogFileExists() + { + var projectFile = GetLogFilePath(AuditLogTutorialDir); + Assert.IsTrue(File.Exists(projectFile), + "Log file for test \"{0}\" does not exist at \"{1}\", set IsRecordAuditLogForTutorials=true to create it", + TestContext.TestName, projectFile); + } + private static bool AreEquivalentAuditLogs(string expected, string actual) { try @@ -2604,6 +2629,13 @@ private void RestoreMinimalView() WaitForConditionUI(WAIT_TIME, () => true, null, true, false); } + /// + /// Restores the SkylineWindow layout by loading a saved .view file named p{pageNum}.view. + /// The page numbers were originally associated with tutorial Word documents and PDFs, + /// but could be any numbers. Ideally they should still increase from start to finish + /// of the tutorial. + /// + /// A number originally associated with a page in a Word document and PDF public void RestoreViewOnScreen(int pageNum) { RestoreViewNameOnScreen(string.Format(@"p{0:0#}", pageNum));