preformance improvements

Author: Nico-Duduf

src/Ramses.pro

@@ -56,6 +56,7 @@ SOURCES += \
     ramobjectmodels/ramfilterlistproxymodel.cpp \
     ramobjectmodels/ramobjectmodel.cpp \
     ramobjectmodels/ramobjectsortfilterproxymodel.cpp \
+    ramobjectmodels/ramschedulemodel.cpp \
     ramobjectmodels/ramstatustablemodel.cpp \
     ramobjectmodels/statisticsmodel.cpp \
     ramobjectmodels/timelineproxy.cpp \
@@ -194,6 +195,7 @@ SOURCES += \
     rameditwidgets/templateassetgroupeditwidget.cpp \
     rameditwidgets/templatestepeditwidget.cpp \
     rameditwidgets/usereditwidget.cpp \
+    statemanager.cpp \
     timelinemanager.cpp \
     userprofilepage.cpp \
     rammanagerwidgets/itemmanagerwidget.cpp \
@@ -221,6 +223,7 @@ HEADERS += \
     ramobjectmodels/ramfilterlistproxymodel.h \
     ramobjectmodels/ramobjectmodel.h \
     ramobjectmodels/ramobjectsortfilterproxymodel.h \
+    ramobjectmodels/ramschedulemodel.h \
     ramobjectmodels/ramstatustablemodel.h \
     ramobjectmodels/statisticsmodel.h \
     ramobjectmodels/timelineproxy.h \
@@ -361,6 +364,7 @@ HEADERS += \
     rameditwidgets/templateassetgroupeditwidget.h \
     rameditwidgets/templatestepeditwidget.h \
     rameditwidgets/usereditwidget.h \
+    statemanager.h \
     timelinemanager.h \
     userprofilepage.h \
     rammanagerwidgets/itemmanagerwidget.h \

src/duqf-app/app-version.h

@@ -3,7 +3,7 @@
 
 #define VERSION_MAJOR 0
 #define VERSION_MINOR 8
-#define VERSION_BUILD 5
+#define VERSION_BUILD 6
 #define VERSION_SUFFIX "Beta"
 
 #define STRINGIFY_VERSION(A, B, C) CONCAT(A, B, C )

src/ramdatainterface/dbinterface.cpp

@@ -101,6 +101,11 @@ bool DBInterface::isRemoved(QString uuid, QString table)
     return m_ldi->isRemoved(uuid, table);
 }
 
+QString DBInterface::modificationDate(QString uuid, QString table)
+{
+    return m_ldi->modificationDate(uuid, table);
+}
+
 void DBInterface::setUsername(QString uuid, QString username)
 {
     m_ldi->setUsername(uuid, username);
@@ -120,10 +125,16 @@ const QString &DBInterface::dataFile() const
 
 void DBInterface::setDataFile(const QString &file, bool ignoreUser)
 {
+    QElapsedTimer openTimer;
+    openTimer.start();
+
     ProgressManager *pm = ProgressManager::instance();
     pm->setText(tr("Loading database..."));
 
     ServerConfig config = m_ldi->setDataFile(file);
+
+    qDebug() << "> Database set: " << openTimer.elapsed()/1000 << " seconds.";
+
     // Set the new server params
     if (config.address != "")
     {
@@ -139,11 +150,16 @@ void DBInterface::setDataFile(const QString &file, bool ignoreUser)
         // Check the user
         QString userUuid = m_ldi->currentUserUuid();
 
-        qDebug() << "Selected previous user: " << userUuid;
+        qDebug() << "> Selecting previous user: " << userUuid;
 
         emit userChanged( userUuid );
+
+        qDebug() << "> Selected user: " << openTimer.elapsed()/1000 << " seconds.";
+
         setOnline(serverUuid);
 
+        qDebug() << "> Online! " << openTimer.elapsed()/1000 << " seconds.";
+
         pm->setText(tr("Ready!"));
         pm->finish();
     }
@@ -218,6 +234,8 @@ void DBInterface::setDataFile(const QString &file, bool ignoreUser)
             return;
         }
     }
+
+    qDebug() << "> DB Ready! " << openTimer.elapsed()/1000 << " seconds.";
 }
 
 void DBInterface::setCurrentUserUuid(QString uuid)

src/ramdatainterface/dbinterface.h

@@ -64,6 +64,8 @@ class DBInterface : public DuQFLoggerObject
     void restoreObject(QString uuid, QString table);
     bool isRemoved(QString uuid, QString table);
 
+    QString modificationDate(QString uuid, QString table);
+
     void setUsername(QString uuid, QString username);
     bool isUserNameAavailable(const QString &userName);
 

src/ramdatainterface/localdatainterface.cpp

@@ -5,6 +5,7 @@
 #include "duqf-app/app-version.h"
 #include "duqf-utils/utils.h"
 #include "progressmanager.h"
+#include "statemanager.h"
 #include "ramuser.h"
 #include "ramses.h"
 
@@ -371,6 +372,19 @@ bool LocalDataInterface::isRemoved(QString uuid, QString table)
     return true;
 }
 
+QString LocalDataInterface::modificationDate(QString uuid, QString table)
+{
+    QString q = "SELECT modified FROM %1 WHERE uuid = '%2';";
+    QSqlQuery qry = query( q.arg(table, uuid) );
+
+    if (qry.first())
+    {
+        return qry.value(0).toString();
+    }
+
+    return "1818-05-05 00:00:00";
+}
+
 void LocalDataInterface::setUsername(QString uuid, QString username)
 {
     username.replace("'", "''");
@@ -490,16 +504,25 @@ const QString &LocalDataInterface::dataFile() const
 
 ServerConfig LocalDataInterface::setDataFile(const QString &file)
 {
+    QElapsedTimer timer;
+    timer.start();
+
+    qDebug() << ">> Opening local file...";
+
     // Clear all cache
     m_uuids.clear();
     m_uuidsWithoutRemoved.clear();
 
+    qDebug() << ">> Cleared cache: " << timer.elapsed()/1000 << " seconds.";
+
     ProgressManager *pm = ProgressManager::instance();
     pm->addToMaximum(2);
 
     QSqlDatabase db = QSqlDatabase::database("localdata");
     openDB(db, file);
 
+    qDebug() << ">> Opened file: " << timer.elapsed()/1000 << " seconds.";
+
     pm->increment();
     pm->setText(tr("Loading data..."));
 
@@ -542,6 +565,8 @@ ServerConfig LocalDataInterface::setDataFile(const QString &file)
 
     pm->increment();
 
+    qDebug() << ">> Local data ready! " << timer.elapsed()/1000 << " seconds.";
+
     return serverConfig();
 }
 
@@ -623,6 +648,9 @@ SyncData LocalDataInterface::getSync(bool fullSync)
 
 void LocalDataInterface::saveSync(SyncData syncData)
 {
+    StateManager::State previousState = StateManager::i()->state();
+    StateManager::i()->setState(StateManager::WritingDataBase);
+
     QHash<QString, QSet<TableRow>> tables = syncData.tables;
 
     ProgressManager *pm = ProgressManager::instance();
@@ -706,11 +734,14 @@ void LocalDataInterface::saveSync(SyncData syncData)
         query( q );
 
         // Emit insertions
+        StateManager::i()->setState(StateManager::LoadingDataBase);
         foreach(QStringList io, insertedObjects ) {
             emit inserted( io.at(0), io.at(1), io.at(2) );
         }
     }
 
+    StateManager::i()->setState(StateManager::WritingDataBase);
+
     // Updates
     i.toFront();
     while (i.hasNext()) {
@@ -795,12 +826,15 @@ void LocalDataInterface::saveSync(SyncData syncData)
         query( q );
 
         // Emit
+        StateManager::i()->setState(StateManager::LoadingDataBase);
         foreach(QStringList cu, changedUuids) {
             emit dataChanged(cu.first(), cu.last(), tableName);
         }
     }
 
     emit syncFinished();
+
+    StateManager::i()->setState(previousState);
 }
 
 void LocalDataInterface::deleteData(SyncData syncData)
@@ -930,6 +964,9 @@ QVector<QStringList> LocalDataInterface::users()
 
 QString LocalDataInterface::cleanDataBase(int deleteDataOlderThan)
 {
+    StateManager::State previousState = StateManager::i()->state();
+    StateManager::i()->setState(StateManager::WritingDataBase);
+
     QString report = "";
 
     // Backup the DB File
@@ -1030,6 +1067,8 @@ QString LocalDataInterface::cleanDataBase(int deleteDataOlderThan)
 
     qDebug() << "Finished clean.";
 
+    StateManager::i()->setState(previousState);
+
     return report;
 }
 
@@ -1081,7 +1120,7 @@ LocalDataInterface::LocalDataInterface():
 }
 
 bool LocalDataInterface::openDB(QSqlDatabase db, const QString &dbFile)
-{
+{   
     ProgressManager *pm = ProgressManager::instance();
     pm->addToMaximum(2);
     pm->setText(tr("Opening database..."));
@@ -1230,6 +1269,9 @@ void LocalDataInterface::autoCleanDB(QSqlDatabase db)
         if ( !db.open() ) return;
     }
 
+    StateManager::State previousState = StateManager::i()->state();
+    StateManager::i()->setState(StateManager::WritingDataBase);
+
     // === Delete removed statuses ===
 
     qry.exec("DELETE FROM RamStatus WHERE `removed` = 1 ;");
@@ -1442,6 +1484,8 @@ void LocalDataInterface::autoCleanDB(QSqlDatabase db)
     // === Vacuum ===
 
     qry.exec("VACUUM;");
+
+    StateManager::i()->setState(previousState);
 }
 
 QSqlQuery LocalDataInterface::query(QString q) const

src/ramdatainterface/localdatainterface.h

@@ -46,6 +46,8 @@ class LocalDataInterface : public DuQFLoggerObject
     void restoreObject(QString uuid, QString table);
     bool isRemoved(QString uuid, QString table);
 
+    QString modificationDate(QString uuid, QString table);
+
     void setUsername(QString uuid, QString username);
     bool isUserNameAavailable(const QString &userName);
     void updateUser(QString uuid, QString username, QString data, QString modified);

src/ramdatainterface/ramserverinterface.cpp

@@ -6,6 +6,7 @@
 #include "ramdatainterface/localdatainterface.h"
 #include "ramdatainterface/logindialog.h"
 #include "duqf-utils/guiutils.h"
+#include "statemanager.h"
 
 // STATIC //
 
@@ -226,6 +227,9 @@ void RamServerInterface::eraseUserPassword()
 
 void RamServerInterface::login()
 {
+    StateManager::State previousState = StateManager::i()->state();
+    StateManager::i()->setState(StateManager::Connecting);
+
     setConnectionStatus(NetworkUtils::Connecting, "Logging in...");
 
     // Check if we have saved credentials
@@ -253,6 +257,7 @@ void RamServerInterface::login()
     if (username != "" && password != "")
     {
         doLogin(username, password, true, true);
+        StateManager::i()->setState(previousState);
         return;
     }
 
@@ -271,6 +276,8 @@ void RamServerInterface::login()
 
     // Wait for the dialog to return
     loop.exec();
+
+    StateManager::i()->setState(previousState);
 }
 
 void RamServerInterface::sync(SyncData syncData)

src/rammanagerwidgets/schedulemanagerwidget.cpp

@@ -825,7 +825,7 @@ void ScheduleManagerWidget::changeProject()
     if (!m_project)
     {
         this->setEnabled(false);
-        m_schedule->setObjectModel(nullptr, nullptr);
+        m_schedule->setObjectModel(nullptr, nullptr, nullptr);
         ui_userMenu->setObjectModel(nullptr);
         ui_endDateEdit->setDate(QDate::currentDate());
         ui_stepMenu->setObjectModel(nullptr);
@@ -835,7 +835,7 @@ void ScheduleManagerWidget::changeProject()
     }
     this->setEnabled(true);
 
-    m_schedule->setObjectModel( m_project->users(), m_project->scheduleComments() );
+    m_schedule->setObjectModel( m_project->users(), m_project->schedule(), m_project->scheduleComments() );
 
     ui_userMenu->setObjectModel( m_project->users() );
     ui_endDateEdit->setDate( QDate::currentDate().addDays(30) );

src/ramobjectmodels/dbtablemodel.cpp

@@ -3,10 +3,11 @@
 #include "dbinterface.h"
 #include "progressmanager.h"
 
-DBTableModel::DBTableModel(RamObject::ObjectType type, bool projectTable, QObject *parent):
+DBTableModel::DBTableModel(RamObject::ObjectType type, bool projectTable, bool sorted, QObject *parent):
     RamAbstractObjectModel{type, parent}
 {
     m_isProjectTable = projectTable;
+    m_userOrder = sorted;
 }
 
 void DBTableModel::addFilterValue(QString key, QString value)
@@ -137,12 +138,13 @@ void DBTableModel::insertObjects(int row, QVector<QStringList> data, QString tab
     // Insert
     if (!silent) beginInsertRows(QModelIndex(), row, row + data.count()-1);
 
+    //qDebug() << "Inserting " << data.count() << " objects in " << table;
+
     for (int i = data.count() - 1; i >= 0; i--)
     {
         QStringList obj = data.at(i);
         QString uuid = obj.first();
         QString dataStr = obj.at(1);
-
         RamAbstractObjectModel::insertObject(row, uuid, dataStr);
     }
 
@@ -208,6 +210,7 @@ bool DBTableModel::checkFilters(QString data) const
 
 void DBTableModel::saveOrder() const
 {
+    if (!m_userOrder) return;
     // Save order
     for (int i = 0; i <= rowCount(); i++)
     {
@@ -243,7 +246,8 @@ void DBTableModel::insertObject(QString uuid, QString data, QString table)
     if (!checkFilters(data)) return;
 
     // Check order
-    int order = getOrder(data);
+    int order = m_objectUuids.count();
+    if (m_userOrder) order = getOrder(data);
 
     // Insert
     QStringList o;
@@ -270,9 +274,17 @@ void DBTableModel::reload()
 
     // Get all
     QVector<QStringList> objs = LocalDataInterface::instance()->tableData( m_table, m_filters );
-    //qDebug() << "Got " << objs.count() << " objects from " << m_table;
+
+    qDebug() << "Got " << objs.count() << " objects from " << m_table;
+
     // Sort
-    std::sort(objs.begin(), objs.end(), objSorter);
+    if (m_userOrder) {
+        std::sort(objs.begin(), objs.end(), objSorter);
+        qDebug() << "Objects sorted";
+    } else {
+        qDebug() << "Table not sorted";
+    }
+
     // Insert
     insertObjects(0, objs, m_table, true);