diff --git a/java/pom.xml b/java/pom.xml index ae5abb19..3a8d1b96 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.micro-manager.pycro-manager PycroManagerJava - 0.46.19 + 0.47.0 jar Pycro-Manager Java The Java components of Pycro-Manager @@ -148,4 +148,4 @@ - \ No newline at end of file + diff --git a/java/src/main/java/org/micromanager/remote/RemoteCoreCallback.java b/java/src/main/java/org/micromanager/remote/RemoteCoreCallback.java index 3c62ee6c..9442dcac 100644 --- a/java/src/main/java/org/micromanager/remote/RemoteCoreCallback.java +++ b/java/src/main/java/org/micromanager/remote/RemoteCoreCallback.java @@ -24,6 +24,7 @@ import java.util.concurrent.LinkedBlockingDeque; import java.util.function.Function; import mmcorej.CMMCore; +import mmcorej.MMCoreJJNI; import mmcorej.MMEventCallback; import mmcorej.org.json.JSONArray; import mmcorej.org.json.JSONException; @@ -262,4 +263,22 @@ public void onSLMExposureChanged(String deviceName, double exposure) { } } + public void onCameraEvent(String name, String eventName, long timestamp, long eventId, String data) { + try { + JSONObject message = new JSONObject(); + message.put("name", "CameraEvent"); + JSONArray args = new JSONArray(); + args.put(eventName); + args.put(timestamp); + args.put(eventId); + args.put(data); + message.put("arguments", args); + eventList_.addLast(message); + } catch (JSONException e) { + e.printStackTrace(); + core_.logMessage(e.toString()); + } + } + + } \ No newline at end of file