1.注释掉一些不用的输出

2.删掉一些错误的注释

Signed-off-by: facat@lab.com <facat@lab.com>
This commit is contained in:
facat@lab.com
2014-12-06 22:12:17 +08:00
parent 69cd117f35
commit 000f9b89fa
9 changed files with 29 additions and 29 deletions

View File

@@ -20,15 +20,15 @@ bool TopologyRecorder::startWithNode(const QString& node)
anotherTerminal=anotherTerminalVector.at(atI);
if(this->reachedTerminal.contains(anotherTerminal))
{
std::cout<<anotherTerminal.toStdString()<<"reached"<<std::endl;
// std::cout<<anotherTerminal.toStdString()<<"reached"<<std::endl; //@1
continue;
}
this->reachedTerminal[anotherTerminal]=0;
std::cout<<"anotherTerminal"<<anotherTerminal.toStdString()<<std::endl;
// std::cout<<"anotherTerminal"<<anotherTerminal.toStdString()<<std::endl;//@1
Terminal *anotherTerminalP=static_cast<Terminal *>(ht[anotherTerminal]);
QString ce;
ce=anotherTerminalP->getConductingEquipment();
std::cout<<ce.toStdString()<<"from "<<anotherTerminal.toStdString() <<std::endl;
// std::cout<<ce.toStdString()<<"from "<<anotherTerminal.toStdString() <<std::endl;//@1
if(ce.startsWith("AC"))
{
foundCate=true;
@@ -41,7 +41,7 @@ bool TopologyRecorder::startWithNode(const QString& node)
ACLineSegment *AC=static_cast<ACLineSegment *>(ht[acID]);
if(!AC)
{
std::cout<<"can not find "<<acID.toStdString()<<std::endl;
// std::cout<<"can not find "<<acID.toStdString()<<std::endl;//@1
continue;
}
QString terminalA;
@@ -50,15 +50,15 @@ bool TopologyRecorder::startWithNode(const QString& node)
terminalB=AC->getTerminalB();
QString nextTerminal;
nextTerminal=(terminalA==anotherTerminal)?terminalB:terminalA;
std::cout<<"new Terminal"<<nextTerminal.toStdString()<<std::endl;
// std::cout<<"new Terminal"<<nextTerminal.toStdString()<<std::endl;//@1
Terminal *nextTerminalP=static_cast<Terminal *>(ht[nextTerminal]);
if(!nextTerminalP)
{
std::cout<<"can not terminal "<<nextTerminal.toStdString()<<std::endl;
// std::cout<<"can not terminal "<<nextTerminal.toStdString()<<std::endl;//@1
continue;
}
QString nextNode=nextTerminalP->getConnectivityNode();
std::cout<<"next node"<<nextNode.toStdString()<<"from"<<nextTerminal.toStdString()<<std::endl;
// std::cout<<"next node"<<nextNode.toStdString()<<"from"<<nextTerminal.toStdString()<<std::endl;//@1
this->startWithNode(nextNode);
}
if(ce.startsWith("SW"))
@@ -72,25 +72,25 @@ bool TopologyRecorder::startWithNode(const QString& node)
Breaker *SW=static_cast<Breaker *>(ht[swID]);
if(!SW)
{
std::cout<<"can not SW "<<swID.toStdString()<<std::endl;
// std::cout<<"can not SW "<<swID.toStdString()<<std::endl;//@1
continue;
}
QString terminalA;
QString terminalB;
terminalA=SW->getTerminalA();
terminalB=SW->getTerminalB();
std::cout<<"terminalA"<<terminalA.toStdString()<<std::endl;
std::cout<<"terminalB"<<terminalB.toStdString()<<std::endl;
// std::cout<<"terminalA"<<terminalA.toStdString()<<std::endl;//@1
// std::cout<<"terminalB"<<terminalB.toStdString()<<std::endl;//@1
QString nextTerminal;
nextTerminal=(terminalA==anotherTerminal)?terminalB:terminalA;
Terminal *nextTerminalP=static_cast<Terminal *>(ht[nextTerminal]);
if(!nextTerminalP)
{
std::cout<<"can not terminal "<<nextTerminal.toStdString()<<std::endl;
// std::cout<<"can not terminal "<<nextTerminal.toStdString()<<std::endl;//@1
continue;
}
QString nextNode=nextTerminalP->getConnectivityNode();
std::cout<<"next node"<<nextNode.toStdString()<<"from"<<nextTerminal.toStdString()<<std::endl;
// std::cout<<"next node"<<nextNode.toStdString()<<"from"<<nextTerminal.toStdString()<<std::endl;//@1
this->startWithNode(nextNode);
}