Got rid of the key in the axis case class and made it so that axes use identity for ==.

Author: MarkCLewis

.scalafmt.conf

@@ -0,0 +1 @@
+version = "2.6.4"

core/src/main/scala/playground/PlotTesting.scala

@@ -173,16 +173,16 @@ object PlotTesting {
    */
   def longForm(): Plot = {
     val font = new Renderer.FontData("Ariel", Renderer.FontStyle.Plain)
-    val xAxis1 = new NumericAxis("x1", None, None, None, Axis.TickStyle.Both, Some(Axis.LabelSettings(90, font, numberFormat)),
+    val xAxis1 = new NumericAxis(None, None, None, Axis.TickStyle.Both, Some(Axis.LabelSettings(90, font, numberFormat)),
         Some(Axis.NameSettings("X1", font)))
-    val xAxis2 = new NumericAxis("x2", None, None, None, Axis.TickStyle.Both, Some(Axis.LabelSettings(90, font, numberFormat)),
+    val xAxis2 = new NumericAxis(None, None, None, Axis.TickStyle.Both, Some(Axis.LabelSettings(90, font, numberFormat)),
         Some(Axis.NameSettings("X2", font)))
-    val xAxisCat = new CategoryAxis("xcat", Axis.TickStyle.Both, 0, font, Some(Axis.NameSettings("Categories", font)), Axis.DisplaySide.Max)
-    val yAxis1 = new NumericAxis("y1", None, None, None, Axis.TickStyle.Both, Some(Axis.LabelSettings(0, font, numberFormat)),
+    val xAxisCat = new CategoryAxis(Axis.TickStyle.Both, 0, font, Some(Axis.NameSettings("Categories", font)), Axis.DisplaySide.Max)
+    val yAxis1 = new NumericAxis(None, None, None, Axis.TickStyle.Both, Some(Axis.LabelSettings(0, font, numberFormat)),
         Some(Axis.NameSettings("Y1", font)))
-    val yAxis2 = new NumericAxis("y2", None, None, None, Axis.TickStyle.Both, Some(Axis.LabelSettings(0, font, "%1.0f")),
+    val yAxis2 = new NumericAxis(None, None, None, Axis.TickStyle.Both, Some(Axis.LabelSettings(0, font, "%1.0f")),
         Some(Axis.NameSettings("Y2", font)))
-    val yAxis3 = new NumericAxis("y3", None, None, None, Axis.TickStyle.Both, Some(Axis.LabelSettings(0, font, "%1.0f")),
+    val yAxis3 = new NumericAxis(None, None, None, Axis.TickStyle.Both, Some(Axis.LabelSettings(0, font, "%1.0f")),
         Some(Axis.NameSettings("Y3", font)), Axis.DisplaySide.Max)
 
     // Main Scatter plot
@@ -376,11 +376,11 @@ object PlotTesting {
       )
     }
     val font = Renderer.FontData("Ariel", Renderer.FontStyle.Plain)
-    val photonCountAxis = NumericAxis("Count", None, None, None, Axis.TickStyle.Both,
+    val photonCountAxis = NumericAxis(None, None, None, Axis.TickStyle.Both,
       Some(Axis.LabelSettings(0.0, font, "%1.1f")), Some(Axis.NameSettings("Photon Count", font)), Axis.DisplaySide.Max)
-    val yAxes = plotStyles.zipWithIndex.map { case (_, i) => NumericAxis("Y"+i, None, None, None, Axis.TickStyle.Both,
+    val yAxes = plotStyles.zipWithIndex.map { case (_, i) => NumericAxis(None, None, None, Axis.TickStyle.Both,
       Some(Axis.LabelSettings(0.0, font, "%1.1f")), Some(Axis.NameSettings("Azimuthal Position", font)), Axis.DisplaySide.Min) }
-    val xAxis = NumericAxis("X", None, None, None, Axis.TickStyle.Both,
+    val xAxis = NumericAxis(None, None, None, Axis.TickStyle.Both,
       Some(Axis.LabelSettings(90.0, font, "%1.1f")), Some(Axis.NameSettings("Radial Position", font)), Axis.DisplaySide.Min)
     val grid = PlotGrid(plotStyles.zipWithIndex.map { case ((cart, scans), i) =>
       Seq(Seq(Plot2D(cart, "X", "Y"+i)), scans.map(scan => Plot2D(scan, "X", "Count"))) },
@@ -399,8 +399,8 @@ object PlotTesting {
     val font = new Renderer.FontData("Ariel", Renderer.FontStyle.Plain)
     val style = ScatterStyle(x, y)
     val p2d = Plot2D(style, "x", "y")
-    val xAxis = NumericAxis("x", tickLabelInfo = Some(Axis.LabelSettings(90, font, numberFormat)), name = Some(Axis.NameSettings("X", font)))
-    val yAxis = NumericAxis("y", tickLabelInfo = Some(Axis.LabelSettings(0, font, numberFormat)), name = Some(Axis.NameSettings("Y", font)))
+    val xAxis = NumericAxis(tickLabelInfo = Some(Axis.LabelSettings(90, font, numberFormat)), name = Some(Axis.NameSettings("X", font)))
+    val yAxis = NumericAxis(tickLabelInfo = Some(Axis.LabelSettings(0, font, numberFormat)), name = Some(Axis.NameSettings("Y", font)))
     val grid = PlotGrid(Seq(Seq(Seq(p2d))), Map("x" -> xAxis, "y" -> yAxis), Seq(1.0), Seq(1.0))
     Plot(grids = Map("main" -> Plot.GridData(grid, Bounds(0.0, 0.05, 0.95, 0.95))))
   }
@@ -424,7 +424,7 @@ object PlotTesting {
     val ys = xs.map(x => math.sqrt(x))
     val counts = (0 to 9).map(i => 1.0 - i*i/100.0)
     Plot.simple(ScatterStyle(xs, xs))
-      .withAxis("y2", NumericAxis.defaultVerticalAxis("y2", "Y2").min(0.0).maxSide)
+      .withAxis("y2", NumericAxis.defaultVerticalAxis("Y2").min(0.0).maxSide)
       .updatedAxis[NumericAxis]("x", _.updatedName("X"))
       .updatedAxis[NumericAxis]("x", _.updatedName("Y"))
       .updatedPlotGrid(_.withRow().withColumn().withRow(0).withColumn(0)

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

@@ -18,7 +18,6 @@ sealed trait Axis {
  * the tickSpacing will be ignored, even if it is provided.
  */
 case class NumericAxis(
-  key:           String,
   min:           Option[Double]                      = None,
   max:           Option[Double]                      = None,
   tickSpacing:   Option[Double]                      = None,
@@ -251,6 +250,17 @@ case class NumericAxis(
     * @return The modified axis.
     */
   def ticks(tstyle: Axis.TickStyle.Value): NumericAxis = updatedTickStyle(tstyle)
+
+  /**
+    * Override equality because I need this to check for identify in the sets and maps.
+    *
+    * @param that
+    * @return
+    */
+  override def equals(that: Any): Boolean = that match {
+    case ar: AnyRef => this eq ar
+    case _ => false
+  }
 
   // Private methods
 
@@ -314,7 +324,7 @@ case class NumericAxis(
     }
   }
 
-  def calcTickLocations(amin: Double, amax: Double): Seq[Double] = {
+  private def calcTickLocations(amin: Double, amax: Double): Seq[Double] = {
     if (tickSpacing.nonEmpty || tickLabelInfo.nonEmpty) {
       style match {
         case Axis.ScaleStyle.Linear =>
@@ -355,15 +365,15 @@ case class NumericAxis(
 }
 
 object NumericAxis {
-  def defaultHorizontalAxis(text: String, key: String = "x", numFormat: String = "%1.1f", xType: Axis.ScaleStyle.Value = Axis.ScaleStyle.Linear) = {
+  def defaultHorizontalAxis(text: String, numFormat: String = "%1.1f", xType: Axis.ScaleStyle.Value = Axis.ScaleStyle.Linear) = {
     val font = Renderer.FontData("Ariel", Renderer.FontStyle.Plain)
-    NumericAxis(key, None, None, None, Axis.TickStyle.Both,
+    NumericAxis(None, None, None, Axis.TickStyle.Both,
       Some(Axis.LabelSettings(90.0, font, numFormat)), Some(Axis.NameSettings(text, font)), Axis.DisplaySide.Min, xType)
   }
 
-  def defaultVerticalAxis(text: String, key: String = "y", numFormat: String = "%1.1f", yType: Axis.ScaleStyle.Value = Axis.ScaleStyle.Linear) = {
+  def defaultVerticalAxis(text: String, numFormat: String = "%1.1f", yType: Axis.ScaleStyle.Value = Axis.ScaleStyle.Linear) = {
     val font = Renderer.FontData("Ariel", Renderer.FontStyle.Plain)
-    NumericAxis(key, None, None, None, Axis.TickStyle.Both,
+    NumericAxis(None, None, None, Axis.TickStyle.Both,
       Some(Axis.LabelSettings(0.0, font, numFormat)), Some(Axis.NameSettings(text, font)), Axis.DisplaySide.Min, yType)
   }
 }
@@ -372,7 +382,6 @@ object NumericAxis {
  * Axis with text categories for labels instead of numeric values.
  */
 case class CategoryAxis(
-  key:           String,
   tickStyle:        Axis.TickStyle.Value,
   labelOrientation: Double, // angle in degrees
   labelFont:        Renderer.FontData,
@@ -453,6 +462,18 @@ case class CategoryAxis(
     }
 
   }
+
+  /**
+    * Override equality because I need this to check for identify in the sets and maps.
+    *
+    * @param that
+    * @return
+    */
+  override def equals(that: Any): Boolean = that match {
+    case ar: AnyRef => this eq ar
+    case _ => false
+  }
+
 }
 
 /**