mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

genesys: Deduplicate dumping of Genesys_Current_Setup to logs

merge-requests/82/head
Povilas Kanapickas 2019-06-08 14:03:59 +03:00
rodzic 7020001ba7
commit efd7723a4f
8 zmienionych plików z 39 dodań i 83 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

24
backend/genesys_gl124.cc
Wyświetl plik

@ -1532,17 +1532,8 @@ gl124_calculate_current_setup (Genesys_Device * dev, const Genesys_Sensor& senso
int optical_res; int optical_res;
DBG(DBG_info, DBG(DBG_info, "%s ", __func__);
"%s:\n" debug_dump(DBG_info, dev->settings);
"Resolution: %ux%uDPI\n"
"Lines : %u\n"
"PPL : %u\n"
"Startpos : %.3f/%.3f\n"
"Scan mode : %d\n\n",
__func__,
dev->settings.xres,
dev->settings.yres, dev->settings.lines, dev->settings.pixels,
dev->settings.tl_x, dev->settings.tl_y, static_cast<unsigned>(dev->settings.scan_mode));
/* channels */ /* channels */
if (dev->settings.scan_mode == ScanColorMode::COLOR_SINGLE_PASS) if (dev->settings.scan_mode == ScanColorMode::COLOR_SINGLE_PASS)
@ -2490,15 +2481,8 @@ gl124_init_regs_for_scan (Genesys_Device * dev, const Genesys_Sensor& sensor)
SANE_Status status; SANE_Status status;
DBG(DBG_info, "%s:\nResolution: %ux%uDPI\n" DBG(DBG_info, "%s ", __func__);
"Lines : %u\npixels : %u\nStartpos : %.3f/%.3f\nScan mode : %d\n\n", __func__, debug_dump(DBG_info, dev->settings);
dev->settings.xres,
dev->settings.yres,
dev->settings.lines,
dev->settings.pixels,
dev->settings.tl_x,
dev->settings.tl_y,
static_cast<unsigned>(dev->settings.scan_mode));
/* wait for motor to stop first */ /* wait for motor to stop first */
status = sanei_genesys_get_status (dev, &val); status = sanei_genesys_get_status (dev, &val);

9
backend/genesys_gl646.cc
Wyświetl plik

@ -2876,13 +2876,8 @@ setup_for_scan (Genesys_Device * dev,
uint16_t startx = 0, endx, pixels; uint16_t startx = 0, endx, pixels;
int move = 0; int move = 0;
DBGSTART; DBG(DBG_info, "%s ", __func__);
DBG(DBG_info, "%s settings:\nResolution: %ux%uDPI\n" debug_dump(DBG_info, dev->settings);
"Lines : %u\nPixels : %u\nStartpos : %.3f/%.3f\nScan mode : %d\nScan method: %s\n\n",
__func__,
settings.xres, settings.yres, settings.lines, settings.pixels,
settings.tl_x, settings.tl_y, static_cast<unsigned>(settings.scan_mode),
settings.scan_method == ScanMethod::FLATBED ? "flatbed" : "XPA");
if (settings.scan_mode == ScanColorMode::COLOR_SINGLE_PASS) if (settings.scan_mode == ScanColorMode::COLOR_SINGLE_PASS)
{ {

18
backend/genesys_gl841.cc
Wyświetl plik

@ -2552,16 +2552,8 @@ static SANE_Status gl841_calculate_current_setup(Genesys_Device * dev, const Gen
SANE_Bool half_ccd; /* false: full CCD res is used, true, half max CCD res is used */ SANE_Bool half_ccd; /* false: full CCD res is used, true, half max CCD res is used */
int optical_res; int optical_res;
DBG(DBG_info, DBG(DBG_info, "%s ", __func__);
"%s:\n" debug_dump(DBG_info, dev->settings);
"Resolution: %uDPI\n"
"Lines : %u\n"
"PPL : %u\n"
"Startpos : %.3f/%.3f\n"
"Scan mode : %d\n\n",
__func__,
dev->settings.yres, dev->settings.lines, dev->settings.pixels,
dev->settings.tl_x, dev->settings.tl_y, static_cast<unsigned>(dev->settings.scan_mode));
/* channels */ /* channels */
if (dev->settings.scan_mode == ScanColorMode::COLOR_SINGLE_PASS) if (dev->settings.scan_mode == ScanColorMode::COLOR_SINGLE_PASS)
@ -3878,10 +3870,8 @@ gl841_init_regs_for_scan (Genesys_Device * dev, const Genesys_Sensor& sensor)
SANE_Status status; SANE_Status status;
DBG(DBG_info, "%s:\nResolution: %uDPI\n" DBG(DBG_info, "%s ", __func__);
"Lines : %u\nPPL : %u\nStartpos : %.3f/%.3f\nScan mode : %d\n\n", __func__, debug_dump(DBG_info, dev->settings);
dev->settings.yres, dev->settings.lines, dev->settings.pixels, dev->settings.tl_x,
dev->settings.tl_y, static_cast<unsigned>(dev->settings.scan_mode));
gl841_slow_back_home(dev,SANE_TRUE); gl841_slow_back_home(dev,SANE_TRUE);

22
backend/genesys_gl843.cc
Wyświetl plik

@ -1676,15 +1676,8 @@ gl843_calculate_current_setup(Genesys_Device * dev, const Genesys_Sensor& sensor
int optical_res; int optical_res;
DBG(DBG_info, "%s settings:\n" DBG(DBG_info, "%s ", __func__);
"Resolution: %ux%uDPI\n" debug_dump(DBG_info, dev->settings);
"Lines : %u\n"
"PPL : %u\n"
"Startpos : %.3f/%.3f\n"
"Scan mode : %d\n\n", __func__,
dev->settings.xres,
dev->settings.yres, dev->settings.lines, dev->settings.pixels,
dev->settings.tl_x, dev->settings.tl_y, static_cast<unsigned>(dev->settings.scan_mode));
xres = dev->settings.xres; xres = dev->settings.xres;
yres = dev->settings.yres; yres = dev->settings.yres;
@ -3006,15 +2999,8 @@ gl843_init_regs_for_scan (Genesys_Device * dev, const Genesys_Sensor& sensor)
SANE_Status status; SANE_Status status;
DBG(DBG_info, "%s settings:\nResolution: %ux%uDPI\n" DBG(DBG_info, "%s ", __func__);
"Lines : %u\npixels : %u\nStartpos : %.3f/%.3f\nScan mode : %d\n\n", __func__, debug_dump(DBG_info, dev->settings);
dev->settings.xres,
dev->settings.yres,
dev->settings.lines,
dev->settings.pixels,
dev->settings.tl_x,
dev->settings.tl_y,
static_cast<unsigned>(dev->settings.scan_mode));
/* ensure head is parked in case of calibration */ /* ensure head is parked in case of calibration */
gl843_slow_back_home (dev, SANE_TRUE); gl843_slow_back_home (dev, SANE_TRUE);

16
backend/genesys_gl846.cc
Wyświetl plik

@ -1379,14 +1379,8 @@ gl846_calculate_current_setup(Genesys_Device * dev, const Genesys_Sensor& sensor
SANE_Bool half_ccd; /* false: full CCD res is used, true, half max CCD res is used */ SANE_Bool half_ccd; /* false: full CCD res is used, true, half max CCD res is used */
int optical_res; int optical_res;
DBG(DBG_info, "%s settings:\n" DBG(DBG_info, "%s ", __func__);
"Resolution: %uDPI\n" debug_dump(DBG_info, dev->settings);
"Lines : %u\n"
"PPL : %u\n"
"Startpos : %.3f/%.3f\n"
"Scan mode : %d\n\n", __func__,
dev->settings.yres, dev->settings.lines, dev->settings.pixels,
dev->settings.tl_x, dev->settings.tl_y, static_cast<unsigned>(dev->settings.scan_mode));
/* channels */ /* channels */
if (dev->settings.scan_mode == ScanColorMode::COLOR_SINGLE_PASS) if (dev->settings.scan_mode == ScanColorMode::COLOR_SINGLE_PASS)
@ -2162,10 +2156,8 @@ gl846_init_regs_for_scan (Genesys_Device * dev, const Genesys_Sensor& sensor)
SANE_Status status; SANE_Status status;
DBG(DBG_info, "%s settings:\nResolution: %uDPI\n" DBG(DBG_info, "%s ", __func__);
"Lines : %u\nPPL : %u\nStartpos : %.3f/%.3f\nScan mode : %d\n\n", __func__, debug_dump(DBG_info, dev->settings);
dev->settings.yres, dev->settings.lines, dev->settings.pixels,
dev->settings.tl_x, dev->settings.tl_y, static_cast<unsigned>(dev->settings.scan_mode));
/* channels */ /* channels */
if (dev->settings.scan_mode == ScanColorMode::COLOR_SINGLE_PASS) if (dev->settings.scan_mode == ScanColorMode::COLOR_SINGLE_PASS)

16
backend/genesys_gl847.cc
Wyświetl plik

@ -1395,14 +1395,8 @@ gl847_calculate_current_setup(Genesys_Device * dev, const Genesys_Sensor& sensor
SANE_Bool half_ccd; /* false: full CCD res is used, true, half max CCD res is used */ SANE_Bool half_ccd; /* false: full CCD res is used, true, half max CCD res is used */
int optical_res; int optical_res;
DBG(DBG_info, "%s settings:\n" DBG(DBG_info, "%s ", __func__);
"Resolution: %uDPI\n" debug_dump(DBG_info, dev->settings);
"Lines : %u\n"
"PPL : %u\n"
"Startpos : %.3f/%.3f\n"
"Scan mode : %d\n\n", __func__,
dev->settings.yres, dev->settings.lines, dev->settings.pixels,
dev->settings.tl_x, dev->settings.tl_y, static_cast<unsigned>(dev->settings.scan_mode));
/* channels */ /* channels */
if (dev->settings.scan_mode == ScanColorMode::COLOR_SINGLE_PASS) if (dev->settings.scan_mode == ScanColorMode::COLOR_SINGLE_PASS)
@ -2226,10 +2220,8 @@ gl847_init_regs_for_scan (Genesys_Device * dev, const Genesys_Sensor& sensor)
SANE_Status status; SANE_Status status;
DBG(DBG_info, "%s settings:\nResolution: %uDPI\n" DBG(DBG_info, "%s ", __func__);
"Lines : %u\nPPL : %u\nStartpos : %.3f/%.3f\nScan mode : %d\n\n", __func__, debug_dump(DBG_info, dev->settings);
dev->settings.yres, dev->settings.lines, dev->settings.pixels,
dev->settings.tl_x, dev->settings.tl_y, static_cast<unsigned>(dev->settings.scan_mode));
/* channels */ /* channels */
if (dev->settings.scan_mode == ScanColorMode::COLOR_SINGLE_PASS) if (dev->settings.scan_mode == ScanColorMode::COLOR_SINGLE_PASS)

15
backend/genesys_low.cc
Wyświetl plik

@ -2081,3 +2081,18 @@ void run_functions_at_backend_exit()
} }
s_functions_run_at_backend_exit.release(); s_functions_run_at_backend_exit.release();
} }
void debug_dump(unsigned level, const Genesys_Settings& settings)
{
DBG(level, "settings:\n"
"Resolution X/Y : %u / %u dpi\n"
"Lines : %u\n"
"Pixels per line : %u\n"
"Depth : %u\n"
"Start position X/Y : %.3f/%.3f\n"
"Scan mode : %d\n\n",
settings.xres, settings.yres,
settings.lines, settings.pixels, settings.depth,
settings.tl_x, settings.tl_y,
static_cast<unsigned>(settings.scan_mode));
}

2
backend/genesys_low.h
Wyświetl plik

@ -1892,4 +1892,6 @@ extern StaticInit<std::vector<Genesys_Sensor>> s_sensors;
void genesys_init_sensor_tables(); void genesys_init_sensor_tables();
void genesys_init_frontend_tables(); void genesys_init_frontend_tables();
void debug_dump(unsigned level, const Genesys_Settings& settings);
#endif /* not GENESYS_LOW_H */ #endif /* not GENESYS_LOW_H */