Skip to content

Commit 0eaa18e

Browse files
committed
Introducet QtNodes namespace (paceholder#40)
1 parent 72282eb commit 0eaa18e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+517
-261
lines changed

examples/calculator/MathOperationDataModel.hpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,15 @@
99

1010
class NumberData;
1111

12+
using QtNodes::PortType;
13+
using QtNodes::PortIndex;
14+
using QtNodes::NodeData;
15+
using QtNodes::NodeDataType;
16+
using QtNodes::NodeDataModel;
17+
using QtNodes::Properties;
18+
using QtNodes::NodeValidationState;
19+
20+
1221
/// The model dictates the number of inputs and outputs for the Node.
1322
/// In this example it has no logic.
1423
class MathOperationDataModel : public NodeDataModel

examples/calculator/NumberData.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
#include <nodes/NodeDataModel>
44

5+
using QtNodes::NodeDataType;
6+
57
/// The class can potentially incapsulate any user data which
68
/// need to be transferred within the Node Editor graph
79
class NumberData : public NodeData

examples/calculator/NumberDisplayDataModel.hpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@
77

88
#include <iostream>
99

10+
using QtNodes::PortType;
11+
using QtNodes::PortIndex;
12+
using QtNodes::NodeData;
13+
using QtNodes::NodeDataType;
14+
using QtNodes::NodeDataModel;
15+
using QtNodes::Properties;
16+
using QtNodes::NodeValidationState;
17+
1018
/// The model dictates the number of inputs and outputs for the Node.
1119
/// In this example it has no logic.
1220
class NumberDisplayDataModel : public NodeDataModel

examples/calculator/NumberSourceDataModel.hpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@
99

1010
class NumberData;
1111

12+
using QtNodes::PortType;
13+
using QtNodes::PortIndex;
14+
using QtNodes::NodeData;
15+
using QtNodes::NodeDataType;
16+
using QtNodes::NodeDataModel;
17+
using QtNodes::Properties;
18+
using QtNodes::NodeValidationState;
19+
1220
/// The model dictates the number of inputs and outputs for the Node.
1321
/// In this example it has no logic.
1422
class NumberSourceDataModel

examples/calculator/main.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
#include "MultiplicationModel.hpp"
1616
#include "DivisionModel.hpp"
1717

18+
using QtNodes::DataModelRegistry;
19+
using QtNodes::FlowScene;
20+
using QtNodes::FlowView;
21+
1822
static std::shared_ptr<DataModelRegistry>
1923
registerDataModels()
2024
{

examples/connection_colors/main.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,37 @@
88

99
#include "models.hpp"
1010

11+
using QtNodes::DataModelRegistry;
12+
using QtNodes::FlowScene;
13+
using QtNodes::FlowView;
14+
using QtNodes::ConnectionStyle;
1115

1216
static std::shared_ptr<DataModelRegistry>
1317
registerDataModels()
1418
{
1519
auto ret = std::make_shared<DataModelRegistry>();
20+
1621
ret->registerModel<NaiveDataModel>();
1722

1823
/*
1924
We could have more models registered.
2025
All of them become items in the context meny of the scene.
2126
22-
ret->registerModel<AnotherDataModel>();
23-
ret->registerModel<OneMoreDataModel>();
27+
ret->registerModel<AnotherDataModel>();
28+
ret->registerModel<OneMoreDataModel>();
2429
2530
*/
2631

2732
return ret;
2833
}
2934

3035

31-
3236
static
3337
void
3438
setStyle()
3539
{
3640
ConnectionStyle::setConnectionStyle(
37-
R"(
41+
R"(
3842
{
3943
"ConnectionStyle": {
4044
"UseDataDefinedColors": true

examples/connection_colors/models.hpp

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,35 @@
77

88
#include <memory>
99

10+
using QtNodes::NodeData;
11+
using QtNodes::NodeDataType;
12+
using QtNodes::NodeDataModel;
13+
using QtNodes::PortType;
14+
using QtNodes::PortIndex;
15+
using QtNodes::Properties;
16+
1017
/// The class can potentially incapsulate any user data which
1118
/// need to be transferred within the Node Editor graph
1219
class MyNodeData : public NodeData
1320
{
1421
public:
1522

16-
NodeDataType
17-
type() const override
18-
{ return NodeDataType {"MyNodeData", "My Node Data"}; }
23+
NodeDataType type() const override
24+
{
25+
return NodeDataType {"MyNodeData",
26+
"My Node Data"};
27+
}
1928
};
2029

2130
class SimpleNodeData : public NodeData
2231
{
2332
public:
2433

25-
NodeDataType
26-
type() const override
27-
{ return NodeDataType {"SimpleData", "Simple Data"}; }
34+
NodeDataType type() const override
35+
{
36+
return NodeDataType {"SimpleData",
37+
"Simple Data"};
38+
}
2839
};
2940

3041
//------------------------------------------------------------------------------
@@ -42,32 +53,27 @@ class NaiveDataModel : public NodeDataModel
4253

4354
public:
4455

45-
QString
46-
caption() const override
56+
QString caption() const override
4757
{
4858
return QString("Naive Data Model");
4959
}
5060

51-
QString
52-
name() const override
61+
QString name() const override
5362
{ return QString("NaiveDataModel"); }
5463

55-
std::unique_ptr<NodeDataModel>
56-
clone() const override
64+
std::unique_ptr<NodeDataModel>clone() const override
5765
{ return std::make_unique<NaiveDataModel>(); }
5866

5967
public:
6068

61-
void
62-
save(Properties &p) const override
69+
void save(Properties &p) const override
6370
{
6471
p.put("model_name", NaiveDataModel::name());
6572
}
6673

6774
public:
6875

69-
unsigned int
70-
nPorts(PortType portType) const override
76+
unsigned int nPorts(PortType portType) const override
7177
{
7278
unsigned int result = 1;
7379

@@ -87,8 +93,8 @@ class NaiveDataModel : public NodeDataModel
8793
return result;
8894
}
8995

90-
NodeDataType
91-
dataType(PortType portType, PortIndex portIndex) const override
96+
NodeDataType dataType(PortType portType,
97+
PortIndex portIndex) const override
9298
{
9399
switch (portType)
94100
{
@@ -123,21 +129,18 @@ class NaiveDataModel : public NodeDataModel
123129
}
124130
}
125131

126-
std::shared_ptr<NodeData>
127-
outData(PortIndex port) override
132+
std::shared_ptr<NodeData> outData(PortIndex port) override
128133
{
129134
if (port < 1)
130135
return std::make_shared<MyNodeData>();
131136

132137
return std::make_shared<SimpleNodeData>();
133138
}
134139

135-
void
136-
setInData(std::shared_ptr<NodeData>, int) override
140+
void setInData(std::shared_ptr<NodeData>, int) override
137141
{
138142
//
139143
}
140144

141-
QWidget *
142-
embeddedWidget() override { return nullptr; }
145+
QWidget *embeddedWidget() override { return nullptr; }
143146
};

examples/example2/TextData.hpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
#include <nodes/NodeDataModel>
44

5+
using QtNodes::NodeData;
6+
using QtNodes::NodeDataType;
7+
58
/// The class can potentially incapsulate any user data which
69
/// need to be transferred within the Node Editor graph
710
class TextData : public NodeData

examples/example2/TextDisplayDataModel.hpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@
99

1010
#include <iostream>
1111

12+
using QtNodes::PortType;
13+
using QtNodes::PortIndex;
14+
using QtNodes::NodeData;
15+
using QtNodes::NodeDataModel;
16+
using QtNodes::Properties;
17+
1218
/// The model dictates the number of inputs and outputs for the Node.
1319
/// In this example it has no logic.
1420
class TextDisplayDataModel : public NodeDataModel

examples/example2/TextSourceDataModel.hpp

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@
99

1010
#include <iostream>
1111

12+
using QtNodes::PortType;
13+
using QtNodes::PortIndex;
14+
using QtNodes::NodeData;
15+
using QtNodes::NodeDataModel;
16+
using QtNodes::Properties;
17+
1218
/// The model dictates the number of inputs and outputs for the Node.
1319
/// In this example it has no logic.
1420
class TextSourceDataModel : public NodeDataModel
@@ -23,51 +29,40 @@ class TextSourceDataModel : public NodeDataModel
2329

2430
public:
2531

26-
QString
27-
caption() const override
32+
QString caption() const override
2833
{ return QString("Text Source"); }
2934

30-
bool
31-
captionVisible() const override { return false; }
35+
bool captionVisible() const override { return false; }
3236

33-
QString
34-
name() const override
37+
QString name() const override
3538
{ return QString("TextSourceDataModel"); }
3639

37-
std::unique_ptr<NodeDataModel>
38-
clone() const override
40+
std::unique_ptr<NodeDataModel>clone() const override
3941
{ return std::make_unique<TextSourceDataModel>(); }
4042

4143
public:
4244

43-
void
44-
save(Properties &p) const override
45+
void save(Properties &p) const override
4546
{
4647
p.put("model_name", TextSourceDataModel::name());
4748
}
4849

4950
public:
5051

51-
unsigned int
52-
nPorts(PortType portType) const override;
52+
unsigned int nPorts(PortType portType) const override;
5353

54-
NodeDataType
55-
dataType(PortType portType, PortIndex portIndex) const override;
54+
NodeDataType dataType(PortType portType, PortIndex portIndex) const override;
5655

57-
std::shared_ptr<NodeData>
58-
outData(PortIndex port) override;
56+
std::shared_ptr<NodeData>outData(PortIndex port) override;
5957

60-
void
61-
setInData(std::shared_ptr<NodeData>, int) override
58+
void setInData(std::shared_ptr<NodeData>, int) override
6259
{ }
6360

64-
QWidget *
65-
embeddedWidget() override { return _lineEdit; }
61+
QWidget *embeddedWidget() override { return _lineEdit; }
6662

6763
private slots:
6864

69-
void
70-
onTextEdited(QString const &string);
65+
void onTextEdited(QString const &string);
7166

7267
private:
7368

0 commit comments

Comments
 (0)