Skip to content

Commit

Permalink
used member variable
Browse files Browse the repository at this point in the history
  • Loading branch information
Fixstars-momoko committed Aug 30, 2024
1 parent 2cc6e59 commit fa462d3
Showing 1 changed file with 8 additions and 10 deletions.
18 changes: 8 additions & 10 deletions src/bb/image-io/rt_u3v.h
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ class U3V {
: gobject_(GOBJECT_FILE, true), aravis_(ARAVIS_FILE, true),
num_sensor_(num_sensor), frame_count_method_(FrameCountMethod::UNAVAILABLE),
frame_sync_(frame_sync), realtime_display_mode_(realtime_display_mode), is_gendc_(false), is_param_integer_(false),
devices_(num_sensor), buffers_(num_sensor), operation_mode_(OperationMode::Came1USB1), frame_cnt_(0), device_idx_(-1), disposed_(false), sim_mode_(sim_mode)
devices_(num_sensor), buffers_(num_sensor), operation_mode_(OperationMode::Came1USB1), frame_cnt_(0), device_idx_(-1), disposed_(false), sim_mode_(sim_mode), order_filp_(false)
{
init_symbols();
log::debug("U3V:: 24-08-29 : revert the order of AcquisitionStart and create stream as a default");
Expand Down Expand Up @@ -572,7 +572,7 @@ class U3V {
bool disposed_;
bool sim_mode_;


bool order_filp_;

}; // class U3V

Expand Down Expand Up @@ -877,7 +877,6 @@ class U3VRealCam: public U3V{
log::info("\tFake Device {}::{} : {}", i, "Command", "AcquisitionStart");
}
}else{
bool order_filp = false;
if (num_device < num_sensor_){
log::info("{} device is found; but the num_sensor is set to {}", num_device, num_sensor_);
throw std::runtime_error("Device number is not match, please set num_device again");
Expand Down Expand Up @@ -951,7 +950,7 @@ class U3VRealCam: public U3V{
}
if (is_gendc_){
frame_count_method_ = FrameCountMethod::TYPESPECIFIC3;
order_filp = true;
order_filp_ = true;
}
}
log::info("\tDevice/USB {}::{} : {}", i, "frame_count method is ",
Expand Down Expand Up @@ -1059,7 +1058,7 @@ class U3VRealCam: public U3V{
* must be pushed to DataStream objectsbefore DataStream acquisition is started.
* refer to https://github.com/AravisProject/aravis/blob/2ebaa8661761ea4bbc4df878aa67b4a9e1a9a3b9/docs/reference/aravis/porting-0.10.md
*/
if (order_filp){
if (order_filp_){
for (auto i=0; i<devices_.size(); ++i) {
arv_device_set_string_feature_value(devices_[i].device_, "AcquisitionMode", arv_acquisition_mode_to_string(ARV_ACQUISITION_MODE_CONTINUOUS), &err_);
if (err_) {
Expand All @@ -1085,7 +1084,7 @@ class U3VRealCam: public U3V{
}
}

if (! order_filp){
if (! order_filp_){
for (auto i=0; i<devices_.size(); ++i) {
arv_device_set_string_feature_value(devices_[i].device_, "AcquisitionMode", arv_acquisition_mode_to_string(ARV_ACQUISITION_MODE_CONTINUOUS), &err_);
if (err_) {
Expand Down Expand Up @@ -1391,7 +1390,6 @@ class U3VGenDC: public U3V{
log::info("\tFake Device {}::{} : {}", i, "Command", "AcquisitionStart");
}
}else{
bool order_filp = false;
if (num_sensor < num_sensor_){
log::info("{} camera is found; but the number is set to {}", num_sensor, num_sensor_);
throw std::runtime_error("Device number is not match, please set num_device again");
Expand Down Expand Up @@ -1475,7 +1473,7 @@ class U3VGenDC: public U3V{
}
if (is_gendc_){
frame_count_method_ = FrameCountMethod::TYPESPECIFIC3;
order_filp = true;
order_filp_ = true;
}
}
log::info("\tDevice/USB {}::{} : {}", i, "frame_count method is ",
Expand Down Expand Up @@ -1571,7 +1569,7 @@ class U3VGenDC: public U3V{
* must be pushed to DataStream objectsbefore DataStream acquisition is started.
* refer to https://github.com/AravisProject/aravis/blob/2ebaa8661761ea4bbc4df878aa67b4a9e1a9a3b9/docs/reference/aravis/porting-0.10.md
*/
if (order_filp){
if (order_filp_){
for (auto i=0; i<devices_.size(); ++i) {
arv_device_set_string_feature_value(devices_[i].device_, "AcquisitionMode", arv_acquisition_mode_to_string(ARV_ACQUISITION_MODE_CONTINUOUS), &err_);
if (err_) {
Expand All @@ -1597,7 +1595,7 @@ class U3VGenDC: public U3V{
}
}

if (! order_filp){
if (! order_filp_){
for (auto i=0; i<devices_.size(); ++i) {
arv_device_set_string_feature_value(devices_[i].device_, "AcquisitionMode", arv_acquisition_mode_to_string(ARV_ACQUISITION_MODE_CONTINUOUS), &err_);
if (err_) {
Expand Down

0 comments on commit fa462d3

Please sign in to comment.