s_abdiganieva/numass-framework
1
0
Fork 0
forked from NPM/numass-framework
Code Pull Requests Activity

Fix data grid for viewer

Browse Source
This commit is contained in:
Alexander Nozik 2021-12-16 18:17:07 +03:00
parent cadfc20e54
commit ac1cddcae7
No known key found for this signature in database
GPG Key ID: F7FCF2DD25C71357
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dataforge-plots/plots-jfc/src/main/kotlin/hep/dataforge/plots/jfreechart/JFreeChartFrame.kt
View File

@ -150,13 +150,11 @@ class JFreeChartFrame : XYPlotFrame(), FXPlotFrame, Serializable {
return Range(meta.getDouble("lower", java.lang.Double.NEGATIVE_INFINITY), meta.getDouble("upper", java.lang.Double.POSITIVE_INFINITY)) return Range(meta.getDouble("lower", java.lang.Double.NEGATIVE_INFINITY), meta.getDouble("upper", java.lang.Double.POSITIVE_INFINITY))
} }
private fun getAxis(axisMeta: Meta): ValueAxis { private fun getAxis(axisMeta: Meta): ValueAxis = when (axisMeta.getString("type", "number").lowercase()) {
return when (axisMeta.getString("type", "number").lowercase()) {
"log" -> getLogAxis(axisMeta) "log" -> getLogAxis(axisMeta)
"time" -> getDateAxis(axisMeta) "time" -> getDateAxis(axisMeta)
else -> getNumberAxis(axisMeta) else -> getNumberAxis(axisMeta)
} }
}
override fun updateAxis(axisName: String, axisMeta: Meta, plotMeta: Meta) { override fun updateAxis(axisName: String, axisMeta: Meta, plotMeta: Meta) {
val axis = getAxis(axisMeta) val axis = getAxis(axisMeta)

6
numass-viewer/build.gradle.kts
View File

@ -19,7 +19,7 @@ application {
mainClass.set("inr.numass.viewer.Viewer") mainClass.set("inr.numass.viewer.Viewer")
} }
version = "0.6.2" version = "0.6.3"
description = "The viewer for numass data" 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/com.sun.javafx.scene.control.behavior=ALL-UNNAMED",
"--add-opens=javafx.controls/javafx.scene.control.skin=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.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 { application {