Merge pull request #127 from henrypinkard/main

add system state cache to summary metadata

pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.micro-manager.acqengj</groupId>
     <artifactId>AcqEngJ</artifactId>
-    <version>0.38.2</version>
+    <version>0.39.0</version>
     <packaging>jar</packaging>
      <name>AcqEngJ</name>
     <description>Java-based Acquisition engine for Micro-Manager</description>

src/main/java/org/micromanager/acqj/main/AcqEngMetadata.java

@@ -26,6 +26,8 @@
 import java.util.Iterator;
 import java.util.TreeSet;
 
+import mmcorej.Configuration;
+import mmcorej.PropertySetting;
 import mmcorej.org.json.JSONArray;
 import mmcorej.org.json.JSONException;
 import mmcorej.org.json.JSONObject;
@@ -85,6 +87,8 @@ public class AcqEngMetadata {
    public static final String Z_AXIS = "z";
    public static final String POSITION_AXIS = "position";
    public static final String TAGS = "tags";
+   public static final String SYSTEM_STATE_CACHE = "SystemStateCache";
+
 
    private static final String ACQUISITION_EVENT = "Event";
 
@@ -190,11 +194,10 @@ public static JSONObject makeSummaryMD(AcquisitionAPI acq) {
          throw new RuntimeException("Camera byte depth cannot be zero");
       }
       AcqEngMetadata.setPixelTypeFromByteDepth(summary, byteDepth);
-//      AcqEngMetadata.setBitDepth(summary, (int) Engine.getCore().getImageBitDepth());
-//      AcqEngMetadata.setWidth(summary, (int) Engine.getCore().getImageWidth());
-//      AcqEngMetadata.setHeight(summary, (int) Engine.getCore().getImageHeight());
       AcqEngMetadata.setPixelSizeUm(summary, Engine.getCore().getPixelSizeUm());
 
+
+
       /////// Info about core devices ////////
       try {
          AcqEngMetadata.setCoreXY(summary, Engine.getCore().getXYStageDevice());
@@ -217,6 +220,21 @@ public static JSONObject makeSummaryMD(AcquisitionAPI acq) {
          AcqEngMetadata.setAffineTransformString(summary, "Undefined");
       }
 
+      // Add system state cache
+      try {
+         Configuration config = Engine.getCore().getSystemStateCache();
+         JSONObject cache = new JSONObject();
+         for (int i = 0; i < config.size(); ++i) {
+            PropertySetting setting = config.getSetting(i);
+            String key = setting.getDeviceLabel() + "-" + setting.getPropertyName();
+            String value = setting.getPropertyValue();
+            cache.put(key, value);
+         }
+         summary.put(SYSTEM_STATE_CACHE, cache);
+      } catch (Exception e) {
+         throw new RuntimeException("problem getting system state cache");
+      }
+
       return summary;
    }