Fixed minor bugs
[speedfreak] / Client / xmlwriter.cpp
index f860975..027e0ba 100644 (file)
@@ -1,26 +1,22 @@
-#include <QtGui>
-#include <QNetworkRequest>
-//#include <QNetworkReply>
-#include <QIODevice>
-#include <QFile>
-#include <QMessageBox>
-#include <QDebug>
-#include <QDateTime>
-#include <QDate>
-#include <QTime>
-#include <QApplication>
-#include "xmlwriter.h"
+/*
+ * Xml writer
+ *
+ * @author     Tiina Kivilinna-Korhola
+ * @author     Toni Jussila <toni.jussila@fudeco.com>
+ * @copyright  (c) 2010 Speed Freak team
+ * license     http://opensource.org/licenses/gpl-license.php GNU Public License
+ */
 
+#include "xmlwriter.h"
 
 /**
   *@brief Constructor, connects object to GUI
   *@param Pointer to carmainwindow, which is temporarily used during development
   */
-XmlWriter::XmlWriter(Ui_CarMainWindow* myMainWindow)
+XmlWriter::XmlWriter()
 {
-    ui = myMainWindow;
-}
 
+}
 
 /**
   *@brief Destructor
@@ -31,14 +27,119 @@ XmlWriter::~XmlWriter()
 }
 
 /**
+  * @brief Writes registration items into tags.
+  * @param netbuf a buffer where xmlstreamwriter writes to.
+  * @param usr for user name.
+  * @param psswd for password.
+  * @param email.
+  * @param .
+  * @param .
+  * @param .
+  * @param .
+  * @param .
+  */
+//void XmlWriter::writeRegistering(QBuffer *netbuf, QString usr, QString psswd, QString email)
+//void XmlWriter::writeRegistering(QBuffer *netbuf, QString usr, QString psswd, QString email, QString manufacturer, QString type, QString model, QString description, QString picture)
+void XmlWriter::writeRegistering(QBuffer *netbuf, QString usr, QString psswd, QString email, QString description)
+{
+    qDebug() << "_writeRegistering";
+
+    xmlwriter.setDevice(netbuf);
+
+    xmlwriter.writeStartDocument();
+    xmlwriter.writeStartElement("user");
+
+    //<login>test827</login>
+    xmlwriter.writeStartElement("login");
+    xmlwriter.writeCharacters(usr);
+    xmlwriter.writeEndElement();
+
+    //<password>thisisaveryinsecurepassword</password>
+    xmlwriter.writeStartElement("password");
+    xmlwriter.writeCharacters(psswd);
+    xmlwriter.writeEndElement();
+
+    //<email>test@example.com</email>
+    xmlwriter.writeStartElement("email");
+    xmlwriter.writeCharacters(email);
+    xmlwriter.writeEndElement();
+
+    //<description>manufacturer;type;model;description</description>
+    xmlwriter.writeStartElement("description");
+    xmlwriter.writeCharacters(description);
+    xmlwriter.writeEndElement();
+
+    xmlwriter.writeEndElement();
+    xmlwriter.writeEndDocument();
+}
+
+/**
+  *@brief Writes Speed Freek results items as tags and contents into a buffer.
+  *@todo Consider looping when writing many values.
+  *@todo Replace test value to finally used variables.
+  */
+void XmlWriter::writeResult(QBuffer *netbuf, double result)
+{
+    qDebug() << "_writeResult";
+
+    xmlwriter.setDevice(netbuf);
+
+    xmlwriter.writeStartDocument();
+    xmlwriter.writeStartElement("result");
+    xmlwriter.writeAttribute("value", QString::number(result));
+    xmlwriter.writeEndElement();
+    xmlwriter.writeEndDocument();
+}
+
+/**
+  *@brief Write track to server.
+  *@param netbuf where to write.
+  *@param counter is GPSData::roundCounter.
+  *@todo Decide suitable attributes.
+  */
+void XmlWriter::writeGpsTrack(QBuffer *netbuf, int counter, int start, int stop, int lat, int lon, int alt, int speed, int time)
+{
+    qDebug() << "_writeGpsTrack";
+
+    // Unused variables
+    //double *ptrValue;
+    //ptrValue = ptrTable;
+    //double tmp = 0;
+    int sTart = start;
+    int sTop = stop;
+
+    xmlwriter.setDevice(netbuf);
+    xmlwriter.writeStartDocument();
+    xmlwriter.writeStartElement("Route");
+    xmlwriter.writeAttribute("starttime", QDateTime::currentDateTime().toString());
+    xmlwriter.writeAttribute("endtime", QDateTime::currentDateTime().toString());
+    xmlwriter.writeAttribute("points", QDateTime::currentDateTime().toString());
+    for(int i = 0; i < counter; i++)
+    {
+        xmlwriter.writeStartElement("point");
+        xmlwriter.writeAttribute("lat", QString::number(lat));
+        xmlwriter.writeAttribute("lon", QString::number(lon));
+        xmlwriter.writeAttribute("alt", QString::number(alt));
+        xmlwriter.writeAttribute("speed", QString::number(speed));
+        xmlwriter.writeAttribute("time", QString::number(time));
+        xmlwriter.writeEndElement();
+    }
+    xmlwriter.writeEndElement();
+    xmlwriter.writeEndDocument();
+}
+
+/**
   *@brief Opens and closes a file, when xml information is written into a file,
   *and passes file to writeXmlFile()
-  *@note Partly harcoded and commented for git.
-  *@todo Replace hardcoced filename and GUI elements to finally used widgets.
+  *@param usr for user name.
+  *@param psswd for password.
+  *@param email.
+  *@todo Replace hardcoced filename to finally GUI entry widget.
   */
+//void XmlWriter::writeXml(QString usr, QString psswd, QString email)
 void XmlWriter::writeXml()
 {
-    QString filename = "xmlfile.xml";
+    QString filename = "xmlcategoryfile.xml";
     QFile file(filename);
     if (!file.open(QFile::WriteOnly | QFile::Text)) {
         qDebug() << "_xmlWrite fail";
@@ -46,22 +147,23 @@ void XmlWriter::writeXml()
     }
 
     writeXmlFile(&file);
+    //writeRegistering(&file, usr, psswd, email);
+    //writeResult(&file);
     file.close();
 }
 
 /**
   *@brief Writes general xml information.
   *Calls other functions to insert login and result information.
-  *@todo Check API connection to QBuffer, when Speed Freek network client has been written.
+  *@param device: target of writing, here filename.
+  *@param usr for user name.
+  *@param psswd for password.
+  *@param email.
   */
 bool XmlWriter::writeXmlFile(QIODevice *device)
-//bool XmlWriter::writeXmlFile(QBuffer *device)
 {
     xmlwriter.setDevice(device);
     xmlwriter.writeStartDocument();
-    xmlwriter.writeStartElement("xml");
-    xmlwriter.writeAttribute("version", "1.0");
-    writeRegister();
     writeItems();
     xmlwriter.writeEndDocument();
 
@@ -69,79 +171,119 @@ bool XmlWriter::writeXmlFile(QIODevice *device)
 }
 
 /**
-  *@brief Writes Speed Freek application specific items as tags and contents.
-  *@brief Results of speed/ direction/ acceleration into QMap are calculated elsewhere
-  *@todo Replace hardcoced user, password and email to finally used GUI elements.
-  */
-void XmlWriter::writeRegister()
-{
-    xmlwriter.writeStartElement("user");
-
-    xmlwriter.writeStartElement("login");
-    xmlwriter.writeCharacters("test123");
-    xmlwriter.writeEndElement();
-
-    xmlwriter.writeStartElement("password");
-    xmlwriter.writeCharacters("thisisaveryinsecurepassword");
-    xmlwriter.writeEndElement();
-
-    //Is this neacessary when sending results
-    xmlwriter.writeStartElement("email");
-    xmlwriter.writeCharacters("test@example.com");
-    xmlwriter.writeEndElement();
-
-    xmlwriter.writeEndElement();
-}
-
-/**
-  *@brief Writes Speed Freek results items as tags and contents.
-  *@brief Results of speed/ direction/ acceleration into QMap are calculated elsewhere
-  *@todo Consider looping of writing QMap values.
-  *@todo Replace hardcoced names to finally used values.
+  *@brief Writes Speed Freek results items as tags and contents to earlier defined target.
+  *@todo Consider looping when writing many values.
+  *@todo Replace testing values to finally used variabls.
   */
 void XmlWriter::writeItems()
 {
-    //During development
-    this->fillResultmap();
-
     xmlwriter.writeStartElement("result");
-    xmlwriter.writeAttribute("value", QString::number(resultmap.value("speed")));
+    xmlwriter.writeAttribute("value", QString::number(14)); //tmp testing value
     xmlwriter.writeAttribute("unit", "seconds");
     xmlwriter.writeAttribute("date", QDateTime::currentDateTime().toString());
     xmlwriter.writeEndElement();
 }
 
-
 /**
-  *@brief A temp function during development, used until real QMap available.
+  * Write profile xml
+  * @param QIODevice device: target of writing, here filename.
+  * @param QString user name
+  * @param QString manufacturer
+  * @param QString type
+  * @param QString model
+  * @param QString description
+  * @param QString picture: filename.
   */
-void XmlWriter::fillResultmap()
+void XmlWriter::writeProfileXmlFile(QIODevice *device, QString userName, QString manufacturer,
+                                    QString type, QString model, QString description, QString picture)
 {
-    resultmap["acceleration"] = 9;
-    resultmap["speed"] = 48;
-    resultmap["distance"] = 600;
+    QString pictureStatus;
+    if(picture != "")
+        pictureStatus = "yes";
+    else
+        pictureStatus = "no";
+
+    /*example of XML:
+    <?xml version="1.0" encoding="UTF-8"?>
+    <profile login="test827" picture="yes">
+            <manufacturer>toyota</manufacturer>
+            <type>corolla</type>
+            <model>1983</model>
+            <description>Fuel efficient, GPS system, only one owner</description>
+    </profile>*/
+
+    xmlwriter.setDevice(device);
+    xmlwriter.writeStartDocument();
+        xmlwriter.writeStartElement("profile");
+        xmlwriter.writeAttribute("login", userName);
+        xmlwriter.writeAttribute("picture", pictureStatus);
+            xmlwriter.writeStartElement("manufacturer");
+                xmlwriter.writeCharacters(manufacturer);
+            xmlwriter.writeEndElement();
+            xmlwriter.writeStartElement("type");
+                xmlwriter.writeCharacters(type);
+            xmlwriter.writeEndElement();
+            xmlwriter.writeStartElement("model");
+                xmlwriter.writeCharacters(model);
+            xmlwriter.writeEndElement();
+            xmlwriter.writeStartElement("description");
+                xmlwriter.writeCharacters(description);
+            xmlwriter.writeEndElement();
+            xmlwriter.writeStartElement("picture");
+                xmlwriter.writeCharacters(picture);
+            xmlwriter.writeEndElement();
+        xmlwriter.writeEndElement();
+    xmlwriter.writeEndDocument();
 }
 
 /**
-  *@brief A temp function during development, used to create a "serverfile".
+  * Write profile xml
+  * @param QIODevice device: target of writing, here netbuf.
+  * @param QString user name
+  * @param QString manufacturer
+  * @param QString type
+  * @param QString model
+  * @param QString description
+  * @param QString picture: filename.
   */
-void XmlWriter::serverWritesTop()
+void XmlWriter::writeProfileXmlFile(QBuffer *netbuf, QString userName, QString manufacturer,
+                                    QString type, QString model, QString description, QString picture)
 {
-    int i = 0;
-    int n = 5;
+    QString pictureStatus;
+    if(picture != "")
+        pictureStatus = "yes";
+    else
+        pictureStatus = "no";
 
-    /* Server sends to client */
-    xmlwriter.writeStartElement("results");
-    xmlwriter.writeAttribute("category", "acceleration-0-100");
-    xmlwriter.writeAttribute("unit", "seconds");
-    xmlwriter.writeAttribute("description", "Acceleration from 0 to 100 km/h");
-
-    for (i = 0; i < n; i++) {
-        xmlwriter.writeStartElement("result");
-        xmlwriter.writeAttribute("position", QString::number(i));
-        xmlwriter.writeAttribute("user", "test123");
-        xmlwriter.writeAttribute("date", QDateTime::currentDateTime().toString());
-        xmlwriter.writeAttribute("value", QString::number(i+i+1));
+    /*example of XML:
+    <?xml version="1.0" encoding="UTF-8"?>
+    <profile login="test827" picture="yes">
+            <manufacturer>toyota</manufacturer>
+            <type>corolla</type>
+            <model>1983</model>
+            <description>Fuel efficient, GPS system, only one owner</description>
+    </profile>*/
+
+    xmlwriter.setDevice(netbuf);
+    xmlwriter.writeStartDocument();
+        xmlwriter.writeStartElement("profile");
+        xmlwriter.writeAttribute("login", userName);
+        xmlwriter.writeAttribute("picture", pictureStatus);
+            xmlwriter.writeStartElement("manufacturer");
+                xmlwriter.writeCharacters(manufacturer);
+            xmlwriter.writeEndElement();
+            xmlwriter.writeStartElement("type");
+                xmlwriter.writeCharacters(type);
+            xmlwriter.writeEndElement();
+            xmlwriter.writeStartElement("model");
+                xmlwriter.writeCharacters(model);
+            xmlwriter.writeEndElement();
+            xmlwriter.writeStartElement("description");
+                xmlwriter.writeCharacters(description);
+            xmlwriter.writeEndElement();
+            xmlwriter.writeStartElement("picture");
+                xmlwriter.writeCharacters(picture);
+            xmlwriter.writeEndElement();
         xmlwriter.writeEndElement();
-    }
+    xmlwriter.writeEndDocument();
 }