Skip to content

Commit 8bfca77

Browse files
committed
Fix
1 parent 92baa2d commit 8bfca77

3 files changed

Lines changed: 28 additions & 8 deletions

File tree

test/src/TestDataFlowGraphModel.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "ApplicationSetup.hpp"
2-
#include "StubNodeDataModel.hpp"
32

43
#include <QtNodes/DataFlowGraphModel>
4+
#include <QtNodes/NodeDelegateModel>
55
#include <QtNodes/NodeDelegateModelRegistry>
66
#include <QtNodes/Definitions>
77

@@ -10,12 +10,13 @@
1010
using QtNodes::ConnectionId;
1111
using QtNodes::DataFlowGraphModel;
1212
using QtNodes::InvalidNodeId;
13+
using QtNodes::NodeDelegateModel;
1314
using QtNodes::NodeDelegateModelRegistry;
1415
using QtNodes::NodeId;
1516
using QtNodes::NodeRole;
1617
using QtNodes::PortType;
1718

18-
class TestNodeDelegate : public StubNodeDataModel
19+
class TestNodeDelegate : public NodeDelegateModel
1920
{
2021
public:
2122
QString name() const override { return "TestNode"; }
@@ -24,6 +25,10 @@ class TestNodeDelegate : public StubNodeDataModel
2425
{
2526
return (portType == PortType::In) ? 2 : 1;
2627
}
28+
QtNodes::NodeDataType dataType(QtNodes::PortType, QtNodes::PortIndex) const override { return {}; }
29+
void setInData(std::shared_ptr<QtNodes::NodeData>, QtNodes::PortIndex const) override {}
30+
std::shared_ptr<QtNodes::NodeData> outData(QtNodes::PortIndex const) override { return nullptr; }
31+
QWidget* embeddedWidget() override { return nullptr; }
2732
};
2833

2934
TEST_CASE("DataFlowGraphModel basic functionality", "[dataflow]")

test/src/TestNodeDelegateModelRegistry.cpp

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,26 @@
1-
#include "StubNodeDataModel.hpp"
2-
1+
#include <QtNodes/NodeDelegateModel>
32
#include <QtNodes/NodeDelegateModelRegistry>
43

54
#include <catch2/catch.hpp>
65

6+
using QtNodes::NodeDelegateModel;
77
using QtNodes::NodeDelegateModelRegistry;
88

99
namespace {
10-
class TestModelWithStaticName : public StubNodeDataModel
10+
class TestModelWithStaticName : public NodeDelegateModel
1111
{
1212
public:
1313
static QString Name() { return "StaticNameModel"; }
1414
QString name() const override { return "StaticNameModel"; }
1515
QString caption() const override { return "Static Name Model"; }
16+
unsigned int nPorts(QtNodes::PortType) const override { return 0; }
17+
QtNodes::NodeDataType dataType(QtNodes::PortType, QtNodes::PortIndex) const override { return {}; }
18+
void setInData(std::shared_ptr<QtNodes::NodeData>, QtNodes::PortIndex const) override {}
19+
std::shared_ptr<QtNodes::NodeData> outData(QtNodes::PortIndex const) override { return nullptr; }
20+
QWidget* embeddedWidget() override { return nullptr; }
1621
};
1722

18-
class TestModelWithName : public StubNodeDataModel
23+
class TestModelWithName : public NodeDelegateModel
1924
{
2025
public:
2126
TestModelWithName(const QString &name = "DefaultName")
@@ -24,6 +29,11 @@ class TestModelWithName : public StubNodeDataModel
2429

2530
QString name() const override { return _modelName; }
2631
QString caption() const override { return QString("Model: %1").arg(_modelName); }
32+
unsigned int nPorts(QtNodes::PortType) const override { return 0; }
33+
QtNodes::NodeDataType dataType(QtNodes::PortType, QtNodes::PortIndex) const override { return {}; }
34+
void setInData(std::shared_ptr<QtNodes::NodeData>, QtNodes::PortIndex const) override {}
35+
std::shared_ptr<QtNodes::NodeData> outData(QtNodes::PortIndex const) override { return nullptr; }
36+
QWidget* embeddedWidget() override { return nullptr; }
2737

2838
private:
2939
QString _modelName;

test/src/TestSerialization.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "ApplicationSetup.hpp"
2-
#include "StubNodeDataModel.hpp"
32

43
#include <QtNodes/DataFlowGraphModel>
4+
#include <QtNodes/NodeDelegateModel>
55
#include <QtNodes/NodeDelegateModelRegistry>
66
#include <QtNodes/Definitions>
77

@@ -15,11 +15,12 @@
1515
using QtNodes::ConnectionId;
1616
using QtNodes::DataFlowGraphModel;
1717
using QtNodes::InvalidNodeId;
18+
using QtNodes::NodeDelegateModel;
1819
using QtNodes::NodeDelegateModelRegistry;
1920
using QtNodes::NodeId;
2021
using QtNodes::NodeRole;
2122

22-
class SerializableTestModel : public StubNodeDataModel
23+
class SerializableTestModel : public NodeDelegateModel
2324
{
2425
public:
2526
QString name() const override { return "SerializableTestModel"; }
@@ -29,6 +30,10 @@ class SerializableTestModel : public StubNodeDataModel
2930
{
3031
return (portType == QtNodes::PortType::In) ? 1 : 1;
3132
}
33+
QtNodes::NodeDataType dataType(QtNodes::PortType, QtNodes::PortIndex) const override { return {}; }
34+
void setInData(std::shared_ptr<QtNodes::NodeData>, QtNodes::PortIndex const) override {}
35+
std::shared_ptr<QtNodes::NodeData> outData(QtNodes::PortIndex const) override { return nullptr; }
36+
QWidget* embeddedWidget() override { return nullptr; }
3237
};
3338

3439
TEST_CASE("DataFlowGraphModel serialization", "[serialization]")

0 commit comments

Comments
 (0)