Skip to content

Commit d85bb2b

Browse files
committed
Implement vertical graph layout and demo
1 parent b54b9e7 commit d85bb2b

31 files changed

+1910
-657
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ CMakeLists.txt.user
33

44
build/
55
.vscode/
6+
7+
tags

CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,20 +80,22 @@ set(CMAKE_AUTOMOC ON)
8080

8181
set(CPP_SOURCE_FILES
8282
src/AbstractGraphModel.cpp
83+
src/AbstractNodeGeometry.cpp
8384
src/BasicGraphicsScene.cpp
8485
src/ConnectionGraphicsObject.cpp
8586
src/ConnectionPainter.cpp
8687
src/ConnectionState.cpp
8788
src/ConnectionStyle.cpp
8889
src/DataFlowGraphModel.cpp
8990
src/DataFlowGraphicsScene.cpp
90-
src/NodeDelegateModelRegistry.cpp
91+
src/DefaultHorizontalNodeGeometry.cpp
92+
src/DefaultVerticalNodeGeometry.cpp
9193
src/Definitions.cpp
9294
src/GraphicsView.cpp
9395
src/GraphicsViewStyle.cpp
96+
src/NodeDelegateModelRegistry.cpp
9497
src/NodeConnectionInteraction.cpp
9598
src/NodeDelegateModel.cpp
96-
src/NodeGeometry.cpp
9799
src/NodeGraphicsObject.cpp
98100
src/NodePainter.cpp
99101
src/NodeState.cpp

examples/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
add_subdirectory(simple_graph_model)
22

3+
add_subdirectory(vertical_layout)
4+
35
add_subdirectory(calculator)
46

57
add_subdirectory(text)

examples/dynamic_ports/DynamicPortsModel.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,11 @@ nodeData(NodeId nodeId, NodeRole role) const
145145
case NodeRole::InternalData:
146146
break;
147147

148-
case NodeRole::NumberOfInPorts:
148+
case NodeRole::InPortCount:
149149
result = _nodePortCounts[nodeId].in;
150150
break;
151151

152-
case NodeRole::NumberOfOutPorts:
152+
case NodeRole::OutPortCount:
153153
result = _nodePortCounts[nodeId].out;
154154
break;
155155

@@ -215,10 +215,10 @@ setNodeData(NodeId nodeId,
215215
case NodeRole::InternalData:
216216
break;
217217

218-
case NodeRole::NumberOfInPorts:
218+
case NodeRole::InPortCount:
219219
break;
220220

221-
case NodeRole::NumberOfOutPorts:
221+
case NodeRole::OutPortCount:
222222
break;
223223

224224
case NodeRole::Widget:

examples/simple_graph_model/SimpleGraphModel.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -206,11 +206,11 @@ nodeData(NodeId nodeId, NodeRole role) const
206206
case NodeRole::InternalData:
207207
break;
208208

209-
case NodeRole::NumberOfInPorts:
209+
case NodeRole::InPortCount:
210210
result = 1u;
211211
break;
212212

213-
case NodeRole::NumberOfOutPorts:
213+
case NodeRole::OutPortCount:
214214
result = 1u;
215215
break;
216216

@@ -265,10 +265,10 @@ setNodeData(NodeId nodeId,
265265
case NodeRole::InternalData:
266266
break;
267267

268-
case NodeRole::NumberOfInPorts:
268+
case NodeRole::InPortCount:
269269
break;
270270

271-
case NodeRole::NumberOfOutPorts:
271+
case NodeRole::OutPortCount:
272272
break;
273273

274274
case NodeRole::Widget:
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
file(GLOB_RECURSE CPPS ./*.cpp )
2+
3+
add_executable(vertical_layout ${CPPS})
4+
5+
target_link_libraries(vertical_layout QtNodes)

0 commit comments

Comments
 (0)