diff --git a/testHasttable/cimexporter.cpp b/testHasttable/cimexporter.cpp index 030f929..36f16c6 100644 --- a/testHasttable/cimexporter.cpp +++ b/testHasttable/cimexporter.cpp @@ -33,6 +33,7 @@ void CIMExporter::add(const QPair& fromTo,Transformer* tf) void CIMExporter::exportTo(const QString& path) { + return; //先给所有节点都编号 this->idToNumber(this->line); this->idToNumber(this->sw); diff --git a/testHasttable/elementhashtable.cpp b/testHasttable/elementhashtable.cpp index 9a4047f..0bbf2c5 100644 --- a/testHasttable/elementhashtable.cpp +++ b/testHasttable/elementhashtable.cpp @@ -57,11 +57,11 @@ bool ElementHashtable::child(QXmlStreamReader &reader) pointer=new PowerTransformer(this); pointer->parse(reader); } -// if(elementName=="SynchronousMachine") -// { -// pointer=new SynchronousMachine(this); -// pointer->parse(reader); -// } + if(elementName=="SynchronousMachine") + { + pointer=new SynchronousMachine(this); + pointer->parse(reader); + } if(pointer && id!="") { diff --git a/testHasttable/task.cpp b/testHasttable/task.cpp index 639322e..d94b4a8 100644 --- a/testHasttable/task.cpp +++ b/testHasttable/task.cpp @@ -49,7 +49,7 @@ void Task::doAgainstTaskFile(ElementHashtable &eleHT) { continue; } - std::cout< +#include #include TopologyRecorder::TopologyRecorder(const QHash& elementHT, const QVector &FDSet, QObject *parent):eleHT(elementHT),FDSet(FDSet) { @@ -88,6 +88,7 @@ bool TopologyRecorder::startWithNode(const QString& node) { continue; } +// std::cout<reachedTerminal[anotherTerminal]=0; Terminal *anotherTerminalP=static_cast(ht[anotherTerminal]); QString ce; @@ -106,6 +107,8 @@ bool TopologyRecorder::startWithNode(const QString& node) { continue; } + std::cout<getLength()<getID().toStdString()<getTerminalA(); terminalB=AC->getTerminalB(); foundEle=AC; @@ -203,7 +206,7 @@ bool TopologyRecorder::startWithNode(const QString& node) } else { -// std::cout<<"encounter "<getNamingDescription().toStdString()<getNamingDescription().toLocal8Bit().data()<isEquipmentNeeded(container)) { // std::cout<<"not belong"<getNamingDescription().toStdString()<<"not belong"<