#41 started

ArsMasiuk · Nov 21, 2021 · b49629f · b49629f
1 parent 1e6faae
commit b49629f
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 14 deletions.
diff --git a/src/qvgelib/CEditorScene.cpp b/src/qvgelib/CEditorScene.cpp
@@ -2,7 +2,7 @@
 This file is a part of
 QVGE - Qt Visual Graph Editor
 
-(c) 2016 Ars L.Masiuk([email protected])
+(c) 2016-2021 Ars L. Masiuk L.Masiuk([email protected])
 
 It can be used freely, maintaining the information above.
 */
@@ -106,24 +106,36 @@ void CEditorScene::initialize()
 	m_classAttributesConstrains.clear();
 
 	// default item attrs
-    createClassAttribute(class_item, "label", "Label", "", ATTR_NODEFAULT | ATTR_FIXED, nullptr, true);
-	createClassAttribute(class_item, "label.color", "Label Color", QColor(Qt::black));
+    createClassAttribute(class_item, "label", tr("Label"), "", ATTR_NODEFAULT | ATTR_FIXED, nullptr, true);
+	createClassAttribute(class_item, "label.color", tr("Label Color"), QColor(Qt::black));
 
 	QFont labelFont;
-	CAttribute labelFontAttr("label.font", "Label Font", labelFont, ATTR_FIXED);
+	CAttribute labelFontAttr("label.font", tr("Label Font"), labelFont, ATTR_FIXED);
 	setClassAttribute(class_item, labelFontAttr);
 
-    createClassAttribute(class_item, "id", "ID", "", ATTR_NODEFAULT | ATTR_FIXED, nullptr, true);
+    createClassAttribute(class_item, "id", tr("ID"), "", ATTR_NODEFAULT | ATTR_FIXED, nullptr, true);
+
+	// labels position
+	static CAttributeConstrainsEnum *labelsPositions = new CAttributeConstrainsEnum();
+	if (labelsPositions->ids.isEmpty()) 
+	{
+		labelsPositions->names << tr("Center") << tr("Top") << tr("Bottom") << tr("Left") << tr("Right");
+		labelsPositions->ids << Center << Top << Bottom << Left << Right;
+	}
+
+	createClassAttribute(class_node, attr_label_position, tr("Label Position"), Center, ATTR_FIXED, labelsPositions);
+	//createClassAttribute(class_scene, attr_label_position, tr("Labels Position"), Center, ATTR_FIXED, labelsPositions);
 
 
 	// labels policy
 	static CAttributeConstrainsEnum *labelsPolicy = new CAttributeConstrainsEnum();
-	if (labelsPolicy->ids.isEmpty()) {
+	if (labelsPolicy->ids.isEmpty()) 
+	{
 		labelsPolicy->names << tr("Auto") << tr("Always On") << tr("Always Off");
 		labelsPolicy->ids << Auto << AlwaysOn << AlwaysOff;
 	}
 
-	createClassAttribute(class_scene, attr_labels_policy, "Labels Policy", Auto, ATTR_FIXED, labelsPolicy);
+	createClassAttribute(class_scene, attr_labels_policy, tr("Labels Policy"), Auto, ATTR_FIXED, labelsPolicy);
 }
 
 
@@ -1331,8 +1343,8 @@ void CEditorScene::layoutItemLabels()
 		return;
 	}
 
-	QElapsedTimer tm;
-	tm.start();
+	//QElapsedTimer tm;
+	//tm.start();
 
 	// else layout texts
 	for (auto citem : allItems)

diff --git a/src/qvgelib/CEditorScene.h b/src/qvgelib/CEditorScene.h
@@ -79,6 +79,10 @@ class CEditorScene : public QGraphicsScene
 	bool itemLabelsEnabled() const		{ return m_labelsEnabled; }
 	bool itemLabelsNeedUpdate() const	{ return m_labelsUpdate; }
 
+	enum LabelsPosition {
+		Center, Top, Bottom, Left, Right
+	};
+
 	enum LabelsPolicy {
 		Auto, AlwaysOn, AlwaysOff
 	};

diff --git a/src/qvgelib/CEditorSceneDefines.h b/src/qvgelib/CEditorSceneDefines.h
@@ -42,6 +42,7 @@ const QByteArray attr_stroke_size = QByteArrayLiteral("stroke.size");
 const QByteArray attr_label = QByteArrayLiteral("label");
 const QByteArray attr_label_font = QByteArrayLiteral("label.font");
 const QByteArray attr_label_color = QByteArrayLiteral("label.color");
+const QByteArray attr_label_position = QByteArrayLiteral("label.position");
 const QByteArray attr_labels_policy = QByteArrayLiteral("labels.policy");
 const QByteArray attr_labels_visIds = QByteArrayLiteral("labels.visibleIds");
 const QByteArray attr_edge_direction = QByteArrayLiteral("direction");
diff --git a/src/qvgelib/CNode.cpp b/src/qvgelib/CNode.cpp
@@ -964,11 +964,30 @@ void CNode::updateLabelPosition()
 	int w = m_labelItem->boundingRect().width();
 	int h = m_labelItem->boundingRect().height();
 
+	auto labelPos = (CEditorScene::LabelsPosition) getAttribute(QByteArrayLiteral("label.position")).toInt();
+
 	QRectF r = Shape::boundingRect();
-	if (r.width() < 16 || r.height() < 16)
-		m_labelItem->setPos(-w / 2, boundingRect().height() / 2);	// if too small: put label at the bottom
-	else
+
+	switch (labelPos)
+	{
+	case CEditorScene::Top:
+		m_labelItem->setPos(-w / 2, -boundingRect().height() / 2 - h);
+		break;
+
+	case CEditorScene::Bottom:
+		m_labelItem->setPos(-w / 2, boundingRect().height() / 2);
+		break;
+
+	default:
 		m_labelItem->setPos(-w / 2, -h / 2);		// else center
+		break;
+	}
+
+
+	//if (r.width() < 16 || r.height() < 16)
+	//	m_labelItem->setPos(-w / 2, boundingRect().height() / 2);	// if too small: put label at the bottom
+	//else
+	//	m_labelItem->setPos(-w / 2, -h / 2);		// else center
 }
 
 

diff --git a/win32/build_msvc_2017_64/makevc.bat b/win32/build_msvc_2017_64/makevc.bat
@@ -1,3 +1,3 @@
 call "c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" 
 
-c:\Qt5.7\5.13.2\msvc2017_64\bin\qmake -r ../../src/qvge.pro -tp vc -recursive
+c:\Qt\5.13.2\msvc2017_64\bin\qmake -r ../../src/qvge.pro -tp vc -recursive
diff --git a/win32/build_msvc_2019_64/makevc.bat b/win32/build_msvc_2019_64/makevc.bat
@@ -1,3 +1,3 @@
 call "c:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" 
 
-c:\Qt5.7\5.15.1\msvc2019_64\bin\qmake -r ../../src/qvge.pro -tp vc -recursive
+c:\Qt\5.15.1\msvc2019_64\bin\qmake -r ../../src/qvge.pro -tp vc -recursive