diff --git a/app/src/main/assets/omr_config.json b/app/src/main/assets/omr_config.json index 06a7714ec00df455744250b57f5559931af16823..bc4515a20ec7d237055426a5704de08b28f07bd9 100644 --- a/app/src/main/assets/omr_config.json +++ b/app/src/main/assets/omr_config.json @@ -1,6 +1,11 @@ { "omrConfigs": { "102": { + "contents": { + "FIRST": "Anis", + "SECOND": "Bowo", + "THIRD": "Janggar" + }, "contourOMRHelperConfig": { "darkIntensityThreshold": 200, "darkPercentageThreshold": 0.9, diff --git a/app/src/main/java/com/k2_9/omrekap/data/models/OMRBaseConfiguration.kt b/app/src/main/java/com/k2_9/omrekap/data/models/OMRBaseConfiguration.kt index c985d839f88c338366b99fcbecc3130e32102235..f5cc6f3d16a24b0c378d4888bfa920251d6e2284 100644 --- a/app/src/main/java/com/k2_9/omrekap/data/models/OMRBaseConfiguration.kt +++ b/app/src/main/java/com/k2_9/omrekap/data/models/OMRBaseConfiguration.kt @@ -1,6 +1,7 @@ package com.k2_9.omrekap.data.models import com.k2_9.omrekap.data.configs.omr.ContourOMRHelperConfig +import com.k2_9.omrekap.data.configs.omr.OMRSection import com.k2_9.omrekap.data.configs.omr.TemplateMatchingOMRHelperConfig /** @@ -11,6 +12,7 @@ data class OMRBaseConfiguration( ) data class OMRConfigurationParameter( + val contents: Map<OMRSection, String>, val contourOMRHelperConfig: ContourOMRHelperConfig, val templateMatchingOMRHelperConfig: TemplateMatchingOMRHelperConfig, ) diff --git a/app/src/main/java/com/k2_9/omrekap/data/view_models/ImageDataViewModel.kt b/app/src/main/java/com/k2_9/omrekap/data/view_models/ImageDataViewModel.kt index 45b01a0eee1c95171cb73fc6765dc57b25738ba4..3f3696f69d6b899efbc3b27931cff9f98d1561d0 100644 --- a/app/src/main/java/com/k2_9/omrekap/data/view_models/ImageDataViewModel.kt +++ b/app/src/main/java/com/k2_9/omrekap/data/view_models/ImageDataViewModel.kt @@ -62,7 +62,8 @@ class ImageDataViewModel : ViewModel() { loadedConfig.templateMatchingOMRHelperConfig.setTemplate(circleTemplateLoader) val contourOMRHelper = ContourOMRHelper(loadedConfig.contourOMRHelperConfig) - val templateMatchingOMRHelper = TemplateMatchingOMRHelper(loadedConfig.templateMatchingOMRHelperConfig) + val templateMatchingOMRHelper = + TemplateMatchingOMRHelper(loadedConfig.templateMatchingOMRHelperConfig) val result: MutableMap<OMRSection, Int?> = mutableMapOf() @@ -78,21 +79,19 @@ class ImageDataViewModel : ViewModel() { } } - // TODO: move this to april tag - val customMap = mutableMapOf<OMRSection, String>() - - customMap[OMRSection.FIRST] = "Anis" - customMap[OMRSection.SECOND] = "Bowo" - customMap[OMRSection.THIRD] = "Janggar" - + val pageContent = loadedConfig.contents val stringKeyResult = mutableMapOf<String, Int?>() result.let { for ((section, value) in it) { - stringKeyResult[customMap[section]!!] = value - - annotatedImage = ImageAnnotationHelper.annotateOMR(annotatedImage, contourOMRHelper.getSectionPosition(section), value) - Log.d("Result", "${customMap[section]}: $value") + stringKeyResult[pageContent[section]!!] = value + + annotatedImage = ImageAnnotationHelper.annotateOMR( + annotatedImage, + contourOMRHelper.getSectionPosition(section), + value + ) + Log.d("Result", "${pageContent[section]}: $value") } }