- fixed building with OGDF support (#130, #139)

ArsMasiuk · Feb 14, 2021 · 1f5063e · 1f5063e
1 parent 933ebe7
commit 1f5063e
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 21 deletions.
diff --git a/CHANGES b/CHANGES
@@ -7,6 +7,7 @@ New features/improvements:
 
 Bugfixes:
 - fixed crash if DOT file has HTML labels (#131)
+- fixed building with OGDF support (#130, #139)
 
 Linux:
 - some setup issues fixed (#132, #133)

diff --git a/src/qvgeioui/CImportExportUIController.cpp b/src/qvgeioui/CImportExportUIController.cpp
@@ -213,7 +213,7 @@ bool CImportExportUIController::importCSV(CEditorScene& scene, const QString &fi
 }
 
 
-bool CImportExportUIController::loadFromFile(const QString &format, const QString &fileName, CEditorScene& scene, QString* lastError)
+bool CImportExportUIController::loadFromFile(const QString &format, const QString &fileName, CNodeEditorScene& scene, QString* lastError)
 {
 	try 
 	{
@@ -273,7 +273,7 @@ bool CImportExportUIController::loadFromFile(const QString &format, const QStrin
 }
 
 
-bool CImportExportUIController::saveToFile(const QString &format, const QString &fileName, CEditorScene& scene, QString* lastError)
+bool CImportExportUIController::saveToFile(const QString &format, const QString &fileName, CNodeEditorScene& scene, QString* lastError)
 {
     if (format == "xgr")
         return (CFileSerializerXGR().save(fileName, scene, lastError));

diff --git a/src/qvgeioui/CImportExportUIController.h b/src/qvgeioui/CImportExportUIController.h
@@ -11,6 +11,7 @@ It can be used freely, maintaining the information above.
 
 class CMainWindow;
 class CEditorScene;
+class CNodeEditorScene;
 class IFileSerializer;
 
 // think: to move?
@@ -38,8 +39,8 @@ class CImportExportUIController: public QObject
 	void exportDOT(CEditorScene& scene);
 	bool importCSV(CEditorScene& scene, const QString &fileName, QString* lastError);
 
-	bool loadFromFile(const QString &format, const QString &fileName, CEditorScene& scene, QString* lastError);
-	bool saveToFile(const QString &format, const QString &fileName, CEditorScene& scene, QString* lastError);
+	bool loadFromFile(const QString &format, const QString &fileName, CNodeEditorScene& scene, QString* lastError);
+	bool saveToFile(const QString &format, const QString &fileName, CNodeEditorScene& scene, QString* lastError);
 
 private:
 	bool doExport(CEditorScene& scene, const IFileSerializer &exporter);

diff --git a/src/qvgelib/CNode.cpp b/src/qvgelib/CNode.cpp
@@ -1000,13 +1000,13 @@ void CNode::recalculateShape()
 		float ry = r.center().y();
 
 		m_shapeCache 
-			<< QPointF(r.left() + r.width() / 3, ry - r.height() / 2)
-			<< QPointF(r.left() + r.width() / 3 * 2, ry - r.height() / 2)
+			<< QPointF(r.left() + r.width() / 4, ry - r.height() / 2)
+			<< QPointF(r.left() + r.width() - r.width() / 4, ry - r.height() / 2)
 			<< QPointF(rx + r.width() / 2, ry)
-			<< QPointF(r.left() + r.width() / 3 * 2, ry + r.height() / 2)
-			<< QPointF(r.left() + r.width() / 3, ry + r.height() / 2)
+			<< QPointF(r.left() + r.width() - r.width() / 4, ry + r.height() / 2)
+			<< QPointF(r.left() + r.width() / 4, ry + r.height() / 2)
 			<< QPointF(r.left(), ry)
-			<< QPointF(r.left() + r.width() / 3, ry - r.height() / 2);
+			<< QPointF(r.left() + r.width() / 4, ry - r.height() / 2);
 	}
 	else if (shapeType == "triangle")
 	{

diff --git a/src/qvgeui/CColorSchemesUIController.cpp b/src/qvgeui/CColorSchemesUIController.cpp
@@ -1,6 +1,7 @@
 #include "CColorSchemesUIController.h"
 
 #include <qvgelib/CEditorScene.h>
+#include <qvgelib/CEditorSceneDefines.h>
 
 
 CColorSchemesUIController::CColorSchemesUIController(QObject *parent) : QObject(parent)
@@ -122,11 +123,11 @@ void CColorSchemesUIController::applyScheme(const Scheme& scheme)
 	{
 		m_scene->setBackgroundBrush(scheme.bgColor);
 		m_scene->setGridPen(scheme.gridColor);
-		m_scene->setClassAttribute("node", "color", scheme.nodeColor);
-		m_scene->setClassAttribute("node", "stroke.color", scheme.nodeStrokeColor);
-		m_scene->setClassAttribute("node", "label.color", scheme.nodeLabelColor);
-		m_scene->setClassAttribute("edge", "color", scheme.edgeColor);
-		m_scene->setClassAttribute("edge", "label.color", scheme.edgeLabelColor);
+		m_scene->setClassAttribute(class_node, "color", scheme.nodeColor);
+		m_scene->setClassAttribute(class_node, "stroke.color", scheme.nodeStrokeColor);
+		m_scene->setClassAttribute(class_node, "label.color", scheme.nodeLabelColor);
+		m_scene->setClassAttribute(class_edge, "color", scheme.edgeColor);
+		m_scene->setClassAttribute(class_edge, "label.color", scheme.edgeLabelColor);
 
 		m_scene->addUndoState();
 

diff --git a/src/qvgeui/CNodeEdgePropertiesUI.cpp b/src/qvgeui/CNodeEdgePropertiesUI.cpp
@@ -281,7 +281,10 @@ void CNodeEdgePropertiesUI::setNodesAttribute(const QByteArray& attrId, const QV
 
 	QList<CNode*> nodes = m_scene->getSelectedNodes();
 	if (nodes.isEmpty())
+	{
+		//m_scene->setClassAttribute(class_node, attrId, v);
 		return;
+	}
 
 	for (auto node : nodes)
 		node->setAttribute(attrId, v);
@@ -300,7 +303,10 @@ void CNodeEdgePropertiesUI::setEdgesAttribute(const QByteArray& attrId, const QV
 
 	QList<CEdge*> edges = m_scene->getSelectedEdges();
 	if (edges.isEmpty())
+	{
+		//m_scene->setClassAttribute(class_edge, attrId, v);
 		return;
+	}
 
 	for (auto edge : edges)
 		edge->setAttribute(attrId, v);

diff --git a/src/qvgeui/ogdf/COGDFLayout.cpp b/src/qvgeui/ogdf/COGDFLayout.cpp
@@ -1,8 +1,8 @@
 #include "COGDFLayout.h"
 
-#include <qvge/CNodeEditorScene.h>
-#include <qvge/CNode.h>
-#include <qvge/CDirectEdge.h>
+#include <qvgelib/CNodeEditorScene.h>
+#include <qvgelib/CNode.h>
+#include <qvgelib/CDirectEdge.h>
 
 #include <ogdf/fileformats/GraphIO.h>
 

diff --git a/src/qvgeui/ogdf/COGDFLayoutUIController.cpp b/src/qvgeui/ogdf/COGDFLayoutUIController.cpp
@@ -4,8 +4,8 @@
 
 #include <appbase/CMainWindow.h>
 
-#include <qvge/CNodeEditorScene.h>
-#include <qvge/CEditorView.h>
+#include <qvgelib/CNodeEditorScene.h>
+#include <qvgelib/CEditorView.h>
 
 #include <ogdf/planarity/PlanarizationLayout.h>
 #include <ogdf/misclayout/LinearLayout.h>

diff --git a/src/qvgeui/ogdf/COGDFNewGraphDialog.cpp b/src/qvgeui/ogdf/COGDFNewGraphDialog.cpp
@@ -2,7 +2,7 @@
 #include "ui_COGDFNewGraphDialog.h"
 #include "COGDFLayout.h"
 
-#include <qvge/CNodeEditorScene.h>
+#include <qvgelib/CNodeEditorScene.h>
 
 #include <ogdf/basic/graph_generators.h>
 #include <ogdf/energybased/FMMMLayout.h>

diff --git a/src/qvgeui/qvgeui.pro b/src/qvgeui/qvgeui.pro
@@ -3,4 +3,4 @@ include($$PWD/../lib.pri)
 TARGET = qvgeui
 QT += core gui widgets printsupport xml
 
-include($$PWD/qvgeui.pri)
+include($$PWD/qvgeui.pri)