-
Notifications
You must be signed in to change notification settings - Fork 101
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improvements to tutorial screenshot taking (#3153)
* Add functionality to save screenshots in pause for screenshot form * Remove uncessary space changes * Add auto screenshot mode * Undo massive changes in form editing * Update save screenshot to use a checkbox * Update location of checkbox * Implement graph screenshots, form targetting, dia tutorial, and preview feature * - fixes and extensions based automating screenshots for AbsoluteQuantTutorialTest and MethodEditTutorialTest * - fixes for targets view clipping and statement completion * - update screenshots for English MethodEdit based on test changes * - add one extra pixel to ClipSelectionStatus to capture statusbar border * - more fixes to PauseAndContinueForm and SkylineTester * - fixes to MethodRefinementTutorialTest to get it to work with auto-screenshot mode - fixes to auto-screenshot mode - removed an unused using clause * - fixed MethodRefinementTutorialTest figure 13 to avoid spectrum graph overlap * - updated MethodRefine tutorial screenshot images * - checkpoint commit for TestGroupedStudies1Tutorial screenshots * Checkpoint commit for ExistingExperimentsTutorial. Update screenshots of graphs, trees, and 2 others that should have included the main window.# * - more fixes to GroupedStudies1TutorialTest * - more fixes for GroupedStudies1TutorialTest * - switch GroupedStudies1Views to .data directory from .zip file * Add controls to preview form. Run pause/preview forms in new thread * Hide preview window while taking screenshot, fix focus/activation of window * * Support trimming horizontal whitespace from SequenceTree * Execute screenshot processing delegates on the active window's UI thread * Prevent test framework from setting icon on dialogs that aren't resizable - ex: PeptideSettingsUI Tests run: Screenshots appear as expected in ExistingExperiementsTutorialTest and MethodEditTutorialTest * Switch ExistingExperimentsViews to .data directory from .zip file * Fix timing issues with preview form. Fix PauseAndContinueForm to come to front. Fix Thread exception in ScreenshotManager * - more fixes for TestGroupedStudies1Tutorial - added TestFunctional.ForceMzmlInScreenShots property to force using mzML in screenshot mode * - more screenshot fixes for TestGroupedStudies1Tutorial * - add red arrow annotations to 3 figures in TestGroupedStudies1Tutorial * - added utility function to show a left arrow cursor on a screenshot - currently unused - fixed TestFunction.ClipTargets to use TreeNodeMS.BoundsMS for right-side white space clipping - fixed ScreenshotPreviewForm to detect errors saving and show a message box - especially when the PNG file is locked - fixed y-scale on GroupedStudies s-95 fold-change bar graph * - add support for docking window drag-drop screenshots * * Change PeptideSettingsUI to support selecting a library by name * Fix Existing Experiments Tutorial to select correct library - fixes screenshot 1 * Update ExistingExperimentsTutorial screenshots. * - fixed non-screenshot mode for GroupedStudies1TutorialTest * - try telling Git that .view and .sky are text file types * - remove .view files accidentally added as binary * - add back .view files hopefully as text * - attempted fixes to get TeamCity closer to passing - exception handling added to PauseAndContinueForm during file save * - remove old view files for 4 tutorials * - add back .view files as UTF-8 BOM and UTF-16 to UTF-8 converter * - have Utf16to8 update the XML text from UTF-16 to UTF-8 * - removed use of async and await in favor of cleaner thread use - improved screenshot form activation to hide selection and cursor in TextBoxes - reduced 3 second wait for automated screenshots to 1 second - fixd closing ScreenshotPreviewForm to always activate PauseAndContinueForm - moved Utf16to8 .view file converter from scripts into Skyline/Executables/DevTools - cleaned up Interop use moving control related methods into FormUtil * - removed unnecessary InteropServices using clauses * - add disk failure icon * Revert the line in .gitattributes saying that .view files are text because that messes up on files which are UTF-8. (also, revert the lines about .sky and .skyl because they're not necessary) * Improved thread handling and usability of preview form * * Update TestMSMS tutorial. Screenshot #20 was manually generated using data not available to the test and is a placeholder for now. Will add data and update the test in a future checkin. * Add processShot helper in TestFunctional to mark a bitmap as a "placeholder". * Add resizing of images to fit panel if auto size is disabled * Fix two peak area graph screenshot calls inadvertently reverted during code review this morning. * Add ability to skip to future screenshot * Convert TargetedMSMS tutorials from .zip to .view files. Convert .views from UTF-16 to UTF-8 BOM. * Convert CustomReportsTutorial from .zip to .view files. Convert .view files from UTF-16 to UTF-8 BOM. Tests run: used TestRunner to make sure tutorial runs from start-to-end * - clean up IsRecordMode us and PauseAndContinueForm use in record mode - improve ScreenshotPreviewForm to clarify thread use and encapsulation and add progress UI - clean up PauseAndContinueForm and ScreenshotManager to better localize responsibilities and clarify API use * - fix simple PauseTest() cases for NREs and form layout * - remove missing using clause from TargetedMsmsTutorialTest * Fix scaling bug. Make preview form not move if on separate screen * Fix continue loading next screenshot when it doesn't exist --------- Co-authored-by: brendanx67 <[email protected]> Co-authored-by: Eddie O'Neil <[email protected]> Co-authored-by: Brendan MacLean <[email protected]> Co-authored-by: Brendan MacLean <[email protected]> Co-authored-by: Nicholas Shulman <[email protected]>
- Loading branch information
1 parent
1c6cff4
commit 50da7cb
Showing
165 changed files
with
8,603 additions
and
802 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
-15.3 KB
(82%)
pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-10.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-14.7 KB
(80%)
pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-11.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-2.7 KB
(75%)
pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-14.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-99 Bytes
(99%)
pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-15.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-4.26 KB
(68%)
pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-15.5 KB
(80%)
pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-21.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-6.21 KB
(92%)
pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-22.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+9.2 KB
(150%)
pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-23.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+2.62 KB
(110%)
pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-24.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+3.39 KB
(120%)
pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-25.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+12.6 KB
(130%)
pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-26.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+1.61 KB
(160%)
pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+8 KB
(140%)
pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-5.02 KB
(91%)
pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-15 KB
(81%)
pwiz_tools/Skyline/Documentation/Tutorials/ExistingQuant/en/s-9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-6.29 KB
(90%)
pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-10.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-9.56 KB
(84%)
pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-11.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-8.45 KB
(78%)
pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-12.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+721 Bytes
(110%)
pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-13.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-730 Bytes
(94%)
pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-20.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-13.1 KB
(80%)
pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-13.7 KB
(79%)
pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-3.27 KB
(82%)
pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-2.55 KB
(83%)
pwiz_tools/Skyline/Documentation/Tutorials/MethodEdit/en/s-7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-12.1 KB
(91%)
pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-4.08 KB
(80%)
pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-10.png
Oops, something went wrong.
Binary file modified
BIN
+385 Bytes
(100%)
pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-12.png
Oops, something went wrong.
Binary file modified
BIN
-2.23 KB
(90%)
pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-13.png
Oops, something went wrong.
Binary file modified
BIN
-2.88 KB
(84%)
pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-14.png
Oops, something went wrong.
Binary file modified
BIN
-3.01 KB
(76%)
pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-16.png
Oops, something went wrong.
Binary file modified
BIN
-11.8 KB
(86%)
pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-17.png
Oops, something went wrong.
Binary file modified
BIN
-7.08 KB
(57%)
pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-19.png
Oops, something went wrong.
Binary file modified
BIN
-2.98 KB
(77%)
pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-2.png
Oops, something went wrong.
Binary file modified
BIN
-3.12 KB
(78%)
pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-20.png
Oops, something went wrong.
Binary file modified
BIN
-3.38 KB
(97%)
pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-21.png
Oops, something went wrong.
Binary file modified
BIN
-2.34 KB
(87%)
pwiz_tools/Skyline/Documentation/Tutorials/MethodRefine/en/s-8.png
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
pwiz_tools/Skyline/Executables/DevTools/Utf16to8/Program.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
using System.Text; | ||
|
||
if (args.Length < 2) | ||
{ | ||
Console.WriteLine("Usage: Utf16to8 <sourceFile> <destinationFile>"); | ||
return; | ||
} | ||
|
||
string sourceFile = args[0]; | ||
string destinationFile = args[1]; | ||
|
||
try | ||
{ | ||
// Read all text from the source file with UTF-16 encoding (default for StreamReader with UTF-16 files) | ||
string content = File.ReadAllText(sourceFile, Encoding.Unicode).Replace("UTF-16", "UTF-8"); | ||
|
||
// Write the content to the destination file in UTF-8 encoding with BOM | ||
File.WriteAllText(destinationFile, content, new UTF8Encoding(true)); | ||
|
||
Console.WriteLine($"Converted {Path.GetFileName(sourceFile)} to UTF-8 with BOM."); | ||
} | ||
catch (Exception ex) | ||
{ | ||
Console.WriteLine($"An error occurred: {ex.Message}"); | ||
} |
10 changes: 10 additions & 0 deletions
10
pwiz_tools/Skyline/Executables/DevTools/Utf16to8/Utf16to8.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
<Project Sdk="Microsoft.NET.Sdk"> | ||
|
||
<PropertyGroup> | ||
<OutputType>Exe</OutputType> | ||
<TargetFramework>net8.0</TargetFramework> | ||
<ImplicitUsings>enable</ImplicitUsings> | ||
<Nullable>enable</Nullable> | ||
</PropertyGroup> | ||
|
||
</Project> |
25 changes: 25 additions & 0 deletions
25
pwiz_tools/Skyline/Executables/DevTools/Utf16to8/Utf16to8.sln
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
|
||
Microsoft Visual Studio Solution File, Format Version 12.00 | ||
# Visual Studio Version 17 | ||
VisualStudioVersion = 17.9.34728.123 | ||
MinimumVisualStudioVersion = 10.0.40219.1 | ||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utf16to8", "Utf16to8.csproj", "{22EEA8E7-EDEC-4972-8936-2B36A5E33CDA}" | ||
EndProject | ||
Global | ||
GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
Debug|Any CPU = Debug|Any CPU | ||
Release|Any CPU = Release|Any CPU | ||
EndGlobalSection | ||
GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
{22EEA8E7-EDEC-4972-8936-2B36A5E33CDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
{22EEA8E7-EDEC-4972-8936-2B36A5E33CDA}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
{22EEA8E7-EDEC-4972-8936-2B36A5E33CDA}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
{22EEA8E7-EDEC-4972-8936-2B36A5E33CDA}.Release|Any CPU.Build.0 = Release|Any CPU | ||
EndGlobalSection | ||
GlobalSection(SolutionProperties) = preSolution | ||
HideSolutionNode = FALSE | ||
EndGlobalSection | ||
GlobalSection(ExtensibilityGlobals) = postSolution | ||
SolutionGuid = {AF22AE3B-295D-4B6A-A0B6-03DFACB15193} | ||
EndGlobalSection | ||
EndGlobal |
23 changes: 23 additions & 0 deletions
23
pwiz_tools/Skyline/Executables/DevTools/Utf16to8/bin/Utf16to8.deps.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
{ | ||
"runtimeTarget": { | ||
"name": ".NETCoreApp,Version=v8.0", | ||
"signature": "" | ||
}, | ||
"compilationOptions": {}, | ||
"targets": { | ||
".NETCoreApp,Version=v8.0": { | ||
"Utf16to8/1.0.0": { | ||
"runtime": { | ||
"Utf16to8.dll": {} | ||
} | ||
} | ||
} | ||
}, | ||
"libraries": { | ||
"Utf16to8/1.0.0": { | ||
"type": "project", | ||
"serviceable": false, | ||
"sha512": "" | ||
} | ||
} | ||
} |
Binary file not shown.
Binary file not shown.
Oops, something went wrong.