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

Patch level :10.0 44X

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :
sistemato problema della non visibilità fasi negli sheet quando la configurazione era per CM


git-svn-id: svn://10.65.10.50/trunk@19284 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2009-09-15 08:27:25 +00:00
parent ff82650d34
commit fea8a47b1c
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ca/ca2100.cpp
View File

@ -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");

9
ca/calib01.cpp
View File

@ -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)