From ca8d89e9bb9d00509392d8c90d01247b0ea8c674 Mon Sep 17 00:00:00 2001 From: areumwoo Date: Sun, 8 Mar 2026 14:45:27 +0900 Subject: [PATCH] Load preset values even without priority --- .../ui/screens/home/preset/PresetLoadPopup.kt | 24 +++++----- .../raman/ui/screens/main/MainViewModel.kt | 45 ++++++++++++++++--- 2 files changed, 52 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/com/laseroptek/raman/ui/screens/home/preset/PresetLoadPopup.kt b/app/src/main/java/com/laseroptek/raman/ui/screens/home/preset/PresetLoadPopup.kt index b5923ca..e54c56e 100644 --- a/app/src/main/java/com/laseroptek/raman/ui/screens/home/preset/PresetLoadPopup.kt +++ b/app/src/main/java/com/laseroptek/raman/ui/screens/home/preset/PresetLoadPopup.kt @@ -780,21 +780,25 @@ fun PresetLoadPopup( .noRippleClickable(onClick = { Timber.d("onClick - Preset Load") - val selectedPreset = - presetViewModel.getPreset(selectedPresetIndex) - val priority = - selectedPreset?.priority ?: 0 + val selectedPreset = presetViewModel.getPreset(selectedPresetIndex) + if (selectedPreset == null) { + Timber.w("onClick - Preset Load: selectedPreset is null. index=$selectedPresetIndex") + return@noRippleClickable + } + val priority = selectedPreset.priority Timber.d("onClick - Preset Load ($priority)") -// if (priority > 0) { // TODO : 검증 필요 + if (priority > 0) { mainViewModel.setSelectedPresetIndex( priority ) mainViewModel.applyPreset(priority) - presetViewModel.clearPreset() - onClick.invoke(false) -// } else { -// Timber.d("SKIP - Preset Load ($priority)") -// } + } else { + // 우선순위가 NONE인 경우, 인덱스 설정 X + mainViewModel.setSelectedPresetIndex(0) + mainViewModel.applyPreset(selectedPreset) + } + presetViewModel.clearPreset() + onClick.invoke(false) }) .size(40.px.dp) .background(Color.Transparent) diff --git a/app/src/main/java/com/laseroptek/raman/ui/screens/main/MainViewModel.kt b/app/src/main/java/com/laseroptek/raman/ui/screens/main/MainViewModel.kt index 5b97382..360a803 100644 --- a/app/src/main/java/com/laseroptek/raman/ui/screens/main/MainViewModel.kt +++ b/app/src/main/java/com/laseroptek/raman/ui/screens/main/MainViewModel.kt @@ -2082,28 +2082,59 @@ class MainViewModel @Inject constructor( Timber.d("preset: ${preset}") val newPreset = if (preset == null) { + val defaultPulseWidth = PulseDurations.first() Preset( handPieceType = handPiece.value.type, priority = priority, - fluence = energyTable.value.getKey2ListForKey1(0.5f).first(), + fluence = energyTable.value.getKey2ListForKey1(defaultPulseWidth).firstOrNull() ?: 0f, repetition = repetitionList.value.first(), - pulseWidth = PulseDurations.first(), + pulseWidth = defaultPulseWidth, ) } else { preset } + applyPreset(newPreset) + } - val fluenceList = energyTable.value.getKey2ListForKey1(newPreset.pulseWidth) + fun applyPreset(preset: Preset) { + val newPreset = preset.copy() val pulseStep = PulseDurations.indexOf(newPreset.pulseWidth).takeIf {it != -1} ?: 0 - val fluenceStep = fluenceList.indexOf(newPreset.fluence).takeIf {it != -1} ?: 0 - val repetitionStep = repetitionList.value.indexOf(newPreset.repetition).takeIf {it != -1} ?: 0 + val resolvedPulseWidth = PulseDurations[pulseStep] + + // 프리셋의 pulseWidth 기준으로 실제 사용 가능한 fluence 목록을 먼저 동기화한다. + val newFluenceList = energyTable.value.getKey2ListForKey1(resolvedPulseWidth) + if (newFluenceList != fluenceList.value) { + setFluenceList(newFluenceList) + } + + // 프리셋 fluence가 정확히 없을 수 있으므로, 가장 가까운 값으로 보정한다. + val resolvedFluence = newFluenceList.minByOrNull { abs(it - newPreset.fluence) } + ?: newFluenceList.firstOrNull() + ?: 0f + val fluenceStep = newFluenceList.indexOf(resolvedFluence).takeIf { it != -1 } ?: 0 + + // 보정된 (pulseWidth, fluence) 조합으로 repetition 테이블을 다시 계산한다. + val hzType = hzTable.value.getValue(resolvedPulseWidth, resolvedFluence) + val newRepetitionList = RepetitionsByColorKey[hzType] ?: RepetitionsByColorKey[KEY_YELLOW]!! + if (newRepetitionList != repetitionList.value) { + setRepetitionList(newRepetitionList) + } + val repetitionStep = newRepetitionList.indexOf(newPreset.repetition).takeIf { it != -1 } ?: 0 Timber.d("pulseStep: ${pulseStep} fluenceStep: ${fluenceStep} repetitionStep: ${repetitionStep}") val pulseAngle = pulseStep.stepToDegree(totalSteps = PulseDurations.size) - val fluenceAngle = fluenceStep.stepToDegree(totalSteps = fluenceList.size) - val repetitionAngle = repetitionStep.stepToDegree(totalSteps = repetitionList.value.size) + val fluenceAngle = if (newFluenceList.isNotEmpty()) { + fluenceStep.stepToDegree(totalSteps = newFluenceList.size) + } else { + 0f + } + val repetitionAngle = if (newRepetitionList.isNotEmpty()) { + repetitionStep.stepToDegree(totalSteps = newRepetitionList.size) + } else { + 0f + } Timber.d("pulseStep: ${pulseStep} fluenceStep: ${fluenceStep} repetitionStep: ${repetitionStep}")