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

Patch level : 12.0 1106

Browse Source 
Files correlati     : ce3.exe ce3900.msk

Commento :

 ricompilato ce3
This commit is contained in:
Alessandro Bonazzi 2022-01-21 10:21:50 +01:00
parent 38f1868cf2
commit a3ea2fd4e7
2 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/ce/ce3900.cpp
View File

@ -31,14 +31,15 @@
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
class TStampa_sintetica_mask : public TAutomask class TStampa_sintetica_mask : public TAutomask
{ {
bool _preview; // bool _preview;
bool _excel; bool _excel;
protected: protected:
bool on_field_event(TOperable_field& o, TField_event e, long jolly); bool on_field_event(TOperable_field& o, TField_event e, long jolly);
public: public:
bool preview() const { return _preview; } // bool preview() const { return _preview; }
bool excel() const { return _excel; } bool excel() const { return _excel; }
void set_excel(bool on) { _excel = on; }
TStampa_sintetica_mask(); TStampa_sintetica_mask();
}; };
@ -82,19 +83,19 @@ bool TStampa_sintetica_mask::on_field_event(TOperable_field& o, TField_event e,
} }
} }
break; break;
case DLG_PRINT: /* case DLG_PRINT:
if (e == fe_button) if (e == fe_button)
{ {
_preview = false; // _preview = false;
_excel = false; // _excel = false;
} }
break; break;
case DLG_PREVIEW: case DLG_PREVIEW:
if (e == fe_button) if (e == fe_button)
{ {
_preview = true; // _preview = true;
_excel = false; // _excel = false;
stop_run(K_ENTER); // stop_run(K_ENTER);
} }
break; break;
case DLG_EXPORT_EXCEL: case DLG_EXPORT_EXCEL:
@ -103,13 +104,13 @@ bool TStampa_sintetica_mask::on_field_event(TOperable_field& o, TField_event e,
_excel = true; _excel = true;
stop_run(K_ENTER); stop_run(K_ENTER);
} }
break; break; */
default: break; default: break;
} }
return ok; return ok;
} }
TStampa_sintetica_mask::TStampa_sintetica_mask() : TAutomask("ce3900"), _preview(false), _excel(false) TStampa_sintetica_mask::TStampa_sintetica_mask() : TAutomask("ce3900"), _excel(false) //, _preview(false)
{ {
} }
@ -201,10 +202,10 @@ void TStampa_sintetica_rep::set_filter(const TStampa_sintetica_mask& msk)
const bool shimp = (!msk.excel()) && msk.get_bool(F_TOTIMP); const bool shimp = (!msk.excel()) && msk.get_bool(F_TOTIMP);
const bool shloc = (!msk.excel()) && msk.get_bool(F_TOTLOC); const bool shloc = (!msk.excel()) && msk.get_bool(F_TOTLOC);
section('H', 2).show(shcat);
section('H', 3).show(shimp); section('H', 3).show(shimp);
section('H', 4).show(shloc); section('H', 4).show(shloc);
section('F', 2).show(shcat); section('F', 2).show(shcat);
section('H', 2).show(shcat);
section('F', 3).show(shimp); section('F', 3).show(shimp);
section('F', 4).show(shloc); section('F', 4).show(shloc);
@ -396,10 +397,12 @@ protected:
void TStampa_sintetica::main_loop() void TStampa_sintetica::main_loop()
{ {
TStampa_sintetica_mask mask; TStampa_sintetica_mask mask;
KEY k;
// mask.set(F_CALCOLO, "X"); // mask.set(F_CALCOLO, "X");
while (mask.run() == K_ENTER) while ((k = mask.run()) != K_QUIT)
{ {
mask.set_excel(k == K_EXCEL);
// Esecuzione calcolo globale // Esecuzione calcolo globale
if (mask.get_bool(F_CALCOLO)) if (mask.get_bool(F_CALCOLO))
{ {
@ -427,7 +430,7 @@ void TStampa_sintetica::main_loop()
book.export_excel(out, false, true, true); book.export_excel(out, false, true, true);
} }
else else
if (mask.preview()) if (k == K_VISUALIZE)
book.preview(); book.preview();
else else
book.print(); book.print();

12
src/ce/ce3900.uml
View File

@ -193,16 +193,16 @@ BEGIN
PROMPT 42 17 "Cespiti alienati" PROMPT 42 17 "Cespiti alienati"
END END
BOOLEAN F_CALCOLO
BEGIN
PROMPT 2 19 "Esegui calcolo ammortamenti prima di stampare"
END
BOOLEAN F_BREAK BOOLEAN F_BREAK
BEGIN BEGIN
PROMPT 2 20 "@bSalto pagina per categoria" PROMPT 2 19 "@bSalto pagina per categoria"
FLAGS "Z" FLAGS "Z"
END END
BOOLEAN F_CALCOLO
BEGIN
PROMPT 2 20 "Esegui calcolo ammortamenti prima di stampare"
END
ENDPAGE ENDPAGE
ENDMASK ENDMASK