Implement new scg format

.gitignore

@@ -1,5 +1,6 @@
 build-*/*
 all-build-desktop/*
+thirdparty
 *.qm
 *.user
 *.user.*

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "thirdparty/sc-machine"]
+	path = thirdparty/sc-machine
+	url = https://github.com/ostis-dev/sc-machine.git

sources/kbe/mainwindow.cpp

@@ -480,7 +480,6 @@ void MainWindow::onFileSaveAs(QWidget* window)
     }
 
     mBlurEffect->setEnabled(false);
-
 }
 
 void MainWindow::onFileSaveAll()

sources/plugins/scg/fileloader.h

@@ -0,0 +1,11 @@
+#pragma once
+
+#include <QString>
+#include <QObject>
+
+class FileLoader
+{
+public:
+    //! Loads file.
+    virtual bool load(QString file_name, QObject *output) = 0;
+};

sources/plugins/scg/filewriter.h

@@ -0,0 +1,13 @@
+#pragma once
+
+#include <QString>
+#include <QObject>
+
+class FileWriter
+{
+public:
+    // Saves scg format to file.
+    virtual bool save(QString file_name, QObject *input) = 0;
+};
+
+

sources/plugins/scg/gwf/gwffileloader.h

@@ -13,11 +13,12 @@
 #include <QPointF>
 #include <QObject>
 
+#include <fileloader.h>
+
 class SCgScene;
 class SCgObject;
 
-class GWFFileLoader
-
+class GWFFileLoader : public FileLoader
 {
 public:
     GWFFileLoader();

sources/plugins/scg/gwf/gwffilewriter.cpp

@@ -32,13 +32,14 @@ bool GWFFileWriter::save(QString file_name, QObject *input)
     SCgScene *scene = qobject_cast<SCgScene*>(input);
 
         QFile fileOut(file_name);
-        if (!fileOut.open(QFile::WriteOnly | QFile::Text)) {
+        if (!fileOut.open(QFile::WriteOnly | QFile::Text))
+        {
                  QMessageBox::warning(0, qAppName(),
                                       QObject::tr("File saving error.\nCannot write file %1:\n%2.")
                                       .arg(file_name)
                                       .arg(fileOut.errorString()));
                  return false;
-             }
+        }
         stream.setDevice(&fileOut);
         stream.startWriting("UTF-8");
 

sources/plugins/scg/gwf/gwffilewriter.h

@@ -6,14 +6,15 @@
 
 #pragma once
 
+#include "filewriter.h"
 #include "gwfstreamwriter.h"
 
 //! TODO: add error messages
 
 class SCgObject;
 class SCgNode;
 
-class GWFFileWriter
+class GWFFileWriter : public FileWriter
 {
 public:
     GWFFileWriter();

sources/plugins/scg/gwf/gwfobjectinforeader.cpp

@@ -120,9 +120,9 @@ void GwfObjectInfoReader::createTypesMap()
     mGWFType2TypeAlias["pair/-/-/-/orient"] = "pair/-/-/-/orient";
 
     //const
-    mGWFType2TypeAlias["pair/const/-/perm/noorien"] = "pair/const/-/perm/noorien";
+    mGWFType2TypeAlias["pair/const/-/perm/noorient"] = "pair/const/-/perm/noorient";
     mGWFType2TypeAlias["pair/const/-/perm/orient"] = "pair/const/-/perm/orient";
-    mGWFType2TypeAlias["pair/const/-/temp/noorien"] = "pair/const/-/temp/noorien";
+    mGWFType2TypeAlias["pair/const/-/temp/noorient"] = "pair/const/-/temp/noorient";
     mGWFType2TypeAlias["pair/const/-/temp/orient"] = "pair/const/-/temp/orient";
     mGWFType2TypeAlias["pair/const/pos/perm/orient/membership"] = "pair/const/pos/perm/orient/membership";
     mGWFType2TypeAlias["pair/const/neg/perm/orient/membership"] = "pair/const/neg/perm/orient/membership";
@@ -132,9 +132,9 @@ void GwfObjectInfoReader::createTypesMap()
     mGWFType2TypeAlias["pair/const/fuz/temp/orient/membership"] = "pair/const/fuz/temp/orient/membership";
 
     //var
-    mGWFType2TypeAlias["pair/var/-/perm/noorien"] = "pair/var/-/perm/noorien";
+    mGWFType2TypeAlias["pair/var/-/perm/noorient"] = "pair/var/-/perm/noorient";
     mGWFType2TypeAlias["pair/var/-/perm/orient"] = "pair/var/-/perm/orient";
-    mGWFType2TypeAlias["pair/var/-/temp/noorien"] = "pair/var/-/temp/noorien";
+    mGWFType2TypeAlias["pair/var/-/temp/noorient"] = "pair/var/-/temp/noorient";
     mGWFType2TypeAlias["pair/var/-/temp/orient"] = "pair/var/-/temp/orient";
     mGWFType2TypeAlias["pair/var/pos/perm/orient/membership"] = "pair/var/pos/perm/orient/membership";
     mGWFType2TypeAlias["pair/var/neg/perm/orient/membership"] = "pair/var/neg/perm/orient/membership";
@@ -144,9 +144,9 @@ void GwfObjectInfoReader::createTypesMap()
     mGWFType2TypeAlias["pair/var/fuz/temp/orient/membership"] = "pair/var/fuz/temp/orient/membership";
 
     //meta
-    mGWFType2TypeAlias["pair/meta/-/perm/noorien"] = "pair/meta/-/perm/noorien";
+    mGWFType2TypeAlias["pair/meta/-/perm/noorient"] = "pair/meta/-/perm/noorient";
     mGWFType2TypeAlias["pair/meta/-/perm/orient"] = "pair/meta/-/perm/orient";
-    mGWFType2TypeAlias["pair/meta/-/temp/noorien"] = "pair/meta/-/temp/noorien";
+    mGWFType2TypeAlias["pair/meta/-/temp/noorient"] = "pair/meta/-/temp/noorient";
     mGWFType2TypeAlias["pair/meta/-/temp/orient"] = "pair/meta/-/temp/orient";
     mGWFType2TypeAlias["pair/meta/pos/perm/orient/membership"] = "pair/meta/pos/perm/orient/membership";
     mGWFType2TypeAlias["pair/meta/neg/perm/orient/membership"] = "pair/meta/neg/perm/orient/membership";
@@ -229,17 +229,17 @@ void GwfObjectInfoReader::createTypesMap()
     mGWFType2TypeAlias["arc/var/fuz/temp"] = "pair/var/fuz/temp/orient/membership";
     mGWFType2TypeAlias["arc/meta/fuz/temp"] = "pair/var/fuz/temp/orient/membership";
 
-    mGWFType2TypeAlias["pair/const/synonym"] = "pair/const/-/perm/noorien";
-    mGWFType2TypeAlias["pair/var/noorient"] = "pair/var/-/perm/noorien";
-    mGWFType2TypeAlias["pair/meta/noorient"] = "pair/var/-/perm/noorien";
+    mGWFType2TypeAlias["pair/const/synonym"] = "pair/const/-/perm/noorient";
+    mGWFType2TypeAlias["pair/var/noorient"] = "pair/var/-/perm/noorient";
+    mGWFType2TypeAlias["pair/meta/noorient"] = "pair/var/-/perm/noorient";
 
     mGWFType2TypeAlias["pair/const/orient"] = "pair/const/-/perm/orient";
     mGWFType2TypeAlias["pair/var/orient"] = "pair/var/-/perm/orient";
     mGWFType2TypeAlias["pair/meta/orient"] = "pair/var/-/perm/orient";
 
-    mGWFType2TypeAlias["pair/rail/noorient"] = "pair/var/-/perm/noorien";
+    mGWFType2TypeAlias["pair/rail/noorient"] = "pair/var/-/perm/noorient";
     mGWFType2TypeAlias["pair/rail/orient"] = "pair/var/-/perm/orient";
-    mGWFType2TypeAlias["pair/rail2/noorient"] = "pair/var/-/perm/noorien";
+    mGWFType2TypeAlias["pair/rail2/noorient"] = "pair/var/-/perm/noorient";
     mGWFType2TypeAlias["pair/rail2/orient"] = "pair/var/-/perm/orient";
 }