-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Feature/conceptmap
- Loading branch information
Showing
33 changed files
with
1,726 additions
and
490 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,6 +8,7 @@ import androidx.compose.ui.window.ApplicationScope | |
| import androidx.compose.ui.window.Window | ||
| import androidx.compose.ui.window.application | ||
| import ca.uhn.fhir.context.FhirContext | ||
| import ca.uhn.fhir.narrative.DefaultThymeleafNarrativeGenerator | ||
| import com.formdev.flatlaf.FlatDarkLaf | ||
| import org.apache.commons.lang3.SystemUtils | ||
| import org.jetbrains.compose.splitpane.ExperimentalSplitPaneApi | ||
|
|
@@ -61,13 +62,7 @@ fun AppWindow( | |
| useDarkTheme: Boolean, | ||
| onChangeDarkTheme: () -> Unit, | ||
| ) { | ||
|
|
||
| when (SystemUtils.IS_OS_WINDOWS) { | ||
| //when (useDarkTheme && SystemUtils.IS_OS_WINDOWS) { | ||
| //setting this does not make sense if not on Windows | ||
| true -> FlatDarkLaf.setup() | ||
| //else -> FlatLightLaf.setup() | ||
| } | ||
| FlatDarkLaf.setup() | ||
| var locale by remember { mutableStateOf(SupportedLocale.valueOf(AppPreferences.language)) } | ||
| val localizedStrings by derivedStateOf { getStrings(locale) } | ||
| val scrollState = rememberScrollState() | ||
|
|
@@ -83,19 +78,13 @@ fun AppWindow( | |
| this.window.iconImage = ImageIO.read(it.resolve("[email protected]")) | ||
| } | ||
| UIManager.setLookAndFeel(FlatDarkLaf()) | ||
| when (SystemUtils.IS_OS_WINDOWS) { | ||
| //when (useDarkTheme && SystemUtils.IS_OS_WINDOWS) { | ||
| /*false -> UIManager.setLookAndFeel(FlatLightLaf()) | ||
| else -> UIManager.setLookAndFeel(FlatDarkLaf())*/ | ||
| true -> UIManager.setLookAndFeel(FlatDarkLaf()) | ||
| } | ||
|
|
||
| if (!hasResizedWindow) { | ||
| // app crashes if we use state for the window, when the locale is changed, with the error | ||
| // that the window is already on screen. | ||
| // this is because everything is recomposed when the locale changes, and that breaks AWT. | ||
| // using the mutable state, we change the window size exactly once, during the first (re-) composition, | ||
| // so that the user can then change the res as they require. | ||
| // using the mutable state, we programatically change the window size exactly once, | ||
| // during the first (re-) composition, so that the user can then change the res as they require. | ||
| // A resolution of 1280x960 is 4:3. | ||
| this.window.size = Dimension(1280, 960) | ||
| hasResizedWindow = true | ||
|
|
||
2 changes: 1 addition & 1 deletion
2
...raries/pager_indicators/PagerIndicator.kt → ...panist/pager_indicators/PagerIndicator.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...in/libraries/pager_indicators/PagerTab.kt → .../accompanist/pager_indicators/PagerTab.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
2 changes: 1 addition & 1 deletion
2
...in/kotlin/terminodiff/ui/util/Carousel.kt → ...n/libraries/sahruday/carousel/Carousel.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
239 changes: 239 additions & 0 deletions
239
src/main/kotlin/terminodiff/engine/conceptmap/ConceptMapState.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,239 @@ | ||
| package terminodiff.terminodiff.engine.conceptmap | ||
|
|
||
| import androidx.compose.material.icons.Icons | ||
| import androidx.compose.material.icons.filled.AutoAwesome | ||
| import androidx.compose.material.icons.filled.Error | ||
| import androidx.compose.material.icons.filled.Verified | ||
| import androidx.compose.runtime.* | ||
| import androidx.compose.ui.graphics.vector.ImageVector | ||
| import org.hl7.fhir.r4.model.ConceptMap | ||
| import org.hl7.fhir.r4.model.ConceptMap.* | ||
| import org.hl7.fhir.r4.model.DateTimeType | ||
| import org.hl7.fhir.r4.model.Enumerations | ||
| import org.hl7.fhir.r4.model.Enumerations.ConceptMapEquivalence | ||
| import org.jgrapht.GraphPath | ||
| import org.jgrapht.alg.shortestpath.AllDirectedPaths | ||
| import terminodiff.engine.resources.DiffDataContainer | ||
| import terminodiff.i18n.LocalizedStrings | ||
| import terminodiff.terminodiff.engine.graph.CombinedEdge | ||
| import terminodiff.terminodiff.engine.graph.CombinedVertex | ||
| import terminodiff.terminodiff.engine.graph.GraphSide | ||
| import terminodiff.terminodiff.ui.panes.diff.NeighborhoodDisplay | ||
|
|
||
| class ConceptMapState( | ||
| diffDataContainer: DiffDataContainer, | ||
| ) { | ||
| fun acceptAll() = conceptMap.group.elements.forEach { element -> | ||
| element.targets.forEach { target -> | ||
| target.isAutomaticallySet = false | ||
| } | ||
| } | ||
|
|
||
| val conceptMap by mutableStateOf(TerminodiffConceptMap(diffDataContainer)) | ||
| } | ||
|
|
||
| class TerminodiffConceptMap(diffDataContainer: DiffDataContainer) { | ||
|
|
||
| val id: MutableState<String?> = mutableStateOf(null) | ||
| val canonicalUrl: MutableState<String?> = mutableStateOf(null) | ||
| val version: MutableState<String?> = mutableStateOf(null) | ||
| val name: MutableState<String?> = | ||
| mutableStateOf(null) | ||
| val title: MutableState<String?> = | ||
| mutableStateOf(null) | ||
| val sourceValueSet: MutableState<String?> = | ||
| mutableStateOf(null) | ||
| val targetValueSet: MutableState<String?> = | ||
| mutableStateOf(null) | ||
| var group by mutableStateOf(ConceptMapGroup(diffDataContainer)) | ||
|
|
||
|
|
||
| val toFhir by derivedStateOf { | ||
| ConceptMap().apply { | ||
| this.id = this@TerminodiffConceptMap.id.value | ||
| this.url = this@TerminodiffConceptMap.canonicalUrl.value | ||
| this.version = this@TerminodiffConceptMap.version.value | ||
| this.name = this@TerminodiffConceptMap.version.value | ||
| this.title = this@TerminodiffConceptMap.title.value | ||
| this.dateElement = DateTimeType.now() | ||
| this.group.add(this@TerminodiffConceptMap.group.toFhir) | ||
| } | ||
| } | ||
|
|
||
| override fun toString(): String { | ||
| return "TerminodiffConceptMap(id=${id.value}, canonicalUrl=${canonicalUrl.value}, version=${version.value}, name=${name.value}, title=${title.value}, sourceValueSet=${sourceValueSet.value}, targetValueSet=${targetValueSet.value})" | ||
| } | ||
| } | ||
|
|
||
| class ConceptMapGroup(diffDataContainer: DiffDataContainer) { | ||
| val sourceUri = mutableStateOf(diffDataContainer.leftCodeSystem?.url) | ||
| val sourceVersion = mutableStateOf(diffDataContainer.leftCodeSystem?.version) | ||
| val targetUri = mutableStateOf(diffDataContainer.rightCodeSystem?.url) | ||
| val targetVersion = mutableStateOf(diffDataContainer.rightCodeSystem?.version) | ||
| val elements = mutableStateListOf<ConceptMapElement>() | ||
|
|
||
| init { | ||
| populateElements(diffDataContainer) | ||
| } | ||
|
|
||
| private fun populateElements(diff: DiffDataContainer) { | ||
| diff.codeSystemDiff!!.combinedGraph!!.affectedVertices.forEach { vertex -> | ||
| elements.add(ConceptMapElement(diff, vertex.code, vertex.getTooltip())) | ||
| } | ||
| } | ||
|
|
||
| override fun toString(): String { | ||
| return "ConceptMapGroup(sourceUri=${sourceUri.value}, sourceVersion=${sourceVersion.value}, targetUri=${targetUri.value}, targetVersion=${targetVersion.value})" | ||
| } | ||
|
|
||
| val toFhir: ConceptMapGroupComponent by derivedStateOf { | ||
| ConceptMapGroupComponent().apply { | ||
| this.source = this@ConceptMapGroup.sourceUri.value | ||
| this.sourceVersion = this@ConceptMapGroup.sourceVersion.value | ||
| this.target = this@ConceptMapGroup.targetUri.value | ||
| this.targetVersion = this@ConceptMapGroup.targetVersion.value | ||
| this.element.addAll(this@ConceptMapGroup.elements.map { it.toFhir } | ||
| .filter(SourceElementComponent::hasTarget)) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| class ConceptMapElement(private val diffDataContainer: DiffDataContainer, code: String, display: String?) { | ||
| val code: MutableState<String> = mutableStateOf(code) | ||
| val display: MutableState<String?> = mutableStateOf(display) | ||
|
|
||
| val neighborhood by derivedStateOf { | ||
| NeighborhoodDisplay(this.code.value, diffDataContainer.codeSystemDiff!!) | ||
| } | ||
|
|
||
| private val neighborhoodGraph by derivedStateOf { | ||
| neighborhood.getNeighborhoodGraph() | ||
| } | ||
|
|
||
| private val suitableTargets by derivedStateOf { | ||
| // the list of targets is calculated from the neighborhood graph of the current vertex | ||
| neighborhoodGraph.vertexSet().filter { it.code != code } // the node itself can't be mapped to | ||
| .filter { it.side == GraphSide.BOTH } // we can only map to nodes that are shared across versions | ||
| .filter { v -> | ||
| // consider nodes that are reachable from the source vertex | ||
| val paths = getPaths(getVertexByCode(code), getVertexByCode(v.code)) | ||
| paths.any { p -> | ||
| p.edgeList.any { e -> e.side != GraphSide.BOTH } | ||
| //disregard those paths that are entirely following nodes in both CS versions | ||
| } | ||
| } | ||
| } | ||
|
|
||
| val targets = mutableStateListOf<ConceptMapTarget>().apply { | ||
| suitableTargets.forEach { t -> | ||
| this.add(ConceptMapTarget(diffDataContainer).apply { | ||
| this.code.value = t.code | ||
| this.equivalence.value = inferEquivalence(this@ConceptMapElement.code.value, t.code) | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| val toFhir: SourceElementComponent by derivedStateOf { | ||
| SourceElementComponent().apply { | ||
| this.code = this@ConceptMapElement.code.value | ||
| this.display = this@ConceptMapElement.display.value | ||
| this.target.addAll(this@ConceptMapElement.targets.filter { it.state == ConceptMapTarget.MappingState.VALID } | ||
| .map { it.toFhir }) | ||
| } | ||
| } | ||
|
|
||
| private fun inferEquivalence(sourceCode: String, targetCode: String): ConceptMapEquivalence? { | ||
| val sourceVertex = getVertexByCode(sourceCode) ?: return null | ||
| val targetVertex = getVertexByCode(targetCode) ?: return null | ||
| val (allPaths, originalOrder) = getPaths(sourceVertex, targetVertex).let { walk -> | ||
| when (walk.isEmpty()) { | ||
| true -> getPaths(targetVertex, sourceVertex) to false // flip the edge order | ||
| else -> walk to true | ||
| } | ||
| } | ||
| return when { | ||
| allPaths.isEmpty() -> null | ||
| allPaths.size == 1 -> inferEquivalenceFromPath(allPaths.first(), originalOrder) | ||
| else -> allPaths.maxByOrNull { it.length }?.let { shortestPath -> | ||
| inferEquivalenceFromPath(shortestPath, originalOrder) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun inferEquivalenceFromPath( | ||
| path: GraphPath<CombinedVertex, CombinedEdge>, | ||
| originalOrder: Boolean, | ||
| ): ConceptMapEquivalence? { | ||
| return when { | ||
| path.edgeList.all { it.side == GraphSide.LEFT } -> if (originalOrder) ConceptMapEquivalence.WIDER else ConceptMapEquivalence.NARROWER | ||
| path.edgeList.all { it.side == GraphSide.RIGHT } -> if (originalOrder) ConceptMapEquivalence.NARROWER else ConceptMapEquivalence.WIDER | ||
| else -> null | ||
| } | ||
| } | ||
|
|
||
| private fun getVertexByCode(searchCode: String) = neighborhoodGraph.vertexSet().find { it.code == searchCode } | ||
|
|
||
| private fun getPaths( | ||
| sourceVertex: CombinedVertex?, | ||
| targetVertex: CombinedVertex?, | ||
| ): List<GraphPath<CombinedVertex, CombinedEdge>> = when { | ||
| sourceVertex == null || targetVertex == null -> listOf() | ||
| else -> AllDirectedPaths(neighborhoodGraph).getAllPaths(sourceVertex, | ||
| targetVertex, | ||
| true, | ||
| neighborhoodGraph.edgeSet().size) // a path can't be longer than one using all edges | ||
| } | ||
|
|
||
|
|
||
| override fun toString(): String { | ||
| return "ConceptMapElement(code=${code.value}, display=${display.value})" | ||
| } | ||
| } | ||
|
|
||
| class ConceptMapTarget(diffDataContainer: DiffDataContainer) { | ||
| val code: MutableState<String?> = mutableStateOf(null) | ||
| val display: String? by derivedStateOf { | ||
| code.value?.let { c -> diffDataContainer.rightGraphBuilder?.nodeTree?.get(c)?.display } | ||
| } | ||
| val equivalence: MutableState<ConceptMapEquivalence?> = mutableStateOf(null) | ||
| val comment: MutableState<String?> = mutableStateOf(null) | ||
|
|
||
| var isAutomaticallySet by mutableStateOf(true) | ||
| private val valid by derivedStateOf { | ||
| when { | ||
| code.value == null -> false | ||
| code.value !in diffDataContainer.allCodes -> false | ||
| isAutomaticallySet -> equivalence.value != null | ||
| equivalence.value == null -> false | ||
| else -> true | ||
| } | ||
| } | ||
|
|
||
| val state by derivedStateOf { | ||
| when { | ||
| !valid -> MappingState.INVALID | ||
| valid && isAutomaticallySet -> MappingState.AUTO | ||
| else -> MappingState.VALID | ||
| } | ||
| } | ||
|
|
||
|
|
||
| val toFhir: TargetElementComponent by derivedStateOf { | ||
| TargetElementComponent().apply { | ||
| this.code = this@ConceptMapTarget.code.value | ||
| this.display = this@ConceptMapTarget.display | ||
| this.comment = this@ConceptMapTarget.comment.value | ||
| this.equivalence = this@ConceptMapTarget.equivalence.value | ||
| } | ||
| } | ||
|
|
||
| enum class MappingState(val image: ImageVector, val description: LocalizedStrings.() -> String) { | ||
| AUTO(Icons.Default.AutoAwesome, { automatic }), VALID(Icons.Default.Verified, | ||
| { ok }), | ||
| INVALID(Icons.Default.Error, { invalid }) | ||
| } | ||
|
|
||
| override fun toString(): String { | ||
| return "ConceptMapTarget(code=${code.value}, display=${display}, equivalence=${equivalence.value}, comment=${comment.value}, state=${state})" | ||
| } | ||
| } |
Oops, something went wrong.