sharper signature frame and text

EnvelopeGenerator.Common/Jobs/PDFBurner.vb

@@ -119,7 +119,7 @@ Namespace Jobs
             Try
                 Dim oSegments = pAnnotation.lines.points
                 Dim oColor = ColorTranslator.FromHtml(pAnnotation.strokeColor)
-                Manager.SelectPage(pAnnotation.pageIndex)
+                Manager.SelectPage(pAnnotation.pageIndex + 1)
 
                 For Each oSegment As List(Of List(Of Single)) In oSegments
                     Dim oPoints = oSegment.

EnvelopeGenerator.Test/EnvelopeGenerator.Test.vbproj

@@ -133,7 +133,6 @@
       <DesignTime>True</DesignTime>
     </Compile>
     <Compile Include="My Project\AssemblyInfo.vb" />
-    <Compile Include="PDFBurner.vb" />
     <EmbeddedResource Include="frmFieldEditor.resx">
       <DependentUpon>frmFieldEditor.vb</DependentUpon>
     </EmbeddedResource>

EnvelopeGenerator.Test/My Project/Application.Designer.vb

@@ -32,7 +32,7 @@ Namespace My
         
         <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _
         Protected Overrides Sub OnCreateMainForm()
-            Me.MainForm = Global.EnvelopeGenerator.frmReportViewer
+            Me.MainForm = Global.EnvelopeGenerator.frmFinalizePDF
         End Sub
     End Class
 End Namespace

EnvelopeGenerator.Test/My Project/Application.myapp

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <MyApplicationData xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MySubMain>true</MySubMain>
-  <MainForm>frmReportViewer</MainForm>
+  <MainForm>frmFinalizePDF</MainForm>
   <SingleInstance>false</SingleInstance>
   <ShutdownMode>0</ShutdownMode>
   <EnableVisualStyles>true</EnableVisualStyles>

EnvelopeGenerator.Test/PDFBurner.vb

@@ -1,162 +0,0 @@
-Imports DevExpress.Pdf
-Imports DigitalData.Modules.Base
-Imports DigitalData.Modules.Logging
-Imports EnvelopeGenerator.PDFBurner
-Imports GdPicture14
-Imports Newtonsoft.Json
-
-Public Class PDFBurner
-    Inherits BaseClass
-
-    Private ReadOnly LicenseKey As String
-    Private ReadOnly Manager As AnnotationManager
-    Private ReadOnly LicenseManager As LicenseManager
-
-    Private Const ANNOTATION_TYPE_IMAGE = "pspdfkit/image"
-    Private Const ANNOTATION_TYPE_INK = "pspdfkit/ink"
-
-    Public Sub New(pLogConfig As LogConfig, pGDPictureLicenseKey As String)
-        MyBase.New(pLogConfig)
-
-        LicenseKey = pGDPictureLicenseKey
-        LicenseManager = New LicenseManager()
-        LicenseManager.RegisterKEY(pGDPictureLicenseKey)
-
-        Manager = New AnnotationManager()
-    End Sub
-
-    Public Function BurnInstantJSONAnnotationsToPDF(pSourcePath As String, pInstantJSONList As List(Of String), pDestinationPath As String) As Boolean
-        If Manager.InitFromFile(pSourcePath) <> GdPictureStatus.OK Then
-            Logger.Warn("Could not open file [{0}] for burning.", pSourcePath)
-            Return False
-        End If
-
-        For Each oJSON In pInstantJSONList
-            If AddInstantJSONAnnotationToPDF(oJSON) = False Then
-                Logger.Warn("Adding Annotation failed. Exiting")
-                Return False
-            End If
-        Next
-
-        Try
-            Manager.BurnAnnotationsToPage(RemoveInitialAnnots:=True, VectorMode:=True)
-            Manager.SaveDocumentToPDF(pDestinationPath)
-            Manager.Close()
-
-            Return True
-        Catch ex As Exception
-            Logger.Warn("Could not burn and save annotations to file [{0}]!", pDestinationPath)
-            Logger.Error(ex)
-
-            Return False
-        End Try
-    End Function
-
-    Private Function AddInstantJSONAnnotationToPDF(pInstantJSON As String) As Boolean
-        Try
-            Dim oAnnotationData = JsonConvert.DeserializeObject(Of AnnotationData)(pInstantJSON)
-
-            For Each oAnnotation In oAnnotationData.annotations
-                Select Case oAnnotation.type
-                    Case ANNOTATION_TYPE_IMAGE
-                        AddImageAnnotation(oAnnotation, oAnnotationData.attachments)
-                    Case ANNOTATION_TYPE_INK
-                        AddInkAnnotation(oAnnotation)
-                End Select
-            Next
-
-            Return True
-        Catch ex As Exception
-            Logger.Warn("Could not create annotation from InstantJSON")
-            Logger.Error(ex)
-            Return False
-        End Try
-    End Function
-
-    Private Function AddImageAnnotation(pAnnotation As Annotation, pAttachments As Dictionary(Of String, Attachment)) As Boolean
-        Try
-            Dim oAttachment = pAttachments.Where(Function(a) a.Key = pAnnotation.imageAttachmentId).
-                        SingleOrDefault()
-
-            ' Convert pixels to Inches
-            Dim oBounds = pAnnotation.bbox.Select(AddressOf ToInches).ToList()
-
-            Dim oX = oBounds.Item(0)
-            Dim oY = oBounds.Item(1)
-            Dim oWidth = oBounds.Item(2)
-            Dim oHeight = oBounds.Item(3)
-
-            Manager.AddEmbeddedImageAnnotFromBase64(oAttachment.Value.binary, oX, oY, oWidth, oHeight)
-
-            Return True
-        Catch ex As Exception
-            Logger.Warn("Could not add image annotation!")
-            Logger.Error(ex)
-
-            Return False
-        End Try
-    End Function
-
-    Private Function AddInkAnnotation(pAnnotation As Annotation) As Boolean
-        Try
-            Dim oSegments = pAnnotation.lines.points
-            Dim oColor = ColorTranslator.FromHtml(pAnnotation.strokeColor)
-            Manager.SelectPage(pAnnotation.pageIndex)
-
-            For Each oSegment As List(Of List(Of Single)) In oSegments
-                Dim oPoints = oSegment.
-                    Select(AddressOf ToPointF).
-                    ToArray()
-
-
-                Manager.AddFreeHandAnnot(oColor, oPoints)
-            Next
-
-            Return True
-        Catch ex As Exception
-            Logger.Warn("Could not add image annotation!")
-            Logger.Error(ex)
-
-            Return False
-        End Try
-
-    End Function
-
-    Private Function ToPointF(pPoints As List(Of Single)) As PointF
-        Dim oPoints = pPoints.Select(AddressOf ToInches).ToList()
-        Return New PointF(oPoints.Item(0), oPoints.Item(1))
-    End Function
-
-    Private Function ToInches(pValue As Double) As Double
-        Return pValue / 72
-    End Function
-
-    Private Function ToInches(pValue As Single) As Single
-        Return pValue / 72
-    End Function
-
-    Friend Class AnnotationData
-        Public Property annotations As List(Of Annotation)
-        Public Property attachments As Dictionary(Of String, Attachment)
-    End Class
-
-    Friend Class Annotation
-        Public Property id As String
-        Public Property bbox As List(Of Double)
-        Public Property type As String
-        Public Property isSignature As Boolean
-        Public Property imageAttachmentId As String
-        Public Property lines As Lines
-        Public Property pageIndex As Integer
-        Public Property strokeColor As String
-    End Class
-
-    Friend Class Lines
-        Public Property points As List(Of List(Of List(Of Single)))
-    End Class
-
-    Friend Class Attachment
-        Public Property binary As String
-        Public Property contentType As String
-    End Class
-End Class

EnvelopeGenerator.Test/frmFinalizePDF.vb

@@ -1,10 +1,8 @@
-Imports System.IO
-Imports DevExpress.Utils
-Imports DigitalData.Modules.Database
+Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
 Imports GdPicture14
-Imports Newtonsoft.Json
 Imports Newtonsoft.Json.Linq
+Imports EnvelopeGenerator.Common.Jobs
 
 Public Class frmFinalizePDF
     Private Const CONNECTIONSTRING = "Server=sDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=+bk8oAbbQP1AzoHtvZUbd+Mbok2f8Fl4miEx1qssJ5yEaEWoQJ9prg4L14fURpPnqi1WMNs9fE4=;"
@@ -12,7 +10,7 @@ Public Class frmFinalizePDF
     Private Database As MSSQLServer
     Private LogConfig As LogConfig
 
-    Private Viewer As GdPicture14.GdViewer
+    Private Viewer As GdViewer
     Private Manager As AnnotationManager
     Private PDFBurner As PDFBurner
 
@@ -46,8 +44,6 @@ Public Class frmFinalizePDF
 
     End Function
 
-
-
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
         Dim oDocumentPath = LoadEnvelopeDocument()
         Dim oTable = LoadAnnotationDataForEnvelope()

EnvelopeGenerator.Web/wwwroot/js/annotation.js

@@ -108,39 +108,56 @@
         return frameAnnotation
     }
 
-  async createAnnotationFrameBlob(receiverName, width, height) {
+    async createAnnotationFrameBlob(receiverName, receiverSignature, width, height) {
         const canvas = document.createElement('canvas')
-    canvas.width = width
-    canvas.height = height
+        const scale = 4
+        const fontSize = 10
+
+        console.log(receiverSignature)
+
+        //canvas.width = width
+        //canvas.height = height
+
+        canvas.width = width * scale
+        canvas.height = height * scale
+
+        //canvas.style.width = width * 4
+        //canvas.style.height = height * 4
 
         const ctx = canvas.getContext('2d')
+        // This supposedly makes the lines and text less blurry
+        // See: https://stackoverflow.com/questions/8696631/canvas-drawings-like-lines-are-blurry
+        ctx.translate(0.5, 0.5)
+
+        // This also should make the lines and text less blurry
+        ctx.textRendering = "geometricPrecision"
 
         const date = new Date()
         const dateString = date.toLocaleDateString('de-DE')
 
-    const signatureLength = 100
+        const signatureLength = 100 * scale
 
         ctx.beginPath()
 
-    ctx.moveTo(30, 10)
-    ctx.lineTo(signatureLength, 10)
+        ctx.moveTo(30 * scale, 10 * scale)
+        ctx.lineTo(signatureLength, 10 * scale)
 
-    ctx.moveTo(30, 10)
-    ctx.arcTo(10, 10, 10, 30, 20)
+        ctx.moveTo(30 * scale, 10 * scale)
+        ctx.arcTo(10 * scale, 10 * scale, 10 * scale, 30 * scale, 20 * scale)
 
-    ctx.moveTo(10, 30)
-    ctx.arcTo(10, 50, 30, 50, 20)
+        ctx.moveTo(10 * scale, 30 * scale)
+        ctx.arcTo(10 * scale, 50 * scale, 30 * scale, 50 * scale, 20 * scale)
 
-    ctx.moveTo(30, 50)
-    ctx.lineTo(signatureLength, 50)
+        ctx.moveTo(30 * scale, 50 * scale)
+        ctx.lineTo(signatureLength, 50 * scale)
 
         ctx.strokeStyle = 'darkblue'
         ctx.stroke()
 
         ctx.fillStyle = 'black'
-    ctx.font = '10px serif'
-    ctx.fillText('Signed by', 30, 10)
-    ctx.fillText(receiverName + ', ' + dateString, 15, 60)
+        ctx.font = `${fontSize * scale}px sans-serif`
+        ctx.fillText('Signed by', 30 * scale, 10 * scale)
+        ctx.fillText(receiverName + ', ' + dateString, 15 * scale, 60 * scale)
 
         return new Promise((resolve) => {
             canvas.toBlob((blob) => {

EnvelopeGenerator.Web/wwwroot/js/app.js

@@ -100,7 +100,7 @@ class App {
         console.log('annotations loaded', loadedAnnotations.toJS())
     }
 
-  handleAnnotationsChange() {}
+    handleAnnotationsChange() { }
 
     async handleAnnotationsCreate(createdAnnotations) {
         const annotation = createdAnnotations.toJS()[0]
@@ -108,13 +108,19 @@ class App {
         const isSignature = !!annotation.isSignature
 
         if (isFormField === false && isSignature === true) {
+
             const left = annotation.boundingBox.left - 25
             const top = annotation.boundingBox.top - 25
             const width = 150
             const height = 75
 
+            console.log(createdAnnotations)
+
+            console.log(annotation)
+
             const imageUrl = await this.Annotation.createAnnotationFrameBlob(
                 this.currentReceiver.name,
+                this.currentReceiver.signature,
                 width,
                 height
             )