【2025】【Markup】测量模块代码整理

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

@@ -1,9 +0,0 @@
-//
-//  KMMainViewController+MenuAction.swift
-//  PDF Reader Pro
-//
-//  Created by tangchao on 2023/2/19.
-//
-
-import Foundation
- 

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

@@ -3139,24 +3139,18 @@ struct KMNMWCFlags {
     //MARK: - 测量
     func refreshMeasureInfo() {
         if distanceMeasureInfoWindowController == nil {
-            let measureInfo = CPDFDistanceMeasureInfo()
             distanceMeasureInfoWindowController = CDistanceMeasureInfoWindowController()
             distanceMeasureInfoWindowController?.delegate = self
-            distanceMeasureInfoWindowController?.measureInfo = measureInfo
         }
         
         if perimeterMeasureInfoWindowController == nil {
-            let measureInfo = CPDFPerimeterMeasureInfo()
             perimeterMeasureInfoWindowController = CPerimeterMeasureInfoWindowController()
             perimeterMeasureInfoWindowController?.delegate = self
-            perimeterMeasureInfoWindowController?.measureInfo = measureInfo
         }
         
         if areaMeasureInfoWindowController == nil {
-            let measureInfo = CPDFAreaMeasureInfo()
             areaMeasureInfoWindowController = CAreaMeasureInfoWindowController()
             areaMeasureInfoWindowController?.delegate = self
-            areaMeasureInfoWindowController?.measureInfo = measureInfo
         }
         
         if let annotation = listView.activeAnnotation {
@@ -3201,13 +3195,17 @@ struct KMNMWCFlags {
         
         let type = self.listView.annotationType
         if type == .measureLine {
-            self.distanceMeasureInfoWindowController?.window?.orderFront(nil)
+            distanceMeasureInfoWindowController?.measureInfo = listView.distanceMeasureInfo
+            distanceMeasureInfoWindowController?.window?.orderFront(nil)
         } else if type == .measurePolyLine {
-            self.perimeterMeasureInfoWindowController?.window?.orderFront(nil)
+            perimeterMeasureInfoWindowController?.measureInfo = listView.perimeterMeasureInfo
+            perimeterMeasureInfoWindowController?.window?.orderFront(nil)
         } else if type == .measurePolyGon {
-            self.areaMeasureInfoWindowController?.window?.orderFront(nil)
+            areaMeasureInfoWindowController?.measureInfo = listView.polygonAreaMeasureInfo
+            areaMeasureInfoWindowController?.window?.orderFront(nil)
         } else if type == .measureSquare {
-            self.areaMeasureInfoWindowController?.window?.orderFront(nil)
+            areaMeasureInfoWindowController?.measureInfo = listView.squareAreaMeasureInfo
+            areaMeasureInfoWindowController?.window?.orderFront(nil)
         } else {
             cancelMeasureType()
         }

PDF Office/PDF Master/Class/PDFTools/Measure/Window/CDistanceSettingWindowController.swift

@@ -30,6 +30,7 @@ import Cocoa
     
     var distanceMeasureInfo: CPDFDistanceMeasureInfo?
     var perimeterMeasureInfo: CPDFPerimeterMeasureInfo?
+    
     var modalSession: NSApplication.ModalSession?
     var isDistance: Bool = false
     

PDF Office/PDF Reader Pro.xcodeproj/project.pbxproj

@@ -3951,9 +3951,6 @@
 		BBE068A52CDDF149000512BC /* KMBatesTemplateItem.xib in Resources */ = {isa = PBXBuildFile; fileRef = BBE068A12CDDF149000512BC /* KMBatesTemplateItem.xib */; };
 		BBE068A62CDDF149000512BC /* KMBatesTemplateItem.xib in Resources */ = {isa = PBXBuildFile; fileRef = BBE068A12CDDF149000512BC /* KMBatesTemplateItem.xib */; };
 		BBE068A72CDDF149000512BC /* KMBatesTemplateItem.xib in Resources */ = {isa = PBXBuildFile; fileRef = BBE068A12CDDF149000512BC /* KMBatesTemplateItem.xib */; };
-		BBE0BDF329A22EF300440583 /* KMMainViewController+MenuAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBE0BDF229A22EF300440583 /* KMMainViewController+MenuAction.swift */; };
-		BBE0BDF429A22EF300440583 /* KMMainViewController+MenuAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBE0BDF229A22EF300440583 /* KMMainViewController+MenuAction.swift */; };
-		BBE0BDF529A22EF300440583 /* KMMainViewController+MenuAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBE0BDF229A22EF300440583 /* KMMainViewController+MenuAction.swift */; };
 		BBE3709D2CB8BD3700390884 /* HistoryFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBE3709C2CB8BD3700390884 /* HistoryFile.swift */; };
 		BBE3709E2CB8BD3700390884 /* HistoryFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBE3709C2CB8BD3700390884 /* HistoryFile.swift */; };
 		BBE3709F2CB8BD3700390884 /* HistoryFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBE3709C2CB8BD3700390884 /* HistoryFile.swift */; };
@@ -6190,7 +6187,6 @@
 		BBE068992CDDF137000512BC /* KMBatesTemplateController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMBatesTemplateController.xib; sourceTree = "<group>"; };
 		BBE068A02CDDF149000512BC /* KMBatesTemplateItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMBatesTemplateItem.swift; sourceTree = "<group>"; };
 		BBE068A12CDDF149000512BC /* KMBatesTemplateItem.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMBatesTemplateItem.xib; sourceTree = "<group>"; };
-		BBE0BDF229A22EF300440583 /* KMMainViewController+MenuAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "KMMainViewController+MenuAction.swift"; sourceTree = "<group>"; };
 		BBE3709C2CB8BD3700390884 /* HistoryFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryFile.swift; sourceTree = "<group>"; };
 		BBE412BF2D12A3410069A661 /* KMRedactToolbarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMRedactToolbarController.swift; sourceTree = "<group>"; };
 		BBE412C02D12A3410069A661 /* KMRedactToolbarController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMRedactToolbarController.xib; sourceTree = "<group>"; };
@@ -7612,15 +7608,6 @@
 			path = WindowController;
 			sourceTree = "<group>";
 		};
-		9FF371AB2C69A67B005F9CC5 /* Measure */ = {
-			isa = PBXGroup;
-			children = (
-				9FF371AF2C69A6BB005F9CC5 /* Window */,
-			);
-			name = Measure;
-			path = ../../../../Class/PDFTools/Measure;
-			sourceTree = "<group>";
-		};
 		9FF371AF2C69A6BB005F9CC5 /* Window */ = {
 			isa = PBXGroup;
 			children = (
@@ -10537,6 +10524,7 @@
 			children = (
 				BB38D2CF2D047A920039F106 /* KMMeasureController.swift */,
 				BB38D2D02D047A920039F106 /* KMMeasureController.xib */,
+				9FF371AF2C69A6BB005F9CC5 /* Window */,
 			);
 			path = Measure;
 			sourceTree = "<group>";
@@ -10818,7 +10806,6 @@
 				9FDD0F62294AB645000C4DAD /* KMMainViewController.swift */,
 				9FDD0F63294AB645000C4DAD /* KMMainViewController.xib */,
 				9FDD0F6E294AD13C000C4DAD /* KMMainViewController+Action.swift */,
-				BBE0BDF229A22EF300440583 /* KMMainViewController+MenuAction.swift */,
 				BB4DF77B2D26AD520054D990 /* WindowControllers */,
 				BB0F585D2CDB708300B4D353 /* EditTool */,
 				BB5A9D6D2CB6522700F64C1F /* PDFView */,
@@ -12122,7 +12109,6 @@
 				8931681E296D73C10073EA59 /* Signature */,
 				89E4E6D72963C6AA002DBA6F /* AnnotationProperty */,
 				8996CFE4295BE15800D32783 /* EditPDF */,
-				9FF371AB2C69A67B005F9CC5 /* Measure */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -14351,7 +14337,6 @@
 				BBFDDDAF2CCA6AB200FA4FDB /* ComponentGroupItem.nib in Resources */,
 				BBCB9EAB2CCDF65000563AC8 /* KMNDisplayViewController.xib in Resources */,
 				ADBC2D17299CCD10006280C8 /* KMTextfieldButton.xib in Resources */,
-				ADFA8F022B5649AE002595A4 /* KMAutoFlowOptionsSheetController.xib in Resources */,
 				AD8B59902D2B777700150EA6 /* KMBatchWatermarkView.xib in Resources */,
 				BB8810992B4F7CD100AFA63E /* KMVerificationTrialViewController.xib in Resources */,
 				BB6EA2A52B70B8F2000D4490 /* KMConvertComparePayViewController.xib in Resources */,
@@ -15606,7 +15591,6 @@
 				AD199DEF2B23121000D56FEE /* KMPrintPamphletView.swift in Sources */,
 				BB27BF3C2B33E85200A0BAAE /* CPDFView+KMExtension.swift in Sources */,
 				657865F32CE1E7DD00AFE2DB /* KMNBookmarkHanddler.swift in Sources */,
-				BBE0BDF329A22EF300440583 /* KMMainViewController+MenuAction.swift in Sources */,
 				653647ED2CDCA85400CDB13E /* KMImageToPDFMethod.swift in Sources */,
 				6515591F2CCA6E3100C0F0D9 /* KMConvertExcelWindowController.swift in Sources */,
 				BB24D4A72977BE6700041659 /* KMRedactConfirmWindowController.swift in Sources */,
@@ -16612,7 +16596,6 @@
 				BBD14F572CDA02570077D52E /* KMEditToolbarView.swift in Sources */,
 				9FD0D2A82AD4EFB000DA3FF8 /* KMSavePanelAccessoryController.swift in Sources */,
 				F367D4E02CFD62DB00B0BB4E /* KMNPopAnnotationWindowController.swift in Sources */,
-				BBE0BDF429A22EF300440583 /* KMMainViewController+MenuAction.swift in Sources */,
 				AD8B5A122D2B778D00150EA6 /* KMBatchProcessingView.swift in Sources */,
 				AD1D484F2AFB8506007AC1F0 /* KMMergeTableViewCell.swift in Sources */,
 				BB3D97172B3023C5007094C8 /* KMCustomButton.swift in Sources */,
@@ -17563,7 +17546,6 @@
 				ADE86AA62B031FF000414DFA /* KMCompareView.swift in Sources */,
 				BBBAED122B57E76400266BD3 /* NSGraphics_SKExtensions.m in Sources */,
 				BBBB6CCC2AD109F30035AA66 /* CPDFAnnotation+PDFListView.swift in Sources */,
-				BBE0BDF529A22EF300440583 /* KMMainViewController+MenuAction.swift in Sources */,
 				ADDF83AF2B391A5D00A81A4E /* DSignatureConfig.swift in Sources */,
 				65B143A32CF06B97001B5A69 /* Date+KMExtensions.swift in Sources */,
 				656C1E3F2CD0745200295F82 /* KMConvertExcelSettingView.swift in Sources */,