Merge branch 'compdfkit_demo_win_dev_measure' of http://git.kdan.cc:8865/Others/kmpdfkit_demo into compdfkit_demo_win_dev_measure

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

@@ -64,6 +64,7 @@ namespace Compdfkit_Tools.Measure
             pdfViewControl.PDFView.AnnotActiveHandler += PDFView_AnnotActiveHandler;
             pdfViewControl.PDFView.AnnotCommandHandler -= PDFView_AnnotCommandHandler;
             pdfViewControl.PDFView.AnnotCommandHandler += PDFView_AnnotCommandHandler;
+            SetInfoPanelVisble(false, false);
         }
 
         private void PDFView_AnnotCommandHandler(object sender, AnnotCommandArgs e)

Demo/Examples/Compdfkit_Tools/Measure/Property/MultilineProperty.xaml.cs

@@ -43,8 +43,8 @@ namespace Compdfkit_Tools.Measure.Property
         {
             if (IsLoadedData)
             {
-                MultilineEvent.UpdateAttrib(AnnotAttrib.NoteText, NoteTextBox.Text);
-                MultilineEvent.UpdateAnnot();
+                MultilineEvent?.UpdateAttrib(AnnotAttrib.NoteText, NoteTextBox.Text);
+                MultilineEvent?.UpdateAnnot();
             }
         }
 
@@ -97,8 +97,8 @@ namespace Compdfkit_Tools.Measure.Property
         {
             if (IsLoadedData)
             {
-                MultilineEvent.UpdateAttrib(AnnotAttrib.FontSize, (sender as ComboBox).SelectedItem);
-                MultilineEvent.UpdateAnnot();
+                MultilineEvent?.UpdateAttrib(AnnotAttrib.FontSize, (sender as ComboBox).SelectedItem);
+                MultilineEvent?.UpdateAnnot();
             }
         }
 
@@ -196,11 +196,11 @@ namespace Compdfkit_Tools.Measure.Property
                         case AnnotAttrib.FontName:
                             {
                                 string fontName = (string)annotEvent.Attribs[AnnotAttrib.FontName];
-                                if (fontName == "Courier New")
+                                if (fontName.Contains("Courier"))
                                 {
                                     FontCombox.SelectedIndex = 1;
                                 }
-                                else if (fontName == "Arial")
+                                else if (fontName == "Arial" || fontName.Contains("Helvetica"))
                                 {
                                     FontCombox.SelectedIndex = 0;
 
@@ -218,6 +218,9 @@ namespace Compdfkit_Tools.Measure.Property
                         case AnnotAttrib.FontSize:
                             SetFontSize(Convert.ToDouble(annotEvent.Attribs[attrib]));
                             break;
+                        case AnnotAttrib.NoteText:
+                            NoteTextBox.Text = annotEvent.Attribs[attrib].ToString();
+                            break;
                         default:
                             break;
                     }

Demo/Examples/Compdfkit_Tools/Measure/Property/PolygonalProperty.xaml.cs

@@ -213,11 +213,11 @@ namespace Compdfkit_Tools.Measure.Property
                         case AnnotAttrib.FontName:
                             {
                                 string fontName = (string)annotEvent.Attribs[AnnotAttrib.FontName];
-                                if (fontName == "Courier New")
+                                if (fontName.Contains("Courier"))
                                 {
                                     FontCombox.SelectedIndex = 1;
                                 }
-                                else if (fontName == "Arial")
+                                else if (fontName == "Arial" || fontName.Contains("Helvetica"))
                                 {
                                     FontCombox.SelectedIndex = 0;
 
@@ -235,6 +235,9 @@ namespace Compdfkit_Tools.Measure.Property
                         case AnnotAttrib.FontSize:
                             SetFontSize(Convert.ToDouble(annotEvent.Attribs[attrib]));
                             break;
+                        case AnnotAttrib.NoteText:
+                            NoteTextBox.Text = annotEvent.Attribs[attrib].ToString();
+                            break;
                         default:
                             break;
                     }

Demo/Examples/Compdfkit_Tools/Measure/Property/StraightnessProperty.xaml.cs

@@ -42,8 +42,8 @@ namespace Compdfkit_Tools.Measure.Property
 
         private void NoteTextBox_TextChanged(object sender, TextChangedEventArgs e)
         {
-            LineEvent.UpdateAttrib(AnnotAttrib.NoteText, NoteTextBox.Text);
-            LineEvent.UpdateAnnot();
+            LineEvent?.UpdateAttrib(AnnotAttrib.NoteText, NoteTextBox.Text);
+            LineEvent?.UpdateAnnot();
         }
 
         private void FontStyleCombox_SelectionChanged(object sender, SelectionChangedEventArgs e)
@@ -82,8 +82,8 @@ namespace Compdfkit_Tools.Measure.Property
         {
             if (IsLoadedData)
             {
-                LineEvent.UpdateAttrib(AnnotAttrib.FontSize, (sender as ComboBox).SelectedItem);
-                LineEvent.UpdateAnnot();
+                LineEvent?.UpdateAttrib(AnnotAttrib.FontSize, (sender as ComboBox).SelectedItem);
+                LineEvent?.UpdateAnnot();
             }
         }
 
@@ -145,11 +145,11 @@ namespace Compdfkit_Tools.Measure.Property
                         case AnnotAttrib.FontName:
                             {
                                 string fontName= (string)annotEvent.Attribs[AnnotAttrib.FontName];
-                                if (fontName == "Courier New")
+                                if (fontName.Contains("Courier"))
                                 {
                                     FontCombox.SelectedIndex = 1;
                                 }
-                                else if (fontName == "Arial")
+                                else if (fontName == "Arial" || fontName.Contains("Helvetica"))
                                 {
                                     FontCombox.SelectedIndex = 0;
 
@@ -167,6 +167,9 @@ namespace Compdfkit_Tools.Measure.Property
                         case AnnotAttrib.FontSize:
                             SetFontSize(Convert.ToDouble(annotEvent.Attribs[attrib]));
                             break;
+                        case AnnotAttrib.NoteText:
+                            NoteTextBox.Text= annotEvent.Attribs[attrib].ToString();
+                            break;
                         default:
                             break;
                     }