From fea8a47b1c6c158e25b4f075df4ca040c678fa09 Mon Sep 17 00:00:00 2001 From: luca Date: Tue, 15 Sep 2009 08:27:25 +0000 Subject: [PATCH] =?UTF-8?q?Patch=20level=20=20=20=20=20=20=20=20=20:10.0?= =?UTF-8?q?=2044X=20Files=20correlati=20=20=20=20=20:=20Ricompilazione=20D?= =?UTF-8?q?emo=20:=20[=20]=20Commento=20=20=20=20=20=20=20=20=20=20=20=20:?= =?UTF-8?q?=20sistemato=20problema=20della=20non=20visibilit=C3=A0=20fasi?= =?UTF-8?q?=20negli=20sheet=20quando=20la=20configurazione=20era=20per=20C?= =?UTF-8?q?M?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://10.65.10.50/trunk@19284 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ca/ca2100.cpp | 4 +++- ca/calib01.cpp | 9 ++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ca/ca2100.cpp b/ca/ca2100.cpp index 3513d2c12..dfc1748b9 100755 --- a/ca/ca2100.cpp +++ b/ca/ca2100.cpp @@ -885,6 +885,8 @@ int TMovanal_msk::create_sheet_fields(int lf, int& y, short& dlg, bool required) return h; } +//metodo per la creazione delle righe dello sheet con le righe movimento analitico +//si basa sulla configurazione void TMovanal_msk::create_sheet() { TSheet_field& sf = sfield(F_RIGHE); @@ -922,7 +924,7 @@ void TMovanal_msk::create_sheet() _cms_start = dlg; _cms_end = dlg + ca_multilevel_code_info(LF_COMMESSE).levels()-1; if (fasinfo.parent() == LF_COMMESSE) - create_sheet_fields(LF_FASI, y, dlg, fsc_req); + create_sheet_fields(LF_FASI, y, dlg, fsc_req); else { const bool cms_req = ini.get_bool("CmsRequired"); diff --git a/ca/calib01.cpp b/ca/calib01.cpp index d9f0cf499..4b7636c5e 100755 --- a/ca/calib01.cpp +++ b/ca/calib01.cpp @@ -43,9 +43,10 @@ const TString& TConfig_anal::get(const char* varname, const char* section, int i if (_has_ca) return TConfig::get(varname, section, index, def); - TString& tmp = get_tmp_string(); + if (_has_cm) { + TString& tmp = get_tmp_string(); const TFixed_string var(varname); //se il valore della variabile sul .ini e' vuoto controlla se e' possibile assegnarlo di default if (var == "AttFasi") @@ -61,14 +62,16 @@ const TString& TConfig_anal::get(const char* varname, const char* section, int i if (var == "Fsc" && index == 1) tmp = "LLLLLLLLLL"; else if (var == "FscDes" && index == 1) - tmp == TR("Fase"); else + tmp = TR("Fase"); else if (var == "EdMask") tmp = "ca0300a"; else if (var == "UsePdcc") tmp = "X"; + + return tmp; } - return tmp; + return EMPTY_STRING; } TConfig& ca_config(bool force)