diff --git a/huagao/Device/ImageMatQueue.cpp b/huagao/Device/ImageMatQueue.cpp index 235e77df..56ecee1e 100644 --- a/huagao/Device/ImageMatQueue.cpp +++ b/huagao/Device/ImageMatQueue.cpp @@ -510,8 +510,8 @@ void ImageMatQueue::proc() cv::flip(front, front, 0); cv::flip(front, front, 1); } - mats.push_back(back); - mats.push_back(front); + mats.push_back(scanParam.is_switchfrontback ? back : front); + mats.push_back(scanParam.is_switchfrontback ? front : back); remove(info.path.c_str()); } else diff --git a/huagao/GscanJsonConfig.cpp b/huagao/GscanJsonConfig.cpp index 0690381f..dd11cb81 100644 --- a/huagao/GscanJsonConfig.cpp +++ b/huagao/GscanJsonConfig.cpp @@ -740,7 +740,7 @@ json GscanJsonConfig::GscancapToJson(GScanCap& cap) js[CONFIG][AUTOCONTRAST] = cap.is_autocontrast; js[CONFIG][CONTRAST] = cap.contrast; js[CONFIG][GAMMA_] = cap.gamma; - + js[CONFIG][CROPMODEL] = cap.normalCrop; js[CONFIG][FILTERTYPE] = cap.filter; js[CONFIG][ENHANCECOLOR] = cap.enhance_color; js[CONFIG][SHARPENTYPE] = cap.sharpen; @@ -792,6 +792,7 @@ GScanCap GscanJsonConfig::JsonToGscancap(json& js) #ifdef UV cap.hardwarecaps.en_uv = json_cast(js[CONFIG][ENUVMODEL]).to_int(); #endif // UV + cap.normalCrop = json_cast(js[CONFIG][CROPMODEL]).to_bool(); cap.detachnoise.is_detachnoise = json_cast(js[CONFIG][DETACHNOISE]).to_int(); cap.detachnoise.detachnoise = json_cast(js[CONFIG][DETACHNOISEVALUE]).to_int(); cap.brightness = json_cast(js[CONFIG][BRIGHTNESS]).to_float(); @@ -837,6 +838,7 @@ json GscanJsonConfig::GetDefaultJson() "iPaperAlign": 0 , "iEnSizeCheck": false , "bAuotCrop": true , + "bcropmodel": false, "iResolution": 200 , "iDuplex": true , "bDiscardBlank": false , @@ -888,6 +890,7 @@ json GscanJsonConfig::GetDefaultJson() "iPaperAlign": 0 , "iEnSizeCheck": false , "bAuotCrop": true , + "bcropmodel": false, "iResolution": 200 , "iDuplex": true , "bDiscardBlank": false ,