From 72df84b2461f2a43d897525edc9eb9c3653e5de5 Mon Sep 17 00:00:00 2001 From: Stanislav Mishchenko Date: Sat, 18 May 2024 15:57:35 +0300 Subject: [PATCH] codestyle --- src/main/kotlin/solve/parsers/planes/ImagePlanesParser.kt | 4 ++-- src/main/kotlin/solve/rendering/canvas/SceneCanvas.kt | 3 ++- .../solve/rendering/engine/core/input/MouseInputHandler.kt | 2 +- src/main/kotlin/solve/scene/SceneFacade.kt | 2 -- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/solve/parsers/planes/ImagePlanesParser.kt b/src/main/kotlin/solve/parsers/planes/ImagePlanesParser.kt index df0dc161..b88a2096 100644 --- a/src/main/kotlin/solve/parsers/planes/ImagePlanesParser.kt +++ b/src/main/kotlin/solve/parsers/planes/ImagePlanesParser.kt @@ -62,7 +62,7 @@ object ImagePlanesParser : Parser { return uids.toList() } - fun getPixelColor(filePath: String, pixelPosition: Point) : Int? { + fun getPixelColor(filePath: String, pixelPosition: Point): Int? { val bufferedImage = loadBufferedImage(filePath) ?: return null return bufferedImage.getPixelColor(pixelPosition) @@ -99,7 +99,7 @@ object ImagePlanesParser : Parser { } } - private fun BufferedImage.getPixelColor(pixelPosition: Point) : Int? { + private fun BufferedImage.getPixelColor(pixelPosition: Point): Int? { val imageByteDataArray = getImageByteDataArray(this) val colorSegmentsType: ColorSegmentsType = ColorSegmentsType.getColorSegmentsType(colorModel.numComponents) ?: return null diff --git a/src/main/kotlin/solve/rendering/canvas/SceneCanvas.kt b/src/main/kotlin/solve/rendering/canvas/SceneCanvas.kt index 1216183e..9cc00474 100644 --- a/src/main/kotlin/solve/rendering/canvas/SceneCanvas.kt +++ b/src/main/kotlin/solve/rendering/canvas/SceneCanvas.kt @@ -247,8 +247,9 @@ class SceneCanvas : OpenGLCanvas() { )?.toLong() ?: return@forEach // The integer pixel color is equal to UID of the corresponding plane. - if (!framePlaneUIDs.contains(clickedPixelIntegerColor)) + if (!framePlaneUIDs.contains(clickedPixelIntegerColor)) { return@forEach + } clickedLandmarkLayerState = layer.layerState clickedLandmarkUID = clickedPixelIntegerColor diff --git a/src/main/kotlin/solve/rendering/engine/core/input/MouseInputHandler.kt b/src/main/kotlin/solve/rendering/engine/core/input/MouseInputHandler.kt index a842b82c..f005f700 100644 --- a/src/main/kotlin/solve/rendering/engine/core/input/MouseInputHandler.kt +++ b/src/main/kotlin/solve/rendering/engine/core/input/MouseInputHandler.kt @@ -63,7 +63,7 @@ object MouseInputHandler { return minKeypointDistanceIndex } - fun getClickedPixelColor() : Color { + fun getClickedPixelColor(): Color { val pointerLocation = MouseInfo.getPointerInfo().location val robot = Robot() diff --git a/src/main/kotlin/solve/scene/SceneFacade.kt b/src/main/kotlin/solve/scene/SceneFacade.kt index fe52fcac..1b6f0c59 100644 --- a/src/main/kotlin/solve/scene/SceneFacade.kt +++ b/src/main/kotlin/solve/scene/SceneFacade.kt @@ -2,7 +2,6 @@ package solve.scene import javafx.beans.property.SimpleObjectProperty import solve.parsers.factories.LineFactory -import solve.parsers.factories.PlaneFactory import solve.parsers.factories.PointFactory import solve.parsers.lines.CSVLinesParser import solve.parsers.points.CSVPointsParser @@ -12,7 +11,6 @@ import solve.project.model.ProjectFrame import solve.project.model.ProjectLayer import solve.scene.controller.SceneController import solve.scene.model.ColorManager -import solve.scene.model.Landmark import solve.scene.model.Layer import solve.scene.model.LayerSettings import solve.scene.model.LayerState