补充:更改bin方式为平均模式

This commit is contained in:
tangchao0503
2023-06-27 11:34:59 +08:00
parent 81e8f4a169
commit 1ec5ed879a

View File

@ -43,9 +43,9 @@ bool Iris::IrisXimeaImager::setSpatialBin(int spatialBin)
int Iris::IrisXimeaImager::getSpectralBin() int Iris::IrisXimeaImager::getSpectralBin()
{ {
int spectralBin = 0; 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; return spectralBin;
} }
@ -53,9 +53,9 @@ int Iris::IrisXimeaImager::getSpectralBin()
int Iris::IrisXimeaImager::getSpatialBin() int Iris::IrisXimeaImager::getSpatialBin()
{ {
int spatialBin = 0; 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; return spatialBin;
} }
@ -347,13 +347,6 @@ uint64_t Iris::IrisXimeaImager::ticks_per_second()
void Iris::IrisXimeaImager::set_spectral_bin(int new_spectral_bin) 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() int Iris::IrisXimeaImager::get_spectral_bin()