piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

[X7] Text view fix - #4143

Browse Source
This commit is contained in:
Bertrand Songis
2016-12-19 17:51:22 +01:00
parent eb3da74331
commit 880216c544
5 changed files with 12 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/212x64/view_text.cpp
-153
View File
@@ -1,153 +0,0 @@
/*
* Copyright (C) OpenTX
*
* Based on code named
* th9x - http://code.google.com/p/th9x
* er9x - http://code.google.com/p/er9x
* gruvin9x - http://code.google.com/p/gruvin9x
*
* License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#include "opentx.h"
#define TEXT_FILE_MAXSIZE 2048
char s_text_file[TEXT_FILENAME_MAXLEN];
char s_text_screen[LCD_LINES-1][LCD_COLS+1];
void readTextFile(int & lines_count)
{
FIL file;
int result;
char c;
unsigned int sz;
int line_length = 0;
int escape = 0;
char escape_chars[4] = {0};
int current_line = 0;
memset(s_text_screen, 0, sizeof(s_text_screen));
result = f_open(&file, s_text_file, FA_OPEN_EXISTING | FA_READ);
if (result == FR_OK) {
for (int i=0; i<TEXT_FILE_MAXSIZE && f_read(&file, &c, 1, &sz)==FR_OK && sz==1 && (lines_count==0 || current_line-menuVerticalOffset<LCD_LINES-1); i++) {
if (c == '\n') {
++current_line;
line_length = 0;
escape = 0;
}
else if (c!='\r' && current_line>=menuVerticalOffset && current_line-menuVerticalOffset<LCD_LINES-1 && line_length<LCD_COLS) {
if (c=='\\' && escape==0) {
escape = 1;
continue;
}
else if (c!='\\' && escape>0 && escape<4) {
escape_chars[escape-1] = c;
if (escape == 2 && !strncmp(escape_chars, "up", 2)) {
c = '\300';
escape = 0;
}
else if (escape == 2 && !strncmp(escape_chars, "dn", 2)) {
c = '\301';
escape = 0;
}
else if (escape == 3) {
int val = atoi(escape_chars);
if (val >= 200 && val < 225) {
c = '\200' + val-200;
}
escape = 0;
}
else {
escape++;
continue;
}
}
else if (c=='~') {
c = 'z'+1;
}
else if (c=='\t') {
c = 0x1D; //tab
}
escape = 0;
s_text_screen[current_line-menuVerticalOffset][line_length++] = c;
}
}
if (c != '\n') {
current_line += 1;
}
f_close(&file);
}
if (lines_count == 0) {
lines_count = current_line;
}
}
void menuTextView(event_t event)
{
static int lines_count;
switch (event) {
case EVT_ENTRY:
menuVerticalOffset = 0;
lines_count = 0;
readTextFile(lines_count);
break;
case EVT_KEY_FIRST(KEY_UP):
if (menuVerticalOffset == 0)
break;
else
menuVerticalOffset--;
readTextFile(lines_count);
break;
case EVT_KEY_FIRST(KEY_DOWN):
if (menuVerticalOffset+LCD_LINES-1 >= lines_count)
break;
else
++menuVerticalOffset;
readTextFile(lines_count);
break;
case EVT_KEY_BREAK(KEY_EXIT):
popMenu();
break;
}
for (int i=0; i<LCD_LINES-1; i++) {
lcdDrawText(0, i*FH+FH+1, s_text_screen[i], FIXEDWIDTH);
}
char *title = s_text_file;
#if defined(SIMU)
if (!strncmp(title, "./", 2)) title += 2;
#else
// TODO?
#endif
lcdDrawText(LCD_W/2-strlen(title)*FW/2, 0, title);
lcdInvertLine(0);
if (lines_count > LCD_LINES-1) {
drawVerticalScrollbar(LCD_W-1, FH, LCD_H-FH, menuVerticalOffset, lines_count, LCD_LINES-1);
}
}
void pushMenuTextView(const char *filename)
{
if (strlen(filename) < TEXT_FILENAME_MAXLEN) {
strcpy(s_text_file, filename);
pushMenu(menuTextView);
}
}
radio/src/gui/common/stdlcd/CMakeLists.txt
+1
View File
@@ -14,6 +14,7 @@ if(ARCH STREQUAL ARM)
${GUI_SRC}
../common/stdlcd/model_inputs.cpp
../common/stdlcd/model_mixes.cpp
../common/stdlcd/view_text.cpp
)
set(CURVE_EDIT_SRC model_curve_edit.cpp)
else()
radio/src/gui/128x64/view_text.cpp → radio/src/gui/common/stdlcd/view_text.cpp
+11 -4
View File
@@ -20,7 +20,6 @@
#include "opentx.h"
#define TEXT_FILENAME_MAXLEN 40
#define TEXT_FILE_MAXSIZE 2048
char s_text_file[TEXT_FILENAME_MAXLEN];
@@ -34,7 +33,7 @@ void readTextFile(int & lines_count)
unsigned int sz;
int line_length = 0;
int escape = 0;
char escape_chars[2];
char escape_chars[4] = {0};
int current_line = 0;
memset(s_text_screen, 0, sizeof(s_text_screen));
@@ -52,7 +51,7 @@ void readTextFile(int & lines_count)
escape = 1;
continue;
}
else if (c!='\\' && escape>0 && escape<3) {
else if (c!='\\' && escape>0 && escape<4) {
escape_chars[escape-1] = c;
if (escape == 2 && !strncmp(escape_chars, "up", 2)) {
c = '\300';
@@ -62,6 +61,13 @@ void readTextFile(int & lines_count)
c = '\301';
escape = 0;
}
else if (escape == 3) {
int val = atoi(escape_chars);
if (val >= 200 && val < 225) {
c = '\200' + val-200;
}
escape = 0;
}
else {
escape++;
continue;
@@ -112,7 +118,8 @@ void menuTextView(event_t event)
break;
else
menuVerticalOffset--;
// no break;
readTextFile(lines_count);
break;
case EVT_KEY_NEXT_LINE:
if (menuVerticalOffset+LCD_LINES-1 >= lines_count)
radio/src/targets/sky9x/CMakeLists.txt
-1
View File
@@ -53,7 +53,6 @@ set(GUI_SRC
radio_diaganas.cpp
radio_hardware.cpp
view_telemetry.cpp
view_text.cpp
view_about.cpp
)
radio/src/targets/taranis/CMakeLists.txt
-1
View File
@@ -93,7 +93,6 @@ set(GUI_SRC ${GUI_SRC}
radio_hardware.cpp
view_channels.cpp
view_telemetry.cpp
view_text.cpp
view_about.cpp
../screenshot.cpp
)