parent
fd0a71f397
commit
88ca00c78b
|
|
@ -33,6 +33,7 @@ void CIMExporter::add(const QPair<QString,QString>& fromTo,Transformer* tf)
|
||||||
|
|
||||||
void CIMExporter::exportTo(const QString& path)
|
void CIMExporter::exportTo(const QString& path)
|
||||||
{
|
{
|
||||||
|
return;
|
||||||
//先给所有节点都编号
|
//先给所有节点都编号
|
||||||
this->idToNumber(this->line);
|
this->idToNumber(this->line);
|
||||||
this->idToNumber(this->sw);
|
this->idToNumber(this->sw);
|
||||||
|
|
|
||||||
|
|
@ -57,11 +57,11 @@ bool ElementHashtable::child(QXmlStreamReader &reader)
|
||||||
pointer=new PowerTransformer(this);
|
pointer=new PowerTransformer(this);
|
||||||
pointer->parse(reader);
|
pointer->parse(reader);
|
||||||
}
|
}
|
||||||
// if(elementName=="SynchronousMachine")
|
if(elementName=="SynchronousMachine")
|
||||||
// {
|
{
|
||||||
// pointer=new SynchronousMachine(this);
|
pointer=new SynchronousMachine(this);
|
||||||
// pointer->parse(reader);
|
pointer->parse(reader);
|
||||||
// }
|
}
|
||||||
|
|
||||||
if(pointer && id!="")
|
if(pointer && id!="")
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,7 @@ void Task::doAgainstTaskFile(ElementHashtable &eleHT)
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
std::cout<<v.toStdString()<<std::endl;
|
// std::cout<<v.toStdString()<<std::endl;
|
||||||
setSep.push_back(v);
|
setSep.push_back(v);
|
||||||
}
|
}
|
||||||
// //开始解析
|
// //开始解析
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,6 @@
|
||||||
|
727揭주땜菉窟,AC-671678,(FD-2096,)
|
||||||
|
|
||||||
|
|
||||||
709美的甲线,AC-671399,(FD-2003,)
|
709美的甲线,AC-671399,(FD-2003,)
|
||||||
720美的乙线,AC-671401,(FD-2003,)
|
720美的乙线,AC-671401,(FD-2003,)
|
||||||
#715北都联络线,AC-975725|AC-456393,(FD-2050,)
|
#715北都联络线,AC-975725|AC-456393,(FD-2050,)
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
#include "topologyrecorder.h"
|
#include "topologyrecorder.h"
|
||||||
//#include <iostream>
|
#include <iostream>
|
||||||
#include <QList>
|
#include <QList>
|
||||||
TopologyRecorder::TopologyRecorder(const QHash<QString,BasicElementInfo *>& elementHT, const QVector<QString> &FDSet, QObject *parent):eleHT(elementHT),FDSet(FDSet)
|
TopologyRecorder::TopologyRecorder(const QHash<QString,BasicElementInfo *>& elementHT, const QVector<QString> &FDSet, QObject *parent):eleHT(elementHT),FDSet(FDSet)
|
||||||
{
|
{
|
||||||
|
|
@ -88,6 +88,7 @@ bool TopologyRecorder::startWithNode(const QString& node)
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
// std::cout<<anotherTerminal.toStdString()<<std::endl;
|
||||||
this->reachedTerminal[anotherTerminal]=0;
|
this->reachedTerminal[anotherTerminal]=0;
|
||||||
Terminal *anotherTerminalP=static_cast<Terminal *>(ht[anotherTerminal]);
|
Terminal *anotherTerminalP=static_cast<Terminal *>(ht[anotherTerminal]);
|
||||||
QString ce;
|
QString ce;
|
||||||
|
|
@ -106,6 +107,8 @@ bool TopologyRecorder::startWithNode(const QString& node)
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
std::cout<<AC->getLength()<<std::endl;
|
||||||
|
std::cout<<AC->getID().toStdString()<<std::endl;
|
||||||
terminalA=AC->getTerminalA();
|
terminalA=AC->getTerminalA();
|
||||||
terminalB=AC->getTerminalB();
|
terminalB=AC->getTerminalB();
|
||||||
foundEle=AC;
|
foundEle=AC;
|
||||||
|
|
@ -203,7 +206,7 @@ bool TopologyRecorder::startWithNode(const QString& node)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// std::cout<<"encounter "<<sfd->getNamingDescription().toStdString()<<std::endl;
|
// std::cout<<"encounter "<<sfd->getNamingDescription().toLocal8Bit().data()<<std::endl;
|
||||||
if(!this->isEquipmentNeeded(container))
|
if(!this->isEquipmentNeeded(container))
|
||||||
{
|
{
|
||||||
// std::cout<<"not belong"<<std::endl;
|
// std::cout<<"not belong"<<std::endl;
|
||||||
|
|
@ -230,6 +233,7 @@ bool TopologyRecorder::startWithNode(const QString& node)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// std::cout<<tf->getNamingDescription().toStdString()<<"not belong"<<std::endl;
|
// std::cout<<tf->getNamingDescription().toStdString()<<"not belong"<<std::endl;
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
typ=TopologyRecorder::Type::TF;
|
typ=TopologyRecorder::Type::TF;
|
||||||
|
|
||||||
|
|
@ -279,7 +283,7 @@ bool TopologyRecorder::startWithNode(const QString& node)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// std::cout<<"not found cate "<<ce.toStdString()<<std::endl;
|
std::cout<<"not found cate "<<ce.toStdString()<<std::endl;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue