From 48e0b25d2fe8424a022db70a14400693fafa7e8c Mon Sep 17 00:00:00 2001 From: guy Date: Thu, 31 Jul 1997 12:30:31 +0000 Subject: [PATCH] cg6.cpp Aggiunti commenti alle chiamate dei vari programmmi cg6600.cpp Aggiunto flag di test cg6600a.uml Aggiunto titolo alla maschera cg6800.cpp Corretto editing movimenti provvisori trasferiti git-svn-id: svn://10.65.10.50/trunk@4993 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- cg/cg6.cpp | 15 ++++++++------- cg/cg6600.cpp | 5 +++-- cg/cg6600a.uml | 2 +- cg/cg6800.cpp | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/cg/cg6.cpp b/cg/cg6.cpp index 8d75b6f16..b1b494e4c 100755 --- a/cg/cg6.cpp +++ b/cg/cg6.cpp @@ -10,23 +10,24 @@ int main(int argc,char** argv) switch(n) { case 0: - cg6100(argc, argv); break; + cg6100(argc, argv); break; // Ricezione automatica case 2: - cg6300(argc, argv); break; + cg6300(argc, argv); break; // Tabelle case 3: - cg6400(argc, argv); break; + cg6400(argc, argv); break; // Ricezione archivi case 4: - cg6500(argc, argv); break; + cg6500(argc, argv); break; // Tabelle case 5: - cg6600(argc, argv); break; + cg6600(argc, argv); break; // Ricezione abelle e ovimenti case 6: - cg6700(argc, argv); break; + cg6700(argc, argv); break; // Lista controllo movimenti case 7: cg6800(argc, argv); break; case 8: cg6900(argc, argv); break; default: break; - } + } + exit(0); return 0; } diff --git a/cg/cg6600.cpp b/cg/cg6600.cpp index 7398491d1..8e15329fd 100755 --- a/cg/cg6600.cpp +++ b/cg/cg6600.cpp @@ -281,8 +281,9 @@ bool TRic_tab::main_loop() } else if (_scelta == 'M') - { - if (video()) + { + bool ok = video(); + if (ok) { apri_file_temp(); diff --git a/cg/cg6600a.uml b/cg/cg6600a.uml index a86c72c5d..aa6036148 100755 --- a/cg/cg6600a.uml +++ b/cg/cg6600a.uml @@ -1,6 +1,6 @@ #include "cg6600.h" -PAGE "" -1 -1 78 13 +PAGE "Ricezione movimenti" -1 -1 78 13 NUMBER F_CODDITTA 5 BEGIN diff --git a/cg/cg6800.cpp b/cg/cg6800.cpp index 7d691b511..564e29978 100755 --- a/cg/cg6800.cpp +++ b/cg/cg6800.cpp @@ -554,7 +554,7 @@ void TVar_mov::setta_campi_maschera(TMask& m) regiva.trim(); long protiva = _rec_mov->get_long(MOV_PROTIVA); long nuprotiva = _rec_mov->get_long(MOV_UPROTIVA); - char provvis = _rec_mov->get_char(MOV_PROVVIS); + TString provvis = _rec_mov->get (MOV_PROVVIS); TString codcaus = _rec_mov->get (MOV_CODCAUS); TString codpag = _rec_mov->get (MOV_CODPAG); codpag.trim();