function drawing fixed

AntonAsmirko · Mar 12, 2021 · 0ea8f97 · 0ea8f97
1 parent 4981e1c
commit 0ea8f97
Show file tree

Hide file tree

Showing 74 changed files with 19 additions and 14 deletions.
diff --git a/.gradle/6.7.1/executionHistory/executionHistory.bin b/.gradle/6.7.1/executionHistory/executionHistory.bin
diff --git a/.gradle/6.7.1/executionHistory/executionHistory.lock b/.gradle/6.7.1/executionHistory/executionHistory.lock
diff --git a/.gradle/6.7.1/fileHashes/fileHashes.bin b/.gradle/6.7.1/fileHashes/fileHashes.bin
diff --git a/.gradle/6.7.1/fileHashes/fileHashes.lock b/.gradle/6.7.1/fileHashes/fileHashes.lock
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/build/classes/kotlin/main/Constants.class b/build/classes/kotlin/main/Constants.class
diff --git a/build/classes/kotlin/main/LeftViewType.class b/build/classes/kotlin/main/LeftViewType.class
diff --git a/build/classes/kotlin/main/MainKt$buttonInBox$1$1$1.class b/build/classes/kotlin/main/MainKt$buttonInBox$1$1$1.class
diff --git a/build/classes/kotlin/main/MainKt$buttonInBox$1$2$1.class b/build/classes/kotlin/main/MainKt$buttonInBox$1$2$1.class
diff --git a/build/classes/kotlin/main/MainKt$buttonInBox$1$3$1.class b/build/classes/kotlin/main/MainKt$buttonInBox$1$3$1.class
diff --git a/build/classes/kotlin/main/MainKt$buttonInBox$1$4.class b/build/classes/kotlin/main/MainKt$buttonInBox$1$4.class
diff --git a/build/classes/kotlin/main/MainKt$drawPoints$sorted$1.class b/build/classes/kotlin/main/MainKt$drawPoints$sorted$1.class
diff --git a/build/classes/kotlin/main/MainKt$functionsButtonsText$1.class b/build/classes/kotlin/main/MainKt$functionsButtonsText$1.class
diff --git a/build/classes/kotlin/main/MainKt$functionsButtonsText$2.class b/build/classes/kotlin/main/MainKt$functionsButtonsText$2.class
diff --git a/build/classes/kotlin/main/MainKt$functionsButtonsText$3.class b/build/classes/kotlin/main/MainKt$functionsButtonsText$3.class
diff --git a/build/classes/kotlin/main/MainKt$functionsButtonsText$4.class b/build/classes/kotlin/main/MainKt$functionsButtonsText$4.class
diff --git a/build/classes/kotlin/main/MainKt$functionsButtonsText$5.class b/build/classes/kotlin/main/MainKt$functionsButtonsText$5.class
diff --git a/build/classes/kotlin/main/MainKt$functionsButtonsText$6.class b/build/classes/kotlin/main/MainKt$functionsButtonsText$6.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$1$1$1$1.class b/build/classes/kotlin/main/MainKt$main$1$1$1$1$1$1$1.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$1$10.class b/build/classes/kotlin/main/MainKt$main$1$1$1$1$10.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$1$11$1.class b/build/classes/kotlin/main/MainKt$main$1$1$1$1$11$1.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$1$2$1.class b/build/classes/kotlin/main/MainKt$main$1$1$1$1$2$1.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$1$3$1.class b/build/classes/kotlin/main/MainKt$main$1$1$1$1$3$1.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$1$4$1.class b/build/classes/kotlin/main/MainKt$main$1$1$1$1$4$1.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$1$5$1.class b/build/classes/kotlin/main/MainKt$main$1$1$1$1$5$1.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$1$6.class b/build/classes/kotlin/main/MainKt$main$1$1$1$1$6.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$1$7$1.class b/build/classes/kotlin/main/MainKt$main$1$1$1$1$7$1.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$1$8.class b/build/classes/kotlin/main/MainKt$main$1$1$1$1$8.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$1$9$1.class b/build/classes/kotlin/main/MainKt$main$1$1$1$1$9$1.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$2.class b/build/classes/kotlin/main/MainKt$main$1$1$1$2.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1.class b/build/classes/kotlin/main/MainKt$main$1$1.class
diff --git a/build/classes/kotlin/main/MainKt$main$1.class b/build/classes/kotlin/main/MainKt$main$1.class
diff --git a/build/classes/kotlin/main/MainKt$plotView$1.class b/build/classes/kotlin/main/MainKt$plotView$1.class
diff --git a/build/classes/kotlin/main/MainKt.class b/build/classes/kotlin/main/MainKt.class
diff --git a/build/classes/kotlin/main/MethodType.class b/build/classes/kotlin/main/MethodType.class
diff --git a/build/kotlin/compileKotlin/build-history.bin b/build/kotlin/compileKotlin/build-history.bin
diff --git a/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab b/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values b/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values
diff --git a/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.s b/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.s
@@ -9,4 +9,4 @@
 é
 á
 ØííííñÀÀÀÀÀÀÄý
-ÀÀÀÀÃ
+ÀÀÀÀÃÃÃÃÃÃÃÃÃÃÃÃ
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/constants.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/constants.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/constants.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/constants.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.s b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.s
@@ -1 +1 @@
-джжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжьыыыыыыыыыыышшшшшшшдддьоооооИИИИИИИИИИИИз
+джжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжьыыыыыыыыыыышшшшшшшдддьоооооИИИИИИИИИИИИзззззззззззз
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.s b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.s
@@ -1 +1 @@
-Юххххххххххххххххххххххххххххххххххххххххххххххххххт!м"У)У)У)У)У)Щ)У(У(У(У(У(У(о(Г)Г)Г)Г)Г)й(п(у)у.в.в.в.в.в.в.в.в.в.в.в.в.в.в.в.в.в.д.
+Юххххххххххххххххххххххххххххххххххххххххххххххххххт!м"У)У)У)У)У)Щ)У(У(У(У(У(У(о(Г)Г)Г)Г)Г)й(п(у)у.в.в.в.в.в.в.в.в.в.в.в.в.в.в.в.в.в.д.Ц.Т.Т.Т.Т.Т.Т.Т.Т.Т.Т.
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.s b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.s
@@ -1 +1 @@
-�윌촌︌︌︌︌︌︌︌，︌︌︌︌，
+�윌촌︌︌︌︌︌︌︌，︌︌︌︌，，，，，，，，，，，，
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/subtypes.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/supertypes.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab b/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab
@@ -1,2 +1,2 @@
-120
-117
+131
+128
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab b/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.s b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.s
@@ -1 +1 @@
-ηΫόμΟΞΙΦχέΙΥΓοΟξΙννεΦρ
+ηΫόμΟΞΙΦχέΙΥΓοΟξΙννεΦρΩΗυύεΤΛΑΔΰξξΛυδ�ήςΰΪμΡώΚλίίοΧαΘμαΦϊΜύΥηκΜ�ΙΫΫιβ�ξΞΥΧΩνέίάΚαΤοΥζβΥψβϊς�ΘΠωγήλΚΝύΘδώλΠμαΑηΥξηάάςρωΚαχχΛΝΪψΜΦυΟΒΓΚΟχϊΨγθΨΩΨόΝΙβΡτΒδΜδϊλΕ

diff --git a/build/kotlin/compileKotlin/last-build.bin b/build/kotlin/compileKotlin/last-build.bin
diff --git a/src/main/kotlin/main.kt b/src/main/kotlin/main.kt
@@ -19,13 +19,12 @@ import model.interpolators.FunctionInterpolator
 import java.awt.image.BufferedImage
 import java.io.File
 import javax.imageio.ImageIO
-import javax.swing.Icon
 import kotlin.math.log2
 import kotlin.math.pow
 import kotlin.math.sin
 
 object Constants {
-    const val POINT_RADIUS = 0.5f
+    const val POINT_RADIUS = 0.005f
     const val TITLE = "Optimizer Visualizer"
     const val NONE_FUNC = "NONE"
     const val BACK_BUTTON = "BACK"
@@ -282,7 +281,9 @@ fun plotView(plotData: PlotData, height: Int, width: Int) {
                 Constants.POINT_RADIUS,
                 plotData.lBound,
                 plotData.minFnVal,
-                scale.first, paint
+                scale.first,
+                scale.second,
+                paint
             )
             restore()
         }
@@ -319,9 +320,12 @@ fun Canvas.drawPoints(
     radius: Float,
     lBound: Float,
     minFnVal: Float,
-    scale: Float,
+    scaleX: Float,
+    scaleY: Float,
     paint: Paint
 ) {
+    save()
+    scale(1 / scaleX, 1 / scaleY)
     val strokeWidthConst = 5f
     val sorted = points.sortedWith(Comparator { o1, o2 ->
         return@Comparator when {
@@ -333,16 +337,17 @@ fun Canvas.drawPoints(
     var prevOffset: Offset? = null
     paint.apply {
         color = Color(0xff64dd17)
-        strokeWidth = strokeWidthConst / scale
+        strokeWidth = strokeWidthConst
     }
     for (i in sorted.indices) {
-        val curOffset = Offset(sorted[i].x - lBound, sorted[i].y - minFnVal)
-        this.drawCircle(curOffset, radius / scale, paint)
+        val curOffset = Offset((sorted[i].x - lBound) * scaleX, (sorted[i].y - minFnVal) * scaleY)
+        this.drawCircle(curOffset, radius, paint)
         if (prevOffset != null) {
             this.drawLine(prevOffset, curOffset, paint)
         }
         prevOffset = curOffset
     }
+    restore()
 }
 
 fun Canvas.prepareAxis(
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		джжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжьыыыыыыыыыыышшшшшшшдддьоооооИИИИИИИИИИИИз
		джжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжжьыыыыыыыыыыышшшшшшшдддьоооооИИИИИИИИИИИИзззззззззззз
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Юххххххххххххххххххххххххххххххххххххххххххххххххххт!м"У)У)У)У)У)Щ)У(У(У(У(У(У(о(Г)Г)Г)Г)Г)й(п(у)у.в.в.в.в.в.в.в.в.в.в.в.в.в.в.в.в.в.д.
		Юххххххххххххххххххххххххххххххххххххххххххххххххххт!м"У)У)У)У)У)Щ)У(У(У(У(У(У(о(Г)Г)Г)Г)Г)й(п(у)у.в.в.в.в.в.в.в.в.в.в.в.в.в.в.в.в.в.д.Ц.Т.Т.Т.Т.Т.Т.Т.Т.Т.Т.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		�윌촌︌︌︌︌︌︌︌，︌︌︌︌，
		�윌촌︌︌︌︌︌︌︌，︌︌︌︌，，，，，，，，，，，，
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ηΫόμΟΞΙΦχέΙΥΓοΟξΙννεΦρ
		ηΫόμΟΞΙΦχέΙΥΓοΟξΙννεΦρΩΗυύεΤΛΑΔΰξξΛυδ�ήςΰΪμΡώΚλίίοΧαΘμαΦϊΜύΥηκΜ�ΙΫΫιβ�ξΞΥΧΩνέίάΚαΤοΥζβΥψβϊς�ΘΠωγήλΚΝύΘδώλΠμαΑηΥξηάάςρωΚαχχΛΝΪψΜΦυΟΒΓΚΟχϊΨγθΨΩΨόΝΙβΡτΒδΜδϊλΕ
Expand Down