diff --git a/testHasttable/aclinesegment.cpp b/testHasttable/aclinesegment.cpp index a87ed96..8288e84 100644 --- a/testHasttable/aclinesegment.cpp +++ b/testHasttable/aclinesegment.cpp @@ -10,7 +10,7 @@ bool ACLineSegment::derivedParse(QXmlStreamReader &reader) { QString terminal; terminal=reader.attributes().value("rdf:resource").toString(); - this->terminalA=terminal.replace("#","").leftRef(-1).toString();//返回整个字符串的Ref + this->terminalA=terminal.replace("#","").leftRef(-1).toString(); qDebug()<<"got "<<"ConductingEquipment.Terminals "<terminalA<<"\n"; this->isTerminalA=false; } @@ -18,14 +18,14 @@ bool ACLineSegment::derivedParse(QXmlStreamReader &reader) { QString terminal; terminal=reader.attributes().value("rdf:resource").toString(); - this->terminalB=terminal.replace("#","").leftRef(-1).toString();//返回整个字符串的Ref + this->terminalB=terminal.replace("#","").leftRef(-1).toString(); qDebug()<<"got "<<"ConductingEquipment.Terminals "<terminalB<<"\n"; } if("ConductingEquipment.Substation"==reader.name() && reader.attributes().hasAttribute("rdf:resource")) { QString ss; ss=reader.attributes().value("rdf:resource").toString(); - this->containsOfSubstation=ss.replace("#","").leftRef(-1).toString();//返回整个字符串的Ref + this->containsOfSubstation=ss.replace("#","").leftRef(-1).toString(); qDebug()<<"got "<<"ConductingEquipment.Substation "<containsOfSubstation<<"\n"; } return true; diff --git a/testHasttable/breaker.cpp b/testHasttable/breaker.cpp index 103efbf..be973f4 100644 --- a/testHasttable/breaker.cpp +++ b/testHasttable/breaker.cpp @@ -10,7 +10,7 @@ bool Breaker::derivedParse(QXmlStreamReader &reader) { QString terminal; terminal=reader.attributes().value("rdf:resource").toString(); - this->terminalA=terminal.replace("#","").leftRef(-1).toString();//返回整个字符串的Ref + this->terminalA=terminal.replace("#","").leftRef(-1).toString(); qDebug()<<"got "<<"ConductingEquipment.Terminals "<terminalA<<"\n"; this->isTerminalA=false; } @@ -18,14 +18,14 @@ bool Breaker::derivedParse(QXmlStreamReader &reader) { QString terminal; terminal=reader.attributes().value("rdf:resource").toString(); - this->terminalB=terminal.replace("#","").leftRef(-1).toString();//返回整个字符串的Ref + this->terminalB=terminal.replace("#","").leftRef(-1).toString(); qDebug()<<"got "<<"ConductingEquipment.Terminals "<terminalB<<"\n"; } if("Equipment.MemberOf_EquipmentContainer"==reader.name() && reader.attributes().hasAttribute("rdf:resource")) { QString ss; ss=reader.attributes().value("rdf:resource").toString(); - this->equipmentContainer=ss.replace("#","").leftRef(-1).toString();//返回整个字符串的Ref + this->equipmentContainer=ss.replace("#","").leftRef(-1).toString(); qDebug()<<"got "<<"Equipment.MemberOf_EquipmentContainer "<equipmentContainer<<"\n"; } return true; diff --git a/testHasttable/busbarsection.cpp b/testHasttable/busbarsection.cpp index ad05e9a..14dff2d 100644 --- a/testHasttable/busbarsection.cpp +++ b/testHasttable/busbarsection.cpp @@ -12,7 +12,7 @@ bool BusbarSection::derivedParse(QXmlStreamReader& reader) { QString terminal; terminal=reader.attributes().value("rdf:resource").toString(); - this->terminal=terminal.replace("#","").leftRef(-1).toString();//返回整个字符串的Ref + this->terminal=terminal.replace("#","").leftRef(-1).toString(); qDebug()<<"got "<<"ConductingEquipment.Terminals "<terminal<<"\n"; // std::cout<<"ConductingEquipment.Terminals"<terminal.toStdString()<terminal=terminal.replace("#","").leftRef(-1).toString();//返回整个字符串的Ref + this->terminal=terminal.replace("#","").leftRef(-1).toString(); qDebug()<<"got "<<"ConductingEquipment.Terminals "<terminal<<"\n"; } return true; diff --git a/testHasttable/disconnector.cpp b/testHasttable/disconnector.cpp index 39c4c62..4cefca2 100644 --- a/testHasttable/disconnector.cpp +++ b/testHasttable/disconnector.cpp @@ -11,7 +11,7 @@ bool Disconnector::derivedParse(QXmlStreamReader &reader) { QString terminal; terminal=reader.attributes().value("rdf:resource").toString(); - this->terminalA=terminal.replace("#","").leftRef(-1).toString();//返回整个字符串的Ref + this->terminalA=terminal.replace("#","").leftRef(-1).toString(); qDebug()<<"got "<<"ConductingEquipment.Terminals "<terminalA<<"\n"; this->isTerminalA=false; } @@ -19,14 +19,14 @@ bool Disconnector::derivedParse(QXmlStreamReader &reader) { QString terminal; terminal=reader.attributes().value("rdf:resource").toString(); - this->terminalB=terminal.replace("#","").leftRef(-1).toString();//返回整个字符串的Ref + this->terminalB=terminal.replace("#","").leftRef(-1).toString(); qDebug()<<"got "<<"ConductingEquipment.Terminals "<terminalB<<"\n"; } if("Equipment.MemberOf_EquipmentContainer"==reader.name() && reader.attributes().hasAttribute("rdf:resource")) { QString ss; ss=reader.attributes().value("rdf:resource").toString(); - this->equipmentContainer=ss.replace("#","").leftRef(-1).toString();//返回整个字符串的Ref + this->equipmentContainer=ss.replace("#","").leftRef(-1).toString(); qDebug()<<"got "<<"Equipment.MemberOf_EquipmentContainer "<equipmentContainer<<"\n"; } return true; diff --git a/testHasttable/powertransformer.cpp b/testHasttable/powertransformer.cpp index deb6649..a7f7bb5 100644 --- a/testHasttable/powertransformer.cpp +++ b/testHasttable/powertransformer.cpp @@ -11,7 +11,7 @@ bool PowerTransformer::derivedParse(QXmlStreamReader &reader) { QString terminal; terminal=reader.attributes().value("rdf:resource").toString(); - this->terminalA=terminal.replace("#","").leftRef(-1).toString();//返回整个字符串的Ref + this->terminalA=terminal.replace("#","").leftRef(-1).toString(); qDebug()<<"got "<<"ConductingEquipment.Terminals "<terminalA<<"\n"; this->isTerminalA=false; } @@ -19,14 +19,14 @@ bool PowerTransformer::derivedParse(QXmlStreamReader &reader) { QString terminal; terminal=reader.attributes().value("rdf:resource").toString(); - this->terminalB=terminal.replace("#","").leftRef(-1).toString();//返回整个字符串的Ref + this->terminalB=terminal.replace("#","").leftRef(-1).toString(); qDebug()<<"got "<<"ConductingEquipment.Terminals "<terminalB<<"\n"; } if("Equipment.MemberOf_EquipmentContainer"==reader.name() && reader.attributes().hasAttribute("rdf:resource")) { QString ss; ss=reader.attributes().value("rdf:resource").toString(); - this->equipmentContainer=ss.replace("#","").leftRef(-1).toString();//返回整个字符串的Ref + this->equipmentContainer=ss.replace("#","").leftRef(-1).toString(); qDebug()<<"got "<<"Equipment.MemberOf_EquipmentContainer "<equipmentContainer<<"\n"; } return true; diff --git a/testHasttable/synchronousmachine.cpp b/testHasttable/synchronousmachine.cpp index 524d200..2c581b3 100644 --- a/testHasttable/synchronousmachine.cpp +++ b/testHasttable/synchronousmachine.cpp @@ -10,7 +10,7 @@ bool SynchronousMachine::derivedParse(QXmlStreamReader &reader) { QString terminal; terminal=reader.attributes().value("rdf:resource").toString(); - this->terminal=terminal.replace("#","").leftRef(-1).toString();//返回整个字符串的Ref + this->terminal=terminal.replace("#","").leftRef(-1).toString(); qDebug()<<"got "<<"ConductingEquipment.Terminals "<terminal<<"\n"; } return true; diff --git a/testHasttable/terminal.cpp b/testHasttable/terminal.cpp index 11fc48c..d7b38d8 100644 --- a/testHasttable/terminal.cpp +++ b/testHasttable/terminal.cpp @@ -12,7 +12,7 @@ bool Terminal::derivedParse(QXmlStreamReader& reader) { QString cn; cn=reader.attributes().value("rdf:resource").toString(); - this->connectivityNode=cn.replace("#","").leftRef(-1).toString();//返回整个字符串的Ref + this->connectivityNode=cn.replace("#","").leftRef(-1).toString(); qDebug()<<"got "<<"Terminal.ConnectivityNode "<connectivityNode<<"\n"; NodeToTerminal nt; nt.add(this->connectivityNode,this->id); @@ -22,7 +22,7 @@ bool Terminal::derivedParse(QXmlStreamReader& reader) { QString ce; ce=reader.attributes().value("rdf:resource").toString(); - this->conductingEquipment=ce.replace("#","").leftRef(-1).toString();//返回整个字符串的Ref + this->conductingEquipment=ce.replace("#","").leftRef(-1).toString(); qDebug()<<"got "<<"Terminal.ConductingEquipment "<conductingEquipment<<"\n"; } return true; diff --git a/testHasttable/topologyrecorder.cpp b/testHasttable/topologyrecorder.cpp index dce99f3..d814216 100644 --- a/testHasttable/topologyrecorder.cpp +++ b/testHasttable/topologyrecorder.cpp @@ -20,15 +20,15 @@ bool TopologyRecorder::startWithNode(const QString& node) anotherTerminal=anotherTerminalVector.at(atI); if(this->reachedTerminal.contains(anotherTerminal)) { - std::cout<reachedTerminal[anotherTerminal]=0; - std::cout<<"anotherTerminal"<(ht[anotherTerminal]); QString ce; ce=anotherTerminalP->getConductingEquipment(); - std::cout<(ht[acID]); if(!AC) { - std::cout<<"can not find "<getTerminalB(); QString nextTerminal; nextTerminal=(terminalA==anotherTerminal)?terminalB:terminalA; - std::cout<<"new Terminal"<(ht[nextTerminal]); if(!nextTerminalP) { - std::cout<<"can not terminal "<getConnectivityNode(); - std::cout<<"next node"<startWithNode(nextNode); } if(ce.startsWith("SW")) @@ -72,25 +72,25 @@ bool TopologyRecorder::startWithNode(const QString& node) Breaker *SW=static_cast(ht[swID]); if(!SW) { - std::cout<<"can not SW "<getTerminalA(); terminalB=SW->getTerminalB(); - std::cout<<"terminalA"<(ht[nextTerminal]); if(!nextTerminalP) { - std::cout<<"can not terminal "<getConnectivityNode(); - std::cout<<"next node"<startWithNode(nextNode); }