Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.micro-manager.pycro-manager</groupId>
<artifactId>PycroManagerJava</artifactId>
<version>0.46.19</version>
<version>0.47.0</version>
<packaging>jar</packaging>
<name>Pycro-Manager Java</name>
<description>The Java components of Pycro-Manager</description>
Expand Down Expand Up @@ -148,4 +148,4 @@
</repository>
</distributionManagement>

</project>
</project>
19 changes: 19 additions & 0 deletions java/src/main/java/org/micromanager/remote/RemoteCoreCallback.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
}
}


}