diff --git a/testHasttable/aclinesegment.cpp b/testHasttable/aclinesegment.cpp index 5c55f8c..db58023 100644 --- a/testHasttable/aclinesegment.cpp +++ b/testHasttable/aclinesegment.cpp @@ -32,14 +32,14 @@ bool ACLineSegment::derivedParse(QXmlStreamReader &reader) { // std::cout<<"Nd"<lineName=reader.readElementText(); + this->namingDescription=reader.readElementText(); } return true; } -QString ACLineSegment::getLineName() +QString ACLineSegment::getNamingDescription() { - return this->lineName; + return this->namingDescription; } QString ACLineSegment::getTerminalA() diff --git a/testHasttable/aclinesegment.h b/testHasttable/aclinesegment.h index 12846f5..96a8ef6 100644 --- a/testHasttable/aclinesegment.h +++ b/testHasttable/aclinesegment.h @@ -8,12 +8,12 @@ public: virtual bool parse(QXmlStreamReader &reader); QString getTerminalA(); QString getTerminalB(); - QString getLineName(); + QString getNamingDescription(); protected: QString terminalA; QString terminalB; QString containsOfSubstation; - QString lineName; + QString namingDescription; virtual bool derivedParse(QXmlStreamReader &reader); private: bool isTerminalA; diff --git a/testHasttable/topologyrecorder.cpp b/testHasttable/topologyrecorder.cpp index 012cdfd..eb3bb3c 100644 --- a/testHasttable/topologyrecorder.cpp +++ b/testHasttable/topologyrecorder.cpp @@ -47,7 +47,7 @@ bool TopologyRecorder::startWithNode(const QString& node) terminalA=AC->getTerminalA(); terminalB=AC->getTerminalB(); std::cout<<"find"<getID().toStdString()<getLineName().toStdString()<getNamingDescription().toStdString()<