Skip to content

Commit

Permalink
Skyline: Fixes for translated small molecule tutorial screenshots (#3308
Browse files Browse the repository at this point in the history 
)

* Skyline: Fixes for translated small molecule tutorial screenshots
* - fixed TestMs1Tutorial full-scan graph clicking
  • Loading branch information
@brendanx67
brendanx67 authored Dec 31, 2024
1 parent b23b6f8 commit 5f716bd
Show file tree
Hide file tree
Showing 9 changed files with 295 additions and 25 deletions.
4 changes: 2 additions & 2 deletions pwiz_tools/Skyline/TestTutorial/Ms1FullScanFilteringTutorial.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -567,9 +567,9 @@ protected override void DoTest()
RevertDoc(undoIndex); // undo changes

ActivateReplicate(TIP_NAME);
ClickChromatogram(TIP_NAME, 37.32, 151, checkTitle: true);
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++);
ClickChromatogram(TIP_NAME, 33.19, 328.1, checkTitle: true);
ClickChromatogram(TIP_NAME, 33.19, 328.1, titleTime: 33.19);
PauseForFullScanGraphScreenShot("MS1 spectrum graph 33.19 minutes", tutorialPage++);

if (PreferWiff)
Expand Down
16 changes: 12 additions & 4 deletions pwiz_tools/Skyline/TestTutorial/SmallMolMethodDevCEOptTutorial.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Globalization;
using System.IO;
using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
Expand Down Expand Up @@ -89,15 +90,19 @@ protected override void DoTest()

SetCsvFileClipboardText(GetTestPath("Energy_TransitionList.csv"));
var confirmHeadersDlg = ShowDialog<ImportTransitionListColumnSelectDlg>(SkylineWindow.Paste);
RunUIForScreenShot(() => ResizeFormOnScreen(confirmHeadersDlg, 1070, null));
PauseForScreenShot<ImportTransitionListColumnSelectDlg>("Confirming column headers", 5);
// TODO: After translation is updated this first image will need to be added for Chinese and Japanese
if (Equals("en", CultureInfo.CurrentCulture.TwoLetterISOLanguageName))
{
RunUIForScreenShot(() => ResizeFormOnScreen(confirmHeadersDlg, 1070, null));
PauseForScreenShot<ImportTransitionListColumnSelectDlg>("Confirming column headers", 5);
}
OkDialog(confirmHeadersDlg, confirmHeadersDlg.OkDialog);

RunUI(() =>
{
AdjustSequenceTreePanelWidth();
});

FocusDocument();
PauseForScreenShot("Main window after paste from csv", 5);

var docTargets = WaitForDocumentChange(doc);
Expand Down Expand Up @@ -343,6 +348,7 @@ protected override void DoTest()
molNode.Nodes[1].Expand();
SkylineWindow.ArrangeGraphsTabbed();
});
FocusDocument();
PauseForScreenShot("Skyline window with calibration data", 23);

// Linearity
Expand Down Expand Up @@ -455,7 +461,7 @@ protected override void DoTest()
PauseForScreenShot<OpenDataSourceDialog>("Import Results Files form", 31);
OkDialog(openDataSourceDialog1, openDataSourceDialog1.Open);
}

FocusDocument();
PauseForScreenShot("Skyline shows new replicate \"CE Optimization\"", 32);
RunUI(() =>
{
Expand All @@ -466,6 +472,8 @@ protected override void DoTest()
SkylineWindow.ShowSingleTransition();
SkylineWindow.ShowSplitChromatogramGraph(true);
});
RestoreViewOnScreen(33);
FocusDocument();
PauseForScreenShot("Split graph", 33);

RunUI(() =>
Expand Down
89 changes: 89 additions & 0 deletions pwiz_tools/Skyline/TestTutorial/SmallMolMethodDevCEOptViews.data/cover.view
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
<?xml version="1.0" encoding="utf-8"?>
<!--DigitalRune Docking Windows configuration file.-->
<!--!!! AUTOMATICALLY GENERATED CONTENT. DO NOT MODIFY !!!-->
<DockPanel FormatVersion="1.0" DockLeftPortion="0.336199381924097" DockRightPortion="0.331596831650566" DockTopPortion="0.25" DockBottomPortion="0.25" ActiveDocumentPane="5" ActivePane="0">
<Contents Count="9">
<Content ID="0" PersistString="pwiz.Skyline.Controls.SequenceTreeForm|0(6(0,1)),1,2|7,7|0" AutoHidePortion="0.25" IsHidden="False" IsFloating="False" />
<Content ID="1" PersistString="pwiz.Skyline.Controls.Graphs.GraphChromatogram|2 min" AutoHidePortion="0.25" IsHidden="True" IsFloating="False" />
<Content ID="2" PersistString="pwiz.Skyline.Controls.Graphs.GraphSummary|AreaGraphController|replicate" AutoHidePortion="0.25" IsHidden="False" IsFloating="False" />
<Content ID="3" PersistString="pwiz.Skyline.Controls.Graphs.GraphSummary|RTGraphController|replicate" AutoHidePortion="0.25" IsHidden="False" IsFloating="False" />
<Content ID="4" PersistString="pwiz.Skyline.Controls.Graphs.GraphChromatogram|1:1_1" AutoHidePortion="0.25" IsHidden="False" IsFloating="False" />
<Content ID="5" PersistString="pwiz.Skyline.Controls.Graphs.GraphChromatogram|1:1_2" AutoHidePortion="0.25" IsHidden="False" IsFloating="False" />
<Content ID="6" PersistString="pwiz.Skyline.Controls.Graphs.GraphChromatogram|2:1_2" AutoHidePortion="0.25" IsHidden="False" IsFloating="False" />
<Content ID="7" PersistString="pwiz.Skyline.Controls.Graphs.GraphChromatogram|1:2_2" AutoHidePortion="0.25" IsHidden="False" IsFloating="False" />
<Content ID="8" PersistString="pwiz.Skyline.Controls.Graphs.GraphChromatogram|CE Optimization" AutoHidePortion="0.25" IsHidden="False" IsFloating="False" />
</Contents>
<Panes Count="6">
<Pane ID="0" DockState="DockLeft" ActiveContent="0">
<Contents Count="1">
<Content ID="0" RefID="0" />
</Contents>
</Pane>
<Pane ID="1" DockState="Floating" ActiveContent="-1">
<Contents Count="1">
<Content ID="0" RefID="2" />
</Contents>
</Pane>
<Pane ID="2" DockState="Floating" ActiveContent="-1">
<Contents Count="1">
<Content ID="0" RefID="3" />
</Contents>
</Pane>
<Pane ID="3" DockState="DockRight" ActiveContent="2">
<Contents Count="1">
<Content ID="0" RefID="2" />
</Contents>
</Pane>
<Pane ID="4" DockState="DockLeft" ActiveContent="3">
<Contents Count="1">
<Content ID="0" RefID="3" />
</Contents>
</Pane>
<Pane ID="5" DockState="Document" ActiveContent="8">
<Contents Count="6">
<Content ID="0" RefID="1" />
<Content ID="1" RefID="5" />
<Content ID="2" RefID="6" />
<Content ID="3" RefID="7" />
<Content ID="4" RefID="4" />
<Content ID="5" RefID="8" />
</Contents>
</Pane>
</Panes>
<DockZones>
<DockZone ID="0" DockState="Document" ZOrderIndex="1">
<NestedPanes Count="1">
<Pane ID="0" RefID="5" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</NestedPanes>
</DockZone>
<DockZone ID="1" DockState="DockLeft" ZOrderIndex="3">
<NestedPanes Count="2">
<Pane ID="0" RefID="0" PrevPane="-1" Alignment="Bottom" Proportion="0.5" />
<Pane ID="1" RefID="4" PrevPane="0" Alignment="Bottom" Proportion="0.5" />
</NestedPanes>
</DockZone>
<DockZone ID="2" DockState="DockRight" ZOrderIndex="2">
<NestedPanes Count="1">
<Pane ID="0" RefID="3" PrevPane="-1" Alignment="Bottom" Proportion="0.5" />
</NestedPanes>
</DockZone>
<DockZone ID="3" DockState="DockTop" ZOrderIndex="4">
<NestedPanes Count="0" />
</DockZone>
<DockZone ID="4" DockState="DockBottom" ZOrderIndex="5">
<NestedPanes Count="0" />
</DockZone>
</DockZones>
<FloatingWindows Count="2">
<FloatingWindow ID="0" Bounds="216, 600, 600, 440" ZOrderIndex="0">
<NestedPanes Count="1">
<Pane ID="0" RefID="1" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</NestedPanes>
</FloatingWindow>
<FloatingWindow ID="1" Bounds="939, 347, 600, 440" ZOrderIndex="1">
<NestedPanes Count="1">
<Pane ID="0" RefID="2" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</NestedPanes>
</FloatingWindow>
</FloatingWindows>
</DockPanel>
86 changes: 86 additions & 0 deletions pwiz_tools/Skyline/TestTutorial/SmallMolMethodDevCEOptViews.data/p16.view
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
<?xml version="1.0" encoding="utf-8"?>
<!--DigitalRune Docking Windows configuration file.-->
<!--!!! AUTOMATICALLY GENERATED CONTENT. DO NOT MODIFY !!!-->
<DockPanel FormatVersion="1.0" DockLeftPortion="0.238777843065398" DockRightPortion="0.364930164983899" DockTopPortion="0.25" DockBottomPortion="0.25" ActiveDocumentPane="5" ActivePane="0">
<Contents Count="5">
<Content ID="0" PersistString="pwiz.Skyline.Controls.SequenceTreeForm|0(0(0,1)),1,2|0,0|0" AutoHidePortion="0.25" IsHidden="False" IsFloating="False" />
<Content ID="1" PersistString="pwiz.Skyline.Controls.Graphs.GraphChromatogram|2 min" AutoHidePortion="0.25" IsHidden="False" IsFloating="False" />
<Content ID="2" PersistString="pwiz.Skyline.Controls.Graphs.GraphSummary|AreaGraphController|replicate" AutoHidePortion="0.25" IsHidden="False" IsFloating="False" />
<Content ID="3" PersistString="pwiz.Skyline.Controls.Graphs.GraphSummary|RTGraphController|replicate" AutoHidePortion="0.25" IsHidden="False" IsFloating="False" />
<Content ID="4" PersistString="pwiz.Skyline.Controls.Graphs.GraphChromatogram|5 min" AutoHidePortion="0.25" IsHidden="False" IsFloating="False" />
</Contents>
<Panes Count="7">
<Pane ID="0" DockState="DockLeft" ActiveContent="0">
<Contents Count="1">
<Content ID="0" RefID="0" />
</Contents>
</Pane>
<Pane ID="1" DockState="Floating" ActiveContent="-1">
<Contents Count="1">
<Content ID="0" RefID="2" />
</Contents>
</Pane>
<Pane ID="2" DockState="Floating" ActiveContent="-1">
<Contents Count="1">
<Content ID="0" RefID="3" />
</Contents>
</Pane>
<Pane ID="3" DockState="DockRight" ActiveContent="2">
<Contents Count="1">
<Content ID="0" RefID="2" />
</Contents>
</Pane>
<Pane ID="4" DockState="DockRight" ActiveContent="3">
<Contents Count="1">
<Content ID="0" RefID="3" />
</Contents>
</Pane>
<Pane ID="5" DockState="Document" ActiveContent="1">
<Contents Count="1">
<Content ID="0" RefID="1" />
</Contents>
</Pane>
<Pane ID="6" DockState="Document" ActiveContent="4">
<Contents Count="1">
<Content ID="0" RefID="4" />
</Contents>
</Pane>
</Panes>
<DockZones>
<DockZone ID="0" DockState="Document" ZOrderIndex="1">
<NestedPanes Count="2">
<Pane ID="0" RefID="5" PrevPane="-1" Alignment="Right" Proportion="0.5" />
<Pane ID="1" RefID="6" PrevPane="5" Alignment="Bottom" Proportion="0.5" />
</NestedPanes>
</DockZone>
<DockZone ID="1" DockState="DockLeft" ZOrderIndex="3">
<NestedPanes Count="1">
<Pane ID="0" RefID="0" PrevPane="-1" Alignment="Bottom" Proportion="0.5" />
</NestedPanes>
</DockZone>
<DockZone ID="2" DockState="DockRight" ZOrderIndex="2">
<NestedPanes Count="2">
<Pane ID="0" RefID="3" PrevPane="-1" Alignment="Bottom" Proportion="0.5" />
<Pane ID="1" RefID="4" PrevPane="3" Alignment="Right" Proportion="0.5" />
</NestedPanes>
</DockZone>
<DockZone ID="3" DockState="DockTop" ZOrderIndex="4">
<NestedPanes Count="0" />
</DockZone>
<DockZone ID="4" DockState="DockBottom" ZOrderIndex="5">
<NestedPanes Count="0" />
</DockZone>
</DockZones>
<FloatingWindows Count="2">
<FloatingWindow ID="0" Bounds="216, 600, 600, 440" ZOrderIndex="0">
<NestedPanes Count="1">
<Pane ID="0" RefID="1" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</NestedPanes>
</FloatingWindow>
<FloatingWindow ID="1" Bounds="939, 347, 600, 440" ZOrderIndex="1">
<NestedPanes Count="1">
<Pane ID="0" RefID="2" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</NestedPanes>
</FloatingWindow>
</FloatingWindows>
</DockPanel>
87 changes: 87 additions & 0 deletions pwiz_tools/Skyline/TestTutorial/SmallMolMethodDevCEOptViews.data/p33.view
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
<?xml version="1.0" encoding="utf-8"?>
<!--DigitalRune Docking Windows configuration file.-->
<!--!!! AUTOMATICALLY GENERATED CONTENT. DO NOT MODIFY !!!-->
<DockPanel FormatVersion="1.0" DockLeftPortion="0.153218508769491" DockRightPortion="0.398933948086043" DockTopPortion="0.25" DockBottomPortion="0.25" ActiveDocumentPane="5" ActivePane="0">
<Contents Count="8">
<Content ID="0" PersistString="pwiz.Skyline.Controls.SequenceTreeForm|0(0(0,1)),1,2|1,1|0" AutoHidePortion="0.25" IsHidden="False" IsFloating="False" />
<Content ID="1" PersistString="pwiz.Skyline.Controls.Graphs.GraphSummary|AreaGraphController|replicate" AutoHidePortion="0.25" IsHidden="False" IsFloating="False" />
<Content ID="2" PersistString="pwiz.Skyline.Controls.Graphs.GraphSummary|RTGraphController|replicate" AutoHidePortion="0.25" IsHidden="True" IsFloating="False" />
<Content ID="3" PersistString="pwiz.Skyline.Controls.Graphs.GraphChromatogram|1:1_1" AutoHidePortion="0.25" IsHidden="False" IsFloating="False" />
<Content ID="4" PersistString="pwiz.Skyline.Controls.Graphs.GraphChromatogram|1:1_2" AutoHidePortion="0.25" IsHidden="False" IsFloating="False" />
<Content ID="5" PersistString="pwiz.Skyline.Controls.Graphs.GraphChromatogram|2:1_2" AutoHidePortion="0.25" IsHidden="False" IsFloating="False" />
<Content ID="6" PersistString="pwiz.Skyline.Controls.Graphs.GraphChromatogram|1:2_2" AutoHidePortion="0.25" IsHidden="False" IsFloating="False" />
<Content ID="7" PersistString="pwiz.Skyline.Controls.Graphs.GraphChromatogram|CE Optimization" AutoHidePortion="0.25" IsHidden="False" IsFloating="False" />
</Contents>
<Panes Count="6">
<Pane ID="0" DockState="DockLeft" ActiveContent="0">
<Contents Count="1">
<Content ID="0" RefID="0" />
</Contents>
</Pane>
<Pane ID="1" DockState="Floating" ActiveContent="-1">
<Contents Count="1">
<Content ID="0" RefID="1" />
</Contents>
</Pane>
<Pane ID="2" DockState="Floating" ActiveContent="-1">
<Contents Count="1">
<Content ID="0" RefID="2" />
</Contents>
</Pane>
<Pane ID="3" DockState="DockRight" ActiveContent="1">
<Contents Count="1">
<Content ID="0" RefID="1" />
</Contents>
</Pane>
<Pane ID="4" DockState="DockRight" ActiveContent="-1">
<Contents Count="1">
<Content ID="0" RefID="2" />
</Contents>
</Pane>
<Pane ID="5" DockState="Document" ActiveContent="7">
<Contents Count="5">
<Content ID="0" RefID="4" />
<Content ID="1" RefID="5" />
<Content ID="2" RefID="6" />
<Content ID="3" RefID="3" />
<Content ID="4" RefID="7" />
</Contents>
</Pane>
</Panes>
<DockZones>
<DockZone ID="0" DockState="Document" ZOrderIndex="1">
<NestedPanes Count="1">
<Pane ID="0" RefID="5" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</NestedPanes>
</DockZone>
<DockZone ID="1" DockState="DockLeft" ZOrderIndex="3">
<NestedPanes Count="1">
<Pane ID="0" RefID="0" PrevPane="-1" Alignment="Bottom" Proportion="0.5" />
</NestedPanes>
</DockZone>
<DockZone ID="2" DockState="DockRight" ZOrderIndex="2">
<NestedPanes Count="2">
<Pane ID="0" RefID="3" PrevPane="-1" Alignment="Bottom" Proportion="0.5" />
<Pane ID="1" RefID="4" PrevPane="3" Alignment="Right" Proportion="0.5" />
</NestedPanes>
</DockZone>
<DockZone ID="3" DockState="DockTop" ZOrderIndex="4">
<NestedPanes Count="0" />
</DockZone>
<DockZone ID="4" DockState="DockBottom" ZOrderIndex="5">
<NestedPanes Count="0" />
</DockZone>
</DockZones>
<FloatingWindows Count="2">
<FloatingWindow ID="0" Bounds="216, 600, 600, 440" ZOrderIndex="0">
<NestedPanes Count="1">
<Pane ID="0" RefID="1" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</NestedPanes>
</FloatingWindow>
<FloatingWindow ID="1" Bounds="939, 347, 600, 440" ZOrderIndex="1">
<NestedPanes Count="1">
<Pane ID="0" RefID="2" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</NestedPanes>
</FloatingWindow>
</FloatingWindows>
</DockPanel>
Binary file removed pwiz_tools/Skyline/TestTutorial/SmallMolMethodDevCEOptViews.zip
View file
Binary file not shown.
13 changes: 10 additions & 3 deletions pwiz_tools/Skyline/TestTutorial/SmallMoleculesQuantificationTutorial.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ protected override void DoTest()
SelectNode(SrmDocument.Level.Transitions, 0);
SelectNode(SrmDocument.Level.Transitions, 1);
SelectNode(SrmDocument.Level.Molecules, 0);
FocusDocument();
PauseForScreenShot<SkylineWindow>("Skyline with small molecule targets", 7);

var transitionSettingsUI = ShowDialog<TransitionSettingsUI>(SkylineWindow.ShowTransitionSettingsUI);
Expand Down Expand Up @@ -189,7 +190,7 @@ protected override void DoTest()

SelectNode(SrmDocument.Level.Transitions, 1);
SelectNode(SrmDocument.Level.Molecules, 0);

FocusDocument();
PauseForScreenShot<SkylineWindow>("Skyline window multi-precursor graph", 13);

var docResults = SkylineWindow.Document;
Expand Down Expand Up @@ -227,6 +228,12 @@ protected override void DoTest()
SelectNode(SrmDocument.Level.Transitions, 0);
SelectNode(SrmDocument.Level.Transitions, 1);
SelectNode(SrmDocument.Level.Molecules, 0);
// TODO: Removed this once Nick has fixed what is causing x-axis labels in the Peak Areas plot to end up horizontal
RunUIForScreenShot(() => SkylineWindow.Height += 200);
JiggleSelection();
RunUIForScreenShot(() => SkylineWindow.Height -= 200);
JiggleSelection();
FocusDocument();
PauseForScreenShot<SkylineWindow>("Skyline window multi-replicate layout", 14);

// Peak integration correction
Expand Down Expand Up @@ -354,7 +361,7 @@ protected override void DoTest()
}

RunUI(() => SkylineWindow.ShowCalibrationForm());
PauseForScreenShot<CalibrationForm>("Calibration Curve ", 23);
PauseForGraphScreenShot<CalibrationForm>("Calibration Curve ", 23);

EnableDocumentGridColumns(documentGrid, Resources.SkylineViewContext_GetDocumentGridRowSources_Replicates, 47,
new[]
Expand Down Expand Up @@ -413,7 +420,7 @@ protected override void DoTest()

var calibrationForm = FindOpenForm<CalibrationForm>();
RunUI(() => calibrationForm.UpdateUI(false));
PauseForScreenShot<CalibrationForm>("Calibration Curve: Log", 26);
PauseForGraphScreenShot<CalibrationForm>("Calibration Curve: Log", 26);
}

}
Expand Down
Loading

0 comments on commit 5f716bd

Please sign in to comment.