1.修复了一些类的isTerminal没有被初始化的bug

2.修复了一些地方判断下一个Terminal的bug
Signed-off-by: facat@lab.com <facat@lab.com>
This commit is contained in:
facat@lab.com
2014-12-06 21:48:07 +08:00
parent 38025aa1fc
commit 69cd117f35
14 changed files with 229 additions and 41 deletions

View File

@@ -7,6 +7,7 @@
#include <QDebug>
#include <QFile>
#include <QHash>
#include <QVector>
#include "BasicElementInfo.h"
#include "subcontrolarea.h"
#include "busbarsection.h"
@@ -17,18 +18,22 @@
#include "disconnector.h"
#include "powertransformer.h"
#include "synchronousmachine.h"
#include "nodetoterminal.h"
#include "topologyrecorder.h"
class ElementHashtable : public QObject
{
Q_OBJECT
public:
explicit ElementHashtable(QObject *parent = 0);
bool parse(const QString& xmlPath);
bool goPath();
bool Parse(const QString& xmlPWPath,const QString& xmlZWPath);
bool GoPath();
private:
bool child(QXmlStreamReader &reader);
bool setCurrentHashTable(QHash<QString,BasicElementInfo *> *t);
bool parse(const QString& xmlPath);
QHash<QString,BasicElementInfo *> eleHT;
QHash<QString,BasicElementInfo *> mainStationHT;//记录主站的元素
NodeToTerminal nodeToTerminal;
QHash<QString,BasicElementInfo *> *currentHT;
signals:
public slots: