git-svn-id: https://valelab.ucsf.edu/svn/micromanager2/trunk@13639 d0ab736e-dc22-4aeb-8dc9-08def0aa14fd

Author: arthur

MMCore/CoreCallback.cpp

@@ -219,7 +219,7 @@ int CoreCallback::OnPropertyChanged(const MM::Device* device, const char* propNa
          core_->stateCache_.addSetting(*ps);
       }
       core_->externalCallback_->onPropertyChanged(label, propName, value);
-      
+
       // find all configs that contain this property and callback to indicate 
       // that the config group changed
       // TODO: assess whether performace is better by maintaining a map tying 
@@ -349,6 +349,21 @@ int CoreCallback::OnExposureChanged(const MM::Device* device, double newExposure
    return DEVICE_OK;
 }
 
+/**
+ * Handler for SLM exposure update
+ * 
+ */
+int CoreCallback::OnSLMExposureChanged(const MM::Device* device, double newExposure)
+{
+   if (core_->externalCallback_) {
+      MMThreadGuard g(*pValueChangeLock_);
+      char label[MM::MaxStrLength];
+      device->GetLabel(label);
+      core_->externalCallback_->onSLMExposureChanged(label, newExposure);
+   }
+   return DEVICE_OK;
+}
+
 /**
  * Handler for magnifier changer
  * 

MMCore/CoreCallback.h

@@ -171,6 +171,7 @@ class CoreCallback : public MM::Core
    int OnXYStagePositionChanged(const MM::Device* device, double xpos, double ypos);
    int OnFinished(const MM::Device* /* caller */);
    int OnExposureChanged(const MM::Device* device, double newExposure);
+   int OnSLMExposureChanged(const MM::Device* device, double newExposure);
    int OnMagnifierChanged(const MM::Device* device);
 
 

MMCore/MMCore.cpp

@@ -79,8 +79,8 @@ using namespace std;
 
 // version info
 const int MMCore_versionMajor = 2;
-const int MMCore_versionMinor = 3;
-const int MMCore_versionBuild = 2;
+const int MMCore_versionMinor = 4;
+const int MMCore_versionBuild = 0;
 
 
 // Legacy macros for logging.

MMCore/MMEventCallback.h

@@ -85,4 +85,9 @@ class MMEventCallback
       std::cout << "onExposureChanged()" << name << " " << newExposure << "\n";
    }
 
+   virtual void onSLMExposureChanged(char* name, double newExposure)
+   {
+      std::cout << "onSLMExposureChanged()" << name << " " << newExposure << "\n";
+   }
+
 };

MMDevice/DeviceBase.h

@@ -1110,6 +1110,15 @@ class CDeviceBase : public T
       return DEVICE_NO_CALLBACK_REGISTERED;
    }
 
+   /*
+    */
+   int OnSLMExposureChanged(double exposure)
+   {
+      if (callback_)
+         return callback_->OnSLMExposureChanged(this, exposure);
+      return DEVICE_NO_CALLBACK_REGISTERED;
+   }
+
    /**
     */
    int OnMagnifierChanged()

MMDevice/MMDevice.h

@@ -27,7 +27,7 @@
 // Header version
 // If any of the class definitions changes, the interface version
 // must be incremented
-#define DEVICE_INTERFACE_VERSION 59
+#define DEVICE_INTERFACE_VERSION 60
 ///////////////////////////////////////////////////////////////////////////////
 
 
@@ -1197,6 +1197,10 @@ namespace MM {
        * When the exposure time has changed, use this callback to inform the UI
        */
       virtual int OnExposureChanged(const Device* caller, double newExposure) = 0;
+      /**
+       * When the SLM exposure time has changed, use this callback to inform the UI
+       */
+      virtual int OnSLMExposureChanged(const Device* caller, double newExposure) = 0;
       /**
        * Magnifiers can use this to signal changes in magnification
        */