From 7aaa950d45c172326b5a14984878517be1b94007 Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Wed, 9 Nov 2022 20:00:07 +0800 Subject: [PATCH] TDKCandidates // Print character descriptions to console, etc. (#250) * TDKCandidates // Remove certain useless default values. * TDKCandidates // Print character descriptions to console. --- .../Sources/CandidateWindow/CandidateCellData.swift | 8 ++++++++ .../Sources/CandidateWindow/CandidatePool.swift | 1 + .../VwrCandidateTDK/VwrCandidateHorizontal.swift | 2 +- .../VwrCandidateTDK/VwrCandidateVertical.swift | 2 +- .../VwrCandidateHorizontalBackports.swift | 2 +- .../VwrCandidateVerticalBackports.swift | 2 +- 6 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/CandidateCellData.swift b/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/CandidateCellData.swift index 935b5b76..13a22ec5 100644 --- a/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/CandidateCellData.swift +++ b/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/CandidateCellData.swift @@ -132,6 +132,14 @@ public class CandidateCellData: Hashable { let attrStrCandidate = NSMutableAttributedString(string: displayedText, attributes: attrCandidate) return attrStrCandidate } + + public var charDescriptions: String { + var result = displayedText + if displayedText.contains("("), displayedText.count > 2 { + result = displayedText.replacingOccurrences(of: "(", with: "").replacingOccurrences(of: ")", with: "") + } + return result.charDescriptions.joined(separator: "\n") + } } // MARK: - Contents specifically made for macOS 12 and newer. diff --git a/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/CandidatePool.swift b/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/CandidatePool.swift index 510576d4..6be973b0 100644 --- a/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/CandidatePool.swift +++ b/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/CandidatePool.swift @@ -188,6 +188,7 @@ public class CandidatePool { case .vertical: highlightVertical(at: indexSpecified) @unknown default: break } + vCLog("\n" + candidateDataAll[highlightedIndex].charDescriptions) } } diff --git a/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK/VwrCandidateHorizontal.swift b/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK/VwrCandidateHorizontal.swift index 246b661c..c9cb1df9 100644 --- a/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK/VwrCandidateHorizontal.swift +++ b/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK/VwrCandidateHorizontal.swift @@ -39,7 +39,7 @@ public struct VwrCandidateHorizontal: View { @Environment(\.colorScheme) var colorScheme @State public var thePool: CandidatePool @State public var tooltip: String = "" - @State public var reverseLookupResult: [String] = ["MLGB"] + @State public var reverseLookupResult: [String] = [] private var positionLabel: String { (thePool.highlightedIndex + 1).description + "/" + thePool.candidateDataAll.count.description diff --git a/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK/VwrCandidateVertical.swift b/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK/VwrCandidateVertical.swift index 85e7f49a..119ce4e9 100644 --- a/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK/VwrCandidateVertical.swift +++ b/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK/VwrCandidateVertical.swift @@ -38,7 +38,7 @@ public struct VwrCandidateVertical: View { @Environment(\.colorScheme) var colorScheme @State public var thePool: CandidatePool @State public var tooltip: String = "" - @State public var reverseLookupResult: [String] = ["MLGB"] + @State public var reverseLookupResult: [String] = [] private var positionLabel: String { (thePool.highlightedIndex + 1).description + "/" + thePool.candidateDataAll.count.description diff --git a/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK_Backports/VwrCandidateHorizontalBackports.swift b/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK_Backports/VwrCandidateHorizontalBackports.swift index 1dcc5a2a..c1c16c31 100644 --- a/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK_Backports/VwrCandidateHorizontalBackports.swift +++ b/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK_Backports/VwrCandidateHorizontalBackports.swift @@ -40,7 +40,7 @@ public struct VwrCandidateHorizontalBackports: View { @Environment(\.colorScheme) var colorScheme @State public var thePool: CandidatePool @State public var tooltip: String = "" - @State public var reverseLookupResult: [String] = ["MLGB"] + @State public var reverseLookupResult: [String] = [] private var positionLabel: String { (thePool.highlightedIndex + 1).description + "/" + thePool.candidateDataAll.count.description diff --git a/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK_Backports/VwrCandidateVerticalBackports.swift b/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK_Backports/VwrCandidateVerticalBackports.swift index df406b84..71051b82 100644 --- a/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK_Backports/VwrCandidateVerticalBackports.swift +++ b/Packages/vChewing_CandidateWindow/Sources/CandidateWindow/TDKCandidates/VwrCandidateTDK_Backports/VwrCandidateVerticalBackports.swift @@ -39,7 +39,7 @@ public struct VwrCandidateVerticalBackports: View { @Environment(\.colorScheme) var colorScheme @State public var thePool: CandidatePool @State public var tooltip: String = "" - @State public var reverseLookupResult: [String] = ["MLGB"] + @State public var reverseLookupResult: [String] = [] private var positionLabel: String { (thePool.highlightedIndex + 1).description + "/" + thePool.candidateDataAll.count.description