diff --git a/dataforge-plots/plots-jfc/src/main/kotlin/hep/dataforge/plots/jfreechart/JFreeChartFrame.kt b/dataforge-plots/plots-jfc/src/main/kotlin/hep/dataforge/plots/jfreechart/JFreeChartFrame.kt index a013b1c..c1e8b5e 100644 --- a/dataforge-plots/plots-jfc/src/main/kotlin/hep/dataforge/plots/jfreechart/JFreeChartFrame.kt +++ b/dataforge-plots/plots-jfc/src/main/kotlin/hep/dataforge/plots/jfreechart/JFreeChartFrame.kt @@ -150,12 +150,10 @@ class JFreeChartFrame : XYPlotFrame(), FXPlotFrame, Serializable { return Range(meta.getDouble("lower", java.lang.Double.NEGATIVE_INFINITY), meta.getDouble("upper", java.lang.Double.POSITIVE_INFINITY)) } - private fun getAxis(axisMeta: Meta): ValueAxis { - return when (axisMeta.getString("type", "number").lowercase()) { - "log" -> getLogAxis(axisMeta) - "time" -> getDateAxis(axisMeta) - else -> getNumberAxis(axisMeta) - } + private fun getAxis(axisMeta: Meta): ValueAxis = when (axisMeta.getString("type", "number").lowercase()) { + "log" -> getLogAxis(axisMeta) + "time" -> getDateAxis(axisMeta) + else -> getNumberAxis(axisMeta) } override fun updateAxis(axisName: String, axisMeta: Meta, plotMeta: Meta) { diff --git a/numass-viewer/build.gradle.kts b/numass-viewer/build.gradle.kts index 2303de8..ce9075a 100644 --- a/numass-viewer/build.gradle.kts +++ b/numass-viewer/build.gradle.kts @@ -19,7 +19,7 @@ application { mainClass.set("inr.numass.viewer.Viewer") } -version = "0.6.2" +version = "0.6.3" description = "The viewer for numass data" @@ -40,6 +40,10 @@ val addJvmArgs = listOf( "--add-opens=javafx.controls/com.sun.javafx.scene.control.behavior=ALL-UNNAMED", "--add-opens=javafx.controls/javafx.scene.control.skin=ALL-UNNAMED", "--add-exports=javafx.controls/com.sun.javafx.scene.control.inputmap=ALL-UNNAMED", + "--add-exports=javafx.controls/com.sun.javafx.scene.control.behavior=ALL-UNNAMED", + "--add-exports=javafx.base/com.sun.javafx.event=ALL-UNNAMED", + "--add-opens=javafx.controls/javafx.scene.control.skin=ALL-UNNAMED", + "--add-opens=javafx.graphics/javafx.scene=ALL-UNNAMED" ) application {