SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@238 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Пелипенко Иван
2017-06-16 12:29:33 +00:00
parent 4e90eef9bc
commit b874ffb253
13 changed files with 259 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cd_utils/cdutils_core.cpp
View File

@@ -118,16 +118,16 @@ void CDCore::k_parse(PIIODevice * d) {
}
void CDCore::k_update(PIIODevice * d) {
void CDCore::k_update(PIIODevice * d, UpdateModeFlags mode) {
CDSection uk = k_;
k_parse(d);
bool kn = true;
/*bool kn = true;
if (!uk.isEmpty())
if (!uk.isSameStructure(k_)) {
piCout << "ask for save names";
K_KeepNamesRequest(&kn);
}
uk.update(k_, kn);
}*/
uk.update(k_, mode);
//piCout << k_.count() << uk.count();
k_ = uk;
k_.makePath();

3
cd_utils/cdutils_core.h
View File

@@ -35,14 +35,13 @@ public:
EVENT(K_Received)
EVENT(K_ReceiveFail)
EVENT(K_ChangedGlobal)
EVENT1(K_KeepNamesRequest, bool*, kn)
EVENT_HANDLER(void, K_Send);
EVENT_HANDLER(void, K_Request);
void k_write(PIIODevice * d);
void k_read(PIIODevice * d);
void k_parse(PIIODevice * d);
void k_update(PIIODevice * d);
void k_update(PIIODevice * d, UpdateModeFlags mode);
void k_calculate();
void initApp();
void initPult();

5
cd_utils/cdutils_k.cpp
View File

@@ -17,7 +17,6 @@ KInterface::KInterface() {
CONNECTU(core, K_SendFail, this, sendFailed);
CONNECTU(core, K_Received, this, received);
CONNECTU(core, K_ReceiveFail, this, receiveFailed);
CONNECTU(core, K_KeepNamesRequest, this, keepNamesRequest);
}
@@ -127,8 +126,8 @@ void KInterface::parse(PIIODevice * d) {
}
void KInterface::update(PIIODevice * d) {
core->k_update(d);
void KInterface::update(PIIODevice * d, UpdateModeFlags mode) {
core->k_update(d, mode);
}

2
cd_utils/cdutils_k.h
View File

@@ -47,7 +47,7 @@ public:
void write(PIIODevice * d);
void read(PIIODevice * d);
void parse(PIIODevice * d);
void update(PIIODevice * d);
void update(PIIODevice * d, UpdateModeFlags mode = SaveByName);
void calculate();
PIString appConfig();

84
cd_utils/cdutils_types.cpp
View File

@@ -375,16 +375,70 @@ void CDSection::read(const void * ep) {
}
void CDSection::update(CDSection & v, bool keep_names) {
// piCout << "[CDSection] update start";
PIMap<PIString, PIString> prev_k_f;
PISet<int> used;
PIMap<int, CDType>::iterator i;
//piCout << "before" << k.size() << v.k.size();
if (keep_names) {
for (i = k.begin(); i != k.end(); ++i)
prev_k_f[i.value().name_] = i.value().formula();
void CDSection::update(CDSection & v, UpdateModeFlags mode) {
if (mode[SaveByIndex] && mode[SaveByName]) {
piCout << "[CDSection] update error: SaveByIndex | SaveByName mode is denied!";
return;
}
//piCout << "[CDSection] update start";
//piCout << "before" << k.size() << v.k.size();
PIMap<int, PIString> prev_k_f_bi;
PIMap<PIString, PIString> prev_k_f_bn;
PIMap<int, CDType>::iterator i;
if (mode[SaveByIndex]) {
for (i = k.begin(); i != k.end(); ++i)
prev_k_f_bi[i.key()] = i.value().formula();
}
if (mode[SaveByName]) {
for (i = k.begin(); i != k.end(); ++i)
prev_k_f_bn[i.value().name_] = i.value().formula();
}
if (!mode[Merge])
k.clear();
for (i = v.k.begin(); i != v.k.end(); ++i) {
int id = i.key();
PIString n = i.value().name();
k[id] = i.value();
if (mode[SaveByIndex]) {
if (prev_k_f_bi.contains(id))
k[id].setFormula(prev_k_f_bi[id]);
}
if (mode[SaveByName]) {
if (prev_k_f_bn.contains(n))
k[id].setFormula(prev_k_f_bn[n]);
}
}
PIMap<int, CDSection> prev_s_bi;
PIMap<PIString, CDSection> prev_s_bn;
PIMap<int, CDSection>::iterator j;
if (mode[SaveByIndex]) {
for (j = s.begin(); j != s.end(); ++j)
prev_s_bi[j.key()] = j.value();
}
if (mode[SaveByName]) {
for (j = s.begin(); j != s.end(); ++j)
prev_s_bn[j.value().alias] = j.value();
}
if (!mode[Merge])
s.clear();
for (j = v.s.begin(); j != v.s.end(); ++j) {
int id = j.key();
PIString n = j.value().alias;
s[id] = j.value();
if (mode[SaveByIndex]) {
if (prev_s_bi.contains(id))
s[id] = prev_s_bi[id];
}
if (mode[SaveByName]) {
if (prev_s_bn.contains(n))
s[id] = prev_s_bn[n];
}
s[id].update(j.value(), mode);
}
/*PISet<int> used;
for (i = k.begin(); i != k.end(); ++i) {
if (v.k.contains(i.key())) {
PIString f = k[i.key()].formula_;
@@ -393,10 +447,10 @@ void CDSection::update(CDSection & v, bool keep_names) {
k[i.key()] = cdt;
used << i.key();
}
if (keep_names) {
if (mode) {
CDType & ck(k[i.key()]);
if (prev_k_f.contains(ck.name_))
ck.setFormula(prev_k_f[ck.name_]);
if (prev_k_f_bn.contains(ck.name_))
ck.setFormula(prev_k_f_bn[ck.name_]);
}
}
//piCout << " after" << k.size();
@@ -404,19 +458,19 @@ void CDSection::update(CDSection & v, bool keep_names) {
if (!used.contains(i.key()))
k[i.key()] = i.value();
CDType & ck(k[i.key()]);
ck.setFormula(prev_k_f.value(ck.name_));
ck.setFormula(prev_k_f_bn.value(ck.name_));
}
used.clear();
PIMap<int, CDSection>::iterator j;
for (j = s.begin(); j != s.end(); ++j) {
if (v.s.contains(j.key()))
j.value().update(v.s[j.key()], keep_names);
j.value().update(v.s[j.key()], mode);
used << j.key();
}
for (j = v.s.begin(); j != v.s.end(); ++j) {
if (!used.contains(j.key()))
s[j.key()] = j.value();
}
}*/
// piCout << "[CDSection] update end";
}

10
cd_utils/cdutils_types.h
View File

@@ -15,6 +15,14 @@ namespace CDUtils {
class CDSection;
enum UpdateMode {
SaveByIndex = 0x01,
SaveByName = 0x02,
Merge = 0x04
};
typedef PIFlags<UpdateMode> UpdateModeFlags;
class CDType {
friend class CDSection;
public:
@@ -97,7 +105,7 @@ protected:
}
void write(PIIODevice * d, const PIString & prefix = PIString());
void read(const void * ep);
void update(CDSection & v, bool keep_names);
void update(CDSection & v, UpdateModeFlags mode = SaveByName);
bool isSameStructure(CDSection & v);
void prepareCalculate();
void calculateRecursive(PIEvaluator * e);