cleaned up after merge

git-svn-id: https://valelab.ucsf.edu/svn/micromanager2/trunk@1569 d0ab736e-dc22-4aeb-8dc9-08def0aa14fd
Lars-Kool · Sep 24, 2008 · 703dea5 · 703dea5
1 parent 47e447b
commit 703dea5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 31 deletions.
diff --git a/DeviceAdapters/Hamamatsu/Hamamatsu.cpp b/DeviceAdapters/Hamamatsu/Hamamatsu.cpp
@@ -524,34 +524,6 @@ int CHamamatsu::OnPhotonImagingMode(MM::PropertyBase* pProp, MM::ActionType eAct
    return DEVICE_OK;
 }
 
-// Output Trigger Polarity
-int CHamamatsu::OnOutputTriggerPolarity(MM::PropertyBase* pProp, MM::ActionType eAct)
-{
-   if (eAct == MM::AfterSet)
-   {
-      double mode;
-      pProp->Get(mode);
-      // Not sure if we need to shut down the image buffer
-      int ret = ShutdownImageBuffer();
-      if (ret != DEVICE_OK)
-         return ret;
-      if (!dcam_setpropertyvalue(m_hDCAM, DCAM_IDPROP_OUTPUTTRIGGER_POLARITY, mode))
-         return ReportError("Error in dcam_setpropertyvalue (outputtriggerpolarity): ");
-
-      ret = ResizeImageBuffer();
-      if (ret != DEVICE_OK)
-         return ret;
-   }
-   else if (eAct == MM::BeforeGet)
-   {
-      double polarity;
-      if (!dcam_getpropertyvalue(m_hDCAM, DCAM_IDPROP_OUTPUTTRIGGER_POLARITY, &polarity))
-         return ReportError("Error in dcam_getpropertyvalue (outputtriggerpolarity): ");
-      pProp->Set(polarity);
-   }
-   return DEVICE_OK;
-}
-
 // ReadoutTime
 int CHamamatsu::OnReadoutTime(MM::PropertyBase* pProp, MM::ActionType eAct)
 {

diff --git a/DeviceAdapters/NikonTE2000/NikonTE2000.cpp b/DeviceAdapters/NikonTE2000/NikonTE2000.cpp
@@ -1736,6 +1736,8 @@ int PFSOffset::SetPositionSteps(long steps)
    int ret = g_hub.SetPFocusPosition(*this, *GetCoreCallback(), steps);
    if (ret != 0)
       return ret;
+
+   return DEVICE_OK;
 }
 
 int PFSOffset::GetPositionSteps(long& steps)

diff --git a/MMCore/CoreCallback.cpp b/MMCore/CoreCallback.cpp
@@ -246,17 +246,17 @@ const char* CoreCallback::GetImage()
    }
 }
 
-int CoreCallback::GetImageDimensions(int& width, int& height, int& depth)
+int CoreCallback::GetImageDimensions(int& /*width*/, int& /*height*/, int& /*depth*/)
 {
    return DEVICE_OK;
 }
 
-int CoreCallback::GetFocusPosition(double& pos)
+int CoreCallback::GetFocusPosition(double& /*pos*/)
 {
    return DEVICE_OK;
 }
 
-int CoreCallback::SetFocusPosition(double pos)
+int CoreCallback::SetFocusPosition(double /*pos*/)
 {
    return DEVICE_OK;
 }