ComPDFKit(win) - 移除MouseMode枚举值

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

@@ -935,7 +935,7 @@ namespace Compdfkit_Tools.PDFControl
             if (e)
             {
                 //pdfViewerControl.PDFToolManager.ClearSelect();
-                pdfViewerControl.PDFViewTool.SetViewerModel(MouseModes.CustomizeTool);
+                pdfViewerControl.PDFToolManager.SetToolType(ToolType.Customize);
             }
             else
             {
@@ -1112,8 +1112,17 @@ namespace Compdfkit_Tools.PDFControl
             {
                 if (annotationPanel is CPDFFreehandUI)
                 {
-                    (annotationPanel as CPDFFreehandUI)?.SetEraseCheck(false);
+                    if(pdfViewerControl.PDFToolManager.GetToolType() == ToolType.Customize)
+                    {
+                        (annotationPanel as CPDFFreehandUI)?.SetEraseCheck(true);
+                        return;
+                    }
+                    else
+                    {
+                        (annotationPanel as CPDFFreehandUI)?.SetEraseCheck(false);
+                    }                    
                 }
+
                 SetAnnotationPanel(annotationPanel);
                 ExpandPanel();
                 ChangeAnnotationData();
@@ -1170,7 +1179,7 @@ namespace Compdfkit_Tools.PDFControl
             }
             else
             {
-                if (pdfViewerControl != null && pdfViewerControl.PDFToolManager.GetToolType() == ToolType.CreateAnnot)
+                if (pdfViewerControl != null && (pdfViewerControl.PDFToolManager.GetToolType() == ToolType.CreateAnnot || pdfViewerControl.PDFToolManager.GetToolType() == ToolType.Customize))
                 {
                     ShowCurrentAnnotPanel();
                     isTempPanel = false;

Demo/Examples/Compdfkit_Tools/Common/BarControl/CPDFMeasureBarControl.xaml.cs

@@ -1,37 +1,19 @@
 using ComPDFKit.Measure;
 using ComPDFKit.PDFAnnotation;
-using ComPDFKit.PDFAnnotation.Form;
 using ComPDFKit.Tool;
 using Compdfkit_Tools.Helper;
 using Compdfkit_Tools.Measure;
-using Compdfkit_Tools.Measure.Property;
-using ComPDFKitViewer;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
 using System.Windows.Shapes;
 using static Compdfkit_Tools.Helper.PanelState;
 
 namespace Compdfkit_Tools.PDFControl
 {
-    /// <summary>
-    /// CPDFMeasureBarControl.xaml 的交互逻辑
-    /// </summary>
     public partial class CPDFMeasureBarControl : UserControl
     {
         #region Data
@@ -237,7 +219,7 @@ namespace Compdfkit_Tools.PDFControl
             else
             {
                 pdfViewer.SetCreateAnnotType(C_ANNOTATION_TYPE.C_ANNOTATION_NONE);
-                pdfViewer.SetToolType(CPDFToolManager.ToolType.Pan);
+                pdfViewer.SetToolType(ToolType.Pan);
                 measureControl.SetInfoPanelVisble(false, false);
             }
             if (annotParam != null)
@@ -253,7 +235,7 @@ namespace Compdfkit_Tools.PDFControl
 
         private AnnotParam CreateLine()
         {
-            pdfViewer.SetToolType(CPDFToolManager.ToolType.CreateAnnot);
+            pdfViewer.SetToolType(ToolType.CreateAnnot);
             pdfViewer.SetCreateAnnotType(C_ANNOTATION_TYPE.C_ANNOTATION_LINE);
             LineMeasureParam lineMeasureParam = new LineMeasureParam();
             lineMeasureParam.CurrentType = C_ANNOTATION_TYPE.C_ANNOTATION_LINE;
@@ -293,7 +275,7 @@ namespace Compdfkit_Tools.PDFControl
 
         private AnnotParam CreateMultiline()
         {
-            pdfViewer.SetToolType(CPDFToolManager.ToolType.CreateAnnot);
+            pdfViewer.SetToolType(ToolType.CreateAnnot);
             pdfViewer.SetCreateAnnotType(C_ANNOTATION_TYPE.C_ANNOTATION_POLYLINE);
             PolyLineMeasureParam polyLineMeasureParam = new PolyLineMeasureParam();
             polyLineMeasureParam.CurrentType = C_ANNOTATION_TYPE.C_ANNOTATION_POLYLINE;
@@ -339,7 +321,7 @@ namespace Compdfkit_Tools.PDFControl
         private AnnotParam CreatePolygonal()
         {
             pdfViewer.PDFViewTool.GetDefaultSettingParam().IsCreateSquarePolygonMeasure = false;
-            pdfViewer.SetToolType(CPDFToolManager.ToolType.CreateAnnot);
+            pdfViewer.SetToolType(ToolType.CreateAnnot);
             pdfViewer.SetCreateAnnotType(C_ANNOTATION_TYPE.C_ANNOTATION_POLYGON);
             PolygonMeasureParam polygonMeasureParam = new PolygonMeasureParam();
             polygonMeasureParam.CurrentType = C_ANNOTATION_TYPE.C_ANNOTATION_POLYGON;
@@ -387,7 +369,7 @@ namespace Compdfkit_Tools.PDFControl
         private AnnotParam CreateRectangles()
         {
             pdfViewer.PDFViewTool.GetDefaultSettingParam().IsCreateSquarePolygonMeasure = true;
-            pdfViewer.SetToolType(CPDFToolManager.ToolType.CreateAnnot);
+            pdfViewer.SetToolType(ToolType.CreateAnnot);
             pdfViewer.SetCreateAnnotType(C_ANNOTATION_TYPE.C_ANNOTATION_POLYGON);
             PolygonMeasureParam polygonMeasureParam = new PolygonMeasureParam();
             polygonMeasureParam.CurrentType = C_ANNOTATION_TYPE.C_ANNOTATION_POLYGON;
@@ -434,7 +416,5 @@ namespace Compdfkit_Tools.PDFControl
         }
 
 #endregion
-
-
     }
 }

Demo/Examples/Compdfkit_Tools/Common/BarControl/FormBarControl.xaml.cs

@@ -213,11 +213,11 @@ namespace Compdfkit_Tools.PDFControl
                     default:
                         break;
                 }
-                pdfViewer.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.WidgetEdit);
+                pdfViewer.SetToolType(ToolType.WidgetEdit);
             }
             else
             {
-                pdfViewer.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.WidgetEdit);
+                pdfViewer.SetToolType(ToolType.WidgetEdit);
             }
         }
 
@@ -250,7 +250,7 @@ namespace Compdfkit_Tools.PDFControl
 
         private void CreateTextBox()
         {
-            pdfViewer.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.WidgetEdit);
+            pdfViewer.SetToolType(ToolType.WidgetEdit);
             pdfViewer.SetCreateWidgetType(C_WIDGET_TYPE.WIDGET_TEXTFIELD);
             TextBoxParam textBoxParam = new TextBoxParam();
             textBoxParam.CurrentType = C_ANNOTATION_TYPE.C_ANNOTATION_WIDGET;
@@ -267,7 +267,7 @@ namespace Compdfkit_Tools.PDFControl
 
         private void CreateRadioBtn()
         {
-            pdfViewer.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.WidgetEdit);
+            pdfViewer.SetToolType(ToolType.WidgetEdit);
             pdfViewer.SetCreateWidgetType(C_WIDGET_TYPE.WIDGET_RADIOBUTTON);
             RadioButtonParam radioButtonParam = new RadioButtonParam();
             radioButtonParam.CurrentType = C_ANNOTATION_TYPE.C_ANNOTATION_WIDGET;
@@ -285,7 +285,7 @@ namespace Compdfkit_Tools.PDFControl
 
         private void CreateCheckBox()
         {
-            pdfViewer.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.WidgetEdit);
+            pdfViewer.SetToolType(ToolType.WidgetEdit);
             pdfViewer.SetCreateWidgetType(C_WIDGET_TYPE.WIDGET_CHECKBOX);
             CheckBoxParam checkBoxParam = new CheckBoxParam();
             checkBoxParam.CurrentType = C_ANNOTATION_TYPE.C_ANNOTATION_WIDGET;
@@ -303,7 +303,7 @@ namespace Compdfkit_Tools.PDFControl
 
         private void CreateComboBox()
         {
-            pdfViewer.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.WidgetEdit);
+            pdfViewer.SetToolType(ToolType.WidgetEdit);
             pdfViewer.SetCreateWidgetType(C_WIDGET_TYPE.WIDGET_COMBOBOX);
             ComboBoxParam comboBoxParam = new ComboBoxParam();
             comboBoxParam.CurrentType = C_ANNOTATION_TYPE.C_ANNOTATION_WIDGET;
@@ -319,7 +319,7 @@ namespace Compdfkit_Tools.PDFControl
 
         private void CreateListBox()
         {
-            pdfViewer.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.WidgetEdit);
+            pdfViewer.SetToolType(ToolType.WidgetEdit);
             pdfViewer.SetCreateWidgetType(C_WIDGET_TYPE.WIDGET_LISTBOX);
             ListBoxParam listBoxParam = new ListBoxParam();
             listBoxParam.CurrentType = C_ANNOTATION_TYPE.C_ANNOTATION_WIDGET;
@@ -335,7 +335,7 @@ namespace Compdfkit_Tools.PDFControl
 
         private void CreatePushBtn()
         {
-            pdfViewer.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.WidgetEdit);
+            pdfViewer.SetToolType(ToolType.WidgetEdit);
             pdfViewer.SetCreateWidgetType(C_WIDGET_TYPE.WIDGET_PUSHBUTTON);
             PushButtonParam pushButtonParam = new PushButtonParam();
             pushButtonParam.CurrentType = C_ANNOTATION_TYPE.C_ANNOTATION_WIDGET;
@@ -354,7 +354,7 @@ namespace Compdfkit_Tools.PDFControl
 
         private void CreateSign()
         {
-            pdfViewer.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.WidgetEdit);
+            pdfViewer.SetToolType(ToolType.WidgetEdit);
             pdfViewer.SetCreateWidgetType(C_WIDGET_TYPE.WIDGET_SIGNATUREFIELDS);
             SignatureParam signatureParam = new SignatureParam();
             signatureParam.CurrentType = C_ANNOTATION_TYPE.C_ANNOTATION_WIDGET;

Demo/Examples/Compdfkit_Tools/Compdfkit_Tools.csproj

@@ -431,9 +431,6 @@
     <Compile Include="Measure\MeasurePropertyControl.xaml.cs">
       <DependentUpon>MeasurePropertyControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Measure\MeasureSettingDialog.xaml.cs">
-      <DependentUpon>MeasureSettingDialog.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Measure\MeasureSettingPanel.xaml.cs">
       <DependentUpon>MeasureSettingPanel.xaml</DependentUpon>
     </Compile>
@@ -1137,10 +1134,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Measure\MeasureSettingDialog.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Measure\MeasureSettingPanel.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

Demo/Examples/Compdfkit_Tools/DigitalSignature/DigitalSignatureControl/DigitalSignatureControl.xaml.cs

@@ -133,7 +133,7 @@ namespace Compdfkit_Tools.PDFControl
             PDFGrid.Child = PDFViewControl;
             FloatPageTool.InitWithPDFViewer(pdfViewer);
             
-            PDFViewControl.PDFToolManager.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.Viewer);
+            PDFViewControl.PDFToolManager.SetToolType(ToolType.Viewer);
             PDFViewControl.PDFViewTool.GetCPDFViewer().UndoManager.ClearHistory();
             
             DigitalSignatureBarControl.DigitalSignatureActionChanged -= DigitalSignatureBarControl_DigitalSignatureActionChanged;
@@ -156,7 +156,7 @@ namespace Compdfkit_Tools.PDFControl
             {
                 ContextMenu = new ContextMenu();
             }
-            if (PDFViewControl.PDFViewTool.GetViewerModel() == MouseModes.WidgetEditTool && e.annotType== C_ANNOTATION_TYPE.C_ANNOTATION_WIDGET)
+            if (PDFViewControl.PDFViewTool.GetToolType() == ToolType.WidgetEdit && e.annotType== C_ANNOTATION_TYPE.C_ANNOTATION_WIDGET)
             {
                 BaseWidget baseWidget = PDFViewControl.GetCacheHitTestWidget();
                 if(baseWidget == null)
@@ -214,7 +214,7 @@ namespace Compdfkit_Tools.PDFControl
 
         private void PDFViewControl_MouseLeftButtonDownHandler(object sender, MouseEventObject e)
         {
-            if (PDFViewControl.PDFViewTool.GetViewerModel() == MouseModes.Viewer && e.annotType== C_ANNOTATION_TYPE.C_ANNOTATION_WIDGET)
+            if (PDFViewControl.PDFViewTool.GetToolType() == ToolType.WidgetEdit && e.annotType== C_ANNOTATION_TYPE.C_ANNOTATION_WIDGET)
             {
                 BaseWidget baseWidget = PDFViewControl.GetCacheHitTestWidget();
                 if(baseWidget == null)
@@ -361,7 +361,7 @@ namespace Compdfkit_Tools.PDFControl
         /// </summary>
         private void CreateSign()
         {
-            PDFViewControl.PDFToolManager.SetToolType(CPDFToolManager.ToolType.WidgetEdit);
+            PDFViewControl.PDFToolManager.SetToolType(ToolType.WidgetEdit);
             PDFViewControl.SetCreateWidgetType(C_WIDGET_TYPE.WIDGET_SIGNATUREFIELDS);
             
             SignatureParam signatureParam = new SignatureParam
@@ -485,7 +485,7 @@ namespace Compdfkit_Tools.PDFControl
             }
             else if (e == Common.CPDFDigitalSignatureBarControl.DigitalSignatureAction.Signing)
             {
-                PDFViewControl.PDFToolManager.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.Viewer);
+                PDFViewControl.PDFToolManager.SetToolType(ToolType.Viewer);
             }
             else if (e == Common.CPDFDigitalSignatureBarControl.DigitalSignatureAction.VerifySignature)
             {

Demo/Examples/Compdfkit_Tools/Edit/ContentEditCOntrol/ContentEditControl.xaml.cs

@@ -151,7 +151,7 @@ namespace Compdfkit_Tools.PDFControl
             }
 
             PdfViewControl.PDFToolManager.SetCreateContentEditType(CPDFEditType.None);
-            PdfViewControl.PDFViewTool.SetCurrentEditType(ContentEditType.EditText | ContentEditType.EditImage);
+            PdfViewControl.PDFViewTool.SetCurrentEditType(CPDFEditType.EditText | CPDFEditType.EditImage);
             PdfViewControl.PDFViewTool.GetCPDFViewer().SetIsVisibleCustomMouse(false);
             PdfViewControl.PDFViewTool.GetCPDFViewer().SetIsShowStampMouse(false);
             PdfViewControl.PDFViewTool.SelectedEditAreaForIndex(-1, -1);
@@ -230,7 +230,7 @@ namespace Compdfkit_Tools.PDFControl
         /// </summary> 
         public void PDFView_KeyDown(object sender, KeyEventArgs e)
         {
-            if (PdfViewControl.PDFViewTool.GetViewerModel() != MouseModes.ContentEdit)
+            if (PdfViewControl.PDFViewTool.GetToolType() != ToolType.ContentEdit)
             {
                 return;
             }
@@ -480,7 +480,7 @@ namespace Compdfkit_Tools.PDFControl
                     defaultSettingParam.SetPDFEditParamm(textEditParam);
                     panelState.RightPanel = PanelState.RightPanelState.PropertyPanel;
                     PdfViewControl.PDFToolManager.SetCreateContentEditType(CPDFEditType.EditText);
-                    PdfViewControl.PDFViewTool.SetCurrentEditType(ContentEditType.EditText);
+                    PdfViewControl.PDFViewTool.SetCurrentEditType(CPDFEditType.EditText);
                 }
 
                 PdfViewControl.PDFViewTool.GetCPDFViewer().UpdateRenderFrame();

Demo/Examples/Compdfkit_Tools/Measure/MeasureControl.xaml.cs

@@ -32,9 +32,6 @@ using Path = System.IO.Path;
 
 namespace Compdfkit_Tools.Measure
 {
-    /// <summary>
-    /// MeasureControl.xaml 的交互逻辑
-    /// </summary>
     public partial class MeasureControl : UserControl
     {
         public MeasurePropertyControl measurePropertyControl = new MeasurePropertyControl();

Demo/Examples/Compdfkit_Tools/Measure/MeasureInfoPanel.xaml.cs

@@ -22,9 +22,6 @@ using ComPDFKit.Tool;
 
 namespace Compdfkit_Tools.Measure
 {
-    /// <summary>
-    /// MeasureInfoPanel.xaml 的交互逻辑
-    /// </summary>
     public partial class MeasureInfoPanel : UserControl
     {
         public event EventHandler SettingClick;

Demo/Examples/Compdfkit_Tools/Measure/MeasurePropertyControl.xaml.cs

@@ -19,9 +19,6 @@ using System.Windows.Shapes;
 
 namespace Compdfkit_Tools.Measure
 {
-    /// <summary>
-    /// MeasurePropertyControl.xaml 的交互逻辑
-    /// </summary>
     public partial class MeasurePropertyControl : UserControl
     {
         private UIElement currentPanel = null;

Demo/Examples/Compdfkit_Tools/Measure/MeasureSettingDialog.xaml

@@ -1,100 +0,0 @@
-<Window x:Class="Compdfkit_Tools.Measure.MeasureSettingDialog"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:Compdfkit_Tools.Measure"
-        mc:Ignorable="d"
-        Title="MeasureSettingDialog" Height="350" Width="530" WindowStyle="None" WindowStartupLocation="CenterOwner"
-        ShowInTaskbar="False">
-    <Grid>
-        <Border BorderBrush="LightGray" CornerRadius="4" Background="White" Width="530" Height="350">
-            <Border.Effect>
-                <DropShadowEffect BlurRadius="20" ShadowDepth="0" Color="Black" Opacity="0.4"/>
-            </Border.Effect>
-
-            <Grid Margin="20">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="auto"></RowDefinition>
-                    <RowDefinition Height="auto"></RowDefinition>
-                    <RowDefinition Height="auto"></RowDefinition>
-                    <RowDefinition Height="auto"></RowDefinition>
-                    <RowDefinition Height="auto"></RowDefinition>
-                </Grid.RowDefinitions>
-                <TextBlock FontSize="16">Settings</TextBlock>
-
-                <Grid Grid.Row="1" Margin="0,20,0,0">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="auto"></RowDefinition>
-                        <RowDefinition Height="auto"></RowDefinition>
-                        <RowDefinition Height="auto"></RowDefinition>
-                        <RowDefinition Height="auto"></RowDefinition>
-                        <RowDefinition Height="auto"></RowDefinition>
-                    </Grid.RowDefinitions>
-                    <TextBlock FontSize="14" FontWeight="Bold">Custom Scale</TextBlock>
-                    <TextBlock FontSize="14" Grid.Row="1" Margin="0,10,0,10">Drawing dimensions: Actual size</TextBlock>
-                    <StackPanel Grid.Row="2" Orientation="Horizontal">
-                        <TextBox Name="RulerBaseText" Width="110"  VerticalContentAlignment="Center" FontSize="14"
-                         InputMethod.IsInputMethodEnabled="False"
-                         PreviewKeyDown="TextBox_PreviewKeyDown"
-                         CommandManager.PreviewCanExecute="TextBox_CanExecute" MaxLength="6">
-
-                        </TextBox>
-                        <ComboBox Name="RulerBaseUnitCombo" Width="110" FontSize="14" Margin="10,0,0,0" VerticalContentAlignment="Center">
-                            <ComboBoxItem>in</ComboBoxItem>
-                            <ComboBoxItem IsSelected="True">cm</ComboBoxItem>
-                            <ComboBoxItem>mm</ComboBoxItem>
-                        </ComboBox>
-                        <TextBlock FontSize="14" Margin="10,0,10,0">=</TextBlock>
-                        <TextBox Name="RulerTranslateText" Width="110" FontSize="14" VerticalContentAlignment="Center"
-                         InputMethod.IsInputMethodEnabled="False"
-                         PreviewKeyDown="TextBox_PreviewKeyDown"
-                         CommandManager.PreviewCanExecute="TextBox_CanExecute" MaxLength="6">
-
-                        </TextBox>
-                        <ComboBox Name="RulerTranslateCombo" Width="110" FontSize="14" Margin="10,0,0,0" VerticalContentAlignment="Center">
-                            <ComboBoxItem>pt</ComboBoxItem>
-                            <ComboBoxItem IsSelected="True">cm</ComboBoxItem>
-                            <ComboBoxItem>in</ComboBoxItem>
-                            <ComboBoxItem>mm</ComboBoxItem>
-                            <ComboBoxItem>m</ComboBoxItem>
-                            <ComboBoxItem>km</ComboBoxItem>
-                            <ComboBoxItem>ft</ComboBoxItem>
-                            <ComboBoxItem>yd</ComboBoxItem>
-                            <ComboBoxItem>mi</ComboBoxItem>
-                        </ComboBox>
-                    </StackPanel>
-                    <TextBlock Grid.Row="3" Margin="0,10,0,10" FontSize="14">
-                Precision
-                    </TextBlock>
-                    <ComboBox Name="PrecisionBox" Grid.Row="4" Width="110" HorizontalAlignment="Left">
-                        <ComboBoxItem>1</ComboBoxItem>
-                        <ComboBoxItem >0.1</ComboBoxItem>
-                        <ComboBoxItem IsSelected="True">0.01</ComboBoxItem>
-                        <ComboBoxItem>0.001</ComboBoxItem>
-                        <ComboBoxItem>0.0001</ComboBoxItem>
-                    </ComboBox>
-                </Grid>
-
-                <Separator Grid.Row="2" Margin="0,10,0,10"></Separator>
-
-                <Grid Grid.Row="3" Visibility="Collapsed">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="auto"></RowDefinition>
-                        <RowDefinition Height="auto"></RowDefinition>
-                        <RowDefinition Height="auto"></RowDefinition>
-                    </Grid.RowDefinitions>
-
-                    <TextBlock FontSize="14" >Show Caption</TextBlock>
-                    <CheckBox x:Name="LengthCheckBox" IsChecked="True" Grid.Row="1" Margin="0,10,0,10" FontSize="14">Length</CheckBox>
-                    <CheckBox x:Name="AreaCheckBox" IsChecked="True" Grid.Row="2" FontSize="14">Area</CheckBox>
-                </Grid>
-
-                <StackPanel Grid.Row="4" HorizontalAlignment="Right" Orientation="Horizontal">
-                    <Button Width="110" Height="32" Click="ButtonCancel_Click">Cancel</Button>
-                    <Button Width="110" Height="32" Click="ButtonDone_Click" Margin="10,0,0,0">Done</Button>
-                </StackPanel>
-            </Grid>
-        </Border>
-    </Grid>
-</Window>

Demo/Examples/Compdfkit_Tools/Measure/MeasureSettingDialog.xaml.cs

@@ -1,280 +0,0 @@
-using ComPDFKit.Measure;
-using ComPDFKit.PDFAnnotation;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-
-namespace Compdfkit_Tools.Measure
-{
-    /// <summary>
-    /// MeasureSettingDialog.xaml 的交互逻辑
-    /// </summary>
-    public partial class MeasureSettingDialog : Window
-    {
-        public MeasureSettingDialog()
-        {
-            InitializeComponent();
-        }
-
-        public event EventHandler CancelEvent;
-        public event EventHandler DoneEvent;
-
-        public bool ReturnToInfoPanel { get; set; }
-
-        //public List<AnnotHandlerEventArgs> UpdateArgsList { get; set; } = new List<AnnotHandlerEventArgs>();
-
-        private void ButtonCancel_Click(object sender, RoutedEventArgs e)
-        {
-            //if (UpdateArgsList != null && UpdateArgsList.Count > 0)
-            //{
-            //    ReturnToInfoPanel = false;
-            //}
-            //UpdateArgsList?.Clear();
-            CancelEvent?.Invoke(this, e);
-            ReturnToInfoPanel = false;
-            Close();
-        }
-
-        private void ButtonDone_Click(object sender, RoutedEventArgs e)
-        {
-            SaveMeasureSetting();
-            //if (UpdateArgsList != null && UpdateArgsList.Count > 0)
-            //{
-            //    List<AnnotArgsType> allowTypeList = new List<AnnotArgsType>()
-            //    {
-            //        AnnotArgsType.LineMeasure,
-            //        AnnotArgsType.PolyLineMeasure,
-            //        AnnotArgsType.PolygonMeasure
-            //    };
-
-            //    foreach (AnnotHandlerEventArgs args in UpdateArgsList)
-            //    {
-            //        if (allowTypeList.Contains(args.EventType))
-            //        {
-            //            CPDFAnnotation pdfAnnot = args.GetPDFAnnot();
-            //            switch (pdfAnnot.Type)
-            //            {
-            //                case C_ANNOTATION_TYPE.C_ANNOTATION_LINE:
-            //                    {
-            //                        CPDFLineAnnotation lineAnnot = (CPDFLineAnnotation)pdfAnnot;
-            //                        if (lineAnnot.IsMersured())
-            //                        {
-            //                            CPDFDistanceMeasure lineMeasure = lineAnnot.GetDistanceMeasure();
-            //                            CPDFMeasureInfo measureInfo = lineMeasure.MeasureInfo;
-            //                            measureInfo.Precision = MeasureSetting.GetMeasureSavePrecision();
-            //                            measureInfo.RulerBase = (float)MeasureSetting.RulerBase;
-            //                            measureInfo.RulerBaseUnit = MeasureSetting.RulerBaseUnit;
-            //                            measureInfo.RulerTranslate = (float)MeasureSetting.RulerTranslate;
-            //                            measureInfo.RulerTranslateUnit = MeasureSetting.RulerTranslateUnit;
-            //                            lineMeasure.SetMeasureInfo(measureInfo);
-            //                            lineMeasure.SetMeasureScale(
-            //                                measureInfo.RulerBase,
-            //                                measureInfo.RulerBaseUnit,
-            //                                measureInfo.RulerTranslate,
-            //                                measureInfo.RulerTranslateUnit);
-            //                            lineMeasure.UpdateAnnotMeasure();
-            //                            lineAnnot.UpdateAp();
-            //                            args.Draw();
-            //                        }
-            //                    }
-            //                    break;
-            //                case C_ANNOTATION_TYPE.C_ANNOTATION_POLYLINE:
-            //                    {
-            //                        CPDFPolylineAnnotation polylineAnnot = (CPDFPolylineAnnotation)pdfAnnot;
-            //                        if (polylineAnnot.IsMersured())
-            //                        {
-            //                            CPDFPerimeterMeasure polylineMeasure = polylineAnnot.GetPerimeterMeasure();
-            //                            CPDFMeasureInfo measureInfo = polylineMeasure.MeasureInfo;
-            //                            measureInfo.Precision = MeasureSetting.GetMeasureSavePrecision();
-            //                            measureInfo.RulerBase = (float)MeasureSetting.RulerBase;
-            //                            measureInfo.RulerBaseUnit = MeasureSetting.RulerBaseUnit;
-            //                            measureInfo.RulerTranslate = (float)MeasureSetting.RulerTranslate;
-            //                            measureInfo.RulerTranslateUnit = MeasureSetting.RulerTranslateUnit;
-            //                            polylineMeasure.SetMeasureInfo(measureInfo);
-            //                            polylineMeasure.SetMeasureScale(
-            //                                measureInfo.RulerBase,
-            //                                measureInfo.RulerBaseUnit,
-            //                                measureInfo.RulerTranslate,
-            //                                measureInfo.RulerTranslateUnit);
-            //                            polylineMeasure.UpdateAnnotMeasure();
-            //                            polylineAnnot.UpdateAp();
-            //                            args.Draw();
-            //                        }
-            //                    }
-            //                    break;
-            //                case C_ANNOTATION_TYPE.C_ANNOTATION_POLYGON:
-            //                    {
-            //                        CPDFPolygonAnnotation areaAnnot = (CPDFPolygonAnnotation)pdfAnnot;
-            //                        if (areaAnnot.IsMersured())
-            //                        {
-            //                            CPDFAreaMeasure areaMeasure = areaAnnot.GetAreaMeasure();
-            //                            CPDFMeasureInfo measureInfo = areaMeasure.MeasureInfo;
-            //                            measureInfo.Precision = MeasureSetting.GetMeasureSavePrecision();
-            //                            measureInfo.RulerBase = (float)MeasureSetting.RulerBase;
-            //                            measureInfo.RulerBaseUnit = MeasureSetting.RulerBaseUnit;
-            //                            measureInfo.RulerTranslate = (float)MeasureSetting.RulerTranslate;
-            //                            measureInfo.RulerTranslateUnit = MeasureSetting.RulerTranslateUnit;
-
-            //                            measureInfo.CaptionType = CPDFCaptionType.CPDF_CAPTION_NONE;
-            //                            if (MeasureSetting.IsShowArea)
-            //                            {
-            //                                measureInfo.CaptionType |= CPDFCaptionType.CPDF_CAPTION_AREA;
-            //                            }
-            //                            if (MeasureSetting.IsShowLength)
-            //                            {
-            //                                measureInfo.CaptionType |= CPDFCaptionType.CPDF_CAPTION_LENGTH;
-            //                            }
-            //                            areaMeasure.SetMeasureInfo(measureInfo);
-            //                            areaMeasure.SetMeasureScale(
-            //                                measureInfo.RulerBase,
-            //                                measureInfo.RulerBaseUnit,
-            //                                measureInfo.RulerTranslate,
-            //                                measureInfo.RulerTranslateUnit);
-            //                            areaMeasure.UpdateAnnotMeasure();
-            //                            areaAnnot.UpdateAp();
-            //                            args.Draw();
-            //                        }
-            //                    }
-            //                    break;
-            //                default:
-            //                    break;
-            //            }
-            //        }
-            //    }
-            //    ReturnToInfoPanel = false;
-            //}
-            //UpdateArgsList?.Clear();
-            DoneEvent?.Invoke(this, e);
-            ReturnToInfoPanel = false;
-            Close();
-        }
-
-        private void TextBox_PreviewKeyDown(object sender, KeyEventArgs e)
-        {
-            List<Key> allowKeys = new List<Key>()
-            {
-                Key.Delete, Key.Back, Key.Enter, Key.NumPad0,  Key.NumPad1, Key.NumPad2, Key.NumPad3,
-                Key.NumPad4, Key.NumPad5, Key.NumPad6, Key.NumPad7, Key.NumPad8, Key.NumPad9, Key.D0,
-                Key.D1, Key.D2, Key.D3, Key.D4, Key.D5, Key.D6, Key.D7, Key.D8, Key.D9, Key.Left, Key.Right,
-                Key.OemPeriod,Key.Decimal
-            };
-
-            if (allowKeys.Contains(e.Key) == false)
-            {
-                e.Handled = true;
-            }
-        }
-
-        private void TextBox_CanExecute(object sender, CanExecuteRoutedEventArgs e)
-        {
-            try
-            {
-                if (e.Command == ApplicationCommands.Paste && Clipboard.ContainsText())
-                {
-                    string checkText = Clipboard.GetText();
-                    if (int.TryParse(checkText, out int value))
-                    {
-                        e.CanExecute = true;
-                    }
-                    e.Handled = true;
-                }
-            }
-            catch (Exception ex)
-            {
-
-            }
-        }
-
-        public void BindMeasureSetting()
-        {
-            //RulerBaseText.Text = MeasureSetting.RulerBase.ToString();
-            //RulerTranslateText.Text = MeasureSetting.RulerTranslate.ToString();
-            //RulerTranslateCombo.SelectedIndex = -1;
-            //RulerBaseUnitCombo.SelectedIndex = -1;
-            //PrecisionBox.SelectedIndex = -1;
-            //if (MeasureSetting.RulerBaseUnit == "in")
-            //{
-            //    RulerBaseUnitCombo.SelectedIndex = 0;
-            //}
-            //if (MeasureSetting.RulerBaseUnit == "cm")
-            //{
-            //    RulerBaseUnitCombo.SelectedIndex = 1;
-            //}
-            //if (MeasureSetting.RulerBaseUnit == "mm")
-            //{
-            //    RulerBaseUnitCombo.SelectedIndex = 2;
-            //}
-
-            //for (int i = 0; i < RulerTranslateCombo.Items.Count; i++)
-            //{
-            //    ComboBoxItem checkItem = RulerTranslateCombo.Items[i] as ComboBoxItem;
-            //    if (checkItem != null && checkItem.Content.ToString() == MeasureSetting.RulerTranslateUnit.ToString())
-            //    {
-            //        RulerTranslateCombo.SelectedIndex = i;
-            //    }
-            //}
-
-            //for (int i = 0; i < PrecisionBox.Items.Count; i++)
-            //{
-            //    ComboBoxItem checkItem = PrecisionBox.Items[i] as ComboBoxItem;
-            //    if (checkItem != null && checkItem.Content.ToString() == ((decimal)MeasureSetting.Precision).ToString())
-            //    {
-            //        PrecisionBox.SelectedIndex = i;
-            //    }
-            //}
-        }
-
-        private void SaveMeasureSetting()
-        {
-            //if (double.TryParse(RulerBaseText.Text, out double ruleBase))
-            //{
-            //    MeasureSetting.RulerBase = ruleBase;
-            //}
-
-            //if (RulerBaseUnitCombo.SelectedItem != null)
-            //{
-            //    ComboBoxItem checkItem = RulerBaseUnitCombo.SelectedItem as ComboBoxItem;
-            //    MeasureSetting.RulerBaseUnit = checkItem.Content.ToString();
-            //}
-
-            //if (double.TryParse(RulerTranslateText.Text, out double ruletranBase))
-            //{
-            //    MeasureSetting.RulerTranslate = ruletranBase;
-            //}
-
-            //if (RulerTranslateCombo.SelectedItem != null)
-            //{
-            //    ComboBoxItem checkItem = RulerTranslateCombo.SelectedItem as ComboBoxItem;
-            //    MeasureSetting.RulerTranslateUnit = checkItem.Content.ToString();
-            //}
-
-            //if (PrecisionBox.SelectedValue != null)
-            //{
-            //    ComboBoxItem checkItem = PrecisionBox.SelectedValue as ComboBoxItem;
-            //    if (double.TryParse(checkItem.Content.ToString(), out double precision))
-            //    {
-            //        MeasureSetting.Precision = precision;
-            //    }
-            //}
-
-            //MeasureSetting.IsShowArea = (bool)AreaCheckBox.IsChecked;
-            //MeasureSetting.IsShowLength = (bool)LengthCheckBox.IsChecked;
-        }
-
-        public void ChangedCheckBoxIsChecked(bool Area, bool Lenght)
-        {
-            AreaCheckBox.IsChecked = Area;
-            LengthCheckBox.IsChecked = Lenght;
-        }
-    }
-}

Demo/Examples/Compdfkit_Tools/Measure/MeasureSettingPanel.xaml.cs

@@ -8,12 +8,8 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using ComPDFKit.Tool.SettingParam;
 
-
 namespace Compdfkit_Tools.Measure
 {
-    /// <summary>
-    /// MeasureSettingPanel.xaml 的交互逻辑
-    /// </summary>
     public partial class MeasureSettingPanel : UserControl
     {
         public event EventHandler CancelEvent;
@@ -23,7 +19,6 @@ namespace Compdfkit_Tools.Measure
 
         public bool ReturnToInfoPanel { get; set; }
 
-        //public List<AnnotHandlerEventArgs> UpdateArgsList { get; set; } = new List<AnnotHandlerEventArgs>();
         public MeasureSettingPanel()
         {
             InitializeComponent();
@@ -31,11 +26,6 @@ namespace Compdfkit_Tools.Measure
 
         private void ButtonCancel_Click(object sender, RoutedEventArgs e)
         {
-            //if (UpdateArgsList != null && UpdateArgsList.Count > 0)
-            //{
-            //    ReturnToInfoPanel = false;
-            //}
-            //UpdateArgsList?.Clear();
             CancelEvent?.Invoke(this, e);
             ReturnToInfoPanel = false;
         }
@@ -185,48 +175,6 @@ namespace Compdfkit_Tools.Measure
                 }
             }
         }
-        //public void BindMeasureSetting(MeasureEventArgs measureEventArgs)
-        //{
-        //    if (measureEventArgs != null)
-        //    {
-
-        //        RulerBaseText.Text = measureEventArgs.RulerBase.ToString();
-        //        RulerTranslateText.Text = measureEventArgs.RulerTranslate.ToString();
-        //        RulerTranslateCombo.SelectedIndex = -1;
-        //        RulerBaseUnitCombo.SelectedIndex = -1;
-        //        PrecisionBox.SelectedIndex = -1;
-        //        if (measureEventArgs.RulerBaseUnit == "in")
-        //        {
-        //            RulerBaseUnitCombo.SelectedIndex = 0;
-        //        }
-        //        if (measureEventArgs.RulerBaseUnit == "cm")
-        //        {
-        //            RulerBaseUnitCombo.SelectedIndex = 1;
-        //        }
-        //        if (measureEventArgs.RulerBaseUnit == "mm")
-        //        {
-        //            RulerBaseUnitCombo.SelectedIndex = 2;
-        //        }
-
-        //        for (int i = 0; i < RulerTranslateCombo.Items.Count; i++)
-        //        {
-        //            ComboBoxItem checkItem = RulerTranslateCombo.Items[i] as ComboBoxItem;
-        //            if (checkItem != null && checkItem.Content.ToString() == measureEventArgs.RulerTranslateUnit.ToString())
-        //            {
-        //                RulerTranslateCombo.SelectedIndex = i;
-        //            }
-        //        }
-
-        //        for (int i = 0; i < PrecisionBox.Items.Count; i++)
-        //        {
-        //            ComboBoxItem checkItem = PrecisionBox.Items[i] as ComboBoxItem;
-        //            if (checkItem != null && checkItem.Content.ToString() == ((decimal)measureEventArgs.Precision).ToString())
-        //            {
-        //                PrecisionBox.SelectedIndex = i;
-        //            }
-        //        }
-        //    }
-        //}
 
         public void SaveMeasureSetting(CPDFAnnotation annot)
         {

Demo/Examples/Compdfkit_Tools/PDFView/PDFViewControl/PDFViewControl.xaml.cs

@@ -15,7 +15,6 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using Compdfkit_Tools.Helper;
 using ComPDFKit.Tool.DrawTool;
-using static ComPDFKit.Tool.CPDFToolManager;
 using SplitMode = Compdfkit_Tools.PDFControlUI.CPDFViewModeUI.SplitMode;
 using System.Threading;
 using System.Threading.Tasks;
@@ -32,7 +31,6 @@ namespace Compdfkit_Tools.PDFControl
         private CPDFViewerTool viewerTool;
         private CPDFToolManager toolManager;
 
-
         public CPDFViewerTool PDFViewTool { get; private set; }
         public CPDFToolManager PDFToolManager { get; private set; }
 
@@ -64,11 +62,11 @@ namespace Compdfkit_Tools.PDFControl
             toolManager = new CPDFToolManager(viewerTool);
             PDFViewTool = viewerTool;
             PDFToolManager = toolManager;
-            PDFToolManager.SetToolType(CPDFToolManager.ToolType.Viewer);
+            PDFToolManager.SetToolType(ToolType.Viewer);
 
             splitViewerTool = new CPDFViewerTool();
             splitToolManager = new CPDFToolManager(splitViewerTool);
-            splitToolManager.SetToolType(CPDFToolManager.ToolType.Viewer);
+            splitToolManager.SetToolType(ToolType.Viewer);
 
             FocusPDFViewTool = viewerTool;
             PDFView.Child = PDFViewTool;
@@ -159,16 +157,16 @@ namespace Compdfkit_Tools.PDFControl
             MouseLeftButtonUpHandler?.Invoke(sender, e);
             if (IsHitEmpty)
             {
-                List<MouseModes> mouseModes = new List<MouseModes>()
+                List<ToolType> toolTypes = new List<ToolType>()
                 {
-                    MouseModes.Viewer,
-                    MouseModes.PanTool
+                    ToolType.Viewer,
+                    ToolType.Pan
                 };
-                MouseModes currentMode = PDFViewTool.GetViewerModel();
+                ToolType currentMode = PDFViewTool.GetToolType();
 
                 if (GetCPDFViewer().Cursor == panToolCursor || GetCPDFViewer().Cursor == panTool2Cursor)
                 {
-                    if (mouseModes.Contains(currentMode))
+                    if (toolTypes.Contains(currentMode))
                     {
                         GetCPDFViewer().Cursor = panToolCursor;
                     }
@@ -636,16 +634,16 @@ namespace Compdfkit_Tools.PDFControl
 
             if (e.LeftButton == MouseButtonState.Released && viewerTool != null)
             {
-                List<MouseModes> mouseModes = new List<MouseModes>
+                List<ToolType> toolTypes = new List<ToolType>
                 {
-                      MouseModes.Viewer,
-                      MouseModes.PanTool
+                      ToolType.Viewer,
+                      ToolType.Pan
                 };
-                MouseModes currentMode = PDFViewTool.GetViewerModel();
+                ToolType currentMode = PDFViewTool.GetToolType();
                 bool cursorSet = false;
                 Cursor newCursor = GetCPDFViewer().Cursor;
 
-                if (mouseModes.Contains(currentMode))
+                if (toolTypes.Contains(currentMode))
                 {
                     BaseAnnot hitAnnot = GetCPDFViewer().AnnotHitTest();
 
@@ -682,7 +680,7 @@ namespace Compdfkit_Tools.PDFControl
                     }
                 }
 
-                if (currentMode == MouseModes.CreateAnnot)
+                if (currentMode == ToolType.CreateAnnot)
                 {
                     List<C_ANNOTATION_TYPE> annotTypes = new List<C_ANNOTATION_TYPE>
                     {

Demo/Examples/ContentEditor/MainWindow.xaml.cs

@@ -260,7 +260,7 @@ namespace ContentEditorViewControl
         private void LeftToolPanelButton_Click(object sender, RoutedEventArgs e)
         {
             panelState.IsLeftPanelExpand = (sender as ToggleButton).IsChecked == true;
-            contentEditControl.PdfViewControl.GetCPDFViewer().GoToPage(PageIndex: 1, new Point(100, 100));
+            contentEditControl.PdfViewControl.GetCPDFViewer().GoToPage(pageIndex: 1, new Point(100, 100));
         }
 
         private void ComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)

Demo/Examples/PDFViewer/MainPage.xaml.cs

@@ -394,7 +394,7 @@ namespace PDFViewer
             SignatureHelper.InitEffectiveSignatureList(viewControl.GetCPDFViewer().GetDocument());
             SignatureHelper.VerifySignatureList(viewControl.GetCPDFViewer().GetDocument());
             signatureStatusBarControl.SetStatus(SignatureHelper.SignatureList);
-            viewControl.PDFViewTool.SetViewerModel(MouseModes.Viewer);
+            viewControl.PDFToolManager.SetToolType(ToolType.Viewer);
             
             viewControl.PDFViewTool.DocumentModifiedChanged -= PDFViewTool_DocumentModifiedChanged;
             viewControl.PDFViewTool.DocumentModifiedChanged += PDFViewTool_DocumentModifiedChanged;
@@ -555,7 +555,7 @@ namespace PDFViewer
                 if (regularViewerControl.PdfViewControl != null)
                 {
                     PDFGrid.Child = regularViewerControl;
-                    viewControl.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.Viewer);
+                    viewControl.SetToolType(ToolType.Viewer);
                     regularViewerControl.OnCanSaveChanged -= ControlOnCanSaveChanged;
                     regularViewerControl.OnCanSaveChanged += ControlOnCanSaveChanged;
                     regularViewerControl.SetBOTAContainer(botaBarControl);
@@ -567,9 +567,7 @@ namespace PDFViewer
                 annotationControl.SetToolBarContainerVisibility(Visibility.Visible);
                 PDFGrid.Child = annotationControl;
 
-                viewControl.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.CreateAnnot);
-                viewControl.PDFViewTool.SetViewerModel(MouseModes.PanTool);
-
+                viewControl.SetToolType(ToolType.Pan);
                 annotationControl.PDFViewControl = viewControl;
                 annotationControl.InitWithPDFViewer(viewControl);
                 if (annotationControl.PDFViewControl != null)
@@ -593,7 +591,7 @@ namespace PDFViewer
                 if (formControl.PdfViewControl != null)
                 {
                     PDFGrid.Child = formControl;
-                    viewControl.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.WidgetEdit);
+                    viewControl.SetToolType(ToolType.WidgetEdit);
                     formControl.OnCanSaveChanged -= ControlOnCanSaveChanged;
                     formControl.OnCanSaveChanged += ControlOnCanSaveChanged;
                     formControl.OnAnnotEditHandler -= PdfFormControlRefreshAnnotList;
@@ -612,9 +610,7 @@ namespace PDFViewer
                 if (contentEditControl.pdfContentEditControl != null && contentEditControl.PdfViewControl != null)
                 { 
                     PDFGrid.Child = contentEditControl;
-                    viewControl.SetToolType(ComPDFKit.Tool.CPDFToolManager.ToolType.ContentEdit);
-                    viewControl.PDFViewTool.SetViewerModel(MouseModes.ContentEdit);
-
+                    viewControl.SetToolType(ToolType.ContentEdit);
                     contentEditControl.OnCanSaveChanged -= ControlOnCanSaveChanged;
                     contentEditControl.OnCanSaveChanged += ControlOnCanSaveChanged;
                     contentEditControl.SetBOTAContainer(botaBarControl);
@@ -637,7 +633,7 @@ namespace PDFViewer
                 {
                     RightPanelButton.Visibility = Visibility.Collapsed;
                     PDFGrid.Child = digitalSignatureControl;
-                    viewControl.PDFViewTool.SetViewerModel(MouseModes.Viewer);
+                    viewControl.PDFToolManager.SetToolType(ToolType.Viewer);
                     digitalSignatureControl.PDFViewControl = viewControl;
                     botaBarControl.AddBOTAContent(BOTATools.Signature);
                     digitalSignatureControl.InitWithPDFViewer(viewControl);
@@ -660,7 +656,7 @@ namespace PDFViewer
                 {
                     RightPanelButton.Visibility = Visibility.Visible;
                     PDFGrid.Child = measureControl; 
-                    viewControl.PDFViewTool.SetViewerModel(MouseModes.PanTool);
+                    viewControl.PDFToolManager.SetToolType(ToolType.Pan);
                     viewControl.SetToolType(ToolType.Pan); 
                     measureControl.InitWithPDFViewer(viewControl);
                     measureControl.SetBOTAContainer(botaBarControl);