|
@@ -624,7 +624,7 @@ namespace ComPDFKit.Tool
|
|
|
switch (e.annotData.AnnotType)
|
|
|
{
|
|
|
case C_ANNOTATION_TYPE.C_ANNOTATION_LINE:
|
|
|
- if ((e.annotData.Annot as CPDFLineAnnotation).IsMersured())
|
|
|
+ if ((e.annotData.Annot as CPDFLineAnnotation).IsMeasured())
|
|
|
{
|
|
|
List<Point> cPoints = new List<Point>();
|
|
|
for (int i = 0; i < e.Points.Count; i++)
|
|
@@ -689,7 +689,7 @@ namespace ComPDFKit.Tool
|
|
|
}
|
|
|
lineMeasure.UpdateAnnotMeasure();
|
|
|
annotLine.UpdateAp();
|
|
|
- if (annotLine.IsMersured())
|
|
|
+ if (annotLine.IsMeasured())
|
|
|
{
|
|
|
PostMeasureInfo(this, annotLine);
|
|
|
}
|
|
@@ -739,7 +739,7 @@ namespace ComPDFKit.Tool
|
|
|
(float)top));
|
|
|
annotLine.GetAreaMeasure().UpdateAnnotMeasure();
|
|
|
annotLine.UpdateAp();
|
|
|
- if (annotLine.IsMersured())
|
|
|
+ if (annotLine.IsMeasured())
|
|
|
{
|
|
|
PostMeasureInfo(this, annotLine);
|
|
|
}
|
|
@@ -771,7 +771,7 @@ namespace ComPDFKit.Tool
|
|
|
|
|
|
annotLine.GetPerimeterMeasure().UpdateAnnotMeasure();
|
|
|
annotLine.UpdateAp();
|
|
|
- if (annotLine.IsMersured())
|
|
|
+ if (annotLine.IsMeasured())
|
|
|
{
|
|
|
PostMeasureInfo(this, annotLine);
|
|
|
}
|
|
@@ -1086,7 +1086,7 @@ namespace ComPDFKit.Tool
|
|
|
{
|
|
|
case C_ANNOTATION_TYPE.C_ANNOTATION_LINE:
|
|
|
{
|
|
|
- if ((cPDFAnnotation as CPDFLineAnnotation).IsMersured())
|
|
|
+ if ((cPDFAnnotation as CPDFLineAnnotation).IsMeasured())
|
|
|
{
|
|
|
MeasureSetting measureSetting = viewerTool.GetMeasureSetting();
|
|
|
if (viewerTool.GetMoveLength() > measureSetting.MoveDetectionLength)
|
|
@@ -1097,7 +1097,7 @@ namespace ComPDFKit.Tool
|
|
|
}
|
|
|
break;
|
|
|
case C_ANNOTATION_TYPE.C_ANNOTATION_POLYGON:
|
|
|
- if ((cPDFAnnotation as CPDFPolygonAnnotation).IsMersured())
|
|
|
+ if ((cPDFAnnotation as CPDFPolygonAnnotation).IsMeasured())
|
|
|
{
|
|
|
DefaultSettingParam defSetting = viewerTool.GetDefaultSettingParam();
|
|
|
if (defSetting.IsCreateSquarePolygonMeasure)
|
|
@@ -1164,7 +1164,7 @@ namespace ComPDFKit.Tool
|
|
|
return;
|
|
|
case C_ANNOTATION_TYPE.C_ANNOTATION_LINE:
|
|
|
{
|
|
|
- if ((annotation as CPDFLineAnnotation).IsMersured())
|
|
|
+ if ((annotation as CPDFLineAnnotation).IsMeasured())
|
|
|
{
|
|
|
if (measurepoints.Count > 1)
|
|
|
{
|
|
@@ -1208,7 +1208,7 @@ namespace ComPDFKit.Tool
|
|
|
break;
|
|
|
case C_ANNOTATION_TYPE.C_ANNOTATION_POLYGON:
|
|
|
{
|
|
|
- if ((annotation as CPDFPolygonAnnotation).IsMersured())
|
|
|
+ if ((annotation as CPDFPolygonAnnotation).IsMeasured())
|
|
|
{
|
|
|
List<CPoint> cPoints = new List<CPoint>();
|
|
|
foreach (Point item in measurepoints)
|
|
@@ -1223,7 +1223,7 @@ namespace ComPDFKit.Tool
|
|
|
break;
|
|
|
case C_ANNOTATION_TYPE.C_ANNOTATION_POLYLINE:
|
|
|
{
|
|
|
- if ((annotation as CPDFPolylineAnnotation).IsMersured())
|
|
|
+ if ((annotation as CPDFPolylineAnnotation).IsMeasured())
|
|
|
{
|
|
|
List<CPoint> cPoints = new List<CPoint>();
|
|
|
foreach (Point item in measurepoints)
|
|
@@ -1457,7 +1457,7 @@ namespace ComPDFKit.Tool
|
|
|
if (rawAnnot.Type == C_ANNOTATION_TYPE.C_ANNOTATION_LINE)
|
|
|
{
|
|
|
CPDFLineAnnotation lineAnnot = rawAnnot as CPDFLineAnnotation;
|
|
|
- if (lineAnnot.IsMersured() && lineAnnot.Points != null && lineAnnot.Points.Count() == 2)
|
|
|
+ if (lineAnnot.IsMeasured() && lineAnnot.Points != null && lineAnnot.Points.Count() == 2)
|
|
|
{
|
|
|
CPDFDistanceMeasure lineMeasure = lineAnnot.GetDistanceMeasure();
|
|
|
CPDFMeasureInfo measureInfo = lineMeasure.MeasureInfo;
|
|
@@ -1490,7 +1490,7 @@ namespace ComPDFKit.Tool
|
|
|
if (rawAnnot.Type == C_ANNOTATION_TYPE.C_ANNOTATION_POLYLINE)
|
|
|
{
|
|
|
CPDFPolylineAnnotation polylineAnnot = rawAnnot as CPDFPolylineAnnotation;
|
|
|
- if (polylineAnnot.IsMersured() && polylineAnnot.Points != null && polylineAnnot.Points.Count() >= 2)
|
|
|
+ if (polylineAnnot.IsMeasured() && polylineAnnot.Points != null && polylineAnnot.Points.Count() >= 2)
|
|
|
{
|
|
|
double totalInch = 0;
|
|
|
for (int i = 0; i < polylineAnnot.Points.Count - 1; i++)
|
|
@@ -1530,7 +1530,7 @@ namespace ComPDFKit.Tool
|
|
|
if (rawAnnot.Type == C_ANNOTATION_TYPE.C_ANNOTATION_POLYGON)
|
|
|
{
|
|
|
CPDFPolygonAnnotation polygonAnnot = rawAnnot as CPDFPolygonAnnotation;
|
|
|
- if (polygonAnnot.IsMersured() && polygonAnnot.Points != null && polygonAnnot.Points.Count() >= 2)
|
|
|
+ if (polygonAnnot.IsMeasured() && polygonAnnot.Points != null && polygonAnnot.Points.Count() >= 2)
|
|
|
{
|
|
|
double totalInch = 0;
|
|
|
for (int i = 0; i < polygonAnnot.Points.Count - 1; i++)
|
|
@@ -2015,7 +2015,7 @@ namespace ComPDFKit.Tool
|
|
|
CPDFLineAnnotation LineAnnotation = (cPDFAnnotation as CPDFLineAnnotation);
|
|
|
if (LineAnnotation != null)
|
|
|
{
|
|
|
- if (LineAnnotation.IsMersured())
|
|
|
+ if (LineAnnotation.IsMeasured())
|
|
|
{
|
|
|
cansave = false;
|
|
|
}
|
|
@@ -2027,10 +2027,10 @@ namespace ComPDFKit.Tool
|
|
|
{
|
|
|
bool cansave = true;
|
|
|
CPDFPolygonAnnotation PolyAnnotation = (cPDFAnnotation as CPDFPolygonAnnotation);
|
|
|
- PolyAnnotation?.IsMersured();
|
|
|
+ PolyAnnotation?.IsMeasured();
|
|
|
if (PolyAnnotation != null)
|
|
|
{
|
|
|
- if (PolyAnnotation.IsMersured())
|
|
|
+ if (PolyAnnotation.IsMeasured())
|
|
|
{
|
|
|
cansave = false;
|
|
|
}
|
|
@@ -2042,10 +2042,10 @@ namespace ComPDFKit.Tool
|
|
|
{
|
|
|
bool cansave = true;
|
|
|
CPDFPolylineAnnotation PolyAnnotation = (cPDFAnnotation as CPDFPolylineAnnotation);
|
|
|
- PolyAnnotation?.IsMersured();
|
|
|
+ PolyAnnotation?.IsMeasured();
|
|
|
if (PolyAnnotation != null)
|
|
|
{
|
|
|
- if (PolyAnnotation.IsMersured())
|
|
|
+ if (PolyAnnotation.IsMeasured())
|
|
|
{
|
|
|
cansave = false;
|
|
|
}
|