From 0bc26beeb3a683322256625da646f6107ebc0b90 Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 2 Dec 1994 18:35:12 +0000 Subject: [PATCH] Correzione errori MI2134 2135 2136 2137 2138 2139 2140 git-svn-id: svn://10.65.10.50/trunk@727 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ba/ba3300.cpp | 100 ++++++++++++++++++++++++-------------------------- 1 file changed, 47 insertions(+), 53 deletions(-) diff --git a/ba/ba3300.cpp b/ba/ba3300.cpp index d8948a51f..0412c72ef 100755 --- a/ba/ba3300.cpp +++ b/ba/ba3300.cpp @@ -63,72 +63,62 @@ void BA3300_application::set_page(int , int counter) const TString80 descr(decodifica_reg()); long contatore = _pag_ini + counter; + if (_inizia_dopo) contatore--; + reset_row(1); + reset_row(2); + reset_row(3); + reset_row(4); + reset_row(5); + reset_row(6); + reset_row(7); + reset_row(8); + reset_row(9); if (counter == 0) { if (!_inizia_dopo) - { - reset_row(8); - set_row(8, "@65gPag.@70g%ld", contatore); - } - - reset_row(1); - reset_row(2); - reset_row(3); - reset_row(4); - reset_row(5); - reset_row(6); - reset_row(7); - - set_row (1, "@50g%-50s", (const char*) descr); - set_row (2, "@50g%-50s", (const char*)_ragsoc); - set_row (3, "@50g%-35s", (const char*)_indulc); - set_row (3, "@90g%-10s", (const char*)_civulc); - set_row (4, "@50g%5s", (const char*)_capulc); - set_row (4, "@60g%-50s", (const char*)_com); - set_row (4, "@115g%5s", (const char*)_prov); - set_row (5, "@50g%16s", (const char*)_cofi); - set_row (6, "@50g%11s", (const char*)_paiv); + set_row(3, "@120gPag. %ld", contatore); + int pos = printer().formlen() / 2 - 3; + set_row (pos++, "@36g%-50s", (const char*) descr); + set_row (pos++, "@36g%-50s", (const char*)_ragsoc); + TString s(_indulc); + + s << " " << _civulc ; + set_row (pos++, "@36g%-52s", (const char*) s); + s = _capulc; + s << " " << _com << " " << _prov; + set_row (pos++, "@36g%-62s", (const char*) s); + set_row (pos++, "@36g%-16s", (const char*)_cofi); + set_row (pos, "@36g%-11s", (const char*)_paiv); } else if (counter==_num_pag-1) { - reset_row(1); - reset_row(2); - reset_row(3); - reset_row(4); - reset_row(5); - reset_row(6); - reset_row(7); - reset_row(8); - set_row (1, "@1gSocieta'@10g%-50s", (const char*) _ragsoc); + set_row (1, "@1g%-50s", (const char*) _ragsoc); set_row (1, "@62g%-29s", (const char*) _indulc); set_row (1, "@93g%-9s", (const char*) _civulc); set_row (1, "@103g%-5s", (const char*) _capulc); set_row (1, "@110g%-18s", (const char*) _com); set_row (1, "@130g%-3s", (const char*) _prov); set_row (2, "@1g%-50s", (const char*) descr); - set_row (2, "@52g%16s", (const char*) _cofi); - set_row (2, "@70g%11s", (const char*) _paiv); + set_row (2, "@52g%-16s", (const char*) _cofi); + set_row (2, "@70g%-11s", (const char*) _paiv); set_row (4, "@50gN. ........ DI REPERTORIO"); - set_row (5, "@50gIL PRESENTE LIBRO DELLA@75g%50s", (const char*) _ragsoc); - set_row (6, "@50g%-35s", (const char*) _indulc); - set_row (6, "@88g%10s", (const char*) _civulc); - set_row (7, "@50g%5s", (const char*) _capulc); - set_row (7, "@58g%50s", (const char*) _com); - set_row (7, "@111g%5s", (const char*) _prov); - set_row (8, "@120gPag.@125g%ld", contatore); + set_row (5, "@50gIL PRESENTE LIBRO DELLA@75g%-50s", (const char*) _ragsoc); + + TString80 s(_indulc); + + s = _indulc; + s << " " << _civulc; + set_row (6, "@50g%-52s", (const char*) s); + s = _capulc; + s << " " << _com << " " << _prov; + set_row (7, "@50g%-62s", (const char*) s); + set_row (8, "@50gCONSTA DI %ld PAGINE UTILI, BOLLATE E NUMERATE", _num_pag - 2); + set_row (9, "@50gE VIENE OGGI VIDIMATO, il ........."); } else { - reset_row(1); - reset_row(2); - reset_row(3); - reset_row(4); - reset_row(5); - reset_row(6); - reset_row(7); - reset_row(8); - set_row (1, "@1gSocieta'@10g%-50s", (const char*) _ragsoc); + set_row (1, "@1g%-50s", (const char*) _ragsoc); set_row (1, "@62g%-29s", (const char*) _indulc); // set_row (1, "@93g%-9s", (const char*) _civulc); // set_row (1, "@103g%-5s", (const char*) _capulc); @@ -137,7 +127,7 @@ void BA3300_application::set_page(int , int counter) set_row (2, "@1g%-50s", (const char*) descr); set_row (2, "@52g%16s", (const char*) _cofi); set_row (2, "@70g%11s", (const char*) _paiv); - set_row (3, "@85gPag.@90g%ld", contatore); + set_row (2, "@120gPag. %ld", contatore); } } @@ -150,6 +140,7 @@ bool BA3300_application::set_print(int) KEY tasto; TString16 app; + _msk->reset(); _nditte->setkey(1); _codice_ditta = get_firm(); _nditte->curr().zero(); @@ -157,7 +148,8 @@ bool BA3300_application::set_print(int) _nditte->read(); app=_nditte->curr().get(N_CODDITTA); _msk->set(F_CODDITTA,app); - _ragsoc=_nditte->curr().get(N_RAGSOC); + _ragsoc="Societa' "; + _ragsoc << _nditte->curr().get(N_RAGSOC); _tipoa =_nditte->curr().get(N_TIPOA); _codanagr =atol(_nditte->curr().get(N_CODANAGR)); _msk->set(F_RAGSOC,_ragsoc); @@ -201,12 +193,14 @@ bool BA3300_application::set_print(int) if (tasto == K_ENTER) { + printer().formlen(_msk->get_int(F_LUNG)); _cod_reg = _msk->get(F_CODICE); _cod_anno = _msk->get_int(F_ANNO); _pag_ini = _msk->get_long(F_NPAGINI); _pag_fin = _msk->get_long(F_NPAGFI); _inizia_dopo = _msk->get_bool(F_PRIMO); - _num_pag = (_pag_fin - _pag_ini) + 1; + _num_pag = (_pag_fin - _pag_ini) + 2; + if (_inizia_dopo) _num_pag++; enable_print_menu(); return TRUE; } @@ -216,7 +210,7 @@ bool BA3300_application::set_print(int) static bool codice_handler (TMask_field& field, KEY key) { - if (key == K_TAB) + if (key == K_TAB && field.focusdirty()) { const TEdit_field& e = (const TEdit_field&)field; const TLocalisamfile& t = e.browse()->cursor()->file();