Move vertices

Author: pink-snow

src/main/scala/org/codingteam/icfpc2021/package.scala

@@ -53,5 +53,8 @@ package object icfpc2021 {
    */
   case class Rect(min: Point, max: Point) {
     lazy val size: Point = max - min + Point.Ones
+
+    def contains(p: Point): Boolean =
+      p.x >= min.x && p.x <= max.x && p.y >= min.y && p.y <= max.y
   }
 }

src/main/scala/org/codingteam/icfpc2021/visualizer/Visualizer.scala

@@ -1,16 +1,21 @@
 package org.codingteam.icfpc2021.visualizer
 
-import org.codingteam.icfpc2021.{Json, Problem}
+import org.codingteam.icfpc2021.{Json, Problem, Point, Rect}
 
 import java.awt._
 import java.awt.event.{ActionEvent, MouseEvent, MouseListener, _}
 import java.nio.file.{Files, Path}
 import javax.swing._
+import scala.collection.mutable.BitSet
 
 class Visualizer(val problem: Problem) extends JFrame("Codingteam ICPFC-2021") {
 
   private val translator = new Translator(problem)
+  private var solution = problem.figure.vertices
+
   private var selection: Option[(java.awt.Point, java.awt.Point)] = None
+  private var selectedFigureVertices = new BitSet
+
   private lazy val mainPanel = {
     val p = new JPanel()
     p.setLayout(new BorderLayout())
@@ -31,20 +36,28 @@ class Visualizer(val problem: Problem) extends JFrame("Codingteam ICPFC-2021") {
           val (x, y) = translator.toScreen(vert)
           g.drawString(String.valueOf(i), x, y)
         }
-        selection foreach { r =>
-          val (x1, x2) = (r._1.x.min(r._2.x), r._1.x.max(r._2.x))
-          val (y1, y2) = (r._1.y.min(r._2.y), r._1.y.max(r._2.y))
+
+        selection foreach { sel =>
+          val (x1, x2) = (sel._1.x.min(sel._2.x), sel._1.x.max(sel._2.x))
+          val (y1, y2) = (sel._1.y.min(sel._2.y), sel._1.y.max(sel._2.y))
           g2.drawRect(x1, y1, x2 - x1, y2 - y1)
         }
+
+        g2.setColor(Color.RED)
+        for (i <- selectedFigureVertices) {
+          val (x, y) = translator.toScreen(solution(i))
+          g.fillOval(x - 4, y - 4, 8, 8)
+        }
+
         g2.setColor(Color.RED)
         for (edge <- problem.figure.edges) {
-          val (x1, y1) = translator.toScreen(problem.figure.vertices(edge.vertex1))
-          val (x2, y2) = translator.toScreen(problem.figure.vertices(edge.vertex2))
+          val (x1, y1) = translator.toScreen(solution(edge.vertex1))
+          val (x2, y2) = translator.toScreen(solution(edge.vertex2))
           g.drawLine(x1, y1, x2, y2)
         }
 
         g2.setColor(Color.BLACK)
-        for ((vert, i) <- problem.figure.vertices.zipWithIndex) {
+        for ((vert, i) <- solution.zipWithIndex) {
           val (x, y) = translator.toScreen(vert)
           g.drawString(String.valueOf(i), x, y)
         }
@@ -76,6 +89,18 @@ class Visualizer(val problem: Problem) extends JFrame("Codingteam ICPFC-2021") {
       override def mouseDragged(e: MouseEvent): Unit = {
         selection foreach { sel =>
           sel._2.setLocation(e.getX, e.getY)
+
+          val (x1, x2) = (sel._1.x.min(sel._2.x), sel._1.x.max(sel._2.x))
+          val (y1, y2) = (sel._1.y.min(sel._2.y), sel._1.y.max(sel._2.y))
+          val rect = Rect(translator.toModel(x1, y1), translator.toModel(x2, y2))
+
+          selectedFigureVertices.clear()
+          for((vert, i) <- solution.zipWithIndex) {
+            if (rect.contains(vert)) {
+              selectedFigureVertices.add(i)
+            }
+          }
+
           p.repaint()
         }
       }
@@ -85,13 +110,22 @@ class Visualizer(val problem: Problem) extends JFrame("Codingteam ICPFC-2021") {
     p
 
   }
+
   private lazy val buttonsPanel = {
     val tb = new JToolBar()
-    tb.add(testAction)
+    tb.add(visualizer.makeAction("Test Action", () => println("Test action called")))
+    tb.add(visualizer.makeAction("←", () => moveSelected(Point(-1, 0))))
+    tb.add(visualizer.makeAction("→", () => moveSelected(Point(+1, 0))))
+    tb.add(visualizer.makeAction("↑", () => moveSelected(Point(0, -1))))
+    tb.add(visualizer.makeAction("↓", () => moveSelected(Point(0, +1))))
     tb
   }
-  private lazy val testAction = new AbstractAction("Test action") {
-    override def actionPerformed(e: ActionEvent): Unit = println("Test action called")
+
+  private def moveSelected(delta: Point): Unit = {
+    solution = solution.zipWithIndex.map { case (p, idx) =>
+      if (selectedFigureVertices.contains(idx)) p + delta else p
+    }
+    problemPanel.repaint()
   }
 
   private def init(): Unit = {
@@ -104,6 +138,13 @@ class Visualizer(val problem: Problem) extends JFrame("Codingteam ICPFC-2021") {
   init()
 }
 
+package object visualizer {
+  // TODO: move this helper function somewhere to an appropriate place
+  def makeAction(name: String, callback: () => Unit): AbstractAction = new AbstractAction(name) {
+    override def actionPerformed(e: ActionEvent): Unit = callback()
+  }
+}
+
 object Visualizer {
   def show(problemFile: Path): Visualizer = {
     val content = Files.readString(problemFile)