Skip to content

Commit

Permalink
fix another round of warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@rladstaetter
rladstaetter committed Apr 23, 2020
1 parent 1f50a02 commit 20c7af1
Show file tree
Hide file tree
Showing 6 changed files with 54 additions and 58 deletions.
3 changes: 2 additions & 1 deletion sudoku-core/src/main/scala/net/ladstatt/opencv/OpenCV.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import org.opencv.core._
import org.opencv.imgcodecs.Imgcodecs
import org.opencv.imgproc.Imgproc

import scala.collection.JavaConverters._
import scala.jdk.CollectionConverters._

import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.Future
import scala.util.Try
Expand Down
5 changes: 2 additions & 3 deletions sudoku-core/src/main/scala/net/ladstatt/sudoku/SRectangle.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ import net.ladstatt.opencv.OpenCV
import net.ladstatt.opencv.OpenCV._
import org.opencv.core._

import scala.collection.JavaConverters._

import scala.jdk.CollectionConverters._
object SRectangle {

def apply(pipeline: FramePipeline) : SRectangle = {
Expand Down Expand Up @@ -36,7 +35,7 @@ case class SRectangle(frame: Mat, detectedCorners: MatOfPoint2f, destCorners: Ma

lazy val detectedCells: Seq[SCell] = cells.filter(_.value != 0)

lazy val corners = detectedCorners.toList.asScala.toList
lazy val corners: Seq[Point] = detectedCorners.toList.asScala.toList
/**
* paints the solution to the canvas.
*
Expand Down
5 changes: 3 additions & 2 deletions sudoku-core/src/main/scala/net/ladstatt/sudoku/SudokuUtils.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,8 @@ object SudokuUtils {

val hits: Seq[SCell] = detectedCells.filter(qualityFilter)
val grouped: Map[Int, Seq[SCell]] = hits.groupBy(f => f.value)
val optimal: Map[Int, SCell] = grouped.map { case (i, cells) => i -> cells.maxBy(c => c.quality) }
// import Ordering.Double.TotalOrdering
val optimal: Map[Int, SCell] = grouped.map { case (i, cells) => i -> cells.maxBy(c => c.quality)(Ordering.Double.TotalOrdering) }

digitLibrary ++
(for (c <- optimal.values if digitLibrary(c.value)._1 > c.quality) yield {
Expand All @@ -181,7 +182,7 @@ object SudokuUtils {
* @return detected contours
*/
def detectRectangle(corners1: MatOfPoint2f, params: SParams, contours: Seq[MatOfPoint]): Option[MatOfPoint2f] = {
import scala.collection.JavaConverters._
import scala.jdk.CollectionConverters._
val (contourArea, c) = extractCurveWithMaxArea(contours)

val minimumExpectedArea = Imgproc.contourArea(corners1) / params.contourRatio
Expand Down
2 changes: 1 addition & 1 deletion sudoku-core/src/test/scala/net/ladstatt/sudoku/SudokuUtilsSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class SudokuUtilsSpec extends AnyWordSpecLike {
//pipeline.persist(new File("target/utilstest/"))
val points: util.List[Point] = res.get.toList
assert(points.size > 0)
import scala.collection.JavaConverters._
import scala.jdk.CollectionConverters._
val pts: Seq[Point] = res.map(_.toList.asScala.toSeq).getOrElse(Seq())
assert(
Seq(
Expand Down
2 changes: 1 addition & 1 deletion sudoku-javafx/src/main/scala/net/ladstatt/sudoku/JfxUtils.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import javafx.stage.Stage
import javafx.util.Callback
import net.ladstatt.core.CanLog

import scala.collection.JavaConverters._
import scala.jdk.CollectionConverters._
import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.Future

Expand Down
95 changes: 45 additions & 50 deletions sudoku-javafx/src/main/scala/net/ladstatt/sudoku/SudokuFX.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ import net.ladstatt.core.CanLog
import net.ladstatt.opencv.OpenCV
import org.opencv.core.{Mat, MatOfPoint, Point}
import org.opencv.videoio.VideoCapture
import rx.lang.scala.{Observable, Subscription}
import rx.lang.scala.Observable

import scala.collection.JavaConverters._
import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.Future
import scala.concurrent.duration.Duration
import scala.jdk.CollectionConverters._
import scala.util.{Failure, Success, Try}

/**
Expand Down Expand Up @@ -64,7 +64,7 @@ class SudokuFXApplication extends Application with JfxUtils {
controller.setPerformanceTracker(PerformanceTracker.getSceneTracker(scene))
stage.setScene(scene)

stage.setOnCloseRequest(mkEventHandler(e => {
stage.setOnCloseRequest(mkEventHandler(_ => {
controller.shutdown()
stage.close()
}))
Expand Down Expand Up @@ -155,15 +155,15 @@ class SudokuFXController extends Initializable with OpenCVJfxUtils with CanLog w
history.map(f => {
val i = new MenuItem(f.getName + s" (${f.list().length})")
i
})
}).toIndexedSeq
}
historyMenu.getItems.addAll(historyItems.asJava)
historyMenu
}

lazy val imageTemplates: Seq[Image] = TemplateLibrary.asSeq.map(toImage)

val videoCapture = {
val videoCapture: VideoCapture = {
val v = new VideoCapture()
v.open(0)
v
Expand All @@ -183,24 +183,21 @@ class SudokuFXController extends Initializable with OpenCVJfxUtils with CanLog w
val videoObservable: Observable[SResult] =
Observable[Mat](o => {
new Thread(
new Runnable {
override def run(): Unit = {
while (getCameraActive) {
Try {
val m = aquireMat()
// Imgcodecs.imwrite(Paths.get("/Users/lad/Documents/sudokufx/target").resolve(UUID.randomUUID() + ".png").toAbsolutePath.toString, m)
m
} match {
case Success(m) => o.onNext(m)
case Failure(e) => o.onError(e)
}
() => {
while (getCameraActive) {
Try {
val m = aquireMat()
// Imgcodecs.imwrite(Paths.get("/Users/lad/Documents/sudokufx/target").resolve(UUID.randomUUID() + ".png").toAbsolutePath.toString, m)
m
} match {
case Success(m) => o.onNext(m)
case Failure(e) => o.onError(e)
}
logInfo("Shutting down video service ... ")
videoCapture.release()
o.onCompleted()
}
logInfo("Shutting down video service ... ")
videoCapture.release()
o.onCompleted()
}).start()
new Subscription {}
}).zipWithIndex.map {
case (frame, index) =>
val params: SParams = SParams(contourModeChoiceBox.getValue, contourMethodChoiceBox.getValue, contourRatioChoiceBox.getValue)
Expand All @@ -227,14 +224,13 @@ class SudokuFXController extends Initializable with OpenCVJfxUtils with CanLog w
execOnUIThread({
polyArea.getChildren.clear()
polyArea.getChildren.addAll(polys.asJava)
()
})
}

def display(f: FramePipeline): Unit = {
setVideoView(f.frame)
}
def display(f: FramePipeline): Unit = setVideoView(f.frame)

def process(result: SResult, state: SudokuState): Unit = {
def process(result: SResult): Unit = {
result match {
case f: FramePipeline =>
display(f)
Expand All @@ -243,7 +239,6 @@ class SudokuFXController extends Initializable with OpenCVJfxUtils with CanLog w
(result, nextState) <- c.calc
} {
setCurrentSudokuState(nextState)
// displayContours(candidate.contours)
display(result)
}
}
Expand All @@ -255,13 +250,13 @@ class SudokuFXController extends Initializable with OpenCVJfxUtils with CanLog w
setCameraActive(false)
}

def initializeCapturing(location: URL, resources: ResourceBundle): Unit = {
def initializeCapturing(): Unit = {
require(viewButtons != null)
require(videoView != null)
require(solutionButton != null)
}

def initializeSharedState(location: URL, resources: ResourceBundle): Unit = {
def initializeSharedState(): Unit = {
require(statusLabel != null)

require(templateToolBar != null)
Expand Down Expand Up @@ -300,7 +295,7 @@ class SudokuFXController extends Initializable with OpenCVJfxUtils with CanLog w
}


val analysisCellCorners: Array[Circle] = Array.tabulate(100)(mkCellCorner)
val analysisCellCorners: Array[Circle] = Array.tabulate(100)(_ => mkCellCorner)
val analysisCellBounds: Array[Polyline] = Array.tabulate(81)(mkCellBound)


Expand All @@ -321,11 +316,11 @@ class SudokuFXController extends Initializable with OpenCVJfxUtils with CanLog w

line.setBlendMode(BlendMode.MULTIPLY)
line.setEffect(new DropShadow())
line.setOnMouseEntered(mkEventHandler(e => {
line.setOnMouseEntered(mkEventHandler(_ => {
analysisFadeIn.play()
logInfo(s"entered box $idx")
}))
line.setOnMouseExited(mkEventHandler(e => {
line.setOnMouseExited(mkEventHandler(_ => {
analysisFadeOut.play()
logInfo(s"left box $idx")
}))
Expand All @@ -337,10 +332,10 @@ class SudokuFXController extends Initializable with OpenCVJfxUtils with CanLog w
line.setStroke(Color.BLUE)
line.setStrokeWidth(5)
line.setEffect(new DropShadow())
line.setOnMouseEntered(mkEventHandler(e => {
line.setOnMouseEntered(mkEventHandler(_ => {
line.setOpacity(1.0)
}))
line.setOnMouseExited(mkEventHandler(e => {
line.setOnMouseExited(mkEventHandler(_ => {
borderFadeTransition.play()
}))
line
Expand Down Expand Up @@ -390,7 +385,7 @@ class SudokuFXController extends Initializable with OpenCVJfxUtils with CanLog w
mkRange(ax, bx) zip mkRange(ay, by)
}

def mkCellCorner(index: Int): Circle = {
def mkCellCorner: Circle = {
val c = new Circle
c.setRadius(3)
c.setStroke(Color.GOLD)
Expand All @@ -402,8 +397,8 @@ class SudokuFXController extends Initializable with OpenCVJfxUtils with CanLog w
/**
* returns coordinates of the 100 cell corners
*/
def mkCellCorners(corners: List[Point]): Seq[(Double, Double)] = {
val List(ul, ur, lr, ll) = corners
def mkCellCorners(corners: Seq[Point]): Seq[(Double, Double)] = {
val Seq(ul, ur, lr, ll) = corners
val left = splitRange(ul.x, ul.y, ll.x, ll.y)
val right = splitRange(ur.x, ur.y, lr.x, lr.y)
if (left.size == 10) {
Expand Down Expand Up @@ -438,7 +433,7 @@ class SudokuFXController extends Initializable with OpenCVJfxUtils with CanLog w
for (i <- 0 to 88 if !exclusions.contains(i)) yield extractBound(i)
}

def updateCellBounds(border: List[Point], cellBounds: Array[Polyline]): Unit = {
def updateCellBounds(border: Seq[Point], cellBounds: Array[Polyline]): Unit = {
val cellCorners = mkCellCorners(border)
if (cellCorners.size == 100) {
val boundCoordinates = mkCellBounds(cellCorners)
Expand All @@ -456,7 +451,7 @@ class SudokuFXController extends Initializable with OpenCVJfxUtils with CanLog w
}
}

def updateCellCorners(corners: List[Point], cellCorners: Array[Circle]): Unit = {
def updateCellCorners(corners: Seq[Point], cellCorners: Array[Circle]): Unit = {
mkCellCorners(corners).zipWithIndex.foreach {
case ((x, y), index) =>
cellCorners(index).setCenterX(x)
Expand Down Expand Up @@ -489,16 +484,16 @@ class SudokuFXController extends Initializable with OpenCVJfxUtils with CanLog w
displayHitCounts(getCurrentSudokuState.hitCounts, as[FlowPane](statsFlowPane.getChildren.asScala.toSeq))

sudokuResult match {
case SSuccess(SCandidate(nr, framePipeline, sr, ss), SRectangle(sudokuCanvas, detectedCells, corners), someSolution) =>
case SSuccess(sc : SCandidate, _, someSolution) =>
if (someSolution.isDefined) {
val sol = someSolution.get
updateVideo(stage, framePipeline, sol.solutionMat)
updateVideo(stage, sc.pipeline, sol.solutionMat)
displayResult(sol.solution, as[Label](resultFlowPane.getChildren.asScala.toSeq))
} else {
updateVideo(stage, framePipeline, framePipeline.frame)
updateVideo(stage, sc.pipeline, sc.pipeline.frame)
}
case SFailure(msg, SCandidate(nr, framePipeline, sr, ss)) =>
updateVideo(stage, framePipeline, framePipeline.frame)
case SFailure(_, sc : SCandidate) =>
updateVideo(stage, sc.pipeline, sc.pipeline.frame)
}

}
Expand Down Expand Up @@ -526,13 +521,13 @@ class SudokuFXController extends Initializable with OpenCVJfxUtils with CanLog w
updateStatus(mkFps(onlyCorners.inputFrame.pipeline.start), Color.ORANGE)
updateCellBounds(onlyCorners.sudokuFrame.corners, analysisCellBounds)
updateCellCorners(onlyCorners.sudokuFrame.corners, analysisCellCorners)
case SFailure(msg, SCandidate(_, framePipeline, sr, SudokuState.DefaultState)) => updateStatus(mkFps(framePipeline.start), Color.AQUA)
case SFailure(_, SCandidate(_, framePipeline, _, SudokuState.DefaultState)) => updateStatus(mkFps(framePipeline.start), Color.AQUA)
}
}


def mkFps(start: Long): String = {
def mkDuration = {
def mkDuration: Long = {
val after = System.nanoTime
(after - start) / 1000000
}
Expand All @@ -554,7 +549,7 @@ class SudokuFXController extends Initializable with OpenCVJfxUtils with CanLog w
def initResultPane(resultPane: FlowPane): Boolean = {
def mkSolutionPane(): Seq[Label] = {
val cells = 1 to 81
for (c <- cells) yield {
for (_ <- cells) yield {
val l = new Label("0")
l.setAlignment(Pos.CENTER)
l.setStyle("-fx-border-color:yellow;-fx-border-width:1px;-fx-border-style:solid")
Expand All @@ -581,7 +576,7 @@ class SudokuFXController extends Initializable with OpenCVJfxUtils with CanLog w
val cells = 1 to 81
val numbers = 0 to 9
val cellz =
for (cellCounts <- cells) yield {
for (_ <- cells) yield {
val fp = new FlowPane()
fp.setStyle("-fx-border-color:black;-fx-border-width:1px;-fx-border-style:solid;")
fp.setMinWidth(cellWidth)
Expand Down Expand Up @@ -646,7 +641,7 @@ class SudokuFXController extends Initializable with OpenCVJfxUtils with CanLog w
def initNumberFlowPane(numberFlowPane: FlowPane): Unit = {
numberFlowPane.setMinWidth(3 * 142.0)
numberFlowPane.setPrefWrapLength(3 * 142.0)
(1 to 9).foreach(i => numberFlowPane.getChildren.add(new ImageView))
(1 to 9).foreach(_ => numberFlowPane.getChildren.add(new ImageView))
}

def initializeChoiceBoxes(): Unit = {
Expand All @@ -662,8 +657,8 @@ class SudokuFXController extends Initializable with OpenCVJfxUtils with CanLog w
override def initialize(location: URL, resources: ResourceBundle): Unit = {

initializeChoiceBoxes()
initializeSharedState(location, resources)
initializeCapturing(location, resources)
initializeSharedState()
initializeCapturing()

// toggleButtons
require(inputButton != null)
Expand Down Expand Up @@ -695,7 +690,7 @@ class SudokuFXController extends Initializable with OpenCVJfxUtils with CanLog w


// startCapture
videoObservable.subscribe((result: SResult) => process(result, getCurrentSudokuState),
videoObservable.subscribe((result: SResult) => process(result),
t => t.printStackTrace(),
() => logInfo("Videostream stopped..."))
()
Expand Down

0 comments on commit 20c7af1

Please sign in to comment.