Browse Source

compdfkit(win) - front back无效

liuaoran 1 year ago
parent
commit
5d8eb46a27

+ 1 - 19
Demo/Examples/Compdfkit_Tools/Common/PreviewControl/PreviewControl.xaml.cs

@@ -219,30 +219,12 @@ namespace Compdfkit_Tools.PDFControl
             writeableBitmap.WritePixels(new Int32Rect(0, 0, (int)pageRect.Width, (int)pageRect.Height), bmpData, writeableBitmap.BackBufferStride, 0);
             writeableBitmap.Freeze();
             Application.Current.Dispatcher.Invoke(new Action(() =>
-            {
-                SaveWriteableBitmapToPng(writeableBitmap, "Output.png");
+            { 
                 ImageSource = writeableBitmap;
 
             }));
         }
 
-        static void SaveWriteableBitmapToPng(WriteableBitmap writeableBitmap, string filePath)
-        {
-            // Create a PngBitmapEncoder
-            PngBitmapEncoder encoder = new PngBitmapEncoder();
-
-            // Create a memory stream to save the PNG image
-            using (MemoryStream stream = new MemoryStream())
-            {
-                // Save the WriteableBitmap to the memory stream
-                encoder.Frames.Add(BitmapFrame.Create(writeableBitmap));
-                encoder.Save(stream);
-
-                // Write the memory stream to a file
-                File.WriteAllBytes(filePath, stream.ToArray());
-            }
-        }
-
         private double CalculateThumbnailSize(Size size)
         {
 

+ 17 - 11
Demo/Examples/Compdfkit_Tools/Common/PropertyControl/PDFLocation/CPDFRotationControl.xaml.cs

@@ -32,18 +32,24 @@ namespace Compdfkit_Tools.Common
                 {
                     return;
                 }
-                if (int.Parse(value) > NumericUpDownControl.Maxium)
-                {
-                    value = NumericUpDownControl.Maxium.ToString();
-                }
-                if (int.Parse(value) < NumericUpDownControl.Minimum)
-                {
-                    value = NumericUpDownControl.Minimum.ToString();
-                }
-                if (UpdateProper(ref _rotationText, value))
+
+                int result = 0;
+
+                if (int.TryParse(value, out result))
                 {
-                    RotationChanged?.Invoke(this, EventArgs.Empty);
-                }
+                    if (result > NumericUpDownControl.Maxium)
+                    {
+                        value = NumericUpDownControl.Maxium.ToString();
+                    }
+                    if (result < NumericUpDownControl.Minimum)
+                    {
+                        value = NumericUpDownControl.Minimum.ToString();
+                    }
+                    if (UpdateProper(ref _rotationText, value))
+                    {
+                        RotationChanged?.Invoke(this, EventArgs.Empty);
+                    }
+                } 
             }
         }
 

+ 6 - 0
Demo/Examples/Compdfkit_Tools/Security/Watermark/AddWatermark/PageRangeDialog.xaml.cs

@@ -98,6 +98,12 @@ namespace Compdfkit_Tools.PDFControl
             this.Close();
         }
 
+        protected override void OnClosed(EventArgs e)
+        {
+            fileInfo.Document.ReleasePages();
+            base.OnClosed(e);
+        }
+
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
             weakReference = new WeakReference(this);

+ 12 - 17
Demo/Examples/Compdfkit_Tools/Security/Watermark/AddWatermark/WatermarkDialog.xaml.cs

@@ -366,22 +366,6 @@ namespace Compdfkit_Tools.PDFControl
             }
         }
 
-        private void LocationChk_Checked(object sender, RoutedEventArgs e)
-        {
-            var locationChk = sender as RadioButton;
-            if (locationChk != null)
-            {
-                if (locationChk.Name == "LocationChk")
-                {
-                    IsFront = true;
-                }
-                else
-                {
-                    IsFront = false;
-                }
-            }
-        }
-
         private void ColorPickerControl_ColorChanged(object sender, EventArgs e)
         {
             var colorPicker = sender as ColorPickerControl;
@@ -494,7 +478,18 @@ namespace Compdfkit_Tools.PDFControl
 
         private void LocationRdo_Checked(object sender, RoutedEventArgs e)
         {
-
+            var locationChk = sender as RadioButton;
+            if (locationChk != null)
+            {
+                if (locationChk.Name == "FrontRdo")
+                {
+                    IsFront = true;
+                }
+                else
+                {
+                    IsFront = false;
+                }
+            }
         }
     }
 }

+ 3 - 3
Demo/Examples/Compdfkit_Tools/Security/Watermark/AddWatermark/WatermarkPreviewControl.cs

@@ -35,13 +35,13 @@ namespace Compdfkit_Tools.PDFControl
                 _watermarkData = value;
 
                 if (watermark != null)
-                {
+                { 
+                    watermark?.ClearWatermark();
+                    watermark?.Release();
                     lock (queueLock)
                     {
                         Document.ReleasePages();
                     }
-                    watermark?.ClearWatermark();
-                    watermark?.Release();
                 }
                 watermark = Document.InitWatermark(WatermarkData.Type);
                 if (IsLoaded)