mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 17:01:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

CScanTs: make better use of available space

Browse Source 
With bigger font sizes, the the allocated space for satellite,
transponder and frequency was getting smaller.
Fix this by just keeping a safe space of 10 pixels to the radar icon.

 Conflicts:
	src/gui/scan.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
Stefan Seyfried
2018-02-04 17:57:45 +01:00
committed by Thilo Graf
parent 5da6ce30a3
commit 5bed4f762b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/scan.cpp
View File

@@ -397,14 +397,15 @@ neutrino_msg_t CScanTs::handleMsg(neutrino_msg_t msg, neutrino_msg_data_t data)
//printf("CScanTs::handleMsg: x %d xpos2 %d width %d w %d\n", x, xpos2, width, w); //printf("CScanTs::handleMsg: x %d xpos2 %d width %d w %d\n", x, xpos2, width, w);
char buffer[128]; char buffer[128];
char str[256]; char str[256];
int w_to_radar = xpos_radar - xpos2 - 10;
switch (msg) { switch (msg) {
case NeutrinoMessages::EVT_SCAN_SATELLITE: case NeutrinoMessages::EVT_SCAN_SATELLITE:
paintLine(xpos2, ypos_cur_satellite, w - (8*fw), (char *)data); paintLine(xpos2, ypos_cur_satellite, w_to_radar, (char *)data);
break; break;
case NeutrinoMessages::EVT_SCAN_NUM_TRANSPONDERS: case NeutrinoMessages::EVT_SCAN_NUM_TRANSPONDERS:
sprintf(buffer, "%ld", data); sprintf(buffer, "%ld", data);
paintLine(xpos2, ypos_transponder, w - (8*fw), buffer); paintLine(xpos2, ypos_transponder, w_to_radar, buffer);
total = data; total = data;
snprintf(str, sizeof(buffer), "scan: %d/%d", done, total); snprintf(str, sizeof(buffer), "scan: %d/%d", done, total);
CVFD::getInstance()->showMenuText(0, str, -1, true); CVFD::getInstance()->showMenuText(0, str, -1, true);
@@ -414,7 +415,7 @@ neutrino_msg_t CScanTs::handleMsg(neutrino_msg_t msg, neutrino_msg_data_t data)
//if (total == 0) data = 0; // why ?? //if (total == 0) data = 0; // why ??
done = data; done = data;
sprintf(buffer, "%d/%d", done, total); sprintf(buffer, "%d/%d", done, total);
paintLine(xpos2, ypos_transponder, w - (8*fw), buffer); paintLine(xpos2, ypos_transponder, (ypos_transponder > ypos_radar + 66) ? w : w_to_radar, buffer);
snprintf(str, sizeof(buffer), "scan %d/%d", done, total); snprintf(str, sizeof(buffer), "scan %d/%d", done, total);
CVFD::getInstance()->showMenuText(0, str, -1, true); CVFD::getInstance()->showMenuText(0, str, -1, true);
break; break;
@@ -441,10 +442,9 @@ neutrino_msg_t CScanTs::handleMsg(neutrino_msg_t msg, neutrino_msg_data_t data)
CFrontend::getDelSys(feparams->delsys, feparams->code_rate_LP, feparams->modulation, f2, s, m); CFrontend::getDelSys(feparams->delsys, feparams->code_rate_LP, feparams->modulation, f2, s, m);
snprintf(buffer,sizeof(buffer), "%u %d %s %s %s %d ", freq, CFrontend::getFEBandwidth(feparams->bandwidth)/1000, f, f2, m, feparams->plp_id); snprintf(buffer,sizeof(buffer), "%u %d %s %s %s %d ", freq, CFrontend::getFEBandwidth(feparams->bandwidth)/1000, f, f2, m, feparams->plp_id);
} }
paintLine(xpos2, ypos_frequency, w - (7*fw), buffer);
} }
break; break;
/* just assume that provider etc is always below radar picture */
case NeutrinoMessages::EVT_SCAN_PROVIDER: case NeutrinoMessages::EVT_SCAN_PROVIDER:
paintLine(xpos2, ypos_provider, w, (char*)data); // UTF-8 paintLine(xpos2, ypos_provider, w, (char*)data); // UTF-8
break; break;