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

Patch level :10.0 442

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :
cambiato il modo di considerare le fasi per CM: adesso sono indipendenti dalle commesse (ci auguriamo che sia la scelta definitiva!!!!)


git-svn-id: svn://10.65.10.50/trunk@19290 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2009-09-16 08:47:22 +00:00
parent 54549a75df
commit 370b55d3c5
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ca/calib01.cpp
View File

@ -5,7 +5,6 @@
#include <mov.h> #include <mov.h>
#include <pconti.h> #include <pconti.h>
#include <treectrl.h>
#include "calib01.h" #include "calib01.h"
#include "calib02.h" #include "calib02.h"
@ -51,8 +50,6 @@ const TString& TConfig_anal::get(const char* varname, const char* section, int i
//se il valore della variabile sul .ini e' vuoto controlla se e' possibile assegnarlo di default //se il valore della variabile sul .ini e' vuoto controlla se e' possibile assegnarlo di default
if (var == "AttFasi") if (var == "AttFasi")
tmp = "X"; else tmp = "X"; else
if (var == "FathFasi")
tmp = "CMS"; else
if (var == "Level" && index == 1) if (var == "Level" && index == 1)
tmp = "CMS"; else tmp = "CMS"; else
if (var == "Cms" && index == 1) if (var == "Cms" && index == 1)
@ -669,6 +666,7 @@ void TAnal_tree_pos::reset()
class TAnal_tree : public TBidirectional_tree class TAnal_tree : public TBidirectional_tree
{ {
TLocalisamfile* _file; TLocalisamfile* _file;
int _fathfasi;
TAnal_tree_pos _curr; TAnal_tree_pos _curr;
protected: protected:
@ -940,6 +938,19 @@ const TToken_string& TAnal_tree::curr_of_file() const
const TRectype& rec = _file->curr(); const TRectype& rec = _file->curr();
TToken_string& k = get_tmp_string(); TToken_string& k = get_tmp_string();
/* if (_fathfasi > 0)
{
const TMultilevel_code_info& ffci = ca_multilevel_code_info(_fathfasi);
for (int i = 0; i < ffci.levels(); i++)
{
const TFieldref& ff_fld = ffci.fieldref(i);
TString16 fname = FASI_CODCMSFAS;
fname << '[' << (ff_fld.from()+1) << ',' << (ff_fld.to()) << ']';
const TFieldref fld(fname, 0);
k.add(fld.read(rec));
}
}*/
for (int i = 0; i < mci.levels(); i++) for (int i = 0; i < mci.levels(); i++)
{ {
@ -977,7 +988,13 @@ int TAnal_tree::curr_level() const
int TAnal_tree::max_level() const int TAnal_tree::max_level() const
{ {
const TMultilevel_code_info& mci = ca_multilevel_code_info(_file->num()); const TMultilevel_code_info& mci = ca_multilevel_code_info(_file->num());
return mci.levels(); int ml = mci.levels();
if (_fathfasi > 0)
{
const TMultilevel_code_info& ffci = ca_multilevel_code_info(_fathfasi);
ml += ffci.levels();
}
return ml;
} }
const TToken_string& TAnal_tree::father_of(const TToken_string& key) const const TToken_string& TAnal_tree::father_of(const TToken_string& key) const
@ -1156,6 +1173,13 @@ bool TAnal_tree::get_description(TString& desc) const
TAnal_tree::TAnal_tree(int logicnum) TAnal_tree::TAnal_tree(int logicnum)
{ {
_file = new TLocalisamfile(logicnum); _file = new TLocalisamfile(logicnum);
_fathfasi = 0;
if (logicnum == LF_FASI)
{
const TString& ff = ca_config().get("FathFasi");
if (ff.full())
_fathfasi = (ff == "CMS") ? LF_COMMESSE : LF_CDC;
}
} }
TAnal_tree::~TAnal_tree() TAnal_tree::~TAnal_tree()