More updates for Scala 2.13. Commented out Polynote until they support 2.13. Fixed most warnings.

Author: MarkCLewis

build.sbt

@@ -66,7 +66,7 @@ lazy val fxrenderer = (project in file("fxrenderer"))
     scalaVersion := "2.13.7",
     libraryDependencies += "org.scalafx" %% "scalafx" % "17.0.1-R26",
     libraryDependencies ++= javaFXModules.map( m =>
-      "org.openjfx" % s"javafx-$m" % "11" classifier osName
+      "org.openjfx" % s"javafx-$m" % "17" classifier osName
     )
   ).dependsOn(jvm)
 
@@ -76,16 +76,18 @@ lazy val swingrenderer = (project in file("swingrenderer"))
     name         := "SwiftVis2Swing",
     scalaVersion := "2.13.7",
     libraryDependencies += "org.scala-lang.modules" %% "scala-swing" % "3.0.0",
-    libraryDependencies += "org.scala-lang.modules" %% "scala-parallel-collections" % "1.0.4"
+    libraryDependencies += "org.scala-lang.modules" %% "scala-parallel-collections" % "1.0.4",
+    libraryDependencies += "org.scalactic" %% "scalactic" % "3.2.10",
+    libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.10" % "test"
   ).dependsOn(jvm)
 
-lazy val polynote = (project in file("polynoteintegration"))
-  .settings(
-    commonSettings,
-    name         := "SwiftVis2Polynote",
-    scalaVersion := "2.12.15",
-    libraryDependencies += "org.polynote" %% "polynote-runtime" % "0.4.4"
-  ).dependsOn(swingrenderer)
+// lazy val polynote = (project in file("polynoteintegration"))
+//   .settings(
+//     commonSettings,
+//     name         := "SwiftVis2Polynote",
+//     scalaVersion := "2.13.7",
+//     libraryDependencies += "org.polynote" %% "polynote-runtime" % "0.4.4"
+//   ).dependsOn(swingrenderer)
 
 lazy val spark = (project in file("spark"))
   .settings(

core/src/main/scala/swiftvis2/plotting/Axes.scala

@@ -330,7 +330,7 @@ case class NumericAxis(
         case Axis.ScaleStyle.Linear =>
           val majorSep = tickSpacing.getOrElse {
             val str = "%e".format((amax - amin) / 6)
-            (str.take(str.indexOf('.') + 2).toDouble.round + str.drop(str.indexOf('e'))).toDouble // TODO - consider BigDecimal here if display gets unhappy
+            (str.take(str.indexOf('.') + 2).toDouble.round.toString + str.drop(str.indexOf('e'))).toDouble // TODO - consider BigDecimal here if display gets unhappy
           }
           val firstTickApprox = (amin / majorSep).toInt * majorSep
           val firstTick = firstTickApprox + (if ((amax - amin).abs < (amax - firstTickApprox).abs) majorSep else 0)

core/src/main/scala/swiftvis2/plotting/PlotGrid.scala

@@ -77,8 +77,8 @@ case class PlotGrid(
     // Draw grid of plots
     r.setColor(0xff000000)
     val sizesAndAxisRenderers = (for {
-      ((row, i), yStart, yEnd) <- (plots.zipWithIndex, yStarts, yStarts.tail).zipped
-      ((p2ds, j), xStart, xEnd) <- (row.zipWithIndex, xStarts, xStarts.tail).zipped
+      ((row, i), yStart, yEnd) <- plots.zipWithIndex.lazyZip(yStarts).lazyZip(yStarts.tail)
+      ((p2ds, j), xStart, xEnd) <- row.zipWithIndex.lazyZip(xStarts).lazyZip(xStarts.tail)
     } yield {
       val axisBounds = Seq(
         minXAxisBounds.subX(xStart, xEnd),
@@ -210,7 +210,7 @@ case class PlotGrid(
   private def collectXAxes(pred: Axis => Boolean): Seq[Seq[String]] = {
     plots.foldLeft(Seq.fill(plots(0).size)(Seq.empty[String])) { (names, row) =>
       val toAdd = row.map(_.flatMap(p2d => axisNameAsListWithCondition(p2d.xAxisName, pred)))
-      (names, toAdd).zipped.map((a, b) => (b ++: a))
+      names.lazyZip(toAdd).map((a, b) => (b ++: a))
     }
   }
 

core/src/main/scala/swiftvis2/plotting/renderer/SVGRenderer.scala

@@ -1,13 +1,13 @@
 package swiftvis2.plotting.renderer
 
 import swiftvis2.plotting.Bounds
-import scala.collection.mutable.ArrayStack
+import scala.collection.mutable.Stack
 
 class SVGRenderer(width: Double, height: Double)  {
   import SVGRenderer.Options
 
   private var copt = Options("#000000", Renderer.StrokeData(1.0, Nil), Renderer.FontData("Ariel", Renderer.FontStyle.Plain), 10.0, None)
-  private val stack = ArrayStack[Options]()
+  private val stack = Stack[Options]()
   private var clipCnt = 0
 
   def drawEllipse(cx: Double, cy: Double, width: Double, height: Double): String = {

core/src/main/scala/swiftvis2/plotting/styles/ColoredSurfaceStyle.scala

@@ -2,6 +2,7 @@ package swiftvis2.plotting.styles
 
 import swiftvis2.plotting._
 import swiftvis2.plotting.renderer.Renderer
+import scala.collection.immutable.ArraySeq
 
 case class XYC(x: Double, y: Double, c: Int)
 
@@ -52,8 +53,8 @@ case class ColoredSurfaceStyle(
     def drawGroup(): Unit = {
       for (i <- 0 until pData(0).length - 1; if i < pData(1).length - 1) {
         r.setColor(pData(0)(i).c)
-        val xs = Array(pData(0)(i).x, pData(1)(i).x, pData(1)(i + 1).x, pData(0)(i + 1).x)
-        val ys = Array(pData(0)(i).y, pData(1)(i).y, pData(1)(i + 1).y, pData(0)(i + 1).y)
+        val xs = ArraySeq(pData(0)(i).x, pData(1)(i).x, pData(1)(i + 1).x, pData(0)(i + 1).x)
+        val ys = ArraySeq(pData(0)(i).y, pData(1)(i).y, pData(1)(i + 1).y, pData(0)(i + 1).y)
         r.fillPolygon(xs, ys)
         r.drawPolygon(xs, ys)
       }

core/src/main/scala/swiftvis2/plotting/styles/ScatterStyle.scala

@@ -73,7 +73,7 @@ final case class ScatterStyle(
         r.setColor(BlackARGB)
         r.drawLine(px, yConv(y - error), px, yConv(y + error))
       }
-      (lines, connectMap).zipped.foreach {
+      lines.lazyZip(connectMap).foreach {
         case (ScatterStyle.LineData(groupFunc, stroke), cm) =>
           val group = groupFunc(i)
           cm.get(group) match {
@@ -93,7 +93,7 @@ final case class ScatterStyle(
       }
       symbol.drawSymbol(px, py, pwidth, pheight, r)
     }
-    (lines, connectMap).zipped.foreach {
+    lines.lazyZip(connectMap).foreach {
       case (LineData(groupFunc, stroke), cm) =>
         for ((group, lst @ ((_, _, c) :: _)) <- cm) {
           r.setColor(c)

fxrenderer/src/main/scala/swiftvis2/plotting/renderer/FXRenderer.scala

@@ -190,7 +190,7 @@ class FXRenderer(gc: GraphicsContext, maxQueue: Int = 1000) extends Renderer {
 
   def drawText(s: String, x: Double, y: Double, align: Renderer.HorizontalAlign.Value, angle: Double): Unit = {
     enqueue(() => {
-      gc.save
+      gc.save()
       text.text = s
       text.font = gc.font
       gc.textBaseline = VPos.Center
@@ -202,13 +202,13 @@ class FXRenderer(gc: GraphicsContext, maxQueue: Int = 1000) extends Renderer {
         case Renderer.HorizontalAlign.Right => TextAlignment.Right
       }
       gc.fillText(s, 0, 0)
-      gc.restore
+      gc.restore()
     })
   }
 
-  def save(): Unit = enqueue(() => gc.save)
+  def save(): Unit = enqueue(() => gc.save())
 
-  def restore(): Unit = enqueue(() => gc.restore)
+  def restore(): Unit = enqueue(() => gc.restore())
 
   def setColor(argb: Int): Unit = {
     enqueue(() => {

jsrenderer/src/main/scala/swiftvis2/plotting/renderer/JSRenderer.scala

@@ -2,7 +2,7 @@ package swiftvis2.plotting.renderer
 
 import swiftvis2.plotting._
 import org.scalajs.dom.html.Canvas
-import org.scalajs.dom.raw.CanvasRenderingContext2D
+import org.scalajs.dom.CanvasRenderingContext2D
 import swiftvis2.plotting.renderer.Renderer.FontStyle
 
 import scala.scalajs.js
@@ -83,7 +83,7 @@ class JSRenderer(canvas: Canvas) extends Renderer {
   }
 
   def drawText(s: String, x: Double, y: Double, align: Renderer.HorizontalAlign.Value, angle: Double): Unit = {
-    ctx2D.save
+    ctx2D.save()
     ctx2D.textBaseline = "middle"
     ctx2D.translate(x, y)
     ctx2D.rotate(angle * (math.Pi / 180))
@@ -93,7 +93,7 @@ class JSRenderer(canvas: Canvas) extends Renderer {
       case Renderer.HorizontalAlign.Right => "right"
     }
     ctx2D.fillText(s, 0, 0)
-    ctx2D.restore
+    ctx2D.restore()
   }
 
   def setColor(argb: Int): Unit = {

jvm/src/main/scala/swiftvis2/CompilerParsing.scala

@@ -49,7 +49,7 @@ object CompilerParsing {
       println(className+"\n"+classString)
       val inputFile = new BatchSourceFile(className+".scala", classString)
       val fParser = new global.syntaxAnalyzer.SourceFileParser(inputFile)
-      val fTree = fParser.parse
+      val fTree = fParser.parse()
       val bounds = findIndices(fTree)
 
       run.compileSources(List(inputFile))

jvm/src/main/scala/swiftvis2/DataElement.scala

@@ -1,5 +1,7 @@
 package swiftvis2
 
+import scala.collection.immutable.ArraySeq
+
 class DataElement(
     private val _x: Array[Double],
     private val _s: Array[String],
@@ -10,9 +12,9 @@ class DataElement(
 }
 
 object DataElement {
-  val noNums = Array[Double]()
-  val noStrings = Array[String]()
-  val noInts = Array[Int]()
+  val noNums = ArraySeq[Double]()
+  val noStrings = ArraySeq[String]()
+  val noInts = ArraySeq[Int]()
 
   def apply(nums: Seq[Double] = noNums, strings: Seq[String] = noStrings, ints: Seq[Int] = noInts): DataElement = 
     new DataElement(nums.toArray, strings.toArray, ints.toArray)