diff --git a/testHasttable/breaker.cpp b/testHasttable/breaker.cpp index 1132c7e..a2abdbb 100644 --- a/testHasttable/breaker.cpp +++ b/testHasttable/breaker.cpp @@ -48,6 +48,11 @@ bool Breaker::derivedParse(QXmlStreamReader &reader) return true; } +QString Breaker::getEquipmentMemberOf_EquipmentContainer() +{ + return this->equipmentContainer; +} + QString Breaker::getNamingDescription() { return this->namingDescription; diff --git a/testHasttable/breaker.h b/testHasttable/breaker.h index dfe2dfd..1bea6ce 100644 --- a/testHasttable/breaker.h +++ b/testHasttable/breaker.h @@ -8,6 +8,7 @@ class Breaker:public BasicElementInfo public: explicit Breaker(QObject *parent = 0); virtual bool parse(QXmlStreamReader& reader); + QString getEquipmentMemberOf_EquipmentContainer(); QString getNamingDescription(); QString getTerminalA(); QString getTerminalB(); diff --git a/testHasttable/loadmapping.cpp b/testHasttable/loadmapping.cpp index 8d0a522..51ccf31 100644 --- a/testHasttable/loadmapping.cpp +++ b/testHasttable/loadmapping.cpp @@ -166,6 +166,7 @@ bool LoadMapping::readMatch(const QString& dir) t->setLoadName(sep.at(i)); loads.push_back(t); (*this->loadsToLoadInfo)[sep.at(i)]=t; + } (*this->loads)[SFDid]=loads; diff --git a/testHasttable/main.cpp b/testHasttable/main.cpp index 3357893..b641391 100644 --- a/testHasttable/main.cpp +++ b/testHasttable/main.cpp @@ -9,7 +9,7 @@ int main(int argc, char *argv[]) { QCoreApplication a(argc, argv); // LoadMapping lm; -// lm.load("D:/Project/佛山项目/数据/搭网架参数文件/泰安/泰安负荷","D:/Project/佛山项目/数据/匹配的数据","D:/Project/佛山项目/数据/exception.txt"); +// lm.load("D:/Project/佛山项目/数据/搭网架参数文件/北滘/北滘负荷","D:/Project/佛山项目/数据/匹配的数据/北滘","D:/Project/佛山项目/数据/exception.txt"); // LoadInfo loadInfo; // loadInfo.setLoadPath("D:/Project/佛山项目/数据/搭网架参数文件/泰安/泰安负荷/718发展线/专变/威灵电机工业园电房1.csv"); // loadInfo.updateByTime(QTime(0,15,0)); diff --git a/testHasttable/topologyrecorder.cpp b/testHasttable/topologyrecorder.cpp index cf05872..500f7b7 100644 --- a/testHasttable/topologyrecorder.cpp +++ b/testHasttable/topologyrecorder.cpp @@ -107,8 +107,8 @@ bool TopologyRecorder::startWithNode(const QString& node) { continue; } - std::cout<getLength()<getID().toStdString()<getLength()<getID().toStdString()<getTerminalA(); terminalB=AC->getTerminalB(); foundEle=AC; @@ -140,6 +140,9 @@ bool TopologyRecorder::startWithNode(const QString& node) { // std::cout<<"sw "<getNamingDescription().toStdString()<<"is close"<getEquipmentMemberOf_EquipmentContainer().toLocal8Bit().data()<getTerminalA(); terminalB=SW->getTerminalB(); // std::cout<<"find"<getID().toStdString()<