Move Charts.kt to kfx-utils

Author: lilvadim

…odelabs/gem/view/control/chart/Charts.kt …n/kotlin/ru/nucodelabs/kfx/ext/Charts.ktsrc/main/java/ru/nucodelabs/gem/view/control/chart/Charts.kt renamed to kfx-utils/src/main/kotlin/ru/nucodelabs/kfx/ext/Charts.kt src/main/java/ru/nucodelabs/gem/view/control/chart/Charts.kt renamed to kfx-utils/src/main/kotlin/ru/nucodelabs/kfx/ext/Charts.kt

@@ -1,4 +1,4 @@
-package ru.nucodelabs.gem.view.control.chart
+package ru.nucodelabs.kfx.ext
 
 import com.sun.javafx.charts.Legend
 import javafx.application.Platform

src/main/java/ru/nucodelabs/gem/view/control/chart/InvertibleValueAxis.kt

@@ -4,6 +4,7 @@ import javafx.beans.property.SimpleBooleanProperty
 import javafx.geometry.Side
 import javafx.scene.chart.ValueAxis
 import javafx.scene.text.Text
+import ru.nucodelabs.kfx.ext.childrenTextNodes
 
 abstract class InvertibleValueAxis<N : Number>(
     lowerBound: Double,
@@ -14,6 +15,7 @@ abstract class InvertibleValueAxis<N : Number>(
         get() = _inverted.get()
         set(value) = _inverted.set(value)
 
+    @Suppress("unused")
     fun invertedProperty() = _inverted
 
     val tickMarksTextNodes: Map<TickMark<N>, Text>

src/main/java/ru/nucodelabs/gem/view/control/chart/log/LogarithmicChartNavigationSupport.kt

@@ -1,7 +1,7 @@
 package ru.nucodelabs.gem.view.control.chart.log
 
 import javafx.scene.chart.ValueAxis
-import ru.nucodelabs.gem.view.control.chart.length
+import ru.nucodelabs.kfx.ext.length
 import ru.nucodelabs.util.std.exp10
 import kotlin.math.log10
 import kotlin.math.max

src/main/java/ru/nucodelabs/gem/view/controller/anisotropy/main/AnisotropyMainViewController.kt

@@ -27,17 +27,16 @@ import ru.nucodelabs.gem.fxmodel.exception.validation
 import ru.nucodelabs.gem.fxmodel.map.ObservableWgs
 import ru.nucodelabs.gem.view.AlertsFactory
 import ru.nucodelabs.gem.view.color.ColorMapper
-import ru.nucodelabs.gem.view.control.chart.*
+import ru.nucodelabs.gem.view.control.chart.CombinedChart
+import ru.nucodelabs.gem.view.control.chart.NucodeNumberAxis
+import ru.nucodelabs.gem.view.control.chart.SmartInterpolationMap
 import ru.nucodelabs.gem.view.controller.tables.STYLE_FOR_FIXED
 import ru.nucodelabs.gem.view.controller.util.indexCellFactory
 import ru.nucodelabs.gem.view.mapping.mapAzimuthSignals
 import ru.nucodelabs.gem.view.mapping.mapSignals
 import ru.nucodelabs.gem.view.mapping.mapSignalsRelations
 import ru.nucodelabs.kfx.core.AbstractViewController
-import ru.nucodelabs.kfx.ext.bidirectionalNot
-import ru.nucodelabs.kfx.ext.forCharts
-import ru.nucodelabs.kfx.ext.observableListOf
-import ru.nucodelabs.kfx.ext.saveInitialDirectory
+import ru.nucodelabs.kfx.ext.*
 import ru.nucodelabs.util.std.toDoubleOrNullBy
 import java.io.File
 import java.net.URL

src/main/java/ru/nucodelabs/gem/view/controller/charts/ColorAxisController.kt

@@ -22,7 +22,6 @@ import ru.nucodelabs.gem.config.Name
 import ru.nucodelabs.gem.view.color.ColorMapper
 import ru.nucodelabs.gem.view.control.chart.NucodeNumberAxis
 import ru.nucodelabs.gem.view.control.chart.PolygonChart
-import ru.nucodelabs.gem.view.control.chart.limitTickLabelsWidth
 import ru.nucodelabs.gem.view.control.chart.log.LogarithmicAxis
 import ru.nucodelabs.kfx.core.AbstractViewController
 import ru.nucodelabs.kfx.ext.*

src/main/java/ru/nucodelabs/gem/view/controller/charts/CurvesPseudoSectionController.kt

@@ -9,11 +9,11 @@ import javafx.scene.control.Label
 import javafx.scene.control.Tooltip
 import javafx.util.StringConverter
 import ru.nucodelabs.gem.fxmodel.ves.ObservableSection
-import ru.nucodelabs.gem.view.control.chart.installTooltips
 import ru.nucodelabs.geo.ves.ExperimentalData
 import ru.nucodelabs.geo.ves.calc.effectiveToSortedIndicesMapping
 import ru.nucodelabs.geo.ves.calc.graph.CurvesSectionGraphContext
 import ru.nucodelabs.kfx.ext.forCharts
+import ru.nucodelabs.kfx.ext.installTooltips
 import ru.nucodelabs.kfx.ext.toObservableList
 import java.net.URL
 import java.text.DecimalFormat

src/main/java/ru/nucodelabs/gem/view/controller/charts/MapPseudoSectionController.kt

@@ -12,10 +12,10 @@ import javafx.util.StringConverter
 import ru.nucodelabs.gem.fxmodel.ves.ObservableSection
 import ru.nucodelabs.gem.view.color.ColorMapper
 import ru.nucodelabs.gem.view.control.chart.InterpolationMap
-import ru.nucodelabs.gem.view.control.chart.installTooltips
 import ru.nucodelabs.geo.ves.calc.effectiveToSortedIndicesMapping
 import ru.nucodelabs.geo.ves.calc.xOfPicket
 import ru.nucodelabs.kfx.ext.forCharts
+import ru.nucodelabs.kfx.ext.installTooltips
 import ru.nucodelabs.kfx.ext.toObservableList
 import java.net.URL
 import java.text.DecimalFormat

src/main/java/ru/nucodelabs/gem/view/controller/charts/ModelCurveDragger.kt

@@ -7,8 +7,8 @@ import javafx.scene.chart.ValueAxis
 import javafx.scene.chart.XYChart.Data
 import javafx.scene.chart.XYChart.Series
 import javafx.scene.input.MouseEvent
-import ru.nucodelabs.gem.view.control.chart.getValueForScene
 import ru.nucodelabs.geo.ves.ModelLayer
+import ru.nucodelabs.kfx.ext.getValueForScene
 import kotlin.properties.Delegates
 
 /**

src/main/java/ru/nucodelabs/gem/view/controller/charts/VesCurvesController.kt

@@ -24,7 +24,6 @@ import ru.nucodelabs.gem.config.Name
 import ru.nucodelabs.gem.config.Style
 import ru.nucodelabs.gem.fxmodel.ves.ObservableSection
 import ru.nucodelabs.gem.view.AlertsFactory
-import ru.nucodelabs.gem.view.control.chart.*
 import ru.nucodelabs.gem.view.control.chart.log.LogarithmicAxis
 import ru.nucodelabs.gem.view.control.chart.log.LogarithmicChartNavigationSupport
 import ru.nucodelabs.gem.view.controller.AbstractController
@@ -36,10 +35,7 @@ import ru.nucodelabs.geo.ves.calc.graph.*
 import ru.nucodelabs.geo.ves.calc.resistanceApparentLowerBoundByError
 import ru.nucodelabs.geo.ves.calc.resistanceApparentUpperBoundByError
 import ru.nucodelabs.geo.ves.calc.zOfModelLayers
-import ru.nucodelabs.kfx.ext.forCharts
-import ru.nucodelabs.kfx.ext.get
-import ru.nucodelabs.kfx.ext.saveSnapshotAsPng
-import ru.nucodelabs.kfx.ext.toObservableList
+import ru.nucodelabs.kfx.ext.*
 import ru.nucodelabs.kfx.snapshot.HistoryManager
 import ru.nucodelabs.util.std.exp10
 import java.lang.Double.max

src/test/java/ru/nucodelabs/gem/view/control/chart/PolygonChartTest.kt

@@ -16,6 +16,7 @@ import org.junit.jupiter.api.Test
 import ru.nucodelabs.gem.view.FXTest
 import ru.nucodelabs.gem.view.control.chart.log.LogarithmicAxis
 import ru.nucodelabs.gem.view.control.chart.log.LogarithmicChartNavigationSupport
+import ru.nucodelabs.kfx.ext.length
 import ru.nucodelabs.kfx.ext.observableListOf
 
 internal class PolygonChartTest : FXTest() {