compdfkit(win) - 测量Demo 暂时取消弹框

Demo/Examples/Compdfkit_Tools/Measure/MeasureControl.xaml

@@ -58,6 +58,12 @@
                 <local:MeasureInfoPanel x:Name="InfoPanel" Width="300" HorizontalAlignment="Right" Margin="0,20,30,0"
                                         Visibility="Collapsed" VerticalAlignment="Top" 
                                         SettingClick="MeasureInfoPanel_SettingClick"></local:MeasureInfoPanel>
+                <local:MeasureSettingPanel x:Name="SettingPanel" HorizontalAlignment="Center" VerticalAlignment="Center" 
+                             Visibility="Collapsed"
+                             CancelEvent="SettingPanel_CancelEvent"
+                             DoneEvent="SettingPanel_DoneEvent">
+
+                </local:MeasureSettingPanel>
             </Grid>
             <Border Grid.Column="3" Name="PropertyContainer" Grid.Row="1" Visibility="Collapsed" ></Border>
             <cpdfcommon:PageNumberControl  Grid.Column="2" Grid.Row="1" x:Name="FloatPageTool" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,20"></cpdfcommon:PageNumberControl>

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

@@ -32,7 +32,6 @@ namespace Compdfkit_Tools.Measure
     public partial class MeasureControl : UserControl
     {
         public MeasurePropertyControl measurePropertyControl = new MeasurePropertyControl();
-        public MeasureSettingDialog SettingPanel = new MeasureSettingDialog();
         private CPDFDisplaySettingsControl displaySettingsControl;
 
         private PDFViewControl PdfViewControl = new PDFViewControl();
@@ -45,10 +44,6 @@ namespace Compdfkit_Tools.Measure
         {
             InitializeComponent();
             MeasureSetting.MeasureChanged += MeasureSetting_MeasureChanged;
-            SettingPanel.CancelEvent -= SettingPanel_CancelEvent;
-            SettingPanel.DoneEvent -= SettingPanel_DoneEvent;
-            SettingPanel.CancelEvent += SettingPanel_CancelEvent;
-            SettingPanel.DoneEvent += SettingPanel_DoneEvent;
         }
 
         private void MeasureSetting_MeasureChanged(object sender, MeasureEventArgs e)
@@ -510,11 +505,6 @@ namespace Compdfkit_Tools.Measure
             }
             InfoPanel.Visibility = measureInfo ? Visibility.Visible : Visibility.Collapsed;
             SettingPanel.Visibility = measureSetting ? Visibility.Visible : Visibility.Collapsed;
-            if(SettingPanel.Visibility == Visibility.Visible)
-            {
-                SettingPanel.Owner=Window.GetWindow(this);
-                SettingPanel.ShowDialog();
-            }
         }
 
         public void SetMeasureInfoType(CPDFMeasureType measureType)

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

@@ -142,7 +142,7 @@ namespace Compdfkit_Tools.Measure
                         AngleText.Text = info.Angle.ToString()+"°";
                         XText.Text=info.MousePos.X.ToString();
                         YText.Text=info.MousePos.Y.ToString();
-                        ScaleText.Text = string.Format("{0}{1}={2}{3}",
+                        ScaleText.Text = string.Format("{0} {1} = {2} {3}",
                             info.RulerBase,
                             info.RulerBaseUnit,
                             info.RulerTranslate,
@@ -154,7 +154,7 @@ namespace Compdfkit_Tools.Measure
                         DistancePolyLineText.Text = info.Distance;
                         PrecisionPolyLineText.Text = ((decimal)info.Precision).ToString();
                         AnglePolyLineText.Text = info.Angle.ToString() + "°";
-                        ScalePolyLineText.Text = string.Format("{0}{1}={2}{3}",
+                        ScalePolyLineText.Text = string.Format("{0} {1} = {2} {3}",
                             info.RulerBase,
                             info.RulerBaseUnit,
                             info.RulerTranslate,
@@ -166,7 +166,7 @@ namespace Compdfkit_Tools.Measure
                         RoundPolygonText.Text = info.Area;
                         PrecisionPolygonText.Text = ((decimal)info.Precision).ToString();
                         AnglePolygonText.Text = info.Angle.ToString() + "°";
-                        ScalePolygonText.Text = string.Format("{0}{1}={2}{3}",
+                        ScalePolygonText.Text = string.Format("{0} {1} = {2} {3}",
                             info.RulerBase,
                             info.RulerBaseUnit, 
                             info.RulerTranslate,

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

@@ -44,6 +44,7 @@ namespace Compdfkit_Tools.Measure
             UpdateArgsList?.Clear();
             CancelEvent?.Invoke(this, e);
             ReturnToInfoPanel = false;
+            Close();
         }
 
         private void ButtonDone_Click(object sender, RoutedEventArgs e)
@@ -157,6 +158,7 @@ namespace Compdfkit_Tools.Measure
             UpdateArgsList?.Clear();
             DoneEvent?.Invoke(this, e);
             ReturnToInfoPanel = false;
+            Close();
         }
 
         private void TextBox_PreviewKeyDown(object sender, KeyEventArgs e)