diff --git a/Source_Files/configfile.cpp b/Source_Files/configfile.cpp index 2f76fad..91c589d 100644 --- a/Source_Files/configfile.cpp +++ b/Source_Files/configfile.cpp @@ -436,6 +436,10 @@ bool Configfile::createConfigFile() ximeadll.add("buffer_policy", Setting::TypeInt) = 0; ximeadll.add("acq_buffer_size", Setting::TypeInt) = 400; + Setting &push_flow_param = root.add("push_flow_param", Setting::TypeGroup); + push_flow_param.add("flow_switch", Setting::TypeInt) = 1; + push_flow_param.add("rgb_height", Setting::TypeInt) = 720; + push_flow_param.add("framerate_video", Setting::TypeInt) = 5; // Write out the new configuration. QString output_file = "/media/nvme/300TC/config/ximea.cfg"; diff --git a/Source_Files/main.cpp b/Source_Files/main.cpp index 50f4dd6..be42197 100644 --- a/Source_Files/main.cpp +++ b/Source_Files/main.cpp @@ -3,7 +3,7 @@ int main(int argc, char *argv[]) { - std::cout<<"ximeaAirborneSystem 版本:"<< "43." < wavelengths; - if (m_imager.getSpectralBin() == 1) + for (int i = getWindowStartBand(); i < getWindowEndBand(); i++) { - for (int i = getWindowStartBand(); i < getWindowEndBand(); i++) - { - wavelengths.push_back(geWavelengthAtBand(i)); - } - } - else if (m_imager.getSpectralBin() == 2) - { - for (int i = m_iOffsetyOfSpectralBin2; i < m_iOffsetyOfSpectralBin2 + m_iHeightOfSpectralBin2; i++) - { - if (i*2 + 1 > m_iOffsetyOfSpectralBin1 + m_iHeightOfSpectralBin1) - { - printf("XimeaImager::writeHdr 出现错误:窗口中,光谱 bin1 波段数小于 bin2 的 2 倍。\n"); - break; - } - wavelengths.push_back((geWavelengthAtBand(i*2) + geWavelengthAtBand(i*2 + 1)) / 2); - } + wavelengths.push_back(geWavelengthAtBand(i)); } //envi打开文件时的红绿蓝波长(nm) @@ -801,41 +786,16 @@ void XimeaImager::writeHdr() hdrFileHandle << "wavelength = {"; //hdrFileHandle << std::setprecision(5); - if (m_imager.getSpectralBin() == 1) + for (int i = getWindowStartBand(); i < getWindowEndBand(); i++) { - for (int i = getWindowStartBand(); i < getWindowEndBand(); i++) + hdrFileHandle << geWavelengthAtBand(i); + if (i < getWindowEndBand() - 1) + hdrFileHandle << ", "; + else { - hdrFileHandle << geWavelengthAtBand(i); - if (i < getWindowEndBand() - 1) - hdrFileHandle << ", "; - else - { - printf("头文件中写入了多少个波段:%d\n",i-getWindowStartBand()+1);//??????????????? - } + printf("头文件中写入了多少个波段:%d\n",i-getWindowStartBand()+1);//??????????????? } } - else if (m_imager.getSpectralBin() == 2) - { - int counter = 0; - for (int i = m_iOffsetyOfSpectralBin2; i < m_iOffsetyOfSpectralBin2 + m_iHeightOfSpectralBin2; i++) - { - if (i*2 + 1 > m_iOffsetyOfSpectralBin1 + m_iHeightOfSpectralBin1) - { - printf("XimeaImager::writeHdr 出现错误:窗口中,光谱 bin1 波段数小于 bin2 的 2 倍。\n"); - break; - } - - hdrFileHandle << (geWavelengthAtBand(i*2) + geWavelengthAtBand(i*2 + 1)) / 2; - counter++; - if (i < m_iOffsetyOfSpectralBin2 + m_iHeightOfSpectralBin2 - 1) - hdrFileHandle << ", "; - else - { - printf("头文件中写入了多少个波段:%d\n", counter); - } - } - } - hdrFileHandle << "}\n"; hdrFileHandle.close();