kaze/orx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve orx-rabbit-control such that writing the QR code to a file is no longer necessary

Browse Source 
* orx-rabbit-control: writing the QR code to a file is no longer necessary
* Smaller QR-code image with MagnifyingFilter.NEAREST
This commit is contained in:
Rein van der Woerd
2020-04-07 23:08:37 +02:00
committed by GitHub
parent eb8a3d43d1
commit b3fd0a0068
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
orx-rabbit-control/src/main/kotlin/RabbitControlServer.kt
View File

@@ -1,12 +1,9 @@
import com.google.zxing.BarcodeFormat import com.google.zxing.BarcodeFormat
import com.google.zxing.client.j2se.MatrixToImageWriter
import com.google.zxing.qrcode.QRCodeWriter import com.google.zxing.qrcode.QRCodeWriter
import org.openrndr.Extension import org.openrndr.Extension
import org.openrndr.Program import org.openrndr.Program
import org.openrndr.color.ColorRGBa import org.openrndr.color.ColorRGBa
import org.openrndr.draw.ColorBufferProxy import org.openrndr.draw.*
import org.openrndr.draw.Drawer
import org.openrndr.draw.isolated
import org.openrndr.extra.compositor.* import org.openrndr.extra.compositor.*
import org.openrndr.extra.fx.blend.Darken import org.openrndr.extra.fx.blend.Darken
import org.openrndr.extra.parameters.Parameter import org.openrndr.extra.parameters.Parameter
@@ -14,7 +11,6 @@ import org.openrndr.extra.parameters.ParameterType
import org.openrndr.extra.parameters.listParameters import org.openrndr.extra.parameters.listParameters
import org.openrndr.extras.imageFit.FitMethod import org.openrndr.extras.imageFit.FitMethod
import org.openrndr.extras.imageFit.imageFit import org.openrndr.extras.imageFit.imageFit
import org.openrndr.internal.colorBufferLoader
import org.openrndr.math.Vector2 import org.openrndr.math.Vector2
import org.openrndr.math.Vector3 import org.openrndr.math.Vector3
import org.openrndr.math.Vector4 import org.openrndr.math.Vector4
@@ -24,11 +20,8 @@ import org.rabbitcontrol.rcp.model.interfaces.IParameter
import org.rabbitcontrol.rcp.model.parameter.* import org.rabbitcontrol.rcp.model.parameter.*
import org.rabbitcontrol.rcp.transport.websocket.server.WebsocketServerTransporterNetty import org.rabbitcontrol.rcp.transport.websocket.server.WebsocketServerTransporterNetty
import java.awt.Color import java.awt.Color
import java.io.File
import java.net.InetSocketAddress import java.net.InetSocketAddress
import java.net.Socket import java.net.Socket
import java.nio.file.FileSystems
import java.nio.file.Path
import kotlin.reflect.KMutableProperty1 import kotlin.reflect.KMutableProperty1
@@ -38,8 +31,7 @@ class RabbitControlServer(private val showQRUntilClientConnects: Boolean = true,
private var parameterMap = mutableMapOf<IParameter, Pair<Any, Parameter>>() private var parameterMap = mutableMapOf<IParameter, Pair<Any, Parameter>>()
private var qrCodeImageProxy: ColorBufferProxy? = null private var qrCodeImage: ColorBuffer? = null
private var qrImagePath: Path? = null
private var qrOverlayComposition: Composite? = null private var qrOverlayComposition: Composite? = null
@@ -71,7 +63,7 @@ class RabbitControlServer(private val showQRUntilClientConnects: Boolean = true,
val ip = socket.localAddress.toString().replace("/", "") val ip = socket.localAddress.toString().replace("/", "")
val clientUrlWithHash = "https://rabbitcontrol.github.io/client/#$ip:$port" val clientUrlWithHash = "https://rabbitcontrol.github.io/client/#$ip:$port"
qrCodeImageProxy = getQRCodeImageProxy(barcodeText = clientUrlWithHash) qrCodeImage = getQRCodeImage(barcodeText = clientUrlWithHash)
println("RabbitControl Web Client: $clientUrlWithHash") println("RabbitControl Web Client: $clientUrlWithHash")
/** /**
@@ -139,7 +131,7 @@ class RabbitControlServer(private val showQRUntilClientConnects: Boolean = true,
} }
draw { draw {
qrCodeImageProxy!!.colorBuffer?.let { qrCodeImage?.let {
program.drawer.imageFit(it, program.width / 4.0,program.height / 4.0, program.width * .5, program.height * .5, 0.0,0.0, FitMethod.Contain) program.drawer.imageFit(it, program.width / 4.0,program.height / 4.0, program.width * .5, program.height * .5, 0.0,0.0, FitMethod.Contain)
} }
} }
@@ -221,17 +213,24 @@ class RabbitControlServer(private val showQRUntilClientConnects: Boolean = true,
override fun shutdown(program: Program) { override fun shutdown(program: Program) {
transporter.dispose() transporter.dispose()
// Delete the temporary file
File(qrImagePath!!.toUri()).delete()
} }
// FIXME is it possible to avoid the file entirely? private fun getQRCodeImage(barcodeText: String): ColorBuffer {
private fun getQRCodeImageProxy(barcodeText: String): ColorBufferProxy {
val qrCodeWriter = QRCodeWriter() val qrCodeWriter = QRCodeWriter()
val bitMatrix = qrCodeWriter.encode(barcodeText, BarcodeFormat.QR_CODE, 500, 500) val bitMatrix = qrCodeWriter.encode(barcodeText, BarcodeFormat.QR_CODE, 30, 30)
qrImagePath = FileSystems.getDefault().getPath("./qr.JPG") val cb = colorBuffer(bitMatrix.width, bitMatrix.height)
MatrixToImageWriter.writeToPath(bitMatrix, "JPG", qrImagePath) cb.filterMag = MagnifyingFilter.NEAREST
return colorBufferLoader.loadFromUrl(qrImagePath!!.toUri().toURL().toString()) val shad = cb.shadow
for (y in 0 until bitMatrix.width) {
for (x in 0 until bitMatrix.height) {
shad[x, y] = if (bitMatrix[x, y]) ColorRGBa.BLACK else ColorRGBa.WHITE
}
}
shad.upload()
return cb
} }
override fun afterDraw(drawer: Drawer, program: Program) { override fun afterDraw(drawer: Drawer, program: Program) {