编辑开发更新

PDF Office/ViewModels/PropertyPanel/PDFEdit/ImageEditPropertyViewModel.cs

@@ -97,6 +97,12 @@ namespace PDF_Master.ViewModels.PropertyPanel.PDFEdit
 
         //顺时针旋转
         public DelegateCommand ClockwiseCommand { get; set; }
+
+        //左右翻转
+        public DelegateCommand FlipleftrightCommand { get; set; }
+
+        //上下翻转
+        public DelegateCommand UpsidedownCommand { get; set; }
         //裁剪状态
         public DelegateCommand CropModeCommand { get; set; }
         //取消裁剪状态
@@ -127,6 +133,8 @@ namespace PDF_Master.ViewModels.PropertyPanel.PDFEdit
 
             AntiClockwiseCommand = new DelegateCommand(AntiClockwise);
             ClockwiseCommand = new DelegateCommand(Clockwise);
+            FlipleftrightCommand = new DelegateCommand(Flipleftright);
+            UpsidedownCommand = new DelegateCommand(Upsidedown);
             CropModeCommand = new DelegateCommand(CropMode);
             CancelCropCommand = new DelegateCommand(CancelCropImg);
 
@@ -245,6 +253,17 @@ namespace PDF_Master.ViewModels.PropertyPanel.PDFEdit
         {
             ImgRoateAngle(-90);
         }
+        private void Flipleftright()
+        {
+            TextEditEvent.HorizontalMirror = true;
+            TextEditEvent.UpdatePDFEditByEventArgs();
+        }
+        private void Upsidedown()
+        {
+            TextEditEvent.VerticalMirror = true;
+           
+            TextEditEvent.UpdatePDFEditByEventArgs();
+        }
 
         private void ImgRoateAngle(int angle)
         {

PDF Office/ViewModels/Tools/TextEditToolContentViewModel.cs

@@ -17,6 +17,7 @@ using PDF_Master.CustomControl;
 using ComPDFKitViewer;
 using System.Windows.Input;
 using PDF_Master.Helper;
+using ComPDFKitViewer.AnnotEvent;
 
 namespace PDF_Master.ViewModels.Tools
 {
@@ -177,13 +178,18 @@ namespace PDF_Master.ViewModels.Tools
                 {
                     IsImgEdit = false;
                     IsTextEdit = true;
+                    PDFViewer.SetPDFEditType(ComPDFKit.PDFPage.CPDFEditType.EditText);
+                    PDFViewer.ReloadDocument();
                     PDFViewer.SetPDFEditCreateType(ComPDFKit.PDFPage.CPDFEditType.EditText);
+                   
                 }
                 else
                 {
                     IsImgEdit = true;
                     IsTextEdit = false;
+                    PDFViewer.SetPDFEditType(ComPDFKit.PDFPage.CPDFEditType.EditImage);
                     PDFViewer.SetPDFEditCreateType(ComPDFKit.PDFPage.CPDFEditType.EditImage);
+                    PDFViewer.ReloadDocument();
                 }
             }
             else
@@ -191,7 +197,10 @@ namespace PDF_Master.ViewModels.Tools
                 IsImgEdit = false;
                 IsTextEdit = false;
                 PDFViewer.SetPDFEditCreateType(ComPDFKit.PDFPage.CPDFEditType.None);
+                PDFViewer.SetPDFEditType(ComPDFKit.PDFPage.CPDFEditType.EditText | ComPDFKit.PDFPage.CPDFEditType.EditImage);
                 PDFViewer.SetMouseMode(MouseModes.PDFEdit);
+                PDFViewer.ReloadDocument();
+
             }
         }
 
@@ -228,6 +237,24 @@ namespace PDF_Master.ViewModels.Tools
             viewContentViewModel.IsPropertyOpen = show;
         }
 
+      
+        public void OnNavigatedTo(NavigationContext navigationContext)
+        {
+            navigationContext.Parameters.TryGetValue<CPDFViewer>(ParameterNames.PDFViewer, out PDFViewer);
+            navigationContext.Parameters.TryGetValue<ViewContentViewModel>(ParameterNames.ViewContentViewModel, out viewContentViewModel);
+
+            if (PDFViewer != null)
+            {
+                PDFViewer.PDFEditActiveHandler -= PDFViewer_PDFEditActiveHandler;
+                PDFViewer.PDFEditActiveHandler += PDFViewer_PDFEditActiveHandler;
+
+                PDFViewer.PDFEditCommandHandler -= PDFViewer_PDFEditCommandHandler;
+                PDFViewer.PDFEditCommandHandler += PDFViewer_PDFEditCommandHandler;
+
+                PDFViewer.CustomNotifyHandler -= PDFViewer_CustomNotifyHandler;
+                PDFViewer.CustomNotifyHandler += PDFViewer_CustomNotifyHandler;
+            }
+        }
         private void PDFViewer_PDFEditActiveHandler(object sender, List<PDFEditEvent> e)
         {
 
@@ -258,7 +285,7 @@ namespace PDF_Master.ViewModels.Tools
                 if (isText == false && isImg == true)
                 {
                     AddToPropertyPanel("Image", e);
-                    
+
                 }
                 if (isText == true && isImg == true)
                 {
@@ -273,24 +300,6 @@ namespace PDF_Master.ViewModels.Tools
 
         }
 
-        public void OnNavigatedTo(NavigationContext navigationContext)
-        {
-            navigationContext.Parameters.TryGetValue<CPDFViewer>(ParameterNames.PDFViewer, out PDFViewer);
-            navigationContext.Parameters.TryGetValue<ViewContentViewModel>(ParameterNames.ViewContentViewModel, out viewContentViewModel);
-
-            if (PDFViewer != null)
-            {
-                PDFViewer.PDFEditActiveHandler -= PDFViewer_PDFEditActiveHandler;
-                PDFViewer.PDFEditActiveHandler += PDFViewer_PDFEditActiveHandler;
-
-                PDFViewer.PDFEditCommandHandler -= PDFViewer_PDFEditCommandHandler;
-                PDFViewer.PDFEditCommandHandler += PDFViewer_PDFEditCommandHandler;
-
-                PDFViewer.CustomNotifyHandler -= PDFViewer_CustomNotifyHandler;
-                PDFViewer.CustomNotifyHandler += PDFViewer_CustomNotifyHandler;
-            }
-        }
-
         private void PDFViewer_PDFEditCommandHandler(object sender, PDFEditCommand e)
         {
             if (e == null)
@@ -326,17 +335,20 @@ namespace PDF_Master.ViewModels.Tools
             }
         }
         private void PDFViewer_CustomNotifyHandler(object sender, CustomNotityData e)
-        {         
-
-            if (e.NotifyType == CustomNotifyType.PDFEditImage)
-            {
-                OpenFileDialog openFileDialog = new OpenFileDialog();
-                openFileDialog.Filter = "Image Files(*.jpg;*.jpeg;*.png;*.bmp)|*.jpg;*.jpeg;*.png;*.bmp;";
-                if (openFileDialog.ShowDialog() == true)
+        {
+          
+        
+                if (e.NotifyType == CustomNotifyType.PDFEditImage)
                 {
-                    PDFViewer.AddPDFEditImage(openFileDialog.FileName);
+                    OpenFileDialog openFileDialog = new OpenFileDialog();
+
+                    openFileDialog.Filter = "Image Files(*.jpg;*.jpeg;*.png;*.bmp)|*.jpg;*.jpeg;*.png;*.bmp;";
+                    if (openFileDialog.ShowDialog() == true)
+                    {
+                        PDFViewer.AddPDFEditImage(openFileDialog.FileName);
+                    }
                 }
-            }
+            
         }
 
 
@@ -352,6 +364,7 @@ namespace PDF_Master.ViewModels.Tools
             IsTextEdit = false;
             PDFViewer.PDFEditActiveHandler -= PDFViewer_PDFEditActiveHandler;
             PDFViewer.PDFEditCommandHandler -= PDFViewer_PDFEditCommandHandler;
+             PDFViewer.CustomNotifyHandler -= PDFViewer_CustomNotifyHandler;
             ShowPropertyPanel(false);
         }