From 26e1a33369945ce8be60add8a2f0e33f84f289d6 Mon Sep 17 00:00:00 2001
From: James Crook <james.k.crook@gmail.com>
Date: Sun, 11 Feb 2018 17:19:55 +0000
Subject: [PATCH] More screenshot options.

---
 scripts/piped-work/docimages_tracks.py |  8 ++++----
 src/commands/ScreenshotCommand.cpp     | 21 +++++++++++++++++++++
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/scripts/piped-work/docimages_tracks.py b/scripts/piped-work/docimages_tracks.py
index 0888dbd20..f0bf01f77 100644
--- a/scripts/piped-work/docimages_tracks.py
+++ b/scripts/piped-work/docimages_tracks.py
@@ -118,7 +118,7 @@ def image3() :
     do( 'SetTrack: TrackIndex=1 Name="Instrument 2" Height=122 Color=Color1')
     do( 'SetTrack: TrackIndex=2 Name="Instrument 3" Height=122 Color=Color2')
     do( 'SetTrack: TrackIndex=3 Name="Instrument 4" Height=122 Color=Color3')
-    do( 'Screenshot: Path='+path+' CaptureWhat=Tracks' )
+    do( 'Screenshot: Path='+path+' CaptureWhat=First_Four_Tracks' )
 
 # Two Tracks, ready to make stereo
 def image4():
@@ -126,7 +126,7 @@ def image4():
     makeMonoTracks(2)
     do( 'SetTrack: TrackIndex=0 Name="Left Track" Height=80')
     do( 'SetTrack: TrackIndex=1 Name="Right Track" Height=80')
-    do( 'Screenshot: Path='+path+' CaptureWhat=Tracks' )
+    do( 'Screenshot: Path='+path+' CaptureWhat=First_Two_Tracks' )
 
 # Mono tracks made stereo    
 def image5():
@@ -154,7 +154,7 @@ def image7() :
     makeMonoTracks(2)
     do( 'SetTrack: TrackIndex=0 Height=80')
     do( 'SetTrack: TrackIndex=1 Height=180')
-    do( 'Screenshot: Path='+path+' CaptureWhat=Tracks' )
+    do( 'Screenshot: Path='+path+' CaptureWhat=First_Two_Tracks' )
 
 # Mono with arrow at start.
 def image8() :
@@ -173,7 +173,7 @@ def image9() :
     do( 'SetPreference: Name=/GUI/SampleView Value=1 Reload=1')
     do( 'Screenshot: Path='+path+' CaptureWhat=First_Track' )
 
-# Zoomed in to show points no stem plot
+# Zoomed in to show points stem-plot and then no stem plot
 def image9and10() :
     global path
     image9()
diff --git a/src/commands/ScreenshotCommand.cpp b/src/commands/ScreenshotCommand.cpp
index f6271ddf1..39bb530ac 100644
--- a/src/commands/ScreenshotCommand.cpp
+++ b/src/commands/ScreenshotCommand.cpp
@@ -72,6 +72,9 @@ enum kCaptureTypes
    kruler,
    ktracks,
    kfirsttrack,
+   kfirsttwotracks,
+   kfirstthreetracks,
+   kfirstfourtracks,
    ksecondtrack,
    ktracksplus,
    kfirsttrackplus,
@@ -104,6 +107,9 @@ static const wxString kCaptureWhatStrings[nCaptureWhats] =
    XO("Ruler"),
    XO("Tracks"),
    XO("First_Track"),
+   XO("First_Two_Tracks"),
+   XO("First_Three_Tracks"),
+   XO("First_Four_Tracks"),
    XO("Second_Track"),
    XO("Tracks_Plus"),
    XO("First_Track_Plus"),
@@ -871,6 +877,21 @@ bool ScreenshotCommand::Apply(const CommandContext & context)
       r.SetHeight( r.GetHeight() + ruler->GetRulerHeight() );
       return Capture(context, mFileName, panel, r );
    }
+   else if (mCaptureMode.IsSameAs(wxT("First_Two_Tracks")))
+   {  wxRect r = GetTrackRect( context.GetProject(), panel, 0 );
+      r = r.Union( GetTrackRect( context.GetProject(), panel, 1 ));
+      return Capture(context, mFileName, panel, r );
+   }
+   else if (mCaptureMode.IsSameAs(wxT("First_Three_Tracks")))
+   {  wxRect r = GetTrackRect( context.GetProject(), panel, 0 );
+      r = r.Union( GetTrackRect( context.GetProject(), panel, 2 ));
+      return Capture(context, mFileName, panel, r );
+   }
+   else if (mCaptureMode.IsSameAs(wxT("First_Four_Tracks")))
+   {  wxRect r = GetTrackRect( context.GetProject(), panel, 0 );
+      r = r.Union( GetTrackRect( context.GetProject(), panel, 3 ));
+      return Capture(context, mFileName, panel, r );
+   }
    else
       return false;