huge fix

Author: ice1000

App/src/finder/LineFinder.kt

@@ -10,7 +10,7 @@ import java.awt.image.BufferedImage
  * Created by ice1000 on 16-8-6.
  */
 open class LineFinder(image: BufferedImage): Area(image), Finder {
-	var pointCache = Point(0, 0)
+	protected var pointCache = Point(1, 2)
 
 	/**
 	 * @param point send a clicked point

App/src/finder/TriangleFinder.kt

@@ -1,15 +1,23 @@
 package finder
 
+import core.models.Line
 import core.models.Point
 import java.awt.image.BufferedImage
 
 /**
  * @author ice1000
  * Created by ice1000 on 2016/8/10.
  */
-open class TriangleFinder(image: BufferedImage): LineFinder(image){
+open class TriangleFinder(image: BufferedImage) : LineFinder(image) {
+	protected var pointCache1 = Point(2, 1)
+
 	override fun send(point: Point): Boolean {
-		// TODO triangle fucking
-		return super.send(point)
+		val ret = point connect pointCache1 && pointCache1 connect pointCache && point connect pointCache
+		drawLine(Line(pointCache1, pointCache))
+		drawLine(Line(point, pointCache))
+		drawLine(Line(point, pointCache1))
+		pointCache = pointCache1
+		pointCache1 = point
+		return ret
 	}
 }

App/src/runnable/Kotlin.kt App/src/runnable/LineFind.kt

@@ -0,0 +1,15 @@
+package runnable
+
+import finder.TriangleFinder
+import view.GUI
+import java.io.File
+import javax.imageio.ImageIO
+
+/**
+ * @author ice1000
+ * Created by ice1000 on 2016/8/11.
+ */
+
+fun main(args: Array<String>) {
+	GUI("Line by ice1000", TriangleFinder(ImageIO.read(File("test.png"))))
+}

App/src/runnable/TriangleFind.kt

@@ -20,7 +20,8 @@ Module|Language
 :---|---:
 Tests|Java
 Documents|Java
-Core (major)|Kotlin
+Core|Kotlin
+GUI|Kotlin
 DSL|Groovy
 
 # Progress

README.md

@@ -8,20 +8,20 @@ import java.util.*
  *
  * 通过两点构造一条直线
  */
-open class Line(start: Point, end: Point) {
+open class Line(one: Point, two: Point) {
 
-	private val a = end.y - start.y
-	private val b = start.x - end.x
-	private val c = end.x * start.y - start.x * end.y
+	private val a = two.y - one.y
+	private val b = one.x - two.x
+	private val c = two.x * one.y - one.x * two.y
 	val allPoints = HashSet<Point>()
 
 	init {
-		(Math.min(start.x, end.x)..Math.max(start.x, end.x)).forEach { x -> allPoints.add(Point(x, x2y(x))) }
-		(Math.min(start.y, end.y)..Math.max(start.y, end.y)).forEach { y -> allPoints.add(Point(y2x(y), y)) }
+		(Math.min(one.x, two.x)..Math.max(one.x, two.x)).forEach { x -> if (b > 0) allPoints.add(Point(x, x2y(x))) }
+		(Math.min(one.y, two.y)..Math.max(one.y, two.y)).forEach { y -> if (a > 0) allPoints.add(Point(y2x(y), y)) }
 	}
 
-	fun x2y(x: Int) = (a * x + c) * -1 / b
-	fun y2x(y: Int) = (b * y + c) * -1 / a
+	fun x2y(x: Int) = -(a * x + c) / b
+	fun y2x(y: Int) = -(b * y + c) / a
 
 	override operator fun equals(other: Any?): Boolean {
 		if (other == null || other !is Line) return false