From 77f8b40d34744dbe0fdb9527c6c087080ca5bd83 Mon Sep 17 00:00:00 2001 From: faberf Date: Wed, 28 Aug 2024 15:27:53 +0200 Subject: [PATCH] bugfix --- .../features/sphericalharmonics/SphericalHarmonics.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vitrivr-engine-module-m3d/src/main/kotlin/org/vitrivr/engine/model3d/features/sphericalharmonics/SphericalHarmonics.kt b/vitrivr-engine-module-m3d/src/main/kotlin/org/vitrivr/engine/model3d/features/sphericalharmonics/SphericalHarmonics.kt index 2ccbb603..39da9aec 100644 --- a/vitrivr-engine-module-m3d/src/main/kotlin/org/vitrivr/engine/model3d/features/sphericalharmonics/SphericalHarmonics.kt +++ b/vitrivr-engine-module-m3d/src/main/kotlin/org/vitrivr/engine/model3d/features/sphericalharmonics/SphericalHarmonics.kt @@ -11,6 +11,7 @@ import org.vitrivr.engine.core.model.content.element.Model3DContent import org.vitrivr.engine.core.model.descriptor.vector.FloatVectorDescriptor import org.vitrivr.engine.core.model.mesh.texturemodel.Mesh import org.vitrivr.engine.core.model.metamodel.Analyser +import org.vitrivr.engine.core.model.metamodel.Analyser.Companion.merge import org.vitrivr.engine.core.model.metamodel.Schema import org.vitrivr.engine.core.model.query.Query import org.vitrivr.engine.core.model.query.basics.Distance @@ -212,7 +213,7 @@ class SphericalHarmonics : Analyser { val minL = field.parameters[MINL_PARAMETER_NAME]?.toIntOrNull() ?: context.getProperty("", "")?.toIntOrNull() ?: MINL_PARAMETER_DEFAULT val maxL = field.parameters[MAXL_PARAMETER_NAME]?.toIntOrNull() ?: context.getProperty("", "")?.toIntOrNull() ?: MAXL_PARAMETER_DEFAULT logger.debug { "Creating new SphericalHarmonicsExtract for field '${field.fieldName}' with parameters ($gridSize, $cap, $minL, $maxL)." } - return SphericalHarmonicsExtractor(input, this, field, gridSize, cap, minL, maxL) + return SphericalHarmonicsExtractor(input, this, field, gridSize, cap, minL, maxL, merge(field, context)) } /** @@ -229,6 +230,6 @@ class SphericalHarmonics : Analyser { val minL = context.getProperty(name, MINL_PARAMETER_NAME)?.toIntOrNull() ?: MINL_PARAMETER_DEFAULT val maxL = context.getProperty(name, MAXL_PARAMETER_NAME)?.toIntOrNull() ?: MAXL_PARAMETER_DEFAULT logger.debug { "Creating new SphericalHarmonicsExtract with parameters ($gridSize, $cap, $minL, $maxL)." } - return SphericalHarmonicsExtractor(input, this, null, gridSize, cap, minL, maxL) + return SphericalHarmonicsExtractor(input, this, null, gridSize, cap, minL, maxL, context.local[name] ?: emptyMap()) } }