Skip to content

Commit a74d580

Browse files
Fix build - replace MultilineLabel and TextLabel with Label
1 parent ef2e7fd commit a74d580

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

demo/svg/swing/src/main/kotlin/demo/svg/SuperscriptExponentNotationDemo.kt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@ import demo.svg.utils.DemoBase
99
import demo.svg.utils.DemoWindow
1010
import org.jetbrains.letsPlot.commons.geometry.DoubleVector
1111
import org.jetbrains.letsPlot.core.plot.base.render.svg.GroupComponent
12-
import org.jetbrains.letsPlot.core.plot.base.render.svg.MultilineLabel
12+
import org.jetbrains.letsPlot.core.plot.base.render.svg.Label
1313
import org.jetbrains.letsPlot.core.plot.base.render.svg.Text
14-
import org.jetbrains.letsPlot.core.plot.base.render.svg.TextLabel
1514
import org.jetbrains.letsPlot.datamodel.svg.dom.*
1615

1716
fun main() {
@@ -101,7 +100,7 @@ private class SuperscriptExponentNotationDemo: DemoBase(DoubleVector(800.0, 1200
101100

102101
fun createItalicModel(): GroupComponent {
103102
val groupComponent = GroupComponent()
104-
val label = MultilineLabel("""Power text: -1.5·\(10^{-15}\)""")
103+
val label = Label("""Power text: -1.5·\(10^{-15}\)""")
105104
SvgUtils.transformTranslate(label.rootGroup, 300.0, 300.0)
106105

107106
groupComponent.add(createLabelExample(12, DoubleVector.ZERO))
@@ -111,7 +110,7 @@ private class SuperscriptExponentNotationDemo: DemoBase(DoubleVector(800.0, 1200
111110

112111
fun createSimpleModel(): GroupComponent {
113112
val groupComponent = GroupComponent()
114-
val label = MultilineLabel("""Power text: -1.5·\(10^{-15}\)""")
113+
val label = Label("""Power text: -1.5·\(10^{-15}\)""")
115114
SvgUtils.transformTranslate(label.rootGroup, 300.0, 300.0)
116115

117116
groupComponent.add(label)
@@ -237,8 +236,8 @@ private class SuperscriptExponentNotationDemo: DemoBase(DoubleVector(800.0, 1200
237236
hAnchor: Text.HorizontalAnchor,
238237
vAnchor: Text.VerticalAnchor,
239238
angle: Double,
240-
): TextLabel {
241-
val label = TextLabel("$FORMULA ($exampleId)")
239+
): Label {
240+
val label = Label("$FORMULA ($exampleId)")
242241
label.addClassName("LBL_$exampleId")
243242
label.setHorizontalAnchor(hAnchor)
244243
label.setVerticalAnchor(vAnchor)

demo/svg/swing/src/main/kotlin/demo/svg/TextJustificationDemo.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import org.jetbrains.letsPlot.core.plot.base.layout.TextJustification
1616
import org.jetbrains.letsPlot.core.plot.base.layout.TextJustification.Companion.TextRotation
1717
import org.jetbrains.letsPlot.core.plot.base.layout.TextJustification.Companion.applyJustification
1818
import org.jetbrains.letsPlot.core.plot.base.render.svg.GroupComponent
19-
import org.jetbrains.letsPlot.core.plot.base.render.svg.MultilineLabel
19+
import org.jetbrains.letsPlot.core.plot.base.render.svg.Label
2020
import org.jetbrains.letsPlot.core.plot.builder.presentation.Defaults.FONT_FAMILY_NORMAL
2121
import org.jetbrains.letsPlot.core.plot.builder.presentation.PlotLabelSpec
2222
import org.jetbrains.letsPlot.datamodel.svg.dom.SvgElement
@@ -102,12 +102,12 @@ private class TextJustificationDemo: DemoBase(DoubleVector(1600.0, 1200.0)) {
102102
boundRect: DoubleRectangle,
103103
justification: TextJustification,
104104
rotation: TextRotation?
105-
): MultilineLabel {
105+
): Label {
106106
val text = "Horizontal justification:" + justification.x + "\n" +
107107
"Vertical justification:" + justification.y + "\n" +
108108
"Angle: " + rotation.toString()
109109

110-
val label = MultilineLabel(text)
110+
val label = Label(text)
111111
label.addClassName(LABEL_CLASS_NAME)
112112
label.textColor().set(Color.DARK_BLUE)
113113

demo/svg/swing/src/main/kotlin/demo/svg/TextLabelDemo.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import demo.svg.utils.DemoWindow
1010
import org.jetbrains.letsPlot.commons.geometry.DoubleVector
1111
import org.jetbrains.letsPlot.commons.values.Color
1212
import org.jetbrains.letsPlot.core.plot.base.render.svg.GroupComponent
13+
import org.jetbrains.letsPlot.core.plot.base.render.svg.Label
1314
import org.jetbrains.letsPlot.core.plot.base.render.svg.Text
14-
import org.jetbrains.letsPlot.core.plot.base.render.svg.TextLabel
1515
import org.jetbrains.letsPlot.datamodel.svg.dom.*
1616

1717
fun main() {
@@ -121,9 +121,9 @@ private class TextLabelDemo : DemoBase(DEMO_BOX_SIZE) {
121121
hAnchor: Text.HorizontalAnchor,
122122
vAnchor: Text.VerticalAnchor,
123123
angle: Double
124-
): TextLabel {
124+
): Label {
125125
val text = "Anchor: " + hAnchor.name + "-" + vAnchor.name + " angle: " + angle + "°"
126-
val label = TextLabel(text)
126+
val label = Label(text)
127127
label.addClassName(LABEL_CLASS_NAME)
128128
label.setHorizontalAnchor(hAnchor)
129129
label.setVerticalAnchor(vAnchor)

0 commit comments

Comments
 (0)