Add support for exported data in Java & remove origin node

serivesmejia · serivesmejia · commit 7df0e72cc2a9 · 2026-05-18T23:53:44.000-06:00
diff --git a/EOCVSimPlugin/build.gradle b/EOCVSimPlugin/build.gradle
@@ -7,7 +7,11 @@ plugins {
     id "com.vanniktech.maven.publish"
 }
 
-apply from: '../build.common.gradle'
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(25)
+    }
+}
 
 components.java {
     tasks.named("shadowJar").configure {
@@ -154,6 +158,7 @@ dependencies {
     // compileOnly("org.deltacv.EOCV-Sim:EOCV-Sim:$eocvsim_version") { transitive = false }
     compileOnly("org.deltacv.EOCV-Sim:Common:$eocvsim_version") { transitive = false }
     compileOnly("org.deltacv.EOCV-Sim:Vision:$eocvsim_version")
+    compileOnly "org.openpnp:opencv:4.9.0-0"
 
     // ugh, coroutines, an internal method call of EOCV-Sim in PaperVisionTabPanel returns a Job
     // and the compiler freaks out if we don't have it accessible during compile time, we can make
diff --git a/EOCVSimPlugin/gradle/wrapper/gradle-wrapper.properties b/EOCVSimPlugin/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Fri May 15 19:44:35 CST 2026
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/EOCVSimPlugin/src/main/kotlin/org/deltacv/papervision/plugin/IpcPaperVisionMain.kt b/EOCVSimPlugin/src/main/kotlin/org/deltacv/papervision/plugin/IpcPaperVisionMain.kt
@@ -16,6 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+@file:Suppress("DEPRECATION")
+
 package org.deltacv.papervision.plugin
 
 import imgui.app.Application
diff --git a/EOCVSimPlugin/src/main/kotlin/org/deltacv/papervision/plugin/PaperVisionEOCVSimPlugin.kt b/EOCVSimPlugin/src/main/kotlin/org/deltacv/papervision/plugin/PaperVisionEOCVSimPlugin.kt
@@ -18,13 +18,13 @@
 
 package org.deltacv.papervision.plugin
 
-import io.github.deltacv.eocvsim.plugin.EOCVSimPlugin
-import io.github.deltacv.eocvsim.plugin.api.InputSourceApi
-import io.github.deltacv.eocvsim.plugin.api.PipelineManagerApi
-import io.github.deltacv.eocvsim.plugin.api.TunableFieldApi
-import io.github.deltacv.eocvsim.plugin.loader.FilePluginLoader
-import io.github.deltacv.eocvsim.plugin.loader.PluginSource
-import io.github.deltacv.eocvsim.virtualreflect.VirtualField
+import org.deltacv.eocvsim.plugin.EOCVSimPlugin
+import org.deltacv.eocvsim.plugin.api.InputSourceApi
+import org.deltacv.eocvsim.plugin.api.PipelineManagerApi
+import org.deltacv.eocvsim.plugin.api.TunableFieldApi
+import org.deltacv.eocvsim.plugin.loader.FilePluginLoader
+import org.deltacv.eocvsim.plugin.loader.PluginSource
+import org.deltacv.eocvsim.virtualreflect.VirtualField
 import org.deltacv.papervision.engine.client.message.*
 import org.deltacv.papervision.engine.client.response.ErrorResponse
 import org.deltacv.papervision.engine.client.response.OkResponse
diff --git a/EOCVSimPlugin/src/main/kotlin/org/deltacv/papervision/plugin/PaperVisionProcessRunner.kt b/EOCVSimPlugin/src/main/kotlin/org/deltacv/papervision/plugin/PaperVisionProcessRunner.kt
@@ -22,7 +22,7 @@ import com.github.serivesmejia.eocvsim.util.JavaProcess
 import com.github.serivesmejia.eocvsim.util.JavaProcess.SLF4JIOReceiver
 import com.github.serivesmejia.eocvsim.util.SysUtil
 import com.github.serivesmejia.eocvsim.util.event.EventHandler
-import io.github.deltacv.common.util.loggerForThis
+import org.deltacv.common.util.loggerForThis
 import org.deltacv.papervision.plugin.engine.EOCVSimIpcEngine
 import java.util.concurrent.Executors
 import java.util.concurrent.Future
diff --git a/EOCVSimPlugin/src/main/kotlin/org/deltacv/papervision/plugin/gui/eocvsim/NewProjectPanel.kt b/EOCVSimPlugin/src/main/kotlin/org/deltacv/papervision/plugin/gui/eocvsim/NewProjectPanel.kt
@@ -18,7 +18,7 @@
 
 package org.deltacv.papervision.plugin.gui.eocvsim
 
-import io.github.deltacv.common.util.loggerForThis
+import org.deltacv.common.util.loggerForThis
 import org.deltacv.papervision.plugin.project.PaperVisionProjectManager
 import java.awt.GridBagConstraints
 import java.awt.GridBagLayout
diff --git a/EOCVSimPlugin/src/main/kotlin/org/deltacv/papervision/plugin/gui/eocvsim/PaperVisionTabPanel.kt b/EOCVSimPlugin/src/main/kotlin/org/deltacv/papervision/plugin/gui/eocvsim/PaperVisionTabPanel.kt
@@ -19,7 +19,7 @@
 package org.deltacv.papervision.plugin.gui.eocvsim
 
 import com.formdev.flatlaf.demo.HintManager
-import io.github.deltacv.eocvsim.plugin.api.VisualizerSidebarApi
+import org.deltacv.eocvsim.plugin.api.VisualizerSidebarApi
 import org.deltacv.papervision.plugin.PaperVisionEOCVSimPlugin
 import org.deltacv.papervision.plugin.project.PaperVisionProjectTree
 import java.awt.Color
diff --git a/EOCVSimPlugin/src/main/kotlin/org/deltacv/papervision/plugin/previz/EOCVSimEngineImageStreamer.kt b/EOCVSimPlugin/src/main/kotlin/org/deltacv/papervision/plugin/previz/EOCVSimEngineImageStreamer.kt
@@ -20,14 +20,14 @@ package org.deltacv.papervision.plugin.previz
 
 import com.qualcomm.robotcore.util.ElapsedTime
 import com.qualcomm.robotcore.util.MovingStatistics
-import io.github.deltacv.eocvsim.stream.ImageStreamer
+import org.deltacv.eocvsim.stream.ImageStreamer
 import kotlinx.coroutines.*
 import org.deltacv.papervision.engine.PaperVisionEngine
 import org.deltacv.papervision.engine.ByteMessageTag
 import org.deltacv.papervision.util.MemoryPool
 import org.deltacv.papervision.util.loggerFor
-import io.github.deltacv.vision.external.util.extension.aspectRatio
-import io.github.deltacv.vision.external.util.extension.clipTo
+import org.deltacv.vision.external.util.extension.aspectRatio
+import org.deltacv.vision.external.util.extension.clipTo
 import org.deltacv.mackjpeg.MackJPEG
 import org.deltacv.mackjpeg.PixelFormat
 import org.deltacv.mackjpeg.exception.JPEGException
diff --git a/EOCVSimPlugin/src/main/kotlin/org/deltacv/papervision/plugin/previz/EOCVSimPrevizSession.kt b/EOCVSimPlugin/src/main/kotlin/org/deltacv/papervision/plugin/previz/EOCVSimPrevizSession.kt
@@ -18,11 +18,11 @@
 
 package org.deltacv.papervision.plugin.previz
 
-import io.github.deltacv.eocvsim.plugin.api.EOCVSimApi
-import io.github.deltacv.eocvsim.plugin.api.PipelineManagerApi
-import io.github.deltacv.eocvsim.stream.ImageStreamer
-import io.github.deltacv.eocvsim.virtualreflect.VirtualReflectContext
-import io.github.deltacv.eocvsim.virtualreflect.jvm.JvmVirtualReflection
+import org.deltacv.eocvsim.plugin.api.EOCVSimApi
+import org.deltacv.eocvsim.plugin.api.PipelineManagerApi
+import org.deltacv.eocvsim.stream.ImageStreamer
+import org.deltacv.eocvsim.virtualreflect.VirtualReflectContext
+import org.deltacv.eocvsim.virtualreflect.jvm.JvmVirtualReflection
 import org.deltacv.papervision.plugin.PaperVisionProcessRunner
 import org.deltacv.papervision.plugin.project.PaperVisionProjectManager
 import org.deltacv.papervision.util.loggerForThis
diff --git a/EOCVSimPlugin/src/main/kotlin/org/deltacv/papervision/plugin/previz/NoOpEngineImageStreamer.kt b/EOCVSimPlugin/src/main/kotlin/org/deltacv/papervision/plugin/previz/NoOpEngineImageStreamer.kt
@@ -18,7 +18,7 @@
 
 package org.deltacv.papervision.plugin.previz
 
-import io.github.deltacv.eocvsim.stream.ImageStreamer
+import org.deltacv.eocvsim.stream.ImageStreamer
 import org.opencv.core.Mat
 
 object NoOpEngineImageStreamer : ImageStreamer {
diff --git a/EOCVSimPlugin/src/main/kotlin/org/deltacv/papervision/plugin/previz/PaperVisionDefaultPipeline.kt b/EOCVSimPlugin/src/main/kotlin/org/deltacv/papervision/plugin/previz/PaperVisionDefaultPipeline.kt
@@ -20,7 +20,7 @@ package org.deltacv.papervision.plugin.previz
 
 import android.graphics.*
 import com.qualcomm.robotcore.eventloop.opmode.Disabled
-import io.github.deltacv.common.util.loggerForThis
+import org.deltacv.common.util.loggerForThis
 import org.firstinspires.ftc.robotcore.external.Telemetry
 import org.opencv.core.Mat
 import org.opencv.core.MatOfByte
diff --git a/EOCVSimPlugin/src/main/kotlin/org/deltacv/papervision/plugin/previz/StreamableNoReflectPipelineInstantiator.kt b/EOCVSimPlugin/src/main/kotlin/org/deltacv/papervision/plugin/previz/StreamableNoReflectPipelineInstantiator.kt
@@ -18,12 +18,12 @@
 
 package org.deltacv.papervision.plugin.previz
 
-import io.github.deltacv.eocvsim.pipeline.StreamableOpenCvPipeline
+import org.deltacv.eocvsim.pipeline.StreamableOpenCvPipeline
 import com.github.serivesmejia.eocvsim.pipeline.instantiator.DefaultPipelineInstantiator
-import io.github.deltacv.eocvsim.plugin.EOCVSimPlugin
-import io.github.deltacv.eocvsim.plugin.api.PipelineInstantiatorApi
-import io.github.deltacv.eocvsim.stream.ImageStreamer
-import io.github.deltacv.eocvsim.virtualreflect.jvm.JvmVirtualReflection
+import org.deltacv.eocvsim.plugin.EOCVSimPlugin
+import org.deltacv.eocvsim.plugin.api.PipelineInstantiatorApi
+import org.deltacv.eocvsim.stream.ImageStreamer
+import org.deltacv.eocvsim.virtualreflect.jvm.JvmVirtualReflection
 import org.deltacv.papervision.util.loggerForThis
 import org.firstinspires.ftc.robotcore.external.Telemetry
 import org.openftc.easyopencv.OpenCvPipeline
diff --git a/EOCVSimPlugin/src/main/kotlin/org/deltacv/papervision/plugin/project/PaperVisionProjectManager.kt b/EOCVSimPlugin/src/main/kotlin/org/deltacv/papervision/plugin/project/PaperVisionProjectManager.kt
@@ -20,9 +20,9 @@ package org.deltacv.papervision.plugin.project
 
 import com.github.serivesmejia.eocvsim.util.SysUtil
 import com.github.serivesmejia.eocvsim.util.extension.removeFromEnd
-import io.github.deltacv.common.util.loggerForThis
-import io.github.deltacv.eocvsim.plugin.api.EOCVSimApi
-import io.github.deltacv.eocvsim.sandbox.nio.SandboxFileSystem
+import org.deltacv.common.util.loggerForThis
+import org.deltacv.eocvsim.plugin.api.EOCVSimApi
+import org.deltacv.eocvsim.sandbox.nio.SandboxFileSystem
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonObject
diff --git a/EOCVSimPlugin/src/main/kotlin/org/deltacv/papervision/plugin/project/recovery/RecoveryDaemonProcessManager.kt b/EOCVSimPlugin/src/main/kotlin/org/deltacv/papervision/plugin/project/recovery/RecoveryDaemonProcessManager.kt
@@ -20,7 +20,7 @@ package org.deltacv.papervision.plugin.project.recovery
 
 import com.github.serivesmejia.eocvsim.util.JavaProcess
 import com.github.serivesmejia.eocvsim.util.JavaProcess.SLF4JIOReceiver
-import io.github.deltacv.common.util.loggerForThis
+import org.deltacv.common.util.loggerForThis
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import org.java_websocket.WebSocket
diff --git a/PaperVision/build.gradle b/PaperVision/build.gradle
@@ -35,9 +35,6 @@ dependencies {
 
     implementation "org.java-websocket:Java-WebSocket:1.5.2"
 
-    implementation("org.eclipse.jdt:org.eclipse.jdt.core:3.44.0")
-    implementation("org.eclipse.platform:org.eclipse.text:3.14.500")
-
     implementation "com.google.code.gson:gson:$gson_version"
     implementation "io.github.classgraph:classgraph:$classgraph_version"
 
diff --git a/PaperVision/src/main/kotlin/org/deltacv/papervision/codegen/GenNode.kt b/PaperVision/src/main/kotlin/org/deltacv/papervision/codegen/GenNode.kt
@@ -61,13 +61,13 @@ interface GenNode<S: CodeGenSession> : PolyglotGenerator<Unit, S> {
 
                 val name = genNodeName
 
-                logger.info("Generating code for ${name ?: this}")
+                logger.debug("Generating code for {}", name ?: this)
 
                 codeGen.sessions[this] = genCode(Unit, current)
 
                 codeGen.unmarkBusy(this)
 
-                logger.info("DONE generating code for ${name ?: this}")
+                logger.debug("DONE generating code for {}", name ?: this)
 
                 codeGenPropagate(current)
             }
@@ -83,7 +83,4 @@ interface GenNode<S: CodeGenSession> : PolyglotGenerator<Unit, S> {
 
     fun ScopeCtx.nameComment() = scope.nameComment()
 
-}
-
-
-
+}
diff --git a/PaperVision/src/main/kotlin/org/deltacv/papervision/codegen/build/Scope.kt b/PaperVision/src/main/kotlin/org/deltacv/papervision/codegen/build/Scope.kt
@@ -117,7 +117,6 @@ class Scope(
                          isStatic: Boolean = false, isFinal: Boolean = false) {
         newStatement()
         usedNames.add(variable.name)
-        importValue(variable)
 
         handleNullability(variable)
 
@@ -127,6 +126,10 @@ class Scope(
             isStatic, isFinal
         )
 
+        // import after asking language for the declaration because the language
+        // may add additional imports to the variable (e.g. annotation types).
+        importValue(variable)
+
         pair.first?.let {
             builder.appendLine("$tabs$it")
         }
diff --git a/PaperVision/src/main/kotlin/org/deltacv/papervision/codegen/build/language/jvm/JavaTypes.kt b/PaperVision/src/main/kotlin/org/deltacv/papervision/codegen/build/language/jvm/JavaTypes.kt
@@ -60,7 +60,7 @@ object JavaTypes {
 
     val Collections = Type("Collections", "java.util")
 
-    val LabelAnnotation = Type("Label", "io.github.deltacv.eocvsim.virtualreflect.jvm")
+    val LabelAnnotation = Type("Label", "org.deltacv.eocvsim.virtualreflect.jvm")
 
 }
 
diff --git a/PaperVision/src/main/kotlin/org/deltacv/papervision/codegen/build/language/jvm/JvmOpenCv.kt b/PaperVision/src/main/kotlin/org/deltacv/papervision/codegen/build/language/jvm/JvmOpenCv.kt
@@ -32,7 +32,7 @@ import org.deltacv.papervision.codegen.resolve.resolved
 object JvmOpenCv {
 
     val OpenCvPipeline = Type("OpenCvPipeline", "org.openftc.easyopencv")
-    val StreamableOpenCvPipeline = Type("StreamableOpenCvPipeline", "io.github.deltacv.eocvsim.pipeline")
+    val StreamableOpenCvPipeline = Type("StreamableOpenCvPipeline", "org.deltacv.eocvsim.pipeline")
 
     object Imgproc : Type("Imgproc", "org.opencv.imgproc") {
         val RETR_LIST = ConValue(StandardTypes.cint, "Imgproc.RETR_LIST").apply {
diff --git a/PaperVision/src/main/kotlin/org/deltacv/papervision/codegen/language/BaseLanguage.kt b/PaperVision/src/main/kotlin/org/deltacv/papervision/codegen/language/BaseLanguage.kt
@@ -26,12 +26,6 @@ import org.deltacv.papervision.codegen.build.language.jvm.JvmOpenCv
 import org.deltacv.papervision.codegen.csv
 import org.deltacv.papervision.util.loggerForThis
 import org.deltacv.papervision.util.toValidIdentifier
-import org.eclipse.jdt.core.JavaCore
-import org.eclipse.jdt.core.ToolFactory
-import org.eclipse.jdt.core.formatter.CodeFormatter
-import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants
-import org.eclipse.jface.text.Document
-import org.eclipse.text.edits.TextEdit
 
 open class BaseLanguage(
     val usesSemicolon: Boolean = true,
@@ -351,49 +345,7 @@ open class BaseLanguage(
             mainScope.scope(classBodyScope, indentOverride = 0)
         }
 
-        val code = mainScope.get()
-
-        // Format the generated code using Palantir Java Formatter
-        // Clean up some of the mess left by code-gen, we didn't bother
-        // to make it clean due to complexity, so this we'll see if this helps
-        formatJavaSource(code)
-    }
-
-    private fun formatJavaSource(source: String): String {
-        val options = HashMap<String, String>().apply {
-            putAll(JavaCore.getOptions())
-
-            put(
-                DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR,
-                JavaCore.SPACE
-            )
-            put(DefaultCodeFormatterConstants.FORMATTER_TAB_SIZE, "4")
-            put(DefaultCodeFormatterConstants.FORMATTER_LINE_SPLIT, "120")
-
-            put(JavaCore.COMPILER_SOURCE, JavaCore.VERSION_1_8)
-            put(JavaCore.COMPILER_COMPLIANCE, JavaCore.VERSION_1_8)
-            put(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, JavaCore.VERSION_1_8)
-        }
-
-        val formatter = ToolFactory.createCodeFormatter(options)
-
-        val edit: TextEdit = formatter.format(
-            CodeFormatter.K_COMPILATION_UNIT,
-            source,
-            0,
-            source.length,
-            0,
-            System.lineSeparator()
-        ) ?: return source
-
-        return try {
-            val document = Document(source)
-            edit.apply(document)
-            document.get()
-        } catch (e: Exception) {
-            logger.error("Error formatting generated code, returning unformatted code.", e)
-            source
-        }
+        mainScope.get()
     }
 
     override val trueValue by lazy { ConValue(BooleanType, "true") }
diff --git a/PaperVision/src/main/kotlin/org/deltacv/papervision/node/FlagsNode.kt b/PaperVision/src/main/kotlin/org/deltacv/papervision/node/FlagsNode.kt
@@ -30,7 +30,7 @@ import org.deltacv.papervision.serialization.v2.DataEncoder
     showInList = false
 )
 @CodecType
-class FlagsNode : InvisibleNode() {
+class FlagsNode : InvisibleNode(shouldDraw = false) {
 
     override val requestedId = 171
 
diff --git a/PaperVision/src/main/kotlin/org/deltacv/papervision/node/InvisibleNode.kt b/PaperVision/src/main/kotlin/org/deltacv/papervision/node/InvisibleNode.kt
@@ -23,30 +23,30 @@ import imgui.extension.imnodes.flag.ImNodesCol
 import org.deltacv.papervision.codegen.CodeGen
 import org.deltacv.papervision.codegen.NoSession
 import org.deltacv.papervision.gui.style.rgbaColor
-import org.deltacv.papervision.serialization.v1.data.SerializeIgnore
 import org.deltacv.papervision.serialization.v2.CodecType
 import org.deltacv.papervision.serialization.v2.DataEncoder
 
-@SerializeIgnore
 @CodecType
-open class InvisibleNode : Node<NoSession>(isDeletable = false) {
+open class InvisibleNode(private val shouldDraw: Boolean = true) : Node<NoSession>(isDeletable = false) {
 
     private val invisibleColor = rgbaColor(0, 0, 0, 0)
 
     override fun draw() {
-        ImNodes.pushColorStyle(ImNodesCol.NodeOutline, invisibleColor)
-        ImNodes.pushColorStyle(ImNodesCol.TitleBar, invisibleColor)
-        ImNodes.pushColorStyle(ImNodesCol.TitleBarHovered, invisibleColor)
-        ImNodes.pushColorStyle(ImNodesCol.TitleBarSelected, invisibleColor)
-        ImNodes.pushColorStyle(ImNodesCol.NodeBackground, invisibleColor)
-        ImNodes.pushColorStyle(ImNodesCol.NodeBackgroundHovered, invisibleColor)
-        ImNodes.pushColorStyle(ImNodesCol.NodeBackgroundSelected, invisibleColor)
-
-        ImNodes.beginNode(id)
-        ImNodes.endNode()
-
-        repeat(7) {
-            ImNodes.popColorStyle()
+        if(shouldDraw) {
+            ImNodes.pushColorStyle(ImNodesCol.NodeOutline, invisibleColor)
+            ImNodes.pushColorStyle(ImNodesCol.TitleBar, invisibleColor)
+            ImNodes.pushColorStyle(ImNodesCol.TitleBarHovered, invisibleColor)
+            ImNodes.pushColorStyle(ImNodesCol.TitleBarSelected, invisibleColor)
+            ImNodes.pushColorStyle(ImNodesCol.NodeBackground, invisibleColor)
+            ImNodes.pushColorStyle(ImNodesCol.NodeBackgroundHovered, invisibleColor)
+            ImNodes.pushColorStyle(ImNodesCol.NodeBackgroundSelected, invisibleColor)
+
+            ImNodes.beginNode(id)
+            ImNodes.endNode()
+
+            repeat(7) {
+                ImNodes.popColorStyle()
+            }
         }
     }
 
@@ -60,4 +60,3 @@ open class InvisibleNode : Node<NoSession>(isDeletable = false) {
 }
 
 
-
diff --git a/PaperVision/src/main/kotlin/org/deltacv/papervision/node/transform/ComposeRotRectNode.kt b/PaperVision/src/main/kotlin/org/deltacv/papervision/node/transform/ComposeRotRectNode.kt
diff --git a/PaperVision/src/main/kotlin/org/deltacv/papervision/node/vision/EntrypointNodes.kt b/PaperVision/src/main/kotlin/org/deltacv/papervision/node/vision/EntrypointNodes.kt
diff --git a/PaperVision/src/main/kotlin/org/deltacv/papervision/node/vision/imageproc/CvtColorNode.kt b/PaperVision/src/main/kotlin/org/deltacv/papervision/node/vision/imageproc/CvtColorNode.kt
diff --git a/PaperVision/src/main/resources/lang_pv.csv b/PaperVision/src/main/resources/lang_pv.csv
diff --git a/build.gradle b/build.gradle
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
diff --git a/settings.gradle b/settings.gradle
