diff --git a/ca/ca0.cpp b/ca/ca0.cpp index 97bc4fce8..a4c26f546 100755 --- a/ca/ca0.cpp +++ b/ca/ca0.cpp @@ -17,6 +17,5 @@ int main(int argc, char** argv) case 8: ca0900(argc,argv); break; // gestione archivi per utente avanzatissima! default: ca0100(argc,argv); break; // gestione tabelle } - exit(0); return 0; } diff --git a/ca/calib01.cpp b/ca/calib01.cpp index 1d941f1cf..4bbe36655 100755 --- a/ca/calib01.cpp +++ b/ca/calib01.cpp @@ -51,19 +51,19 @@ const TString& TConfig_anal::get(const char* varname, const char* section, int i if (_has_cm) { - TString& tmp = get_tmp_string(); const TFixed_string var(varname); + TString& tmp = get_tmp_string(); //se il valore della variabile sul .ini e' vuoto controlla se e' possibile assegnarlo di default if (var == "AttFasi") tmp = "X"; else if (var == "Level" && index == 1) tmp = "CMS"; else if (var == "Cms" && index == 1) - tmp = "LLLLLLLLLLLLLLLLLLLL"; else + tmp = TConfig::get(var, section, 1, "LLLLLLLLLLLLLLLLLLLL"); else if (var == "CmsDes" && index == 1) tmp = TR("Commessa"); else if (var == "Fsc" && index == 1) - tmp = "LLLLLLLLLL"; else + tmp = TConfig::get(var, section, 1, "LLLLLLLLLL"); else if (var == "FscDes" && index == 1) tmp = TR("Fase"); else if (var == "EdMask") @@ -106,21 +106,20 @@ const TString& TMultilevel_code_info::picture(int level) const } bool TMultilevel_code_info::is_required(int level) const -{ - bool yes = level <= 0; - return yes; -} +{ return level <= 0; } bool TMultilevel_code_info::is_numeric_picture(int level) const { const TString& pic = picture(level); - if (pic.blank()) - return false; - - for (int i = 0; pic[i]; i++) - if (pic[i] != '0' && pic[i] != '9') - return false; - return true; + if (pic.full()) + { + int i; + // Tutti 0 e 9 + for (i = 0; pic[i] == '0' || pic[i] == '9'; i++); + if (pic[i] == '\0') + return true; + } + return false; } int TMultilevel_code_info::len(int level) const