root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 4.0

Browse Source 
Files correlati     : librerie
Ricompilazione Demo : [ ]
Commento            :
diction.cpp:  aggiunto logging delle frasi non tradotte
isam.cpp: aggiunti commenti e migliorati prompt delle importazioni
reprint.cpp: aggiunti commenti


git-svn-id: svn://10.65.10.50/trunk@14325 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2006-09-15 15:27:47 +00:00
parent a1ce9f49c7
commit f386003944
3 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/diction.cpp
View File

@ -268,19 +268,17 @@ const char* dictionary_translate_header(const char* head)
{ {
if (head && *head && dictionary_active()) if (head && *head && dictionary_active())
{ {
TString str = head; const TFixed_string str(head);
const int at = str.rfind('@'); const int at = str.rfind('@');
if (at >= 0) if (at >= 0)
{ {
TString postfix; // lasciare TString! TString& tmp = get_tmp_string();
postfix = str.mid(at); tmp = dictionary_translate(str.left(at));
str.cut(at); tmp << str.mid(at);
str = dictionary_translate(str); return tmp;
str << postfix;
return str;
} }
if (str.right(1)[0] == ' ') if (str.ends_with(" "))
return dictionary_translate_prompt(head); return dictionary_translate_prompt(head);
return dictionary_translate(head); return dictionary_translate(head);

22
include/isam.cpp
View File

@ -2521,8 +2521,9 @@ int TSystemisamfile::load(
if (fd) sfd << fd; if (fd) sfd << fd;
int last = NOERR; int last = NOERR;
s1.format("Imp. archivio %d\n%6ld records %6ld errori - %3d", _logicnum, r, e, last); s1.format("Importazione archivio %d da %s\n%6ld records %6ld errori - %3d",
TProgind p(nitems, s1, TRUE, TRUE, 70); _logicnum, from, r, e, last);
TProgind p(nitems, s1, true, true, 78);
long pos = 16*nflds; long pos = 16*nflds;
for (s = f.line(); s.not_empty() && !p.iscancelled(); s = f.line()) for (s = f.line(); s.not_empty() && !p.iscancelled(); s = f.line())
{ {
@ -2539,7 +2540,8 @@ int TSystemisamfile::load(
} }
if ((r + e) % 50 == 0) if ((r + e) % 50 == 0)
{ {
s1.format("Imp. archivio %d\n%6ld records %6ld errori - %3d", _logicnum, r, e, last); s1.format("Importazione archivio %d da %s\n%6ld records %6ld errori - %3d",
_logicnum, from, r, e, last);
p.set_text(s1); p.set_text(s1);
} }
@ -2565,15 +2567,14 @@ int TSystemisamfile::load(
s1 = s.get(); s1 = s.get();
if (fd) if (fd)
{ {
s1.rtrim(1); s1.rtrim(1);
s1.ltrim(1); s1.ltrim(1);
} }
if (curr().type((const TString&) fld[j]) == _memofld) if (curr().type((const TString&) fld[j]) == _memofld)
{ {
TString s2 = s1; TString s2 = s1;
s1 = esc(s2); s1 = esc(s2);
} }
put((const TString&) fld[j], s1); put((const TString&) fld[j], s1);
} }
} }
@ -2590,7 +2591,8 @@ int TSystemisamfile::load(
// break; // break;
} }
} }
s1.format("Imp. archivio %d\n%6ld records %6ld errori - %3d", _logicnum, r, e, last); s1.format("Importazione archivio %d da %s\n%6ld records %6ld errori - %3d",
_logicnum, from, r, e, last);
p.set_text(s1); p.set_text(s1);
close(); close();

13
include/reprint.cpp
View File

@ -151,14 +151,14 @@ void advanced_draw_paragraph(TWindow& win, const TString_array& para, const RCT&
if (top < rct.bottom) if (top < rct.bottom)
{ {
const TString& line = para.row(row); const TString& line = para.row(row);
if (!line.blank()) if (line.full())
{ {
RCT rctline = rct; RCT rctline = rct;
rctline.top = top; rctline.top = top;
rctline.bottom = top + ky10 / 10; rctline.bottom = top + ky10 / 10;
char ha = halign; char ha = halign;
if (ha == 'J' && (row == rows-1 || finisce_per_punto(line))) if (ha == 'J' && (row == rows-1 || finisce_per_punto(line)))
ha = 'L'; ha = 'L'; // Le righe finali non vanno giustificate
advanced_draw_text_line(win, line, rctline, ha, 'T'); advanced_draw_text_line(win, line, rctline, ha, 'T');
} }
} }
@ -168,7 +168,7 @@ void advanced_draw_paragraph(TWindow& win, const TString_array& para, const RCT&
} }
else else
{ {
if (halign == 'J') halign = 'L'; if (halign == 'J') halign = 'L'; // Le righe isolate non vanno giustificate
advanced_draw_text_line(win, para.row(0), rct, halign, valign); advanced_draw_text_line(win, para.row(0), rct, halign, valign);
} }
} }
@ -1826,7 +1826,7 @@ void TPrintind::update_bar()
TProgind::update_bar(); TProgind::update_bar();
const int m = _modules.items(); const int m = _modules.items();
if (m > 0) if (m > 0) // come dire ADVANCED_GRAPHICS
{ {
const int n = _status * 100 / _max; const int n = _status * 100 / _max;
const TImage& img = (const TImage&)_modules[n%m]; const TImage& img = (const TImage&)_modules[n%m];
@ -1849,7 +1849,6 @@ TPrintind::TPrintind(long n, const char* msg) : TProgind(n, msg, true, true)
} }
} }
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
// TReport_book // TReport_book
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
@ -1946,7 +1945,7 @@ void TReport_book::reprint_group_headers(const TReport_section& rs)
} }
} }
if (rs.level() > 10) // E' una sottosezione if (rs.level() > 10) // E' una sottosezione ?
{ {
TPointer_array headers; // Elenco degli header di sottosezione che devo stampare TPointer_array headers; // Elenco degli header di sottosezione che devo stampare
for (int level = rs.level(); level > 10; level /= 10) for (int level = rs.level(); level > 10; level /= 10)
@ -2039,7 +2038,7 @@ long TReport_book::print_section(TReport_section& rs)
page_break = h > space_left; // Controlla se e' sufficiente page_break = h > space_left; // Controlla se e' sufficiente
// Controllo se la sezione puo' essere stampata su due pagine // Controllo se la sezione puo' essere stampata su due pagine
if (page_break && space_left >= 100 && rs.can_be_broken() ) if (page_break && space_left >= 100 && rs.can_be_broken())
{ {
reprint_from = space_left / 100 * 100; reprint_from = space_left / 100 * 100;
rs.print_clipped(*this, 0, reprint_from); rs.print_clipped(*this, 0, reprint_from);