fixed several issues on removing objects and added "copy uuid" context menu for devs

Nico-Duduf · Nico-Duduf · commit 106bb66fc379 · 2022-11-30T12:53:55.000+01:00
diff --git a/src/duqf-app/app-version.h b/src/duqf-app/app-version.h
@@ -3,7 +3,7 @@
 
 #define VERSION_MAJOR 0
 #define VERSION_MINOR 8
-#define VERSION_BUILD 0
+#define VERSION_BUILD 1
 #define VERSION_SUFFIX "Beta"
 
 #define STRINGIFY_VERSION(A, B, C) CONCAT(A, B, C )
diff --git a/src/pipeline-editor/pipelinewidget.cpp b/src/pipeline-editor/pipelinewidget.cpp
@@ -457,6 +457,8 @@ void PipelineWidget::newPipe(RamObject *p)
 {
     RamPipe *pipe = qobject_cast<RamPipe*>(p);
     if (!pipe) return;
+    if (!pipe->inputStep()) return;
+    if (!pipe->outputStep()) return;
 
     // Get nodes
     DuQFNode *inputNode = nullptr;
@@ -537,8 +539,10 @@ void PipelineWidget::connectionRemoved(DuQFConnection *co)
     if (!input) return;
 
     RamPipe *p = project->pipe(output, input);
-    project->pipeline()->removeObjects(QStringList(p->uuid()));
-    if (p) p->remove();
+    if (p) {
+        project->pipeline()->removeObjects(QStringList(p->uuid()));
+        p->remove();
+    }
 }
 
 void PipelineWidget::loadProjectLayout()
diff --git a/src/ramdatainterface/dbinterface.cpp b/src/ramdatainterface/dbinterface.cpp
@@ -66,9 +66,9 @@ QSet<QString> DBInterface::tableUuids(QString table)
     return m_ldi->tableUuids(table);
 }
 
-bool DBInterface::contains(QString uuid, QString table)
+bool DBInterface::contains(QString uuid, QString table, bool includeRemoved)
 {
-    return m_ldi->contains(uuid, table);
+    return m_ldi->contains(uuid, table, includeRemoved);
 }
 
 void DBInterface::createObject(QString uuid, QString table, QString data)
diff --git a/src/ramdatainterface/dbinterface.h b/src/ramdatainterface/dbinterface.h
@@ -53,7 +53,7 @@ class DBInterface : public DuQFLoggerObject
     // DATA INTERFACE //
 
     QSet<QString> tableUuids(QString table);
-    bool contains(QString uuid, QString table);
+    bool contains(QString uuid, QString table, bool includeRemoved = false);
 
     void createObject(QString uuid, QString table, QString data);
 
diff --git a/src/ramdatainterface/localdatainterface.cpp b/src/ramdatainterface/localdatainterface.cpp
@@ -160,7 +160,8 @@ QString LocalDataInterface::getRamsesPath(QString dbFile)
 QSet<QString> LocalDataInterface::tableUuids(QString table, bool includeRemoved)
 {
     // If we've got the info in the cache, use it.
-    if (CACHE_LOCAL_DATA && m_uuids.contains(table) ) return m_uuids.value(table);
+    if (includeRemoved && CACHE_LOCAL_DATA && m_uuids.contains(table) ) return m_uuids.value(table);
+    if (!includeRemoved && CACHE_LOCAL_DATA && m_uuidsWithoutRemoved.contains(table) ) return m_uuidsWithoutRemoved.value(table);
 
     QString q = "SELECT uuid FROM '%1'";
     if (!includeRemoved) q += " WHERE removed = 0";
@@ -172,7 +173,8 @@ QSet<QString> LocalDataInterface::tableUuids(QString table, bool includeRemoved)
     while (qry.next()) data << qry.value(0).toString();
 
     // Cache
-    m_uuids.insert(table, data);
+    if (includeRemoved) m_uuids.insert(table, data);
+    else m_uuidsWithoutRemoved.insert(table, data);
 
     return data;
 }
@@ -237,10 +239,10 @@ QVector<QStringList> LocalDataInterface::tableData(QString table, QHash<QString,
     return tData;
 }
 
-bool LocalDataInterface::contains(QString uuid, QString table)
+bool LocalDataInterface::contains(QString uuid, QString table, bool includeRemoved)
 {
     // Get all UUIDS
-    QSet<QString> uuids = tableUuids(table, true);
+    QSet<QString> uuids = tableUuids(table, includeRemoved);
     return uuids.contains(uuid);
 
 
@@ -269,6 +271,7 @@ void LocalDataInterface::createObject(QString uuid, QString table, QString data)
 {
     // Remove table cache
     m_uuids.remove(table);
+    m_uuidsWithoutRemoved.remove(table);
 
     QString newData = data;
 
@@ -489,6 +492,7 @@ ServerConfig LocalDataInterface::setDataFile(const QString &file)
 {
     // Clear all cache
     m_uuids.clear();
+    m_uuidsWithoutRemoved.clear();
 
     ProgressManager *pm = ProgressManager::instance();
     pm->addToMaximum(2);
@@ -641,6 +645,7 @@ void LocalDataInterface::saveSync(SyncData syncData)
 
         // Clear cache
         m_uuids.remove(tableName);
+        m_uuidsWithoutRemoved.remove(tableName);
 
         // We're going to need the uuids and dates of the table
         QMap<QString, QString> uuidDates = modificationDates( tableName );
@@ -717,6 +722,7 @@ void LocalDataInterface::saveSync(SyncData syncData)
 
         // Clear cache
         m_uuids.remove(tableName);
+        m_uuidsWithoutRemoved.remove(tableName);
 
         QSet<TableRow> incomingRows = i.value();
 
@@ -932,6 +938,7 @@ QString LocalDataInterface::cleanDataBase(int deleteDataOlderThan)
 
     // Clear cache
     m_uuids.clear();
+    m_uuidsWithoutRemoved.clear();
 
     // Get needed data
 
diff --git a/src/ramdatainterface/localdatainterface.h b/src/ramdatainterface/localdatainterface.h
@@ -34,7 +34,7 @@ class LocalDataInterface : public DuQFLoggerObject
     QSet<QString> tableUuids(QString table, bool includeRemoved = false);
     // Returns a vector instead of set: tabledata may be sorted later
     QVector<QStringList> tableData(QString table, QHash<QString, QStringList> filters = QHash<QString, QStringList>(), bool includeRemoved = false);
-    bool contains(QString uuid, QString table);
+    bool contains(QString uuid, QString table, bool includeRemoved = false);
     QMap<QString, QString> modificationDates(QString table);
 
     void createObject(QString uuid, QString table, QString data);
@@ -121,6 +121,7 @@ private slots:
 
     // Cache UUIDS to check their existence faster
     QHash<QString, QSet<QString>> m_uuids;
+    QHash<QString, QSet<QString>> m_uuidsWithoutRemoved;
 
     // The UUIDS to delete when cleaning the database
     QHash<QString, QSet<QString>> m_uuidsToRemove;
diff --git a/src/rammanagerwidgets/itemmanagerwidget.cpp b/src/rammanagerwidgets/itemmanagerwidget.cpp
@@ -853,7 +853,7 @@ void ItemManagerWidget::setupUi()
 
     ui_table = new RamItemView(this);
     ui_table->setEditableObjects(false);
-    ui_table->setContextMenuPolicy(Qt::CustomContextMenu);
+    ui_table->setContextMenuDisabled(true);
     ui_header = new RamStepHeaderView(ui_table);
     ui_table->setHorizontalHeader( ui_header );
     ui_table->setSelectionMode(QAbstractItemView::ExtendedSelection);
@@ -900,6 +900,12 @@ void ItemManagerWidget::setupUi()
     completionContextMenu->addAction(ui_completion90 );
     completionContextMenu->addAction(ui_completion100);
     ui_contextMenu->addMenu(completionContextMenu);
+
+    ui_contextMenu->addSeparator();
+
+    ui_actionCopyUuid = new QAction(tr("Copy UUID"));
+    ui_actionCopyUuid->setIcon(QIcon(":/icons/code"));
+    ui_contextMenu->addAction(ui_actionCopyUuid);
 }
 
 void ItemManagerWidget::connectEvents()
@@ -956,6 +962,8 @@ void ItemManagerWidget::connectEvents()
     connect(ui_copyComment, SIGNAL(triggered()), this, SLOT(copyComment()));
     connect(ui_cutComment, SIGNAL(triggered()), this, SLOT(cutComment()));
     connect(ui_pasteComment, SIGNAL(triggered()), this, SLOT(pasteComment()));
+    // Dev tools
+    connect(ui_actionCopyUuid, SIGNAL(triggered()), ui_table, SLOT(copyUuid()));
     // search
     connect(ui_searchEdit, SIGNAL(changing(QString)), ui_table, SLOT(search(QString)));
     connect(ui_searchEdit, SIGNAL(changed(QString)), ui_table, SLOT(search(QString)));
diff --git a/src/rammanagerwidgets/itemmanagerwidget.h b/src/rammanagerwidgets/itemmanagerwidget.h
@@ -159,6 +159,7 @@ private slots:
     QAction *ui_pasteComment;
     RamObjectMenu *ui_assignUserContextMenu;
     RamObjectMenu *ui_changeStateContextMenu;
+    QAction *ui_actionCopyUuid;
 
 
     RamProject *m_project = nullptr;
diff --git a/src/ramobjectmodels/dbtablemodel.cpp b/src/ramobjectmodels/dbtablemodel.cpp
@@ -1,5 +1,6 @@
 #include "dbtablemodel.h"
 #include "localdatainterface.h"
+#include "dbinterface.h"
 #include "progressmanager.h"
 
 DBTableModel::DBTableModel(RamObject::ObjectType type, bool projectTable, QObject *parent):
@@ -232,6 +233,9 @@ void DBTableModel::insertObject(QString uuid, QString data, QString table)
 {
     if (table != m_table) return;
 
+    // Removed
+    if (DBInterface::instance()->isRemoved(uuid, table)) return;
+
     // Filter
     if (!checkFilters(data)) return;
 
diff --git a/src/ramobjects/ramabstractobject.cpp b/src/ramobjects/ramabstractobject.cpp
@@ -616,7 +616,7 @@ void RamAbstractObject::createData(QString data)
     m_created = true;
 }
 
-bool RamAbstractObject::checkUuid(QString uuid, ObjectType type, bool mayBeVirtual)
+bool RamAbstractObject::checkUuid(QString uuid, ObjectType type, bool mayBeVirtual, bool includeRemoved)
 {
     QString table = objectTypeName(type);
     if (uuid == "")
@@ -628,13 +628,16 @@ bool RamAbstractObject::checkUuid(QString uuid, ObjectType type, bool mayBeVirtu
     if (mayBeVirtual) return true;
 
     // Check if the uuid exists in the DB
-    if (!DBInterface::instance()->contains(uuid, table))
+    if (!DBInterface::instance()->contains(uuid, table, includeRemoved))
     {
         qCritical() << QString("%1::get - This uuid can't be found in the database: %2").arg(table, uuid);
         // Don't do anything, let the caller handle it
         return false;
     }
 
+    // Check if it's removed
+    //if (!includeRemoved && DBInterface::instance()->isRemoved(uuid, table)) return false;
+
     return true;
 }
 
diff --git a/src/ramobjects/ramabstractobject.h b/src/ramobjects/ramabstractobject.h
@@ -123,7 +123,7 @@ class RamAbstractObject
 
     // Checks if this is a valid uuid,
     // and if it exists in the DB
-    static bool checkUuid(QString uuid, ObjectType type, bool mayBeVirtual = false);
+    static bool checkUuid(QString uuid, ObjectType type, bool mayBeVirtual = false, bool includeRemoved = false);
 
     static QSet<RamAbstractObject*> invalidObjects();
     static void removeInvalidObjects();
diff --git a/src/ramobjects/ramproject.cpp b/src/ramobjects/ramproject.cpp
@@ -339,7 +339,10 @@ RamPipe *RamProject::pipe(RamStep *outputStep, RamStep *inputStep)
     for (int i = 0; i < m_pipeline->rowCount(); i++)
     {
         RamPipe *p = RamPipe::c( m_pipeline->get(i) );
-        if ( p->outputStep()->is(outputStep) && p->inputStep()->is(inputStep) ) return p;
+        RamStep *thisOutput = p->outputStep();
+        RamStep *thisInput = p->inputStep();
+
+        if ( outputStep->is(thisOutput) && inputStep->is(thisInput) ) return p;
     }
     return nullptr;
 }
diff --git a/src/ramobjectviews/ramobjectview.cpp b/src/ramobjectviews/ramobjectview.cpp
@@ -11,6 +11,11 @@ RamObjectView::RamObjectView(DisplayMode mode, QWidget *parent):
     connectEvents();
 }
 
+void RamObjectView::setContextMenuDisabled(bool disabled)
+{
+    m_contextMenuDisabled = disabled;
+}
+
 void RamObjectView::setObjectModel(QAbstractItemModel *model)
 {
     m_objectModel->freeze();
@@ -158,6 +163,21 @@ void RamObjectView::select(const QModelIndex &index)
     emit objectSelected(obj);
 }
 
+void RamObjectView::contextMenuRequested(QPoint p)
+{
+    if (m_contextMenuDisabled) return;
+
+    ui_contextMenu->popup(this->viewport()->mapToGlobal(p));
+}
+
+void RamObjectView::copyUuid()
+{
+    QModelIndex index = this->currentIndex();
+    QString uuid = index.data(RamObject::UUID).toString();
+    QClipboard *clipboard = QGuiApplication::clipboard();
+    clipboard->setText( uuid );
+}
+
 void RamObjectView::rowMoved(int logicalIndex, int oldVisualIndex, int newVisualIndex)
 {
     Q_UNUSED(logicalIndex);
@@ -224,6 +244,7 @@ void RamObjectView::setupUi()
     this->setShowGrid(false);
     this->setColumnWidth( 0, this->size().width() );
     this->setMouseTracking(true);
+    this->setContextMenuPolicy(Qt::CustomContextMenu);
 
     QString style = "QTableView { padding-top: 3px; padding-bottom: 3px; gridline-color: rgba(0,0,0,0); selection-background-color: rgba(0,0,0,0); } ";
     style += "QTableView::item:hover { background-color: none; } ";
@@ -232,6 +253,13 @@ void RamObjectView::setupUi()
     m_delegate = new RamObjectDelegate();
     this->setItemDelegate( m_delegate );
 
+    // Context menu
+    ui_contextMenu = new QMenu(this);
+
+    ui_actionCopyUuid = new QAction(tr("Copy UUID"));
+    ui_actionCopyUuid->setIcon(QIcon(":/icons/code"));
+    ui_contextMenu->addAction(ui_actionCopyUuid);
+
     // Set model
     m_objectModel = new RamObjectSortFilterProxyModel(this);
     this->setModel(m_objectModel);
@@ -252,4 +280,7 @@ void RamObjectView::connectEvents()
     // SELECT
     // Unselect before filtering
     connect(m_objectModel, SIGNAL(aboutToFilter()), this->selectionModel(), SLOT(clear()));
+    // Context menu
+    connect(this, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenuRequested(QPoint)));
+    connect(ui_actionCopyUuid, SIGNAL(triggered()), this, SLOT( copyUuid() ) );
 }
diff --git a/src/ramobjectviews/ramobjectview.h b/src/ramobjectviews/ramobjectview.h
@@ -34,6 +34,8 @@ class RamObjectView : public QTableView
     void setObjectModel(QAbstractItemModel *model);
     QAbstractItemModel *objectModel() const;
 
+    void setContextMenuDisabled(bool disabled);
+
 signals:
     void objectSelected(RamObject*);
 
@@ -44,6 +46,8 @@ public slots:
     void setCompletionRatio(bool showCompletion);
     void showDetails(bool s);
 
+    void copyUuid();
+
 protected:
     virtual void mouseMoveEvent(QMouseEvent *event) override;
     virtual void mousePressEvent(QMouseEvent *event) override;
@@ -60,6 +64,7 @@ protected slots:
 
 private slots:
     void select(const QModelIndex &index);
+    void contextMenuRequested(QPoint p);
 
 private:
     void setupUi();
@@ -73,11 +78,16 @@ private slots:
     // Filters
     QString m_currentFilterUuid;
 
+    // Context menu
+    QMenu *ui_contextMenu;
+    QAction *ui_actionCopyUuid;
+
     // UI Events
     QPoint m_initialDragPos;
     bool m_dragging = false;
     bool m_layout = false;
     QModelIndex m_clicking = QModelIndex();
+    bool m_contextMenuDisabled = false;
 };
 
 #endif // RAMOBJECTVIEW_H
diff --git a/src/resources.qrc b/src/resources.qrc
@@ -71,6 +71,7 @@
         <file alias="storage-settings">resources/icons/storage_settings.svg</file>
         <file alias="lock">resources/icons/lock_sl.svg</file>
         <file alias="tray-color">resources/icons/ramses-picto.svg</file>
+        <file alias="code">resources/icons/code_sl.svg</file>
     </qresource>
     <qresource prefix="/styles">
         <file alias="default-ramses-client">resources/style/style-ramses.css</file>
diff --git a/src/resources/icons/code_sl.svg b/src/resources/icons/code_sl.svg

Original file line number	Diff line number	Diff line change
`@@ -66,9 +66,9 @@ QSet<QString> DBInterface::tableUuids(QString table)`
`66`	`66`	`return m_ldi->tableUuids(table);`
`67`	`67`	`}`
`68`	`68`
`69`		`-bool DBInterface::contains(QString uuid, QString table)`
	`69`	`+bool DBInterface::contains(QString uuid, QString table, bool includeRemoved)`
`70`	`70`	`{`
`71`		`- return m_ldi->contains(uuid, table);`
	`71`	`+ return m_ldi->contains(uuid, table, includeRemoved);`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`void DBInterface::createObject(QString uuid, QString table, QString data)`
Original file line number	Diff line number	Diff line change
`@@ -616,7 +616,7 @@ void RamAbstractObject::createData(QString data)`
`616`	`616`	`m_created = true;`
`617`	`617`	`}`
`618`	`618`
`619`		`-bool RamAbstractObject::checkUuid(QString uuid, ObjectType type, bool mayBeVirtual)`
	`619`	`+bool RamAbstractObject::checkUuid(QString uuid, ObjectType type, bool mayBeVirtual, bool includeRemoved)`
`620`	`620`	`{`
`621`	`621`	`QString table = objectTypeName(type);`
`622`	`622`	`if (uuid == "")`
`@@ -628,13 +628,16 @@ bool RamAbstractObject::checkUuid(QString uuid, ObjectType type, bool mayBeVirtu`
`628`	`628`	`if (mayBeVirtual) return true;`
`629`	`629`
`630`	`630`	`// Check if the uuid exists in the DB`
`631`		`- if (!DBInterface::instance()->contains(uuid, table))`
	`631`	`+ if (!DBInterface::instance()->contains(uuid, table, includeRemoved))`
`632`	`632`	`{`
`633`	`633`	`qCritical() << QString("%1::get - This uuid can't be found in the database: %2").arg(table, uuid);`
`634`	`634`	`// Don't do anything, let the caller handle it`
`635`	`635`	`return false;`
`636`	`636`	`}`
`637`	`637`
	`638`	`+ // Check if it's removed`
	`639`	`+ //if (!includeRemoved && DBInterface::instance()->isRemoved(uuid, table)) return false;`
	`640`	`+`
`638`	`641`	`return true;`
`639`	`642`	`}`
`640`	`643`