Skip to content

Skyline: Fixes for auto-screenshot mode for several tests #3237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 26, 2024
Merged

Skyline: Fixes for auto-screenshot mode for several tests #3237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b61a0b6
Skyline: Fixes for auto-screenshot mode for several tests
Nov 24, 2024
fb8c966
Merge branch 'master' into Skyline/work/20241124_tutorial_screnshots
brendanx67 Nov 24, 2024
ba839b3
Merge branch 'master' into Skyline/work/20241124_tutorial_screnshots
brendanx67 Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions pwiz_tools/Skyline/FileUI/ImportTransitionListColumnSelectDlg.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1664,7 +1664,14 @@ private bool UpdateProteinAssociationState(AssociateProteinsMode mode)
}

#region testing support

public bool AssociateProteinsPreviewCompleted => checkBoxAssociateProteins.Checked && isAssociated;

public void SetColumnWidth(int columnIndex, int width)
{
dataGrid.Columns[columnIndex].Width = width;
}

#endregion

}
Expand Down
5 changes: 5 additions & 0 deletions pwiz_tools/Skyline/FileUI/OpenDataSourceDialog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,11 @@ public IEnumerable<string> SelectedFiles
}
}

public void EnsureListViewItemVisible(int item)
{
listView.EnsureVisible(item);
}

public View ListView
{
get { return listView.View; }
Expand Down
2 changes: 1 addition & 1 deletion pwiz_tools/Skyline/SettingsUI/Irt/AddIrtPeptidesDlg.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 13 additions & 13 deletions pwiz_tools/Skyline/SettingsUI/Irt/AddIrtPeptidesDlg.ja.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="btnOk.Location" type="System.Drawing.Point, System.Drawing">
<value>497, 14</value>
<value>595, 14</value>
</data>
<data name="btnOk.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
Expand Down Expand Up @@ -160,7 +160,7 @@
<value>NoControl</value>
</data>
<data name="btnCancel.Location" type="System.Drawing.Point, System.Drawing">
<value>497, 44</value>
<value>595, 44</value>
</data>
<data name="btnCancel.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
Expand Down Expand Up @@ -199,7 +199,7 @@
<value>ポイント数</value>
</data>
<data name="Points.MinimumWidth" type="System.Int32, mscorlib">
<value>32</value>
<value>80</value>
</data>
<metadata name="Equation.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
Expand All @@ -208,7 +208,7 @@
<value>式</value>
</data>
<data name="Equation.MinimumWidth" type="System.Int32, mscorlib">
<value>38</value>
<value>100</value>
</data>
<metadata name="R.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
Expand All @@ -217,7 +217,7 @@
<value>R</value>
</data>
<data name="R.MinimumWidth" type="System.Int32, mscorlib">
<value>25</value>
<value>30</value>
</data>
<metadata name="Result.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
Expand All @@ -232,7 +232,7 @@
<value>5, 73</value>
</data>
<data name="dataGridView.Size" type="System.Drawing.Size, System.Drawing">
<value>481, 106</value>
<value>579, 106</value>
</data>
<data name="dataGridView.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
Expand Down Expand Up @@ -280,7 +280,7 @@
<value>5, 306</value>
</data>
<data name="panelKeep.Size" type="System.Drawing.Size, System.Drawing">
<value>481, 121</value>
<value>579, 121</value>
</data>
<data name="panelKeep.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
Expand Down Expand Up @@ -323,7 +323,7 @@ MS/MSスキャンから計算されたより新しいiRT値は無視されます
<value>7, 32</value>
</data>
<data name="listKeep.Size" type="System.Drawing.Size, System.Drawing">
<value>437, 69</value>
<value>535, 69</value>
</data>
<data name="listKeep.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
Expand Down Expand Up @@ -449,7 +449,7 @@ MS/MSスキャンから計算されたより新しいiRT値は無視されます
<value>5, 185</value>
</data>
<data name="panelOverwrite.Size" type="System.Drawing.Size, System.Drawing">
<value>481, 121</value>
<value>579, 121</value>
</data>
<data name="panelOverwrite.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
Expand Down Expand Up @@ -492,7 +492,7 @@ MS/MSスキャンから計算されたより新しいiRT値は無視されます
<value>7, 32</value>
</data>
<data name="listOverwrite.Size" type="System.Drawing.Size, System.Drawing">
<value>437, 69</value>
<value>535, 69</value>
</data>
<data name="listOverwrite.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
Expand Down Expand Up @@ -576,7 +576,7 @@ MS/MSスキャンから計算されたより新しいiRT値は無視されます
<value>5, 427</value>
</data>
<data name="panelExisting.Size" type="System.Drawing.Size, System.Drawing">
<value>481, 180</value>
<value>579, 180</value>
</data>
<data name="panelExisting.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
Expand Down Expand Up @@ -702,7 +702,7 @@ MS/MSスキャンから計算されたより新しいiRT値は無視されます
<value>7, 19</value>
</data>
<data name="listExisting.Size" type="System.Drawing.Size, System.Drawing">
<value>437, 56</value>
<value>535, 56</value>
</data>
<data name="listExisting.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
Expand All @@ -714,7 +714,7 @@ MS/MSスキャンから計算されたより新しいiRT値は無視されます
<value>6, 13</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>584, 613</value>
<value>682, 613</value>
</data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterParent</value>
Expand Down
26 changes: 13 additions & 13 deletions pwiz_tools/Skyline/SettingsUI/Irt/AddIrtPeptidesDlg.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="btnOk.Location" type="System.Drawing.Point, System.Drawing">
<value>497, 14</value>
<value>595, 14</value>
</data>
<data name="btnOk.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
Expand Down Expand Up @@ -160,7 +160,7 @@
<value>NoControl</value>
</data>
<data name="btnCancel.Location" type="System.Drawing.Point, System.Drawing">
<value>497, 44</value>
<value>595, 44</value>
</data>
<data name="btnCancel.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
Expand Down Expand Up @@ -199,7 +199,7 @@
<value>Points</value>
</data>
<data name="Points.MinimumWidth" type="System.Int32, mscorlib">
<value>24</value>
<value>30</value>
</data>
<metadata name="Equation.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
Expand All @@ -208,7 +208,7 @@
<value>Equation</value>
</data>
<data name="Equation.MinimumWidth" type="System.Int32, mscorlib">
<value>38</value>
<value>100</value>
</data>
<metadata name="R.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
Expand All @@ -217,7 +217,7 @@
<value>R</value>
</data>
<data name="R.MinimumWidth" type="System.Int32, mscorlib">
<value>25</value>
<value>30</value>
</data>
<metadata name="Result.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
Expand All @@ -232,7 +232,7 @@
<value>5, 73</value>
</data>
<data name="dataGridView.Size" type="System.Drawing.Size, System.Drawing">
<value>481, 106</value>
<value>579, 106</value>
</data>
<data name="dataGridView.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
Expand Down Expand Up @@ -280,7 +280,7 @@
<value>5, 306</value>
</data>
<data name="panelKeep.Size" type="System.Drawing.Size, System.Drawing">
<value>481, 121</value>
<value>579, 121</value>
</data>
<data name="panelKeep.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
Expand Down Expand Up @@ -323,7 +323,7 @@ and newer iRT values calculated from MS/MS scans ignored:</value>
<value>7, 32</value>
</data>
<data name="listKeep.Size" type="System.Drawing.Size, System.Drawing">
<value>437, 69</value>
<value>535, 69</value>
</data>
<data name="listKeep.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
Expand Down Expand Up @@ -449,7 +449,7 @@ and newer iRT values calculated from MS/MS scans ignored:</value>
<value>5, 185</value>
</data>
<data name="panelOverwrite.Size" type="System.Drawing.Size, System.Drawing">
<value>481, 121</value>
<value>579, 121</value>
</data>
<data name="panelOverwrite.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
Expand Down Expand Up @@ -492,7 +492,7 @@ with iRT values calculated from chromatogram peaks:</value>
<value>7, 32</value>
</data>
<data name="listOverwrite.Size" type="System.Drawing.Size, System.Drawing">
<value>437, 69</value>
<value>535, 69</value>
</data>
<data name="listOverwrite.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
Expand Down Expand Up @@ -576,7 +576,7 @@ with iRT values calculated from chromatogram peaks:</value>
<value>5, 427</value>
</data>
<data name="panelExisting.Size" type="System.Drawing.Size, System.Drawing">
<value>481, 180</value>
<value>579, 180</value>
</data>
<data name="panelExisting.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
Expand Down Expand Up @@ -702,7 +702,7 @@ with iRT values calculated from chromatogram peaks:</value>
<value>7, 19</value>
</data>
<data name="listExisting.Size" type="System.Drawing.Size, System.Drawing">
<value>437, 56</value>
<value>535, 56</value>
</data>
<data name="listExisting.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
Expand All @@ -714,7 +714,7 @@ with iRT values calculated from chromatogram peaks:</value>
<value>6, 13</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>584, 613</value>
<value>682, 613</value>
</data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterParent</value>
Expand Down
26 changes: 13 additions & 13 deletions pwiz_tools/Skyline/SettingsUI/Irt/AddIrtPeptidesDlg.zh-CHS.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="btnOk.Location" type="System.Drawing.Point, System.Drawing">
<value>497, 14</value>
<value>595, 14</value>
</data>
<data name="btnOk.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
Expand Down Expand Up @@ -160,7 +160,7 @@
<value>NoControl</value>
</data>
<data name="btnCancel.Location" type="System.Drawing.Point, System.Drawing">
<value>497, 44</value>
<value>595, 44</value>
</data>
<data name="btnCancel.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
Expand Down Expand Up @@ -199,7 +199,7 @@
<value>点</value>
</data>
<data name="Points.MinimumWidth" type="System.Int32, mscorlib">
<value>32</value>
<value>30</value>
</data>
<metadata name="Equation.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
Expand All @@ -208,7 +208,7 @@
<value>方程式</value>
</data>
<data name="Equation.MinimumWidth" type="System.Int32, mscorlib">
<value>38</value>
<value>100</value>
</data>
<metadata name="R.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
Expand All @@ -217,7 +217,7 @@
<value>R</value>
</data>
<data name="R.MinimumWidth" type="System.Int32, mscorlib">
<value>25</value>
<value>30</value>
</data>
<metadata name="Result.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
Expand All @@ -232,7 +232,7 @@
<value>5, 73</value>
</data>
<data name="dataGridView.Size" type="System.Drawing.Size, System.Drawing">
<value>481, 106</value>
<value>579, 106</value>
</data>
<data name="dataGridView.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
Expand Down Expand Up @@ -280,7 +280,7 @@
<value>5, 306</value>
</data>
<data name="panelKeep.Size" type="System.Drawing.Size, System.Drawing">
<value>481, 121</value>
<value>579, 121</value>
</data>
<data name="panelKeep.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
Expand Down Expand Up @@ -323,7 +323,7 @@
<value>7, 32</value>
</data>
<data name="listKeep.Size" type="System.Drawing.Size, System.Drawing">
<value>437, 69</value>
<value>535, 69</value>
</data>
<data name="listKeep.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
Expand Down Expand Up @@ -449,7 +449,7 @@
<value>5, 185</value>
</data>
<data name="panelOverwrite.Size" type="System.Drawing.Size, System.Drawing">
<value>481, 121</value>
<value>579, 121</value>
</data>
<data name="panelOverwrite.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
Expand Down Expand Up @@ -492,7 +492,7 @@
<value>7, 32</value>
</data>
<data name="listOverwrite.Size" type="System.Drawing.Size, System.Drawing">
<value>437, 69</value>
<value>535, 69</value>
</data>
<data name="listOverwrite.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
Expand Down Expand Up @@ -576,7 +576,7 @@
<value>5, 427</value>
</data>
<data name="panelExisting.Size" type="System.Drawing.Size, System.Drawing">
<value>481, 180</value>
<value>579, 180</value>
</data>
<data name="panelExisting.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
Expand Down Expand Up @@ -702,7 +702,7 @@
<value>7, 19</value>
</data>
<data name="listExisting.Size" type="System.Drawing.Size, System.Drawing">
<value>437, 56</value>
<value>535, 56</value>
</data>
<data name="listExisting.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
Expand All @@ -714,7 +714,7 @@
<value>6, 13</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>584, 613</value>
<value>682, 613</value>
</data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterParent</value>
Expand Down
1 change: 1 addition & 0 deletions pwiz_tools/Skyline/SettingsUI/ViewLibraryDlg.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ private MSGraphControl GraphControl
get { return msGraphExtension1.Graph; }
}

public Control ListControl => listPeptide;

/// <summary>
/// Constructor for the View Library dialog.
Expand Down
Loading