ComPDFKit.Tool(win) - 调整代码规范

Demo/Examples/ComPDFKit.Tool/CPDFToolManager.cs

@@ -363,7 +363,7 @@ namespace ComPDFKit.Tool
         public List<CPDFEditArea> GetSelectedEditAreaListObject(ref List<int> pageIndexs)
         {
             List<CPDFEditArea> editAreaObjectlist = new List<CPDFEditArea>();
-            MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(viewerTool.PDFViewer.GetViewForTag(viewerTool.multiSelectedRectViewTag));
+            MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(viewerTool.PDFViewer.GetViewForTag(viewerTool.MultiSelectedRectViewTag));
             if (multiSelectedRect != null && multiSelectedRect.Children.Count > 0)
             {
                 foreach (SelectedRect selectedRect in multiSelectedRect.Children)
@@ -1818,7 +1818,7 @@ namespace ComPDFKit.Tool
                 if (createContentEditType != CPDFEditType.EditImage)
                 {
                     Cursor cursor = Cursors.Arrow;
-                    MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(viewerTool.PDFViewer.GetViewForTag(viewerTool.multiSelectedRectViewTag));
+                    MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(viewerTool.PDFViewer.GetViewForTag(viewerTool.MultiSelectedRectViewTag));
 
                     if (viewerTool.GetLastSelectedRect() != null)
                     {
@@ -1859,7 +1859,7 @@ namespace ComPDFKit.Tool
                 else
                 {
                     Cursor cursor = Cursors.Arrow;
-                    MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(viewerTool.PDFViewer.GetViewForTag(viewerTool.multiSelectedRectViewTag));
+                    MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(viewerTool.PDFViewer.GetViewForTag(viewerTool.MultiSelectedRectViewTag));
 
                     if (viewerTool.GetLastSelectedRect() != null)
                     {
@@ -2171,7 +2171,7 @@ namespace ComPDFKit.Tool
                         else
                         {
                             //If it is multiple selection, do not create a new input box
-                            MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(viewerTool.PDFViewer.GetViewForTag(viewerTool.multiSelectedRectViewTag));
+                            MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(viewerTool.PDFViewer.GetViewForTag(viewerTool.MultiSelectedRectViewTag));
                             if (multiSelectedRect != null && multiSelectedRect.Children.Count > 0)
                             {
                                 return;

Demo/Examples/ComPDFKit.Tool/CPDFViewerTool.Command.cs

@@ -253,7 +253,7 @@ namespace ComPDFKit.Tool
                             e.CanExecute = true;
                         }
                         //Add multi status
-                        MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(multiSelectedRectViewTag));
+                        MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(MultiSelectedRectViewTag));
                         if (multiSelectedRect != null && multiSelectedRect.Children.Count > 0)
                         {
                             e.CanExecute = true;
@@ -474,7 +474,7 @@ namespace ComPDFKit.Tool
                 else
                 { 
                     //Add multi status
-                    MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(multiSelectedRectViewTag));
+                    MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(MultiSelectedRectViewTag));
                     if (multiSelectedRect != null && multiSelectedRect.Children.Count > 0)
                     {
                         foreach (SelectedRect selectedRect in multiSelectedRect.Children)
@@ -592,7 +592,7 @@ namespace ComPDFKit.Tool
             else
             {
                 //Add multi status
-                MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(multiSelectedRectViewTag));
+                MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(MultiSelectedRectViewTag));
                 if (multiSelectedRect != null && multiSelectedRect.Children.Count > 0)
                 {
                     foreach (SelectedRect selectedRect in multiSelectedRect.Children)
@@ -931,7 +931,6 @@ namespace ComPDFKit.Tool
 
         #endregion
 
-
         #region Annot
 
         private bool CheckCacheHitTestAnnot(string cmdName = "")

Demo/Examples/ComPDFKit.Tool/CPDFViewerTool.MultiSelectedRect.cs

@@ -1,15 +1,10 @@
 using ComPDFKit.Tool.DrawTool;
 using ComPDFKit.Tool.Help;
 using ComPDFKit.Viewer.Layer;
-using ComPDFKitViewer.Layer;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
-using System.Windows.Media;
 
 namespace ComPDFKit.Tool
 {
@@ -36,11 +31,15 @@ namespace ComPDFKit.Tool
 
     public partial class CPDFViewerTool
     {
-        public int multiSelectedRectViewTag = -1;
-        List<int> editAreaMultiIndex = new List<int>();
-        int multiPage = -1;
         public event EventHandler<MultiSelectedData> MultiDataChanging;
         public event EventHandler<MultiSelectedData> MultiDataChanged;
+        public int MultiSelectedRectViewTag { get; set; } = -1;
+
+        private List<int> editAreaMultiIndex = new List<int>();
+        private int multiPage = -1;
+        private bool isOpen = false;
+        private Key multiKey = Key.LeftCtrl;
+
         private void InsertMultiSelectedRectView()
         {
             int selectedRectViewIndex = PDFViewer.GetMaxViewIndex();
@@ -51,14 +50,14 @@ namespace ComPDFKit.Tool
             multiSelectedRect.DataChanged += MultiSelectedRect_DataChanged;
             multiSelectedRect.DataChanging += MultiSelectedRect_DataChanging;
             PDFViewer.InsertView(selectedRectViewIndex, customizeLayer);
-            multiSelectedRectViewTag = customizeLayer.GetResTag();
+            MultiSelectedRectViewTag = customizeLayer.GetResTag();
             //multiSelectedRect.Children.Add(multiSelectedRect);
         }
 
         private void MultiSelectedRect_DataChanging(object sender, Point e)
         {
             MultiSelectedData multiSelectedAnnotData = new MultiSelectedData();
-            MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(multiSelectedRectViewTag));
+            MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(MultiSelectedRectViewTag));
             if (isOpen && multiSelectedRect != null)
             {
                 multiSelectedAnnotData.ZoomX = multiSelectedRect.GetZoomX();
@@ -75,7 +74,7 @@ namespace ComPDFKit.Tool
         private void MultiSelectedRect_DataChanged(object sender, Point e)
         {
             MultiSelectedData multiSelectedAnnotData = new MultiSelectedData();
-            MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(multiSelectedRectViewTag));
+            MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(MultiSelectedRectViewTag));
             if (isOpen && multiSelectedRect != null)
             {
                 multiSelectedAnnotData.ZoomX = multiSelectedRect.GetZoomX();
@@ -89,10 +88,6 @@ namespace ComPDFKit.Tool
             }
         }
 
-        bool isOpen = false;
-
-        Key multiKey = Key.LeftCtrl;
-
         /// <summary>
         /// Set multiple selection shortcut keys
         /// </summary>
@@ -101,14 +96,15 @@ namespace ComPDFKit.Tool
         {
             multiKey = multikey;
         }
-        public void OpenSelectedMulti(bool open)
+
+        private void OpenSelectedMulti(bool open)
         {
             isOpen = open;
         }
 
         public bool HitTestMultiSelectedRect()
         {
-            MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(multiSelectedRectViewTag));
+            MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(MultiSelectedRectViewTag));
             if (isOpen && multiSelectedRect != null)
             {
                 if (multiSelectedRect.GetHitControlIndex(Mouse.GetPosition(this)) != PointControlType.None)
@@ -121,7 +117,7 @@ namespace ComPDFKit.Tool
 
         public void SelectedMultiRect(Rect selectedRects, Rect MaxRect, SelectedType type)
         {
-            MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(multiSelectedRectViewTag));
+            MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(MultiSelectedRectViewTag));
             bool open = isOpen;
             if (!Keyboard.IsKeyDown(multiKey))
             {
@@ -222,7 +218,7 @@ namespace ComPDFKit.Tool
 
         public void CleanSelectedMultiRect()
         {
-            MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(multiSelectedRectViewTag));
+            MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(MultiSelectedRectViewTag));
             if (multiSelectedRect != null)
             {
                 multiSelectedRect.Children.Clear();
@@ -235,7 +231,7 @@ namespace ComPDFKit.Tool
 
         public void DrawStartSelectedMultiRect()
         {
-            MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(multiSelectedRectViewTag));
+            MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(MultiSelectedRectViewTag));
 
             if (multiSelectedRect != null)
             {
@@ -247,7 +243,7 @@ namespace ComPDFKit.Tool
 
         public void DrawMoveSelectedMultiRect()
         {
-            MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(multiSelectedRectViewTag));
+            MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(MultiSelectedRectViewTag));
 
             if (multiSelectedRect != null)
             {
@@ -258,7 +254,7 @@ namespace ComPDFKit.Tool
 
         public void DrawEndSelectedMultiRect()
         {
-            MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(multiSelectedRectViewTag));
+            MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(MultiSelectedRectViewTag));
 
             if (multiSelectedRect != null)
             {
@@ -269,7 +265,7 @@ namespace ComPDFKit.Tool
 
         public void ReDrawSelectedMultiRect()
         {
-            MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(multiSelectedRectViewTag));
+            MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(MultiSelectedRectViewTag));
 
             if (multiSelectedRect != null)
             {

Demo/Examples/ComPDFKit.Tool/CPDFViewerTool.TextEdit.cs

@@ -1,5 +1,4 @@
 using ComPDFKit.Import;
-using ComPDFKit.PDFAnnotation;
 using ComPDFKit.PDFDocument;
 using ComPDFKit.PDFPage;
 using ComPDFKit.PDFPage.Edit;
@@ -19,9 +18,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
-using System.Windows.Markup;
 using System.Windows.Media;
-using static ComPDFKit.Tool.Help.ImportWin32;
 
 namespace ComPDFKit.Tool
 {
@@ -714,7 +711,7 @@ namespace ComPDFKit.Tool
 
         public MultiSelectedRect GetMultiSelectedRect()
         {
-            MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(multiSelectedRectViewTag));
+            MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(MultiSelectedRectViewTag));
             return multiSelectedRect;
         }
 
@@ -2057,7 +2054,7 @@ namespace ComPDFKit.Tool
             customizeLayer.Children.Add(caretVisual);
 
             currentZoom = currentRenderFrame.ZoomFactor;
-            MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(multiSelectedRectViewTag));
+            MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(MultiSelectedRectViewTag));
             foreach (RenderData item in currentRenderFrame.GetRenderDatas())
             {
                 if (item.PageIndex == FrameSelectPageIndex)
@@ -2142,7 +2139,7 @@ namespace ComPDFKit.Tool
         public void SetPDFEditAlignment(AlignModes align)
         {
             List<CPDFEditArea> editAreaObjectlist = new List<CPDFEditArea>();
-            MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(multiSelectedRectViewTag));
+            MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(MultiSelectedRectViewTag));
             if (multiSelectedRect == null || multiSelectedRect.Children.Count <= 1 || align == AlignModes.AlignNone)
             {
                 return;
@@ -2212,7 +2209,7 @@ namespace ComPDFKit.Tool
         private void SetPDFEditAlignLeft()
         {
             List<CPDFEditArea> editAreaObjectlist = new List<CPDFEditArea>();
-            MultiSelectedRect MultiSelectEditList = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(multiSelectedRectViewTag));
+            MultiSelectedRect MultiSelectEditList = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(MultiSelectedRectViewTag));
             if (MultiSelectEditList == null || MultiSelectEditList.Children.Count <= 1)
             {
                 return;
@@ -2257,7 +2254,7 @@ namespace ComPDFKit.Tool
         private void SetPDFEditAlignVerticalCenter()
         {
             List<CPDFEditArea> editAreaObjectlist = new List<CPDFEditArea>();
-            MultiSelectedRect MultiSelectEditList = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(multiSelectedRectViewTag));
+            MultiSelectedRect MultiSelectEditList = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(MultiSelectedRectViewTag));
             if (MultiSelectEditList == null || MultiSelectEditList.Children.Count <= 1)
             {
                 return;
@@ -2314,7 +2311,7 @@ namespace ComPDFKit.Tool
         private void SetPDFEditAlignRight()
         {
             List<CPDFEditArea> editAreaObjectlist = new List<CPDFEditArea>();
-            MultiSelectedRect MultiSelectEditList = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(multiSelectedRectViewTag));
+            MultiSelectedRect MultiSelectEditList = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(MultiSelectedRectViewTag));
             if (MultiSelectEditList == null || MultiSelectEditList.Children.Count <= 1)
             {
                 return;
@@ -2373,7 +2370,7 @@ namespace ComPDFKit.Tool
         private void SetPDFEditAlignTop()
         {
             List<CPDFEditArea> editAreaObjectlist = new List<CPDFEditArea>();
-            MultiSelectedRect MultiSelectEditList = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(multiSelectedRectViewTag));
+            MultiSelectedRect MultiSelectEditList = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(MultiSelectedRectViewTag));
             if (MultiSelectEditList == null || MultiSelectEditList.Children.Count <= 1)
             {
                 return;
@@ -2416,7 +2413,7 @@ namespace ComPDFKit.Tool
         private void SetPDFEditAlignHorizonCenter()
         {
             List<CPDFEditArea> editAreaObjectlist = new List<CPDFEditArea>();
-            MultiSelectedRect MultiSelectEditList = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(multiSelectedRectViewTag));
+            MultiSelectedRect MultiSelectEditList = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(MultiSelectedRectViewTag));
             if (MultiSelectEditList == null || MultiSelectEditList.Children.Count <= 1)
             {
                 return;
@@ -2457,7 +2454,7 @@ namespace ComPDFKit.Tool
         private void SetPDFEditAlignBottom()
         {
             List<CPDFEditArea> editAreaObjectlist = new List<CPDFEditArea>();
-            MultiSelectedRect MultiSelectEditList = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(multiSelectedRectViewTag));
+            MultiSelectedRect MultiSelectEditList = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(MultiSelectedRectViewTag));
             if (MultiSelectEditList == null || MultiSelectEditList.Children.Count <= 1)
             {
                 return;
@@ -2500,7 +2497,7 @@ namespace ComPDFKit.Tool
         private void SetPDFEditDistributeHorizontal()
         {
             List<CPDFEditArea> editAreaObjectlist = new List<CPDFEditArea>();
-            MultiSelectedRect MultiSelectEditList = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(multiSelectedRectViewTag));
+            MultiSelectedRect MultiSelectEditList = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(MultiSelectedRectViewTag));
             if (MultiSelectEditList == null || MultiSelectEditList.Children.Count <= 1)
             {
                 return;
@@ -2547,7 +2544,7 @@ namespace ComPDFKit.Tool
         private void SetPDFEditDistributeVertical()
         {
             List<CPDFEditArea> editAreaObjectlist = new List<CPDFEditArea>();
-            MultiSelectedRect MultiSelectEditList = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(multiSelectedRectViewTag));
+            MultiSelectedRect MultiSelectEditList = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(MultiSelectedRectViewTag));
             if (MultiSelectEditList == null || MultiSelectEditList.Children.Count <= 1)
             {
                 return;