From 013963a9904258696b97e303f4b447bb3c4a26b3 Mon Sep 17 00:00:00 2001
From: Samuel Fadel <samuelfadel@gmail.com>
Date: Tue, 13 Oct 2015 18:21:35 -0300
Subject: Reorganizing code in main().

---
 main.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'main.cpp')

diff --git a/main.cpp b/main.cpp
index 4d0d594..8355590 100644
--- a/main.cpp
+++ b/main.cpp
@@ -33,10 +33,6 @@ int main(int argc, char **argv)
     app.setApplicationName("pm");
     app.setApplicationVersion("1.0");
 
-    qmlRegisterType<Scatterplot>("PM", 1, 0, "Scatterplot");
-    qmlRegisterType<HistoryGraph>("PM", 1, 0, "HistoryGraph");
-    qmlRegisterSingletonType<Main>("PM", 1, 0, "Main", mainProvider);
-
     QCommandLineParser parser;
     parser.setApplicationDescription("Interactive multidimensional projections.");
     parser.addHelpOption();
@@ -58,12 +54,6 @@ int main(int argc, char **argv)
         parser.showHelp(1);
     }
 
-    // Set up multisampling
-    QSurfaceFormat fmt;
-    fmt.setSamples(16);
-    QSurfaceFormat::setDefaultFormat(fmt);
-    QQmlApplicationEngine engine(QUrl("qrc:///main_view.qml"));
-
     Main *m = Main::instance();
     if (parser.isSet(indicesFileOutputOption)) {
         m->setIndicesSavePath(parser.value(indicesFileOutputOption));
@@ -84,6 +74,16 @@ int main(int argc, char **argv)
     arma::mat Ys(subsampleSize, 2, arma::fill::randn);
     mp::forceScheme(mp::dist(X.rows(sampleIndices)), Ys);
 
+    qmlRegisterType<Scatterplot>("PM", 1, 0, "Scatterplot");
+    qmlRegisterType<HistoryGraph>("PM", 1, 0, "HistoryGraph");
+    qmlRegisterSingletonType<Main>("PM", 1, 0, "Main", mainProvider);
+
+    // Set up multisampling
+    QSurfaceFormat fmt;
+    fmt.setSamples(16);
+    QSurfaceFormat::setDefaultFormat(fmt);
+    QQmlApplicationEngine engine(QUrl("qrc:///main_view.qml"));
+
     ColorScale colorScale{
         QColor("#1f77b4"),
         QColor("#ff7f0e"),
-- 
cgit v1.2.3