Fixed problem with wrongly applying /CropBox on page orientation (/Ro…

…tate) other than Portrait. Added debug (StdOut and StdErr) output in the Ghostscript.NET.Viewer.
ArtifexSoftware · Dec 14, 2016 · 0115389 · 0115389
1 parent 93776b5
commit 0115389
Show file tree

Hide file tree

Showing 16 changed files with 1,294 additions and 37 deletions.
diff --git a/Ghostscript.NET.VS2015.VC.db b/Ghostscript.NET.VS2015.VC.db
diff --git a/Ghostscript.NET.Viewer/FDebug.Designer.cs b/Ghostscript.NET.Viewer/FDebug.Designer.cs
diff --git a/Ghostscript.NET.Viewer/FDebug.cs b/Ghostscript.NET.Viewer/FDebug.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace Ghostscript.NET.Viewer
+{
+    public partial class FDebug : Form
+    {
+        public FDebug()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Ghostscript.NET.Viewer/FDebug.resx b/Ghostscript.NET.Viewer/FDebug.resx
diff --git a/Ghostscript.NET.Viewer/FMain.Designer.cs b/Ghostscript.NET.Viewer/FMain.Designer.cs
diff --git a/Ghostscript.NET.Viewer/FMain.cs b/Ghostscript.NET.Viewer/FMain.cs
@@ -42,6 +42,9 @@ public partial class FMain : Form
     {
         private GhostscriptViewer _viewer;
         private GhostscriptVersionInfo _gsVersion = GhostscriptVersionInfo.GetLastInstalledVersion();
+        private StringBuilder _stdOut = new StringBuilder();
+        private StringBuilder _stdErr = new StringBuilder();
+        private bool _supressPageNumberChangeEvent = false;
 
         public FMain()
         {
@@ -53,6 +56,7 @@ public FMain()
             pbPage.Height = 100;
 
             _viewer = new GhostscriptViewer();
+            _viewer.AttachStdIO(new GhostscriptStdIOHandler(_stdOut, _stdErr));
 
             _viewer.DisplaySize += new GhostscriptViewerViewEventHandler(_viewer_DisplaySize);
             _viewer.DisplayUpdate += new GhostscriptViewerViewEventHandler(_viewer_DisplayUpdate);
@@ -75,7 +79,10 @@ void _viewer_DisplayPage(object sender, GhostscriptViewerViewEventArgs e)
             pbPage.Invalidate();
             pbPage.Update();
 
+            _supressPageNumberChangeEvent = true;
             tbPageNumber.Text = _viewer.CurrentPageNumber.ToString();
+            _supressPageNumberChangeEvent = false;
+
             tbTotalPages.Text = " / " + _viewer.LastPageNumber.ToString();
         }
 
@@ -98,6 +105,8 @@ private void mnuFileOpen_Click(object sender, EventArgs e)
             {
                 mnuFileClose_Click(this, null);
 
+                _stdOut.AppendLine("@GSNET_VIEWER -> COMMAND -> OPEN");
+
                 _viewer.Open(ofd.FileName, _gsVersion, false);
 
                 this.Text = System.IO.Path.GetFileName(ofd.FileName) + " - " + Program.NAME;
@@ -107,6 +116,10 @@ private void mnuFileOpen_Click(object sender, EventArgs e)
         private void mnuFileClose_Click(object sender, EventArgs e)
         {
             _viewer.Close();
+
+            _stdOut.Clear();
+            _stdErr.Clear();
+
             pbPage.Image = null;
             this.Text = Program.NAME;
             tbPageNumber.Text = string.Empty;
@@ -121,31 +134,39 @@ private void mnuFileExit_Click(object sender, EventArgs e)
 
         private void tbPageFirst_Click(object sender, EventArgs e)
         {
+            _stdOut.AppendLine("@GSNET_VIEWER -> COMMAND -> SHOW FIRST PAGE");
             _viewer.ShowFirstPage();
         }
 
         private void tbPagePrevious_Click(object sender, EventArgs e)
         {
+            _stdOut.AppendLine("@GSNET_VIEWER -> COMMAND -> SHOW PREVIOUS PAGE");
             _viewer.ShowPreviousPage();
         }
 
         private void tbPageNext_Click(object sender, EventArgs e)
         {
+            _stdOut.AppendLine("@GSNET_VIEWER -> COMMAND -> SHOW NEXT PAGE");
             _viewer.ShowNextPage();
         }
 
         private void tbPageLast_Click(object sender, EventArgs e)
         {
+            _stdOut.AppendLine("@GSNET_VIEWER -> COMMAND -> SHOW LAST PAGE");
             _viewer.ShowLastPage();
         }
 
         private void tbPageNumber_TextChanged(object sender, EventArgs e)
         {
             try
             {
-                if (tbPageNumber.Text.Length > 0)
+                if (!_supressPageNumberChangeEvent)
                 {
-                    _viewer.ShowPage(int.Parse(tbPageNumber.Text));
+                    if (tbPageNumber.Text.Length > 0)
+                    {
+                        _stdOut.AppendLine("@GSNET_VIEWER -> COMMAND -> SHOW PAGE " + tbPageNumber.Text);
+                        _viewer.ShowPage(int.Parse(tbPageNumber.Text));
+                    }
                 }
             }
             catch { }
@@ -158,32 +179,54 @@ private void mnuAbout_Click(object sender, EventArgs e)
 
         private void mnuNext_Click(object sender, EventArgs e)
         {
+            _stdOut.AppendLine("@GSNET_VIEWER -> COMMAND -> SHOW NEXT PAGE");
             _viewer.ShowNextPage();
         }
 
         private void mnuPrev_Click(object sender, EventArgs e)
         {
+            _stdOut.AppendLine("@GSNET_VIEWER -> COMMAND -> SHOW PREVIOUS PAGE");
             _viewer.ShowPreviousPage();
         }
 
         private void mnuFirst_Click(object sender, EventArgs e)
         {
+            _stdOut.AppendLine("@GSNET_VIEWER -> COMMAND -> SHOW LAST PAGE");
             _viewer.ShowFirstPage();
         }
 
         private void mnuLast_Click(object sender, EventArgs e)
         {
+            _stdOut.AppendLine("@GSNET_VIEWER -> COMMAND -> SHOW LAST PAGE");
             _viewer.ShowLastPage();
         }
 
         private void tpZoomIn_Click(object sender, EventArgs e)
         {
+            _stdOut.AppendLine("@GSNET_VIEWER -> COMMAND -> ZOOM IN");
             _viewer.ZoomIn();
         }
 
         private void tpZoomOut_Click(object sender, EventArgs e)
         {
+            _stdOut.AppendLine("@GSNET_VIEWER -> COMMAND -> ZOOM OUT");
             _viewer.ZoomOut();
         }
+
+        private void tbDebug_Click(object sender, EventArgs e)
+        {
+
+            FDebug debug = new FDebug();
+            debug.txtDebug.AppendText("StdOut:\r\n");
+            debug.txtDebug.AppendText("---------------------------------------------------------------------------\r\n");
+            debug.txtDebug.AppendText(_stdOut.ToString() + "\r\n");
+            debug.txtDebug.AppendText("===========================================================================\r\n");
+            debug.txtDebug.AppendText("StdErr:\r\n");
+            debug.txtDebug.AppendText("---------------------------------------------------------------------------\r\n");
+            debug.txtDebug.AppendText(_stdErr.ToString() + "\r\n");
+            debug.txtDebug.AppendText("===========================================================================\r\n");
+            debug.ShowDialog(this);
+            debug.Dispose();
+        }
     }
 }