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

@@ -186,15 +186,11 @@ namespace Compdfkit_Tools.Measure
                         CPDFDistanceMeasure lineMeasure = lineAnnot.GetDistanceMeasure();
                         CPDFMeasureInfo measureInfo = lineMeasure.MeasureInfo;
                         Vector standVector = new Vector(1, 0);
-
                         Point startPoint = new Point(lineAnnot.Points[0].x, lineAnnot.Points[0].y);
                         Point endPoint = new Point(lineAnnot.Points[1].x, lineAnnot.Points[1].y);
                         Vector movevector = endPoint - startPoint;
-                        double inch = movevector.Length / 72D;
-                        double rate = measureInfo.RulerTranslate / measureInfo.RulerBase;
-                        double ratio = GetMeasureRatio(measureInfo.RulerBaseUnit);
-                        double showLenght = inch * rate / ratio;
 
+                        double showLenght=lineMeasure.GetMeasurementResults(CPDFCaptionType.CPDF_CAPTION_LENGTH);
                         MeasureEventArgs measureEvent = new MeasureEventArgs();
                         measureEvent.Angle = (int)Math.Abs(Vector.AngleBetween(movevector, standVector));
                         measureEvent.RulerTranslateUnit = measureInfo.RulerTranslateUnit;
@@ -240,32 +236,10 @@ namespace Compdfkit_Tools.Measure
                         totalInch = totalInch / 72D;
                         CPDFPerimeterMeasure lineMeasure = polylineAnnot.GetPerimeterMeasure();
                         CPDFMeasureInfo measureInfo = lineMeasure.MeasureInfo;
-
-                        double rate = measureInfo.RulerTranslate / measureInfo.RulerBase;
-                        double ratio = GetMeasureRatio(measureInfo.RulerBaseUnit);
-                        double showLenght = totalInch * rate / ratio;
+                        double showLenght = lineMeasure.GetMeasurementResults(CPDFCaptionType.CPDF_CAPTION_LENGTH);
 
                         MeasureEventArgs measureEvent = new MeasureEventArgs();
                         measureEvent.Angle = 0;
-                        //if (polylineAnnot.Points.Count() >= 3)
-                        //{
-                        //    int count = polylineAnnot.Points.Count();
-                        //    Point endLinePoint = new Point(
-                        //       polylineAnnot.Points[count - 1].x,
-                        //       polylineAnnot.Points[count - 1].y
-                        //       );
-                        //    Point cornerLinePoint = new Point(
-                        //        polylineAnnot.Points[count - 2].x,
-                        //        polylineAnnot.Points[count - 2].y
-                        //        );
-                        //    Point startLinePoint = new Point(
-                        //        polylineAnnot.Points[count - 3].x,
-                        //        polylineAnnot.Points[count - 3].y
-                        //        );
-                        //    Vector startVector = startLinePoint - cornerLinePoint;
-                        //    Vector endvector = endLinePoint - cornerLinePoint;
-                        //    measureEvent.Angle = (int)Math.Abs(Vector.AngleBetween(endvector, startVector));
-                        //}
                         measureEvent.RulerTranslateUnit = measureInfo.RulerTranslateUnit;
                         measureEvent.RulerTranslate = measureInfo.RulerTranslate;
                         measureEvent.RulerBase = measureInfo.RulerBase;