ximea new param
- added CAP_PROP_XI_SENSOR_BOARD_TEMP parameter - added acquisition resetting for paramters that require it
This commit is contained in:
		| @@ -318,6 +318,7 @@ enum { CAP_PROP_XI_DOWNSAMPLING                                 = 400, // Change | |||||||
|        CAP_PROP_XI_CHIP_TEMP                                    = 468, // Camera sensor temperature |        CAP_PROP_XI_CHIP_TEMP                                    = 468, // Camera sensor temperature | ||||||
|        CAP_PROP_XI_HOUS_TEMP                                    = 469, // Camera housing tepmerature |        CAP_PROP_XI_HOUS_TEMP                                    = 469, // Camera housing tepmerature | ||||||
|        CAP_PROP_XI_HOUS_BACK_SIDE_TEMP                          = 590, // Camera housing back side tepmerature |        CAP_PROP_XI_HOUS_BACK_SIDE_TEMP                          = 590, // Camera housing back side tepmerature | ||||||
|  |        CAP_PROP_XI_SENSOR_BOARD_TEMP                            = 596, // Camera sensor board temperature | ||||||
|        CAP_PROP_XI_CMS                                          = 470, // Mode of color management system. |        CAP_PROP_XI_CMS                                          = 470, // Mode of color management system. | ||||||
|        CAP_PROP_XI_APPLY_CMS                                    = 471, // Enable applying of CMS profiles to xiGetImage (see XI_PRM_INPUT_CMS_PROFILE, XI_PRM_OUTPUT_CMS_PROFILE). |        CAP_PROP_XI_APPLY_CMS                                    = 471, // Enable applying of CMS profiles to xiGetImage (see XI_PRM_INPUT_CMS_PROFILE, XI_PRM_OUTPUT_CMS_PROFILE). | ||||||
|        CAP_PROP_XI_IMAGE_IS_COLOR                               = 474, // Returns 1 for color cameras. |        CAP_PROP_XI_IMAGE_IS_COLOR                               = 474, // Returns 1 for color cameras. | ||||||
|   | |||||||
| @@ -303,6 +303,7 @@ enum | |||||||
|     CV_CAP_PROP_XI_CHIP_TEMP                                    = 468, // Camera sensor temperature |     CV_CAP_PROP_XI_CHIP_TEMP                                    = 468, // Camera sensor temperature | ||||||
|     CV_CAP_PROP_XI_HOUS_TEMP                                    = 469, // Camera housing tepmerature |     CV_CAP_PROP_XI_HOUS_TEMP                                    = 469, // Camera housing tepmerature | ||||||
|     CV_CAP_PROP_XI_HOUS_BACK_SIDE_TEMP                          = 590, // Camera housing back side tepmerature |     CV_CAP_PROP_XI_HOUS_BACK_SIDE_TEMP                          = 590, // Camera housing back side tepmerature | ||||||
|  |     CV_CAP_PROP_XI_SENSOR_BOARD_TEMP                            = 596, // Camera sensor board temperature | ||||||
|     CV_CAP_PROP_XI_CMS                                          = 470, // Mode of color management system. |     CV_CAP_PROP_XI_CMS                                          = 470, // Mode of color management system. | ||||||
|     CV_CAP_PROP_XI_APPLY_CMS                                    = 471, // Enable applying of CMS profiles to xiGetImage (see XI_PRM_INPUT_CMS_PROFILE, XI_PRM_OUTPUT_CMS_PROFILE). |     CV_CAP_PROP_XI_APPLY_CMS                                    = 471, // Enable applying of CMS profiles to xiGetImage (see XI_PRM_INPUT_CMS_PROFILE, XI_PRM_OUTPUT_CMS_PROFILE). | ||||||
|     CV_CAP_PROP_XI_IMAGE_IS_COLOR                               = 474, // Returns 1 for color cameras. |     CV_CAP_PROP_XI_IMAGE_IS_COLOR                               = 474, // Returns 1 for color cameras. | ||||||
|   | |||||||
| @@ -568,6 +568,10 @@ bool CvCaptureCAM_XIMEA::setProperty( int property_id, double value ) | |||||||
|         ximea_param = "hous_back_side_temp"; |         ximea_param = "hous_back_side_temp"; | ||||||
|         value_type = xiTypeFloat; |         value_type = xiTypeFloat; | ||||||
|         break; |         break; | ||||||
|  |     case CV_CAP_PROP_XI_SENSOR_BOARD_TEMP: | ||||||
|  |         ximea_param = "sensor_board_temp"; | ||||||
|  |         value_type = xiTypeFloat; | ||||||
|  |         break; | ||||||
|     case CV_CAP_PROP_XI_CMS: |     case CV_CAP_PROP_XI_CMS: | ||||||
|         ximea_param = "cms"; |         ximea_param = "cms"; | ||||||
|         value_type = xiTypeEnum; |         value_type = xiTypeEnum; | ||||||
| @@ -676,6 +680,7 @@ bool CvCaptureCAM_XIMEA::setProperty( int property_id, double value ) | |||||||
|     case CV_CAP_PROP_XI_TRG_SELECTOR: |     case CV_CAP_PROP_XI_TRG_SELECTOR: | ||||||
|         ximea_param = "trigger_selector"; |         ximea_param = "trigger_selector"; | ||||||
|         value_type = xiTypeEnum; |         value_type = xiTypeEnum; | ||||||
|  |         doAcqReset = true; | ||||||
|         break; |         break; | ||||||
|     case CV_CAP_PROP_XI_ACQ_FRAME_BURST_COUNT: |     case CV_CAP_PROP_XI_ACQ_FRAME_BURST_COUNT: | ||||||
|         ximea_param = "acq_frame_burst_count"; |         ximea_param = "acq_frame_burst_count"; | ||||||
| @@ -780,14 +785,17 @@ bool CvCaptureCAM_XIMEA::setProperty( int property_id, double value ) | |||||||
|     case CV_CAP_PROP_XI_SENSOR_CLOCK_FREQ_HZ: |     case CV_CAP_PROP_XI_SENSOR_CLOCK_FREQ_HZ: | ||||||
|         ximea_param = "sensor_clock_freq_hz"; |         ximea_param = "sensor_clock_freq_hz"; | ||||||
|         value_type = xiTypeFloat; |         value_type = xiTypeFloat; | ||||||
|  |         doAcqReset = true; | ||||||
|         break; |         break; | ||||||
|     case CV_CAP_PROP_XI_SENSOR_CLOCK_FREQ_INDEX: |     case CV_CAP_PROP_XI_SENSOR_CLOCK_FREQ_INDEX: | ||||||
|         ximea_param = "sensor_clock_freq_index"; |         ximea_param = "sensor_clock_freq_index"; | ||||||
|         value_type = xiTypeInteger; |         value_type = xiTypeInteger; | ||||||
|  |         doAcqReset = true; | ||||||
|         break; |         break; | ||||||
|     case CV_CAP_PROP_XI_SENSOR_OUTPUT_CHANNEL_COUNT: |     case CV_CAP_PROP_XI_SENSOR_OUTPUT_CHANNEL_COUNT: | ||||||
|         ximea_param = "sensor_output_channel_count"; |         ximea_param = "sensor_output_channel_count"; | ||||||
|         value_type = xiTypeEnum; |         value_type = xiTypeEnum; | ||||||
|  |         doAcqReset = true; | ||||||
|         break; |         break; | ||||||
|     case CV_CAP_PROP_XI_FRAMERATE: |     case CV_CAP_PROP_XI_FRAMERATE: | ||||||
|         ximea_param = "framerate"; |         ximea_param = "framerate"; | ||||||
| @@ -808,6 +816,7 @@ bool CvCaptureCAM_XIMEA::setProperty( int property_id, double value ) | |||||||
|     case CV_CAP_PROP_XI_AVAILABLE_BANDWIDTH: |     case CV_CAP_PROP_XI_AVAILABLE_BANDWIDTH: | ||||||
|         ximea_param = "available_bandwidth"; |         ximea_param = "available_bandwidth"; | ||||||
|         value_type = xiTypeInteger; |         value_type = xiTypeInteger; | ||||||
|  |         doAcqReset = true; | ||||||
|         break; |         break; | ||||||
|     case CV_CAP_PROP_XI_BUFFER_POLICY: |     case CV_CAP_PROP_XI_BUFFER_POLICY: | ||||||
|         ximea_param = "buffer_policy"; |         ximea_param = "buffer_policy"; | ||||||
| @@ -816,14 +825,17 @@ bool CvCaptureCAM_XIMEA::setProperty( int property_id, double value ) | |||||||
|     case CV_CAP_PROP_XI_LUT_EN: |     case CV_CAP_PROP_XI_LUT_EN: | ||||||
|         ximea_param = "LUTEnable"; |         ximea_param = "LUTEnable"; | ||||||
|         value_type = xiTypeBoolean; |         value_type = xiTypeBoolean; | ||||||
|  |         doAcqReset = true; | ||||||
|         break; |         break; | ||||||
|     case CV_CAP_PROP_XI_LUT_INDEX: |     case CV_CAP_PROP_XI_LUT_INDEX: | ||||||
|         ximea_param = "LUTIndex"; |         ximea_param = "LUTIndex"; | ||||||
|         value_type = xiTypeInteger; |         value_type = xiTypeInteger; | ||||||
|  |         doAcqReset = true; | ||||||
|         break; |         break; | ||||||
|     case CV_CAP_PROP_XI_LUT_VALUE: |     case CV_CAP_PROP_XI_LUT_VALUE: | ||||||
|         ximea_param = "LUTValue"; |         ximea_param = "LUTValue"; | ||||||
|         value_type = xiTypeInteger; |         value_type = xiTypeInteger; | ||||||
|  |         doAcqReset = true; | ||||||
|         break; |         break; | ||||||
|     case CV_CAP_PROP_XI_TRG_DELAY: |     case CV_CAP_PROP_XI_TRG_DELAY: | ||||||
|         ximea_param = "trigger_delay"; |         ximea_param = "trigger_delay"; | ||||||
| @@ -886,6 +898,7 @@ bool CvCaptureCAM_XIMEA::setProperty( int property_id, double value ) | |||||||
|     case CV_CAP_PROP_XI_SENSOR_MODE: |     case CV_CAP_PROP_XI_SENSOR_MODE: | ||||||
|         ximea_param = "sensor_mode"; |         ximea_param = "sensor_mode"; | ||||||
|         value_type = xiTypeEnum; |         value_type = xiTypeEnum; | ||||||
|  |         doAcqReset = true; | ||||||
|         break; |         break; | ||||||
|     case CV_CAP_PROP_XI_HDR: |     case CV_CAP_PROP_XI_HDR: | ||||||
|         ximea_param = "hdr"; |         ximea_param = "hdr"; | ||||||
| @@ -1235,6 +1248,10 @@ double CvCaptureCAM_XIMEA::getProperty( int property_id ) const | |||||||
|         ximea_param = "hous_back_side_temp"; |         ximea_param = "hous_back_side_temp"; | ||||||
|         value_type = xiTypeFloat; |         value_type = xiTypeFloat; | ||||||
|         break; |         break; | ||||||
|  |     case CV_CAP_PROP_XI_SENSOR_BOARD_TEMP: | ||||||
|  |         ximea_param = "sensor_board_temp"; | ||||||
|  |         value_type = xiTypeFloat; | ||||||
|  |         break; | ||||||
|     case CV_CAP_PROP_XI_CMS: |     case CV_CAP_PROP_XI_CMS: | ||||||
|         ximea_param = "cms"; |         ximea_param = "cms"; | ||||||
|         value_type = xiTypeEnum; |         value_type = xiTypeEnum; | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Marian Zajko
					Marian Zajko