all XML code removed + fix with iterator

TimVanMourik · Jun 19, 2017 · e181a7c · e181a7c
1 parent 25ec013
commit e181a7c
Show file tree

Hide file tree

Showing 14 changed files with 45 additions and 57 deletions.
diff --git a/Porcupine.pro b/Porcupine.pro
@@ -7,7 +7,7 @@
 
 ROOT                                    = $$_PRO_FILE_PWD_
 
-QT                                     += widgets core gui xmlpatterns xml printsupport
+QT                                     += widgets core gui printsupport
 
 CONFIG                                 += static
 

diff --git a/include/MainWindow.hpp b/include/MainWindow.hpp
@@ -32,7 +32,6 @@
 //----------------------------------------------------------------------------------------------------------------------
 
 #include <QMainWindow>
-#include <QtXmlPatterns>
 
 namespace Ui {
 class MainWindow;
@@ -155,8 +154,6 @@ public slots:
 
     /// @brief
     QVector<QAction*> m_nodeActs;
-    /// @brief
-    QXmlSchemaValidator* m_nodeValidator;
 };
 
 #endif // MAINWINDOW_H
diff --git a/include/NodeEditor/PortPair.hpp b/include/NodeEditor/PortPair.hpp
@@ -104,11 +104,6 @@ class PortPair : public QGraphicsTextItem
             qreal _height
             );
     //
-    void loadFromXml(
-            QDomElement& _xmlNode,
-            QMap<quint64, Port*>& o_portMap
-            );
-    //
     const QString& getFileName(
                 ) const;
     //
@@ -149,8 +144,6 @@ public slots:
     //
     bool m_secret;
     //
-    bool m_isIterator;
-    //
     Port* m_input;
     //
     Port* m_output;

diff --git a/include/Settings/Argument.hpp b/include/Settings/Argument.hpp
@@ -48,6 +48,9 @@ class Argument
     bool isVisible(
             ) const;
     //
+    bool isIterator(
+            ) const;
+    //
     void setName(
             const QString& _name
             );
@@ -60,6 +63,10 @@ class Argument
             bool _editable
             );
     //
+    void setIterator(
+            bool _iterator
+            );
+    //
     const QString& getName(
             ) const;
     //
@@ -94,6 +101,8 @@ class Argument
     //
     bool m_isVisible;
     //
+    bool m_isIterator;
+    //
     QJsonObject m_json;
     //
     QString m_argumentName;

diff --git a/include/Settings/NodeLibrary.hpp b/include/Settings/NodeLibrary.hpp
@@ -33,9 +33,7 @@
 
 #include <map>
 
-#include <QDomDocument>
 #include <QString>
-#include <QtXmlPatterns>
 
 #include "Singleton.hpp"
 

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
@@ -28,11 +28,12 @@
 #include <QApplication>
 #include <QBoxLayout>
 #include <QContextMenuEvent>
-#include <QDomDocument>
 #include <QFile>
 #include <QFileDialog>
 #include <QGraphicsScene>
 #include <QGraphicsView>
+#include <QJsonObject>
+#include <QJsonDocument>
 #include <QMenuBar>
 #include <QPainter>
 #include <QPrinter>
@@ -291,15 +292,15 @@ void MainWindow::printFile(
     QString fileName = QFileDialog::getSaveFileName();
     if (fileName.isEmpty())
     {
-        qDebug() << "No file name was chosen. Ergo, no file will be saved.";
+//        qDebug() << "No file name was chosen. Ergo, no file will be saved.";
         return;
     }
     printer.setOutputFileName(fileName);
 
     QPainter painter;
     if(!painter.begin(&printer))
     {
-        qDebug() << "Error setting up printer.";
+//        qDebug() << "Error setting up printer.";
         return;
     }
     painter.setRenderHint(QPainter::TextAntialiasing);

diff --git a/src/NodeEditor/Link.cpp b/src/NodeEditor/Link.cpp
@@ -23,7 +23,6 @@
 
 #include <assert.h>
 
-#include <QDomDocument>
 #include <QJsonObject>
 #include <QGraphicsScene>
 #include <QPainter>

diff --git a/src/NodeEditor/Node.cpp b/src/NodeEditor/Node.cpp
@@ -23,10 +23,12 @@
 
 #include <assert.h>
 
-#include <QDomDocument>
 #include <QGraphicsItem>
 #include <QGraphicsProxyWidget>
 #include <QGraphicsScene>
+#include <QJsonArray>
+#include <QJsonObject>
+#include <QJsonDocument>
 #include <QLineEdit>
 #include <QLinearGradient>
 

diff --git a/src/NodeEditor/NodeEditor.cpp b/src/NodeEditor/NodeEditor.cpp
@@ -23,8 +23,6 @@
 
 #include <iostream>
 
-#include <QDomDocument>
-#include <QDomElement>
 #include <QJsonArray>
 #include <QPainter>
 #include <QPointF>

diff --git a/src/NodeEditor/Port.cpp b/src/NodeEditor/Port.cpp
@@ -23,7 +23,6 @@
 
 #include <assert.h>
 
-#include <QDomDocument>
 #include <QFont>
 #include <QGraphicsItem>
 #include <QGraphicsScene>

diff --git a/src/NodeEditor/PortPair.cpp b/src/NodeEditor/PortPair.cpp
@@ -23,8 +23,6 @@
 
 #include "assert.h"
 
-#include <QDomDocument>
-
 #include "Argument.hpp"
 #include "Node.hpp"
 #include "Port.hpp"
@@ -251,28 +249,6 @@ bool PortPair::hasNodeAncestor(
     return false;
 }
 
-void PortPair::loadFromXml(
-        QDomElement& _xmlNode,
-        QMap<quint64, Port*>& o_portMap
-        )
-{
-    QDomNode portNode = _xmlNode.firstChild();
-    while(!portNode.isNull())
-    {
-        QDomElement portElement = portNode.toElement();
-        if(portElement.attribute("type").compare("input") == 0)
-        {
-            o_portMap[(quint64) portElement.attribute("identifier").toULongLong(0, 16)] = m_input;
-        }
-        else if(portElement.attribute("type").compare("output") == 0)
-        {
-            o_portMap[(quint64) portElement.attribute("identifier").toULongLong(0, 16)] = m_output;
-        }
-//        Argument* argument = new Argument(portElement.attribute("name"), d);
-        portNode = portNode.nextSibling();
-    }
-}
-
 void PortPair::fileNameChanged(
         const QString& _fileName,
         bool _cascadeUp
@@ -322,7 +298,7 @@ void PortPair::setAsIterator(
         bool _iterator
         )
 {
-    m_isIterator = _iterator;
+    m_argument.setIterator(_iterator);
 }
 
 const QString& PortPair::getFileName(
@@ -334,7 +310,7 @@ const QString& PortPair::getFileName(
 bool PortPair::isIterator(
             ) const
 {
-    return m_isIterator;
+    return m_argument.isIterator();
 }
 
 PortPair::~PortPair()

diff --git a/src/NodeTreeEditor/NodeTreeItem.cpp b/src/NodeTreeEditor/NodeTreeItem.cpp
@@ -24,7 +24,6 @@
 #include <QApplication>
 #include <QComboBox>
 #include <QCheckBox>
-#include <QDomDocument>
 #include <QDrag>
 #include <QDropEvent>
 #include <QFormLayout>
@@ -122,12 +121,11 @@ NodeTreeItem::NodeTreeItem(
         if(pair->getInputPort())
         {
             QCheckBox* iterateCheckbox = new QCheckBox();
-            iterateCheckbox->setChecked(false);
             QFile fileIterator(":/qss/iterator_button.qss");
             fileIterator.open(QFile::ReadOnly);
             QString styleSheetIterator = QString::fromLatin1(fileIterator.readAll());
             iterateCheckbox->setStyleSheet(styleSheetIterator);
-            if(pair->isIterator())
+            if(pair->getArgument().isIterator())
             {
                 iterateCheckbox->setChecked(true);
             }

diff --git a/src/Settings/Argument.cpp b/src/Settings/Argument.cpp
@@ -28,12 +28,13 @@
 Argument::Argument(
         const QJsonObject& _json
         ) :
-    m_isInput     (_json["input"  ].toBool()),
-    m_isOutput    (_json["output" ].toBool()),
-    m_isVisible   (_json["visible"].toBool()),
-    m_argumentName(_json["name"   ].toString()),
-    m_defaultValue(_json["value"  ].toString()),
-    m_json(_json)
+    m_isInput     (_json["input"   ].toBool()),
+    m_isOutput    (_json["output"  ].toBool()),
+    m_isVisible   (_json["visible" ].toBool()),
+    m_isIterator  (_json["iterator"].toBool()),
+    m_json(_json),
+    m_argumentName(_json["name"    ].toString()),
+    m_defaultValue(_json["value"   ].toString())
 {
     foreach (QJsonValue code, _json["code"].toArray())
     {
@@ -70,6 +71,12 @@ bool Argument::isVisible(
     return m_isVisible;
 }
 
+bool Argument::isIterator(
+        ) const
+{
+    return m_isIterator;
+}
+
 void Argument::setDefault(
         const QString& _default
         )
@@ -84,6 +91,13 @@ void Argument::setVisible(
     m_isVisible = _editable;
 }
 
+void Argument::setIterator(
+        bool _iterator
+        )
+{
+    m_isIterator = _iterator;
+}
+
 const QString& Argument::getName(
         ) const
 {

diff --git a/src/Settings/NodeLibrary.cpp b/src/Settings/NodeLibrary.cpp
@@ -23,7 +23,11 @@
 
 #include <iostream>
 #include <cstring>
-#include <QDomDocument>
+
+#include <QFile>
+#include <QJsonArray>
+#include <QJsonObject>
+#include <QJsonDocument>
 
 #include "Argument.hpp"
 #include "NodeLibrary.hpp"