Add debugging for station list parsing

[quandoparte] / application / stationlistmodel.cpp

diff --git a/application/stationlistmodel.cpp b/application/stationlistmodel.cpp
index 01083d8..2ee009d 100644 (file)
--- a/application/stationlistmodel.cpp
+++ b/application/stationlistmodel.cpp
@@ -1,3 +1,24 @@
+/*
+
+Copyright (C) 2011 Luciano Montanaro <mikelima@cirulla.net>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
+
+*/
+
 #include "stationlistmodel.h"
 
 #include <QFile>
@@ -6,14 +27,18 @@
 #include <QStandardItem>
 #include <QGeoCoordinate>
 
+#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
 QTM_USE_NAMESPACE
 Q_DECLARE_METATYPE(QGeoCoordinate)
+#endif
 
 StationListModel::StationListModel(QObject *parent) :
     QStandardItemModel(parent)
-
 {
     setRowCount(0);
+#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+    setRoleNames(roleNames());
+#endif
 }
 
 bool StationListModel::load(const QString &filename)
@@ -23,6 +48,8 @@ bool StationListModel::load(const QString &filename)
 
     qDebug() << "loading file:" << fi.absoluteFilePath();
 
+    emit layoutAboutToBeChanged();
+    beginResetModel();
     if (!file.open(QFile::ReadOnly | QFile::Text)) {
         qDebug() << "cannot open file:" << filename;
         return false;
@@ -41,6 +68,7 @@ bool StationListModel::load(const QString &filename)
         }
     }
     file.close();
+    qDebug() << rowCount() << "stations loaded";
     if (m_reader.hasError()) {
         qDebug() << "parser error for:" << filename;
         return false;
@@ -48,9 +76,26 @@ bool StationListModel::load(const QString &filename)
         qDebug() << "file error for:" << filename;
         return false;
     }
+    endResetModel();
+    emit layoutChanged();
     return true;
 }
 
+QHash<int, QByteArray> StationListModel::roleNames() const
+{
+    QHash<int, QByteArray> roles;
+    roles[Qt::DisplayRole] = "name";
+    roles[StationListModel::PositionRole] = "position";
+    roles[StationListModel::StationCodeRole] = "code";
+    return roles;
+}
+
+int StationListModel::rowCount(const QModelIndex &parent) const
+{
+    return QStandardItemModel::rowCount(parent);
+
+}
+
 void StationListModel::readStationsElement()
 {
     m_reader.readNext();
@@ -62,7 +107,7 @@ void StationListModel::readStationsElement()
             if (m_reader.name() == "station") {
                 readStationElement();
             } else {
-                skipUnknownElement();
+                skipUnknownElement(m_reader.name().toString());
             }
         } else {
             m_reader.readNext();
@@ -84,8 +129,10 @@ void StationListModel::readStationElement()
                 readPosElement(item);
             } else  if (m_reader.name() == "name") {
                 readNameElement(item);
+            } else  if (m_reader.name() == "code") {
+                readCodeElement(item);
             } else {
-                skipUnknownElement();
+                skipUnknownElement(m_reader.name().toString());
             }
         } else {
             m_reader.readNext();
@@ -98,7 +145,6 @@ void StationListModel::readPosElement(QStandardItem *item)
     QStringList coordinates = m_reader.readElementText().split(",");
     QGeoCoordinate pos = QGeoCoordinate(coordinates[0].toDouble(), coordinates[1].toDouble());
     item->setData(QVariant::fromValue(pos), PositionRole);
-    qDebug() << "pos:" << pos;
     m_reader.readElementText();
     if (m_reader.isEndElement()) {
         m_reader.readNext();
@@ -108,15 +154,25 @@ void StationListModel::readPosElement(QStandardItem *item)
 void StationListModel::readNameElement(QStandardItem *item)
 {
     item->setText(m_reader.readElementText());
-    qDebug() << "name:" << item->text();
     if (m_reader.isEndElement()) {
         m_reader.readNext();
     }
 }
 
-void StationListModel::skipUnknownElement()
+void StationListModel::readCodeElement(QStandardItem *item)
+{
+    const QString code = m_reader.readElementText();
+    qDebug() << "reading code element" << code;
+
+    item->setData(QVariant::fromValue(code), StationCodeRole);
+    if (m_reader.isEndElement()) {
+        m_reader.readNext();
+    }
+}
+
+void StationListModel::skipUnknownElement(const QString &name)
 {
-    qDebug() << "skipping unknown element";
+    qDebug() << "skipping unknown element" << name << "at line" << m_reader.lineNumber();
 
     m_reader.readNext();
     while (!m_reader.atEnd()) {
@@ -124,7 +180,7 @@ void StationListModel::skipUnknownElement()
             m_reader.readNext();
             break;
         } else if (!m_reader.isStartElement()) {
-            skipUnknownElement();
+            skipUnknownElement(m_reader.name().toString());
         } else {
             m_reader.readNext();
         }