kscience/maps-kt
8
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases 1 Wiki Activity

fix featureGroup remember

Browse Source
This commit is contained in:
Alexander Nozik 2023-01-06 10:47:24 +03:00
parent ad938a614a
commit f288a17243
5 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demo/scheme/src/jvmMain/kotlin/Main.kt
View File

@ -37,7 +37,7 @@ fun App() {
text(1132.0881 to 394.99127, "Ordruin").color(Color.Red) text(1132.0881 to 394.99127, "Ordruin").color(Color.Red)
arc(center = 1132.0881 to 394.99127, radius = 20f, startAngle = 0f, 2 * PI.toFloat()) arc(center = 1132.0881 to 394.99127, radius = 20f, startAngle = 0f, 2 * PI.toFloat())
circle(410.52737 to 868.7676, id = "hobbit") //circle(410.52737 to 868.7676, id = "hobbit")
scope.launch { scope.launch {
var t = 0.0 var t = 0.0

2
maps-kt-features/src/commonMain/kotlin/center/sciprog/maps/features/FeatureGroup.kt
View File

@ -187,7 +187,7 @@ public data class FeatureGroup<T : Any>(
public fun <T : Any> remember( public fun <T : Any> remember(
coordinateSpace: CoordinateSpace<T>, coordinateSpace: CoordinateSpace<T>,
builder: FeatureGroup<T>.() -> Unit = {}, builder: FeatureGroup<T>.() -> Unit = {},
): FeatureGroup<T> = remember(builder) { ): FeatureGroup<T> = remember{
build(coordinateSpace, builder) build(coordinateSpace, builder)
} }

1
maps-kt-scheme/src/commonMain/kotlin/center/sciprog/maps/scheme/schemeFeatures.kt
View File

@ -8,7 +8,6 @@ import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.DpSize import androidx.compose.ui.unit.DpSize
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import center.sciprog.attributes.Attributes import center.sciprog.attributes.Attributes
import center.sciprog.attributes.ZAttribute
import center.sciprog.maps.features.* import center.sciprog.maps.features.*
internal fun Pair<Number, Number>.toCoordinates(): XY = XY(first.toFloat(), second.toFloat()) internal fun Pair<Number, Number>.toCoordinates(): XY = XY(first.toFloat(), second.toFloat())

4
maps-kt-scheme/src/jvmMain/kotlin/center/sciprog/maps/scheme/SchemeView.kt
View File

@ -93,7 +93,7 @@ public fun SchemeView(
} }
} }
val state = rememberMapState( val state = XYViewScope.remember(
config, config,
initialViewPoint = initialViewPoint, initialViewPoint = initialViewPoint,
initialRectangle = initialRectangle ?: featureState.features.computeBoundingBox(XYCoordinateSpace, Float.MAX_VALUE), initialRectangle = initialRectangle ?: featureState.features.computeBoundingBox(XYCoordinateSpace, Float.MAX_VALUE),
@ -118,7 +118,7 @@ public fun SchemeView(
buildFeatures: FeatureGroup<XY>.() -> Unit = {}, buildFeatures: FeatureGroup<XY>.() -> Unit = {},
) { ) {
val featureState = FeatureGroup.remember(XYCoordinateSpace, buildFeatures) val featureState = FeatureGroup.remember(XYCoordinateSpace, buildFeatures)
val mapState: XYViewScope = rememberMapState( val mapState: XYViewScope = XYViewScope.remember(
config, config,
initialViewPoint = initialViewPoint, initialViewPoint = initialViewPoint,
initialRectangle = initialRectangle ?: featureState.features.computeBoundingBox(XYCoordinateSpace, Float.MAX_VALUE), initialRectangle = initialRectangle ?: featureState.features.computeBoundingBox(XYCoordinateSpace, Float.MAX_VALUE),

1
maps-kt-scheme/src/jvmMain/kotlin/center/sciprog/maps/svg/exportToSvg.kt
View File

@ -8,7 +8,6 @@ import androidx.compose.ui.graphics.drawscope.Stroke
import androidx.compose.ui.graphics.drawscope.drawIntoCanvas import androidx.compose.ui.graphics.drawscope.drawIntoCanvas
import androidx.compose.ui.graphics.drawscope.translate import androidx.compose.ui.graphics.drawscope.translate
import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.graphics.painter.Painter
import center.sciprog.attributes.AlphaAttribute
import center.sciprog.maps.features.* import center.sciprog.maps.features.*
import center.sciprog.maps.scheme.* import center.sciprog.maps.scheme.*
import org.jfree.svg.SVGGraphics2D import org.jfree.svg.SVGGraphics2D