Merge branch 'master' into master

ProteoWizard · Jan 8, 2025 · c26f9d3 · c26f9d3
2 parents 964bcb3 + 78335e2
commit c26f9d3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/pwiz_tools/Skyline/Executables/DevTools/ImageComparer/ScreenshotInfo.cs b/pwiz_tools/Skyline/Executables/DevTools/ImageComparer/ScreenshotInfo.cs
@@ -85,7 +85,7 @@ public bool IsCurrent(ScreenshotFile screenshot, ImageSource currentSource)
 
     internal class ScreenshotFile
     {
-        private static readonly Regex PATTERN = new Regex(@"\\([a-zA-Z\-]+)\\(\w\w-?[A-Z]*)\\s-(\d\d)\.png");
+        private static readonly Regex PATTERN = new Regex(@"\\([a-zA-Z0-9\-]+)\\(\w\w-?[A-Z]*)\\s-(\d\d)\.png");
 
         public static bool IsMatch(string filePath)
         {

diff --git a/pwiz_tools/Skyline/TestTutorial/GroupedStudies1TutorialTest.cs b/pwiz_tools/Skyline/TestTutorial/GroupedStudies1TutorialTest.cs
@@ -255,10 +255,20 @@ private void OpenImportArrange()
             if (IsPauseForScreenShots)
                 RunUI(() =>
                 {
-                    // Essentially maximize the window for a 1920x1080 monitor at 100%
                     savedBounds = SkylineWindow.Bounds;
-                    SkylineWindow.Size = new Size(1934, 1047);
-                    SkylineWindow.Location = new Point(-7, 0);
+
+                    // Essentially maximize the window at 1920 x 1080 screen resolution at 100% zoom
+                    // Ideally this should be the maximum size that will fit on all screens or the minima
+                    // of the WorkingArea width and height.
+
+                    // SkylineWindow.Size = Screen.FromControl(SkylineWindow).WorkingArea.Size;
+
+                    // Size on Windows 10 = 1920 x 1040 (leaves 7 pixels below and 7 pixels on left and right for shadow)
+                    // Size on Windows 11 = 1920 x 1032 (same borders with a taller task bar)
+                    // A laptop at 1920 x 1200 would allow 120 pixels more in width
+
+                    SkylineWindow.Size = new Size(1920, 1032);
+                    SkylineWindow.Location = new Point(0, 0);
                 });
 
             SelectNode(SrmDocument.Level.Molecules, 0);
@@ -1098,7 +1108,7 @@ private void PrepareForStatistics()
                 var documentSettingsDlg = ShowDialog<DocumentSettingsDlg>(SkylineWindow.ShowDocumentSettingsDialog);
 
                 AddAnnotation(documentSettingsDlg, "MissingData", AnnotationDef.AnnotationType.true_false, null,
-                    AnnotationDef.AnnotationTargetSet.Singleton(AnnotationDef.AnnotationTarget.peptide));
+                    AnnotationDef.AnnotationTargetSet.Singleton(AnnotationDef.AnnotationTarget.peptide), true);
 
                 RunUI(() => documentSettingsDlg.AnnotationsCheckedListBox.SetItemChecked(3, true));