综合-简单的初步接入（仅有Viewer和部分注释创建）

Demo/Examples/Annotations/Annotations.csproj

@@ -45,9 +45,17 @@
     <Reference Include="ComPDFKit.Desk, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\ComPDFKit.NetFramework.1.9.0\lib\ComPDFKit.Desk.dll</HintPath>
     </Reference>
+    <Reference Include="ComPDFKit.Tool.RE, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Compdfkit_Tools\ComPDFKit.Tool.RE.dll</HintPath>
+    </Reference>
     <Reference Include="ComPDFKit.Viewer, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\ComPDFKit.NetFramework.1.9.0\lib\ComPDFKit.Viewer.dll</HintPath>
     </Reference>
+    <Reference Include="ComPDFKit.Viewer.RE, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Compdfkit_Tools\ComPDFKit.Viewer.RE.dll</HintPath>
+    </Reference>
     <Reference Include="PresentationFramework.Aero2" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -116,6 +124,15 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="ComPDFKit.Desk.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="ComPDFKit.Tool.RE.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="ComPDFKit.Viewer.RE.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Resource Include="ComPDFKit_Logo.ico" />
     <Content Include="..\license_key_win.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

Demo/Examples/Annotations/MainWindow.xaml

@@ -8,6 +8,7 @@
         xmlns:cpdfcommon="clr-namespace:Compdfkit_Tools.Common;assembly=Compdfkit_Tools"
         mc:Ignorable="d"
         Loaded="MainWindow_Loaded"
+        Closed="MainWindow_Closed"
         Title="Annotations_ComPDFKit V1.9.1" Height="720" Width="1080"  WindowStartupLocation="CenterScreen">
     <Window.Resources>
         <ResourceDictionary>

Demo/Examples/Compdfkit_Tools/Annotation/PDFAnnotationPanel/PDFAnnotationControl/CPDFAnnotationControl.xaml.cs

@@ -15,6 +15,11 @@ using Compdfkit_Tools.Annotation.PDFAnnotationUI;
 using Microsoft.Win32;
 using System.Windows.Media;
 using Compdfkit_Tools.Properties;
+using CPDFViewer = ComPDFKitViewer.PdfViewer.CPDFViewer;
+using ComPDFKit.Tool;
+using ComPDFKit.PDFAnnotation;
+using ComPDFKit.Import;
+using ComPDFKitViewer.Helper;
 
 namespace Compdfkit_Tools.PDFControl
 {
@@ -49,13 +54,86 @@ namespace Compdfkit_Tools.PDFControl
         private bool disableClean;
         public event EventHandler ClearAnnotationBar;
 
+        #region Rebuild
+
+        private CPDFViewerTool cPDFViewerTool;
+        CPDFAnnotation cPDFAnnotation;
+        public void LoadPDFViewToolHandler()
+        {
+            cPDFViewerTool.SetViewerModel(ComPDFKit.Tool.ViewerModel.kCreateAnnot);
+            cPDFViewerTool.MouseLeftButtonDownHandler += CPDFViewerTool_MouseLeftButtonDownHandler;
+            cPDFViewerTool.MouseLeftButtonUpHandler += CPDFViewerTool_MouseLeftButtonUpHandler;
+            cPDFViewerTool.MouseMoveHandler += CPDFViewerTool_MouseMoveHandler;
+        }
+
+        private void CPDFViewerTool_MouseMoveHandler(object sender, MouseHitTeseType e)
+        {
+            if (e == ComPDFKit.Tool.MouseHitTeseType.kSelectRect)
+            {
+
+            }
+            else
+            {
+                cPDFViewerTool.MoveDrawAnnot();
+            }
+        }
+
+        private void CPDFViewerTool_MouseLeftButtonUpHandler(object sender, MouseHitTeseType e)
+        {
+            if (e == ComPDFKit.Tool.MouseHitTeseType.kSelectRect)
+            {
+
+            }
+            else
+            {
+                Rect rect = cPDFViewerTool.EndDrawAnnot();
+                if (cPDFAnnotation != null)
+                {
+                    Rect maxRect = cPDFViewerTool.GetDrawAnnotMaxRect();
+                    double zoom = cPDFViewerTool.GetCPDFViewer().GetZoom();
+                    Rect rect1 = new Rect(
+                        (rect.Left - maxRect.X) / zoom,
+                        (rect.Top - maxRect.Y) / zoom,
+                        rect.Width / zoom,
+                      rect.Height / zoom
+                        );
+                    Rect rect2 = DpiHelper.StandardRectToPDFRect(rect1);
+                    CRect cRect = new CRect((float)rect2.Left, (float)rect2.Bottom, (float)rect2.Right, (float)rect2.Top);
+                    cPDFAnnotation.SetRect(cRect);
+                    cPDFViewerTool.ClearDrawAnnot();
+                    cPDFViewerTool.GetCPDFViewer().UpDataRenderFrame();
+                }
+            }
+        }
+
+        private void CPDFViewerTool_MouseLeftButtonDownHandler(object sender, MouseHitTeseType e)
+        {
+            if (e == ComPDFKit.Tool.MouseHitTeseType.kUnknown)
+            {
+                cPDFAnnotation = cPDFViewerTool.StartDrawAnnot(C_ANNOTATION_TYPE.C_ANNOTATION_SQUARE);
+                if (cPDFAnnotation != null)
+                {
+                    cPDFViewerTool.CleanSelectedRect();
+                    (cPDFAnnotation as CPDFSquareAnnotation).SetLineWidth(2);
+                    return;
+                }
+            }
+        }
+
+        #endregion
+
         public CPDFAnnotationControl()
         {
             InitializeComponent();
         }
 
-        public void SetPDFViewer(CPDFViewer pdfViewer)
+        public void SetPDFViewer(CPDFViewer pdfViewer,CPDFViewerTool tool)
         {
+            cPDFViewerTool = tool;
+            if (cPDFViewerTool!=null)
+            {
+                LoadPDFViewToolHandler();
+            }
             if (this.pdfViewer != null)
             {
                 UnLoadPDFViewHandler();
@@ -64,6 +142,7 @@ namespace Compdfkit_Tools.PDFControl
             LoadPDFViewHandler();
         }
 
+
         public void LoadPDFViewHandler()
         {
             if (this.pdfViewer != null)

Demo/Examples/Compdfkit_Tools/Compdfkit_Tools.csproj

@@ -47,9 +47,17 @@
     <Reference Include="ComPDFKit.Desk, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\ComPDFKit.NetFramework.1.9.0\lib\ComPDFKit.Desk.dll</HintPath>
     </Reference>
+    <Reference Include="ComPDFKit.Tool.RE, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>.\ComPDFKit.Tool.RE.dll</HintPath>
+    </Reference>
     <Reference Include="ComPDFKit.Viewer, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\ComPDFKit.NetFramework.1.9.0\lib\ComPDFKit.Viewer.dll</HintPath>
     </Reference>
+    <Reference Include="ComPDFKit.Viewer.RE, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>.\ComPDFKit.Viewer.RE.dll</HintPath>
+    </Reference>
     <Reference Include="PresentationFramework.Aero2, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\PresentationFramework.Aero2.1.0.1\lib\PresentationFramework.Aero2.dll</HintPath>
     </Reference>
@@ -385,6 +393,15 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Resource>
     <Resource Include="ComPDFKit_Logo.ico" />
+    <Content Include="ComPDFKit.Desk.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="ComPDFKit.Tool.RE.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="ComPDFKit.Viewer.RE.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="VirtualizingWrapPanel.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

Demo/Examples/Compdfkit_Tools/Edit/PDFContentEditControl.xaml.cs

@@ -14,6 +14,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using CPDFViewer = ComPDFKitViewer.PdfViewer.CPDFViewer;
 
 namespace Compdfkit_Tools.Edit
 {

Demo/Examples/Compdfkit_Tools/Edit/PDFImageEdit/PDFImageEditControl/PDFImageEditControl.xaml.cs

@@ -11,6 +11,7 @@ using Microsoft.Win32;
 using System.Diagnostics;
 using System.Drawing;
 using System.IO;
+using CPDFViewer = ComPDFKitViewer.PdfViewer.CPDFViewer;
 
 namespace Compdfkit_Tools.Edit
 {

Demo/Examples/Compdfkit_Tools/Edit/PDFTextEdit/PDFTextEditControl/PDFTextEditControl.xaml.cs

@@ -7,6 +7,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Media;
+using CPDFViewer = ComPDFKitViewer.PdfViewer.CPDFViewer;
 
 namespace Compdfkit_Tools.Edit
 {

Demo/Examples/Compdfkit_Tools/Form/Property/PushButtonProperty.xaml.cs

@@ -9,6 +9,7 @@ using System.Windows.Media;
 using System.Collections.ObjectModel;
 using ComPDFKit.PDFDocument.Action;
 using ComPDFKitViewer.PdfViewer;
+using CPDFViewer = ComPDFKitViewer.PdfViewer.CPDFViewer;
 
 namespace Compdfkit_Tools.PDFControl
 {

Demo/Examples/Compdfkit_Tools/Form/Property/RadioButtonProperty.xaml.cs

@@ -9,6 +9,7 @@ using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
+using CPDFViewer = ComPDFKitViewer.PdfViewer.CPDFViewer;
 
 namespace Compdfkit_Tools.PDFControl
 {

Demo/Examples/Compdfkit_Tools/PDFView/PDFDisplaySettings/PDFDisplaySettingsControl/CPDFDisplaySettingsControl.xaml.cs

@@ -4,6 +4,7 @@ using ComPDFKitViewer.PdfViewer;
 using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Controls;
+using CPDFViewer = ComPDFKitViewer.PdfViewer.CPDFViewer;
 
 namespace Compdfkit_Tools.PDFControl
 {

Demo/Examples/Compdfkit_Tools/PDFView/PDFDisplaySettings/PDFDisplaySettingsControl/CPDFDrawModeControl.xaml.cs

@@ -3,6 +3,7 @@ using ComPDFKitViewer.PdfViewer;
 using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Controls;
+using CPDFViewer = ComPDFKitViewer.PdfViewer.CPDFViewer;
 
 namespace Compdfkit_Tools.PDFControl
 {

Demo/Examples/Compdfkit_Tools/PDFView/PDFScaling/PDFScalingControl/CPDFScalingControl.xaml.cs

@@ -3,6 +3,7 @@ using ComPDFKitViewer.PdfViewer;
 using System;
 using System.Windows;
 using System.Windows.Controls;
+using CPDFViewer = ComPDFKitViewer.PdfViewer.CPDFViewer;
 
 namespace Compdfkit_Tools.PDFControl
 {

compdfkit_demo_windows/compdfkit/compdfkit.sln

@@ -0,0 +1,72 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.33516.290
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "compdfkit", "compdfkit\compdfkit.csproj", "{807EE747-34A1-4E03-8B72-9E9F6C3BB002}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "viewer-ctrl-demo", "viewer-ctrl-demo\viewer-ctrl-demo.csproj", "{A25DD47F-1FDF-48A1-8D0E-8CFF2C066A74}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "compdfkit-tools", "compdfkit-tools\compdfkit-tools.csproj", "{9363BCB1-3A67-446A-8093-5708B86BF418}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "compdfkit-assets", "compdfkit-assets\compdfkit-assets.csproj", "{9B25B167-4896-40E3-A423-7A02CEF3005E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "edit-ctrl-demo", "edit-ctrl-demo\edit-ctrl-demo.csproj", "{03BC0C60-9D99-41D5-8116-F2516CBFCE54}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "form-ctrl-demo", "form-ctrl-demo\form-ctrl-demo.csproj", "{0F35ACB7-E10B-4AAE-AA77-88E4602C3EFB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pageedit-ctrl-demo", "pageedit-ctrl-demo\pageedit-ctrl-demo.csproj", "{F7A2B42C-55CC-4E48-A4DC-5E3239F23203}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SDKLicense", "SDKLicense", "{43ED4BF9-5941-4F32-A9DC-016E94A0E74E}"
+	ProjectSection(SolutionItems) = preProject
+		SDKLicense.xml = SDKLicense.xml
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "annotation-ctrl-demo", "annotation-ctrl-demo\annotation-ctrl-demo.csproj", "{018AF31A-EDFB-42B1-A9DF-ECF950CA62B1}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{807EE747-34A1-4E03-8B72-9E9F6C3BB002}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{807EE747-34A1-4E03-8B72-9E9F6C3BB002}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{807EE747-34A1-4E03-8B72-9E9F6C3BB002}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{807EE747-34A1-4E03-8B72-9E9F6C3BB002}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A25DD47F-1FDF-48A1-8D0E-8CFF2C066A74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A25DD47F-1FDF-48A1-8D0E-8CFF2C066A74}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A25DD47F-1FDF-48A1-8D0E-8CFF2C066A74}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A25DD47F-1FDF-48A1-8D0E-8CFF2C066A74}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9363BCB1-3A67-446A-8093-5708B86BF418}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9363BCB1-3A67-446A-8093-5708B86BF418}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9363BCB1-3A67-446A-8093-5708B86BF418}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9363BCB1-3A67-446A-8093-5708B86BF418}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9B25B167-4896-40E3-A423-7A02CEF3005E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B25B167-4896-40E3-A423-7A02CEF3005E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9B25B167-4896-40E3-A423-7A02CEF3005E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9B25B167-4896-40E3-A423-7A02CEF3005E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{03BC0C60-9D99-41D5-8116-F2516CBFCE54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{03BC0C60-9D99-41D5-8116-F2516CBFCE54}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{03BC0C60-9D99-41D5-8116-F2516CBFCE54}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{03BC0C60-9D99-41D5-8116-F2516CBFCE54}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0F35ACB7-E10B-4AAE-AA77-88E4602C3EFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0F35ACB7-E10B-4AAE-AA77-88E4602C3EFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0F35ACB7-E10B-4AAE-AA77-88E4602C3EFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0F35ACB7-E10B-4AAE-AA77-88E4602C3EFB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F7A2B42C-55CC-4E48-A4DC-5E3239F23203}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F7A2B42C-55CC-4E48-A4DC-5E3239F23203}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F7A2B42C-55CC-4E48-A4DC-5E3239F23203}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F7A2B42C-55CC-4E48-A4DC-5E3239F23203}.Release|Any CPU.Build.0 = Release|Any CPU
+		{018AF31A-EDFB-42B1-A9DF-ECF950CA62B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{018AF31A-EDFB-42B1-A9DF-ECF950CA62B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{018AF31A-EDFB-42B1-A9DF-ECF950CA62B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{018AF31A-EDFB-42B1-A9DF-ECF950CA62B1}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {8EE774F1-5FBF-482A-9A31-5ABDEC216DEF}
+	EndGlobalSection
+EndGlobal