Compare commits
2 Commits
0d635830f9
...
bugfix/sig
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4d34eb7adc | ||
|
|
7481691b4e |
@@ -156,7 +156,11 @@ Public Class EnvelopeEditorController
|
|||||||
|
|
||||||
Public Async Function CreateDocument(pDocumentFilePath As String) As Threading.Tasks.Task(Of EnvelopeDocument)
|
Public Async Function CreateDocument(pDocumentFilePath As String) As Threading.Tasks.Task(Of EnvelopeDocument)
|
||||||
Try
|
Try
|
||||||
Dim oFileInfo = New FileInfo(pDocumentFilePath)
|
Dim oFixedPath = FixPageRotation.FixPageRotation(pDocumentFilePath)
|
||||||
|
If oFixedPath <> pDocumentFilePath Then
|
||||||
|
Logger.Info("PageRotation has been reseted to 0.")
|
||||||
|
End If
|
||||||
|
Dim oFileInfo = New FileInfo(oFixedPath)
|
||||||
Dim oTempFiles As New TempFiles(State.LogConfig)
|
Dim oTempFiles As New TempFiles(State.LogConfig)
|
||||||
Dim oTempFilePath = Path.Combine(oTempFiles._TempPath, Guid.NewGuid().ToString + oFileInfo.Extension)
|
Dim oTempFilePath = Path.Combine(oTempFiles._TempPath, Guid.NewGuid().ToString + oFileInfo.Extension)
|
||||||
|
|
||||||
@@ -172,7 +176,7 @@ Public Class EnvelopeEditorController
|
|||||||
.FileNameOriginal = oFileInfo.Name,
|
.FileNameOriginal = oFileInfo.Name,
|
||||||
.Thumbnail = Thumbnail.GetThumbnailFromPDFFile(oTempFilePath),
|
.Thumbnail = Thumbnail.GetThumbnailFromPDFFile(oTempFilePath),
|
||||||
.PageCount = Thumbnail.GetPageCount(oTempFilePath),
|
.PageCount = Thumbnail.GetPageCount(oTempFilePath),
|
||||||
.Byte_Data = ReadFile(pDocumentFilePath)
|
.Byte_Data = ReadFile(oFixedPath)
|
||||||
}
|
}
|
||||||
|
|
||||||
Return oDocument
|
Return oDocument
|
||||||
|
|||||||
@@ -362,6 +362,7 @@
|
|||||||
<SubType>Form</SubType>
|
<SubType>Form</SubType>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="Helper\Encryption.vb" />
|
<Compile Include="Helper\Encryption.vb" />
|
||||||
|
<Compile Include="Helper\FixPageRotation.vb" />
|
||||||
<Compile Include="Helper\RefreshHelper.vb" />
|
<Compile Include="Helper\RefreshHelper.vb" />
|
||||||
<Compile Include="Helper\TempFiles.vb" />
|
<Compile Include="Helper\TempFiles.vb" />
|
||||||
<Compile Include="Helper\Thumbnail.vb" />
|
<Compile Include="Helper\Thumbnail.vb" />
|
||||||
|
|||||||
48
EnvelopeGenerator.Form/Helper/FixPageRotation.vb
Normal file
48
EnvelopeGenerator.Form/Helper/FixPageRotation.vb
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
Imports System.IO
|
||||||
|
Imports GdPicture14
|
||||||
|
|
||||||
|
Public Class FixPageRotation
|
||||||
|
''' <summary>
|
||||||
|
''' Checks if there are any rotations in the document. If so, normalizes the page rotation to 0 without affecting its visual appearance.
|
||||||
|
''' Creates and uses a new document with the corrected properties.
|
||||||
|
''' Fixes the issue of annotations being rotated to match the page's rotation.
|
||||||
|
''' </summary>
|
||||||
|
''' <param name="pFilePath"></param>
|
||||||
|
''' <returns></returns>
|
||||||
|
Public Shared Function FixPageRotation(pFilePath As String) As String
|
||||||
|
|
||||||
|
Dim oFolder As String = Path.GetDirectoryName(pFilePath)
|
||||||
|
Dim oChanged As Boolean = False
|
||||||
|
|
||||||
|
Using gdpicturePDF As New GdPicturePDF()
|
||||||
|
|
||||||
|
Dim status As GdPictureStatus = gdpicturePDF.LoadFromFile(pFilePath, True)
|
||||||
|
If status = GdPictureStatus.OK Then
|
||||||
|
|
||||||
|
Dim count As Integer = gdpicturePDF.GetPageCount()
|
||||||
|
For i As Integer = 1 To count
|
||||||
|
If gdpicturePDF.SelectPage(i) = GdPictureStatus.OK Then
|
||||||
|
Dim rotation As Integer = gdpicturePDF.GetPageRotation()
|
||||||
|
If rotation <> 0 Then
|
||||||
|
gdpicturePDF.NormalizePage()
|
||||||
|
oChanged = True
|
||||||
|
End If
|
||||||
|
End If
|
||||||
|
Next
|
||||||
|
|
||||||
|
End If
|
||||||
|
|
||||||
|
If oChanged Then
|
||||||
|
Dim newFilesPath As String = Path.Combine(oFolder, "RotationFixed_" & Path.GetFileName(pFilePath))
|
||||||
|
If gdpicturePDF.SaveToFile(newFilesPath) = GdPictureStatus.OK Then
|
||||||
|
Return newFilesPath
|
||||||
|
End If
|
||||||
|
End If
|
||||||
|
|
||||||
|
End Using
|
||||||
|
|
||||||
|
Return pFilePath
|
||||||
|
|
||||||
|
End Function
|
||||||
|
|
||||||
|
End Class
|
||||||
@@ -282,6 +282,7 @@
|
|||||||
'
|
'
|
||||||
'frmFieldEditor
|
'frmFieldEditor
|
||||||
'
|
'
|
||||||
|
Me.Appearance.Options.UseFont = True
|
||||||
resources.ApplyResources(Me, "$this")
|
resources.ApplyResources(Me, "$this")
|
||||||
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
|
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
|
||||||
Me.Controls.Add(Me.SplitContainerControl1)
|
Me.Controls.Add(Me.SplitContainerControl1)
|
||||||
|
|||||||
@@ -123,7 +123,7 @@
|
|||||||
</data>
|
</data>
|
||||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||||
<data name="SplitContainerControl1.Location" type="System.Drawing.Point, System.Drawing">
|
<data name="SplitContainerControl1.Location" type="System.Drawing.Point, System.Drawing">
|
||||||
<value>0, 132</value>
|
<value>0, 59</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="ThumbnailEx2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
<data name="ThumbnailEx2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||||
<value>Fill</value>
|
<value>Fill</value>
|
||||||
@@ -132,7 +132,7 @@
|
|||||||
<value>0, 0</value>
|
<value>0, 0</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="ThumbnailEx2.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="ThumbnailEx2.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>199, 526</value>
|
<value>199, 600</value>
|
||||||
</data>
|
</data>
|
||||||
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||||
<data name="ThumbnailEx2.TabIndex" type="System.Int32, mscorlib">
|
<data name="ThumbnailEx2.TabIndex" type="System.Int32, mscorlib">
|
||||||
@@ -142,7 +142,7 @@
|
|||||||
<value>ThumbnailEx2</value>
|
<value>ThumbnailEx2</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>ThumbnailEx2.Type" xml:space="preserve">
|
<data name=">>ThumbnailEx2.Type" xml:space="preserve">
|
||||||
<value>GdPicture14.ThumbnailEx, GdPicture.NET.14, Version=14.1.0.152, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb</value>
|
<value>GdPicture14.ThumbnailEx, GdPicture.NET.14, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>ThumbnailEx2.Parent" xml:space="preserve">
|
<data name=">>ThumbnailEx2.Parent" xml:space="preserve">
|
||||||
<value>SplitContainerControl1.Panel1</value>
|
<value>SplitContainerControl1.Panel1</value>
|
||||||
@@ -172,7 +172,7 @@
|
|||||||
<value>0, 0</value>
|
<value>0, 0</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="DocumentViewer1.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="DocumentViewer1.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>916, 526</value>
|
<value>917, 600</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="DocumentViewer1.TabIndex" type="System.Int32, mscorlib">
|
<data name="DocumentViewer1.TabIndex" type="System.Int32, mscorlib">
|
||||||
<value>3</value>
|
<value>3</value>
|
||||||
@@ -181,7 +181,7 @@
|
|||||||
<value>DocumentViewer1</value>
|
<value>DocumentViewer1</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>DocumentViewer1.Type" xml:space="preserve">
|
<data name=">>DocumentViewer1.Type" xml:space="preserve">
|
||||||
<value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.9.2.0, Culture=neutral, PublicKeyToken=null</value>
|
<value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.9.8.0, Culture=neutral, PublicKeyToken=null</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>DocumentViewer1.Parent" xml:space="preserve">
|
<data name=">>DocumentViewer1.Parent" xml:space="preserve">
|
||||||
<value>SplitContainerControl1.Panel2</value>
|
<value>SplitContainerControl1.Panel2</value>
|
||||||
@@ -205,7 +205,7 @@
|
|||||||
<value>1</value>
|
<value>1</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="SplitContainerControl1.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="SplitContainerControl1.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>1125, 526</value>
|
<value>1126, 600</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="SplitContainerControl1.TabIndex" type="System.Int32, mscorlib">
|
<data name="SplitContainerControl1.TabIndex" type="System.Int32, mscorlib">
|
||||||
<value>15</value>
|
<value>15</value>
|
||||||
@@ -397,7 +397,7 @@
|
|||||||
<value>Combo</value>
|
<value>Combo</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="ribbonControl1.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="ribbonControl1.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>1125, 132</value>
|
<value>1126, 88</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>ribbonControl1.Name" xml:space="preserve">
|
<data name=">>ribbonControl1.Name" xml:space="preserve">
|
||||||
<value>ribbonControl1</value>
|
<value>ribbonControl1</value>
|
||||||
@@ -427,7 +427,7 @@
|
|||||||
<value>0, 0</value>
|
<value>0, 0</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="barDockControlTop.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="barDockControlTop.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>1125, 0</value>
|
<value>1126, 0</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>barDockControlTop.Name" xml:space="preserve">
|
<data name=">>barDockControlTop.Name" xml:space="preserve">
|
||||||
<value>barDockControlTop</value>
|
<value>barDockControlTop</value>
|
||||||
@@ -445,10 +445,10 @@
|
|||||||
<value>Bottom</value>
|
<value>Bottom</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="barDockControlBottom.Location" type="System.Drawing.Point, System.Drawing">
|
<data name="barDockControlBottom.Location" type="System.Drawing.Point, System.Drawing">
|
||||||
<value>0, 658</value>
|
<value>0, 659</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="barDockControlBottom.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="barDockControlBottom.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>1125, 0</value>
|
<value>1126, 0</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>barDockControlBottom.Name" xml:space="preserve">
|
<data name=">>barDockControlBottom.Name" xml:space="preserve">
|
||||||
<value>barDockControlBottom</value>
|
<value>barDockControlBottom</value>
|
||||||
@@ -469,7 +469,7 @@
|
|||||||
<value>0, 0</value>
|
<value>0, 0</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="barDockControlLeft.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="barDockControlLeft.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>0, 658</value>
|
<value>0, 659</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>barDockControlLeft.Name" xml:space="preserve">
|
<data name=">>barDockControlLeft.Name" xml:space="preserve">
|
||||||
<value>barDockControlLeft</value>
|
<value>barDockControlLeft</value>
|
||||||
@@ -487,10 +487,10 @@
|
|||||||
<value>Right</value>
|
<value>Right</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="barDockControlRight.Location" type="System.Drawing.Point, System.Drawing">
|
<data name="barDockControlRight.Location" type="System.Drawing.Point, System.Drawing">
|
||||||
<value>1125, 0</value>
|
<value>1126, 0</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="barDockControlRight.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="barDockControlRight.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>0, 658</value>
|
<value>0, 659</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>barDockControlRight.Name" xml:space="preserve">
|
<data name=">>barDockControlRight.Name" xml:space="preserve">
|
||||||
<value>barDockControlRight</value>
|
<value>barDockControlRight</value>
|
||||||
@@ -511,7 +511,7 @@
|
|||||||
<value>6, 13</value>
|
<value>6, 13</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
|
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>1125, 658</value>
|
<value>1689, 988</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="$this.Font" type="System.Drawing.Font, System.Drawing">
|
<data name="$this.Font" type="System.Drawing.Font, System.Drawing">
|
||||||
<value>Segoe UI, 8.25pt</value>
|
<value>Segoe UI, 8.25pt</value>
|
||||||
|
|||||||
Reference in New Issue
Block a user