【2025】【Markup】测量模块显示处理

PDF Office/PDF Master/KMClass/KMPDFViewController/KMMainViewController.swift

@@ -3401,17 +3401,17 @@ struct KMNMWCFlags {
         } else {
             let type = self.listView.annotationType
             if type == .measureLine {
-//                distanceMeasureInfoWindowController?.measureInfo = listView.distanceMeasureInfo
-//                distanceMeasureInfoWindowController?.window?.orderFront(nil)
+                distanceMeasureInfoWindowController?.measureInfo = listView.distanceMeasureInfo
+                distanceMeasureInfoWindowController?.window?.orderFront(nil)
             } else if type == .measurePolyLine {
-//                perimeterMeasureInfoWindowController?.measureInfo = listView.perimeterMeasureInfo
-//                perimeterMeasureInfoWindowController?.window?.orderFront(nil)
+                perimeterMeasureInfoWindowController?.measureInfo = listView.perimeterMeasureInfo
+                perimeterMeasureInfoWindowController?.window?.orderFront(nil)
             } else if type == .measurePolyGon {
-//                areaMeasureInfoWindowController?.measureInfo = listView.polygonAreaMeasureInfo
-//                areaMeasureInfoWindowController?.window?.orderFront(nil)
+                areaMeasureInfoWindowController?.measureInfo = listView.polygonAreaMeasureInfo
+                areaMeasureInfoWindowController?.window?.orderFront(nil)
             } else if type == .measureSquare {
-//                areaMeasureInfoWindowController?.measureInfo = listView.squareAreaMeasureInfo
-//                areaMeasureInfoWindowController?.window?.orderFront(nil)
+                areaMeasureInfoWindowController?.measureInfo = listView.squareAreaMeasureInfo
+                areaMeasureInfoWindowController?.window?.orderFront(nil)
             } else {
                 cancelMeasureType()
             }
@@ -5996,15 +5996,15 @@ extension KMMainViewController: CPDFViewDelegate,CPDFListViewDelegate {
     }
      
     private func handleLineAnnotation(_ annotation: CPDFLineAnnotation) {
-//        if perimeterMeasureInfoWindowController?.window?.isVisible == true {
-//            perimeterMeasureInfoWindowController?.hideFloatingWindow()
-//            distanceMeasureInfoWindowController?.showWindow(self)
-//        } else if areaMeasureInfoWindowController?.window?.isVisible == true {
-//            areaMeasureInfoWindowController?.hideFloatingWindow()
-//            distanceMeasureInfoWindowController?.showWindow(self)
-//        } else if distanceMeasureInfoWindowController?.window?.isVisible == false {
-//            distanceMeasureInfoWindowController?.showWindow(self)
-//        }
+        if perimeterMeasureInfoWindowController?.window?.isVisible == true {
+            perimeterMeasureInfoWindowController?.hideFloatingWindow()
+            distanceMeasureInfoWindowController?.showWindow(self)
+        } else if areaMeasureInfoWindowController?.window?.isVisible == true {
+            areaMeasureInfoWindowController?.hideFloatingWindow()
+            distanceMeasureInfoWindowController?.showWindow(self)
+        } else if distanceMeasureInfoWindowController?.window?.isVisible == false {
+            distanceMeasureInfoWindowController?.showWindow(self)
+        }
         
         let measureInfo = annotation.measureInfo
         let startPoint = annotation.startPoint
@@ -6018,15 +6018,15 @@ extension KMMainViewController: CPDFViewDelegate,CPDFListViewDelegate {
     }
     
     private func handlePolylineAnnotation(_ annotation: CPDFPolylineAnnotation) {
-//        if distanceMeasureInfoWindowController?.window?.isVisible == true {
-//            distanceMeasureInfoWindowController?.hideFloatingWindow()
-//            perimeterMeasureInfoWindowController?.showWindow(self)
-//        } else if areaMeasureInfoWindowController?.window?.isVisible == true {
-//            areaMeasureInfoWindowController?.hideFloatingWindow()
-//            perimeterMeasureInfoWindowController?.showWindow(self)
-//        } else if perimeterMeasureInfoWindowController?.window?.isVisible == false {
-//            perimeterMeasureInfoWindowController?.showWindow(self)
-//        }
+        if distanceMeasureInfoWindowController?.window?.isVisible == true {
+            distanceMeasureInfoWindowController?.hideFloatingWindow()
+            perimeterMeasureInfoWindowController?.showWindow(self)
+        } else if areaMeasureInfoWindowController?.window?.isVisible == true {
+            areaMeasureInfoWindowController?.hideFloatingWindow()
+            perimeterMeasureInfoWindowController?.showWindow(self)
+        } else if perimeterMeasureInfoWindowController?.window?.isVisible == false {
+            perimeterMeasureInfoWindowController?.showWindow(self)
+        }
         
         let measureInfo = annotation.measureInfo
         let savePoints = annotation.savePoints()
@@ -6045,15 +6045,15 @@ extension KMMainViewController: CPDFViewDelegate,CPDFListViewDelegate {
     }
     
     private func handlePolygonAnnotation(_ annotation: CPDFPolygonAnnotation) {
-//        if distanceMeasureInfoWindowController?.window?.isVisible == true {
-//            distanceMeasureInfoWindowController?.hideFloatingWindow()
-//            areaMeasureInfoWindowController?.showWindow(self)
-//        } else if perimeterMeasureInfoWindowController?.window?.isVisible == true {
-//            perimeterMeasureInfoWindowController?.hideFloatingWindow()
-//            areaMeasureInfoWindowController?.showWindow(self)
-//        } else if areaMeasureInfoWindowController?.window?.isVisible == false {
-//            areaMeasureInfoWindowController?.showWindow(self)
-//        }
+        if distanceMeasureInfoWindowController?.window?.isVisible == true {
+            distanceMeasureInfoWindowController?.hideFloatingWindow()
+            areaMeasureInfoWindowController?.showWindow(self)
+        } else if perimeterMeasureInfoWindowController?.window?.isVisible == true {
+            perimeterMeasureInfoWindowController?.hideFloatingWindow()
+            areaMeasureInfoWindowController?.showWindow(self)
+        } else if areaMeasureInfoWindowController?.window?.isVisible == false {
+            areaMeasureInfoWindowController?.showWindow(self)
+        }
         
         let measureInfo = annotation.measureInfo
         let savePoints = annotation.savePoints