调整自动识别文字方向导致 全变成横向
This commit is contained in:
parent
7c51604abb
commit
61db49f534
|
@ -9,11 +9,6 @@ namespace Device {
|
||||||
InitPaperMap();
|
InitPaperMap();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
PaperSize::~PaperSize()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void PaperSize::InitPaperMap()
|
void PaperSize::InitPaperMap()
|
||||||
{
|
{
|
||||||
papersize.insert({ A3,SIZE{297,420} });
|
papersize.insert({ A3,SIZE{297,420} });
|
||||||
|
@ -47,33 +42,23 @@ namespace Device {
|
||||||
SIZE PaperSize::GetPaperSize(DWORD paperType, float dpi,int orentation)
|
SIZE PaperSize::GetPaperSize(DWORD paperType, float dpi,int orentation)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (papersize.find((TwSS)paperType) != papersize.end() && (dpi > 99 && dpi < 601)) {
|
if (papersize.find((TwSS)paperType) != papersize.end() && (dpi > 99 && dpi < 601))
|
||||||
|
{
|
||||||
SIZE resize{2338,3307};
|
SIZE resize{2338,3307};
|
||||||
|
long cx = papersize[(TwSS)paperType].cx * dpi / 25.4;
|
||||||
if (orentation == 0){
|
long cy = papersize[(TwSS)paperType].cy * dpi / 25.4;
|
||||||
resize.cx = papersize[(TwSS)paperType].cx * dpi / 25.4;
|
if (orentation == 0)
|
||||||
resize.cy = papersize[(TwSS)paperType].cy * dpi / 25.4;
|
{
|
||||||
return resize;
|
resize.cx = cx;
|
||||||
|
resize.cy = cy;
|
||||||
}
|
}
|
||||||
else{
|
else
|
||||||
resize.cy = papersize[(TwSS)paperType].cx * dpi / 25.4;
|
{
|
||||||
resize.cx = papersize[(TwSS)paperType].cy * dpi / 25.4;
|
resize.cx = cy;
|
||||||
return resize;
|
resize.cy = cx;
|
||||||
}
|
}
|
||||||
|
return resize;
|
||||||
}
|
}
|
||||||
return SIZE{2338, 3307};
|
return SIZE{2338, 3307};
|
||||||
//auto iter = dpiDct.find({(TwSS)paperType, dpi});
|
|
||||||
//if (iter != dpiDct.end()) {
|
|
||||||
// if (orentation == 0)
|
|
||||||
// return iter->second;
|
|
||||||
// else if(orentation == 3)
|
|
||||||
// {
|
|
||||||
// SIZE size;
|
|
||||||
// size.cx = iter->second.cy;
|
|
||||||
// size.cy = iter->second.cx;
|
|
||||||
// return size;
|
|
||||||
// }
|
|
||||||
//}
|
|
||||||
//return SIZE(2338, 3307);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -32,7 +32,6 @@ namespace Device {
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
PaperSize(int pid);
|
PaperSize(int pid);
|
||||||
~PaperSize();
|
|
||||||
private:
|
private:
|
||||||
void InitPaperMap();
|
void InitPaperMap();
|
||||||
std::map<TwSS, SIZE> papersize;
|
std::map<TwSS, SIZE> papersize;
|
||||||
|
|
|
@ -967,8 +967,8 @@ void hg_scanner_200::writedown_image_configuration(void)
|
||||||
|
|
||||||
if (is_lateral(image_prc_param_.bits.paper))
|
if (is_lateral(image_prc_param_.bits.paper))
|
||||||
ic.paperAlign = Rot270;
|
ic.paperAlign = Rot270;
|
||||||
else if (image_prc_param_.bits.text_direction == TEXT_DIRECTION_AUTO)
|
// else if (image_prc_param_.bits.text_direction == TEXT_DIRECTION_AUTO)
|
||||||
ic.paperAlign = AutoTextOrientation;
|
// ic.paperAlign = AutoTextOrientation;
|
||||||
else
|
else
|
||||||
ic.paperAlign = Rot0;
|
ic.paperAlign = Rot0;
|
||||||
|
|
||||||
|
|
|
@ -792,8 +792,8 @@ int hg_scanner_239::writedown_image_configuration(void)
|
||||||
|
|
||||||
if (is_lateral(image_prc_param_.bits.paper))
|
if (is_lateral(image_prc_param_.bits.paper))
|
||||||
ic.paperAlign = Rot270;
|
ic.paperAlign = Rot270;
|
||||||
else if (image_prc_param_.bits.text_direction == TEXT_DIRECTION_AUTO)
|
// else if (image_prc_param_.bits.text_direction == TEXT_DIRECTION_AUTO)
|
||||||
ic.paperAlign = AutoTextOrientation;
|
// ic.paperAlign = AutoTextOrientation;
|
||||||
else
|
else
|
||||||
ic.paperAlign = Rot0;
|
ic.paperAlign = Rot0;
|
||||||
|
|
||||||
|
|
|
@ -903,8 +903,8 @@ void hg_scanner_300::writedown_image_configuration(void)
|
||||||
|
|
||||||
if (is_lateral(image_prc_param_.bits.paper))
|
if (is_lateral(image_prc_param_.bits.paper))
|
||||||
ic.paperAlign = Rot270;
|
ic.paperAlign = Rot270;
|
||||||
else if (image_prc_param_.bits.text_direction == TEXT_DIRECTION_AUTO)
|
// else if (image_prc_param_.bits.text_direction == TEXT_DIRECTION_AUTO)
|
||||||
ic.paperAlign = AutoTextOrientation;
|
// ic.paperAlign = AutoTextOrientation;
|
||||||
else
|
else
|
||||||
ic.paperAlign = Rot0;
|
ic.paperAlign = Rot0;
|
||||||
|
|
||||||
|
|
|
@ -908,8 +908,8 @@ void hg_scanner_400::writedown_image_configuration(void)
|
||||||
|
|
||||||
if (is_lateral(image_prc_param_.bits.paper))
|
if (is_lateral(image_prc_param_.bits.paper))
|
||||||
ic.paperAlign = Rot270;
|
ic.paperAlign = Rot270;
|
||||||
else if (image_prc_param_.bits.text_direction == TEXT_DIRECTION_AUTO)
|
// else if (image_prc_param_.bits.text_direction == TEXT_DIRECTION_AUTO)
|
||||||
ic.paperAlign = AutoTextOrientation;
|
// ic.paperAlign = AutoTextOrientation;
|
||||||
else
|
else
|
||||||
ic.paperAlign = Rot0;
|
ic.paperAlign = Rot0;
|
||||||
ic.en_sizecheck = dsp_config.params.sizedetece;
|
ic.en_sizecheck = dsp_config.params.sizedetece;
|
||||||
|
|
|
@ -426,7 +426,6 @@ namespace hg_imgproc
|
||||||
|
|
||||||
SIZE temp_Size = papersize_.GetPaperSize(img_conf_.papertype,200,img_conf_.paperAlign);
|
SIZE temp_Size = papersize_.GetPaperSize(img_conf_.papertype,200,img_conf_.paperAlign);
|
||||||
cv::Size cvSize(temp_Size.cx, temp_Size.cy);
|
cv::Size cvSize(temp_Size.cx, temp_Size.cy);
|
||||||
|
|
||||||
CImageApplyAutoCrop crop(img_conf_.is_autocrop,img_conf_.autodescrew,img_conf_.fillbackground,cvSize,img_conf_.is_convex,img_conf_.isfillcolor);
|
CImageApplyAutoCrop crop(img_conf_.is_autocrop,img_conf_.autodescrew,img_conf_.fillbackground,cvSize,img_conf_.is_convex,img_conf_.isfillcolor);
|
||||||
|
|
||||||
crop.apply(mats,img_conf_.is_duplex);
|
crop.apply(mats,img_conf_.is_duplex);
|
||||||
|
|
Loading…
Reference in New Issue