merge

sources/qetgraphicsitem/element.h

@@ -1,5 +1,5 @@
 /*
-	Copyright 2006-2020 The QElectroTech Team
+	Copyright 2006-2021 The QElectroTech Team
 	This file is part of QElectroTech.
 
 	QElectroTech is free software: you can redistribute it and/or modify
@@ -18,16 +18,17 @@
 #ifndef ELEMENT_H
 #define ELEMENT_H
 
-#include <algorithm>
-#include <QPicture>
-#include <QHash>
-
-#include "qet.h"
+#include "../ElementsCollection/elementslocation.h"
+#include "../NameList/nameslist.h"
+#include "../autoNum/assignvariables.h"
+#include "../diagramcontext.h"
+#include "../qet.h"
 #include "qetgraphicsitem.h"
-#include "diagramcontext.h"
-#include "assignvariables.h"
-#include "elementslocation.h"
-#include "nameslist.h"
+#include "../properties/elementdata.h"
+
+#include <QHash>
+#include <QPicture>
+#include <algorithm>
 
 class QETProject;
 class Terminal;
@@ -100,7 +101,7 @@ class Element : public QetGraphicsItem // TODO: derive from propertiesInterface!
 
 			//METHODS related to information
 		DiagramContext elementInformations()const
-		{return m_element_informations;}
+		{return m_data.m_informations;}
 		virtual void setElementInformations(DiagramContext dc);
 		DiagramContext kindInformations() const
 		{return m_kind_informations;}
@@ -214,16 +215,16 @@ class Element : public QetGraphicsItem // TODO: derive from propertiesInterface!
 		kind			  m_link_type = Element::Simple;
 
 			//ATTRIBUTES related to informations
-		DiagramContext m_element_informations, m_kind_informations;
+		DiagramContext m_kind_informations;
 		autonum::sequentialNumbers m_autoNum_seq;
 		bool m_freeze_label = false;
 		QString m_F_str;
 
 		ElementsLocation m_location;
-		NamesList m_names;
 		QList <Terminal *> m_terminals;
 		const QPicture m_picture;
 		const QPicture m_low_zoom_picture;
+		ElementData m_data;
 
 	private:
 		bool m_must_highlight = false;