Merge remote-tracking branch 'origin/QetGraphicsTableItem'

This commit is contained in:
Laurent Trinques
2020-04-12 18:51:38 +02:00
parent 41541dde2c
commit 73149973e3
38 changed files with 3232 additions and 528 deletions

View File

@@ -20,6 +20,8 @@
#include <QtWidgets>
#include <QtXml>
#include <QHash>
#include <QUuid>
#include "bordertitleblock.h"
#include "conductorproperties.h"
#include "exportproperties.h"
@@ -119,6 +121,7 @@ class Diagram : public QGraphicsScene
bool m_freeze_new_elements;
bool m_freeze_new_conductors_;
QUuid m_uuid = QUuid::createUuid();
// METHODS
protected:
@@ -133,6 +136,7 @@ class Diagram : public QGraphicsScene
void keyReleaseEvent (QKeyEvent *) override;
public:
QUuid uuid();
void setEventInterface (DiagramEventInterface *event_interface);
void clearEventInterface();