diff --git a/testHasttable/cimexporter.cpp b/testHasttable/cimexporter.cpp index 8fdf615..4bc9892 100644 --- a/testHasttable/cimexporter.cpp +++ b/testHasttable/cimexporter.cpp @@ -49,6 +49,7 @@ void CIMExporter::exportTo(const QString& path) } + template void CIMExporter::idToNumber(QList &s)//把所有元件的标识进行编号 { diff --git a/testHasttable/main.cpp b/testHasttable/main.cpp index ebf5db8..0459346 100644 --- a/testHasttable/main.cpp +++ b/testHasttable/main.cpp @@ -7,10 +7,10 @@ int main(int argc, char *argv[]) { QCoreApplication a(argc, argv); // ReadWrite aa; - RegexExtract re; - re.extract("D:/Project/佛山项目/数据/df8003/df8600/exportfiles/exportmodel_pw.xml"); - re.exportBlocks("./a"); - return a.exec(); +// RegexExtract re; +// re.extract("D:/Project/佛山项目/数据/df8003/df8600/exportfiles/exportmodel_pw.xml"); +// re.exportBlocks("./a"); +// return a.exec(); ElementHashtable eleReader; eleReader.Parse("D:/Project/佛山项目/数据/df8003/df8600/exportfiles/exportmodel_pw.xml","D:/Project/佛山项目/佛山收资/exportmodel_zwyth20141204/exportmodel_zwyth.xml"); // eleReader.GoPath(); diff --git a/testHasttable/task.cpp b/testHasttable/task.cpp index 53163a7..4160cfd 100644 --- a/testHasttable/task.cpp +++ b/testHasttable/task.cpp @@ -66,7 +66,7 @@ void Task::doAgainstTaskFile(ElementHashtable &eleHT) eleHT.SetFDSet(setSep.toVector()); eleHT.GoPath(); eleHT.ShowContainerInfo(lineName); -// break; + break; } file.close(); } diff --git a/testHasttable/task.txt b/testHasttable/task.txt index 85ece74..fac20d0 100644 --- a/testHasttable/task.txt +++ b/testHasttable/task.txt @@ -47,7 +47,7 @@ 719ˮ,AC-831217,(FD-2048) #704ˮ,AC-591831,()svg 703ǰ,AC-671661,(FD-1992,FD-1998) -730̩,AC-903666,(FD-58442,FD-2025) +730̩,AC-903666,(FD-58442,FD-2025,) 716ҵ,AC-591810,(FD-1994,FD-58443) 712ϴ,AC-671668,(FD-2042) 714̩,AC-671670,(FD-2103,) diff --git a/testHasttable/topologyrecorder.cpp b/testHasttable/topologyrecorder.cpp index 6247f0b..972079e 100644 --- a/testHasttable/topologyrecorder.cpp +++ b/testHasttable/topologyrecorder.cpp @@ -83,7 +83,6 @@ bool TopologyRecorder::startWithNode(const QString& node) { TopologyRecorder::Type::EleType typ; BasicElementInfo *foundEle=NULL; -// bool foundCate=false; anotherTerminal=anotherTerminalVector.at(atI); if(this->reachedTerminal.contains(anotherTerminal)) { @@ -109,10 +108,6 @@ bool TopologyRecorder::startWithNode(const QString& node) } terminalA=AC->getTerminalA(); terminalB=AC->getTerminalB(); -// std::cout<<"find"<getID().toStdString()<getNamingDescription().toStdString()<getLength()<hasAdded.contains(foundEle->getID())) + { + continue; + } + this->hasAdded[foundEle->getID()]=0; case TopologyRecorder::Type::AC: branch=new Line(fromTo,static_cast(foundEle),this); this->cimExporter.add(fromTo,static_cast(branch)); diff --git a/testHasttable/topologyrecorder.h b/testHasttable/topologyrecorder.h index 3ca8c28..e2291c0 100644 --- a/testHasttable/topologyrecorder.h +++ b/testHasttable/topologyrecorder.h @@ -42,6 +42,7 @@ private: QVector tfs; CIMExporter cimExporter; QVector FDSet; + QHash hasAdded; bool isEquipmentNeeded(const QString& substatinID); };