From eb918818735fe50d96616cdfe8e2568bee1be904 Mon Sep 17 00:00:00 2001 From: jjangddu Date: Tue, 11 Aug 2026 15:00:22 +0900 Subject: [PATCH] =?UTF-8?q?feat(dev-mode):=20BV=20Method=20=ED=86=A0?= =?UTF-8?q?=EA=B8=80=EC=97=90=20"D-P"=20=EC=98=B5=EC=85=98=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20+=20useMethodDBv=20=EB=9D=BC=EC=9A=B0=ED=8C=85=20fi?= =?UTF-8?q?x?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 변경 1 · UI (dev-mode BV chip row): · bvMethods 리스트에 METHOD_D_P → "D-P" 추가 (teal 색 #00897B). · label 은 공간 절약 위해 "Method D" → "D" 로 단축. · demo-final default 인 METHOD_D_P 를 dev-mode 에서 명시적으로 선택/확인 가능. 변경 2 · 라우팅 fix (PiezoMonitoringView:430): · useMethodDBv 조건이 BvMethod.METHOD_D 만 확인 → METHOD_D_P 선택 시 사실상 아무 BV 경로도 안 타는 버그. (이전 커밋 fd7b5da 의 지연 발견 결함). · METHOD_D_P 도 동일 경로 (methodDDets 계산 + 아래 브랜치 진입) 통과. · dispatcher (line 487~) 에서 실제로 legacydp 로 분기됨. 빌드: BUILD SUCCESSFUL 7s. --- .../vesiscan/ui/views/monitoring/PiezoMonitoringView.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/medithings/vesiscan/ui/views/monitoring/PiezoMonitoringView.kt b/app/src/main/java/com/medithings/vesiscan/ui/views/monitoring/PiezoMonitoringView.kt index c313183..6c9b6b4 100644 --- a/app/src/main/java/com/medithings/vesiscan/ui/views/monitoring/PiezoMonitoringView.kt +++ b/app/src/main/java/com/medithings/vesiscan/ui/views/monitoring/PiezoMonitoringView.kt @@ -427,7 +427,9 @@ fun PiezoMonitoringView(appState: AppState) { // 2026-06-30: BvMethod.METHOD_D 시 Method D walls 사용. 단 detection 이 // 이미 METHOD_D 면 allWalls 가 곧 Method D → recompute 생략. - val useMethodDBv = bvMethodSetting == com.medithings.vesiscan.managers.BvMethod.METHOD_D + // 2026-08-11: METHOD_D_P (legacy phantom fork) 도 동일 경로 통과 · dispatcher 에서 분기. + val useMethodDBv = bvMethodSetting == com.medithings.vesiscan.managers.BvMethod.METHOD_D || + bvMethodSetting == com.medithings.vesiscan.managers.BvMethod.METHOD_D_P val detectionIsMethodD = method == com.medithings.vesiscan.managers.DetectionMethod.METHOD_D val sourceAllWalls: List?> = if (useMethodDBv && !detectionIsMethodD) { val signals = (0..5).map { ch -> @@ -2045,9 +2047,10 @@ fun PiezoMonitoringView(appState: AppState) { val bvMethods = listOf( com.medithings.vesiscan.managers.BvMethod.FRUSTUM to "Frustum", com.medithings.vesiscan.managers.BvMethod.V41 to "V41", - com.medithings.vesiscan.managers.BvMethod.METHOD_D to "Method D" + com.medithings.vesiscan.managers.BvMethod.METHOD_D to "D", + com.medithings.vesiscan.managers.BvMethod.METHOD_D_P to "D-P" ) - val bvColors = listOf(MlPrimary, Color(0xFFFF5722), Color(0xFF7C3AED)) + val bvColors = listOf(MlPrimary, Color(0xFFFF5722), Color(0xFF7C3AED), Color(0xFF00897B)) Row(horizontalArrangement = Arrangement.spacedBy(4.dp)) { bvMethods.forEachIndexed { idx, (m, label) -> val sel = selectedBvMethod == m