From 2ee558e8c1e7a8ad63ba5f7dcb96f93b1a5dc0c8 Mon Sep 17 00:00:00 2001 From: guy Date: Thu, 2 Feb 2006 12:26:36 +0000 Subject: [PATCH] Patch level : 2.2 Files correlati : Ricompilazione Demo : [ ] Commento : Corretta funzione che determina il file relativo al livello di cdc/commessa/fase: sbagliava a stabilire il secondo livello, scambiandolo col primo git-svn-id: svn://10.65.10.50/trunk@13751 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ca/calib01.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ca/calib01.cpp b/ca/calib01.cpp index 7eef7973c..a4af6d1e7 100755 --- a/ca/calib01.cpp +++ b/ca/calib01.cpp @@ -282,8 +282,7 @@ const TMultilevel_code_info* ca_multilevel_code_info_by_index(int level) { TConfig& cfg = ca_config(); const TString& lev1 = cfg.get("Level", NULL, 1); - - if (!lev1.blank()) + if (lev1.full()) { const TMultilevel_code_info& fasi = ca_multilevel_code_info(LF_FASI); int k = 0; @@ -292,9 +291,9 @@ const TMultilevel_code_info* ca_multilevel_code_info_by_index(int level) _logicnum[++k] = LF_FASI; const TString& lev2 = cfg.get("Level", NULL, 2); - if (!lev2.blank()) + if (lev2.full()) { - _logicnum[k] = _logicnum[0] == LF_COMMESSE ? LF_CDC : LF_COMMESSE; + _logicnum[++k] = _logicnum[0] == LF_COMMESSE ? LF_CDC : LF_COMMESSE; if (fasi.parent() == _logicnum[k]) _logicnum[++k] = LF_FASI; }