From 1ec5ed879a7c6242ef94cc151e9a30ba4c751bb5 Mon Sep 17 00:00:00 2001 From: tangchao0503 <735056338@qq.com> Date: Tue, 27 Jun 2023 11:34:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=EF=BC=9A=E6=9B=B4=E6=94=B9bi?= =?UTF-8?q?n=E6=96=B9=E5=BC=8F=E4=B8=BA=E5=B9=B3=E5=9D=87=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source_Files/irisximeaimager.cpp | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/Source_Files/irisximeaimager.cpp b/Source_Files/irisximeaimager.cpp index e9c62c7..34454d8 100644 --- a/Source_Files/irisximeaimager.cpp +++ b/Source_Files/irisximeaimager.cpp @@ -43,9 +43,9 @@ bool Iris::IrisXimeaImager::setSpatialBin(int spatialBin) int Iris::IrisXimeaImager::getSpectralBin() { int spectralBin = 0; -// CE(xiGetParamInt(m_xiH, XI_PRM_BINNING_VERTICAL, &spectralBin)); + CE(xiGetParamInt(m_xiH, XI_PRM_BINNING_VERTICAL, &spectralBin)); - CE(xiGetParamInt(m_xiH, XI_PRM_DECIMATION_VERTICAL, &spectralBin)); +// CE(xiGetParamInt(m_xiH, XI_PRM_DECIMATION_VERTICAL, &spectralBin)); return spectralBin; } @@ -53,9 +53,9 @@ int Iris::IrisXimeaImager::getSpectralBin() int Iris::IrisXimeaImager::getSpatialBin() { int spatialBin = 0; -// CE(xiGetParamInt(m_xiH, XI_PRM_BINNING_HORIZONTAL, &spatialBin)); + CE(xiGetParamInt(m_xiH, XI_PRM_BINNING_HORIZONTAL, &spatialBin)); - CE(xiGetParamInt(m_xiH, XI_PRM_DECIMATION_HORIZONTAL, &spatialBin)); +// CE(xiGetParamInt(m_xiH, XI_PRM_DECIMATION_HORIZONTAL, &spatialBin)); return spatialBin; } @@ -347,13 +347,6 @@ uint64_t Iris::IrisXimeaImager::ticks_per_second() void Iris::IrisXimeaImager::set_spectral_bin(int new_spectral_bin) { - CE(xiSetParamInt(m_xiH, XI_PRM_BINNING_SELECTOR, XI_BIN_SELECT_HOST_CPU));//用：XI_BIN_SELECT_HOST_CPU；默认为XI_BIN_SELECT_SENSOR(会报错)，不可用：XI_BIN_SELECT_DEVICE_FPGA - - CE(xiSetParamInt(m_xiH, XI_PRM_BINNING_VERTICAL_MODE, XI_BIN_MODE_SUM)); - CE(xiSetParamInt(m_xiH, XI_PRM_BINNING_VERTICAL, new_spectral_bin)); - -// CE(xiSetParamInt(m_xiH, XI_PRM_BINNING_HORIZONTAL_MODE, XI_BIN_MODE_SUM)); -// CE(xiSetParamInt(m_xiH, XI_PRM_BINNING_HORIZONTAL, x)); } int Iris::IrisXimeaImager::get_spectral_bin()