Refactor everything to use central Graph Model

Author: paceholder

CMakeLists.txt

@@ -5,6 +5,7 @@ project(NodeEditor CXX)
 set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
 set(CMAKE_DISABLE_SOURCE_CHANGES  ON)
 set(OpenGL_GL_PREFERENCE LEGACY)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 get_directory_property(_has_parent PARENT_DIRECTORY)
 if(_has_parent)
@@ -72,37 +73,36 @@ endif()
 set(CMAKE_AUTOMOC ON)
 
 set(CPP_SOURCE_FILES
-  src/Connection.cpp
+  src/BasicGraphicsScene.cpp
   src/ConnectionBlurEffect.cpp
-  src/ConnectionGeometry.cpp
   src/ConnectionGraphicsObject.cpp
   src/ConnectionPainter.cpp
   src/ConnectionState.cpp
   src/ConnectionStyle.cpp
+  src/DataFlowGraphModel.cpp
+  src/DataFlowGraphicsScene.cpp
   src/DataModelRegistry.cpp
-  src/FlowScene.cpp
-  src/FlowView.cpp
-  src/FlowViewStyle.cpp
-  src/Node.cpp
+  src/GraphModel.cpp
+  src/GraphicsView.cpp
+  src/GraphicsViewStyle.cpp
   src/NodeConnectionInteraction.cpp
   src/NodeDataModel.cpp
   src/NodeGeometry.cpp
   src/NodeGraphicsObject.cpp
   src/NodePainter.cpp
   src/NodeState.cpp
   src/NodeStyle.cpp
-  src/Properties.cpp
   src/StyleCollection.cpp
+  src/locateNode.cpp
 )
 
 # If we want to give the option to build a static library,
 # set BUILD_SHARED_LIBS option to OFF
-add_library(nodes
-  ${CPP_SOURCE_FILES}
-  ${RESOURCES}
-)
+add_library(nodes ${CPP_SOURCE_FILES} ${RESOURCES})
+
 add_library(NodeEditor::nodes ALIAS nodes)
 
+
 target_include_directories(nodes
   PUBLIC
     $<INSTALL_INTERFACE:include>
@@ -189,7 +189,7 @@ endif()
 ##
 
 if(BUILD_TESTING)
-  add_subdirectory(test)
+  #add_subdirectory(test)
 endif()
 
 ###############

examples/CMakeLists.txt

@@ -1,9 +1,12 @@
-add_subdirectory(connection_colors)
-
-add_subdirectory(example2)
+add_subdirectory(graph)
 
 add_subdirectory(calculator)
 
+add_subdirectory(text)
+
 add_subdirectory(images)
 
 add_subdirectory(styles)
+
+add_subdirectory(connection_colors)
+

examples/calculator/AdditionModel.hpp

@@ -15,8 +15,7 @@ class AdditionModel : public MathOperationDataModel
 {
 public:
 
-  virtual
-  ~AdditionModel() {}
+  ~AdditionModel() = default;
 
 public:
 
@@ -40,18 +39,16 @@ class AdditionModel : public MathOperationDataModel
 
     if (n1 && n2)
     {
-      modelValidationState = NodeValidationState::Valid;
-      modelValidationError = QString();
       _result = std::make_shared<DecimalData>(n1->number() +
                                               n2->number());
     }
     else
     {
-      modelValidationState = NodeValidationState::Warning;
-      modelValidationError = QStringLiteral("Missing or incorrect inputs");
       _result.reset();
     }
 
     Q_EMIT dataUpdated(outPortIndex);
   }
+
+
 };

examples/calculator/Converters.cpp

@@ -68,24 +68,25 @@ class DivisionModel : public MathOperationDataModel
 
     if (n2 && (n2->number() == 0.0))
     {
-      modelValidationState = NodeValidationState::Error;
-      modelValidationError = QStringLiteral("Division by zero error");
+      //modelValidationState = NodeValidationState::Error;
+      //modelValidationError = QStringLiteral("Division by zero error");
       _result.reset();
     }
     else if (n1 && n2)
     {
-      modelValidationState = NodeValidationState::Valid;
-      modelValidationError = QString();
+      //modelValidationState = NodeValidationState::Valid;
+      //modelValidationError = QString();
       _result = std::make_shared<DecimalData>(n1->number() /
                                               n2->number());
     }
     else
     {
-      modelValidationState = NodeValidationState::Warning;
-      modelValidationError = QStringLiteral("Missing or incorrect inputs");
+      //modelValidationState = NodeValidationState::Warning;
+      //modelValidationError = QStringLiteral("Missing or incorrect inputs");
       _result.reset();
     }
 
     Q_EMIT dataUpdated(outPortIndex);
   }
+
 };

examples/calculator/Converters.hpp

@@ -40,6 +40,11 @@ setInData(std::shared_ptr<NodeData> data, PortIndex portIndex)
   auto numberData =
     std::dynamic_pointer_cast<DecimalData>(data);
 
+  if (!data)
+  {
+    Q_EMIT dataInvalidated(0);
+  }
+
   if (portIndex == 0)
   {
     _number1 = numberData;
@@ -52,18 +57,3 @@ setInData(std::shared_ptr<NodeData> data, PortIndex portIndex)
   compute();
 }
 
-
-NodeValidationState
-MathOperationDataModel::
-validationState() const
-{
-  return modelValidationState;
-}
-
-
-QString
-MathOperationDataModel::
-validationMessage() const
-{
-  return modelValidationError;
-}

examples/calculator/DivisionModel.hpp

@@ -10,12 +10,11 @@
 
 class DecimalData;
 
-using QtNodes::PortType;
-using QtNodes::PortIndex;
 using QtNodes::NodeData;
-using QtNodes::NodeDataType;
 using QtNodes::NodeDataModel;
-using QtNodes::NodeValidationState;
+using QtNodes::NodeDataType;
+using QtNodes::PortIndex;
+using QtNodes::PortType;
 
 /// The model dictates the number of inputs and outputs for the Node.
 /// In this example it has no logic.
@@ -25,8 +24,7 @@ class MathOperationDataModel : public NodeDataModel
 
 public:
 
-  virtual
-  ~MathOperationDataModel() {}
+  ~MathOperationDataModel() = default;
 
 public:
 
@@ -46,12 +44,6 @@ class MathOperationDataModel : public NodeDataModel
   QWidget *
   embeddedWidget() override { return nullptr; }
 
-  NodeValidationState
-  validationState() const override;
-
-  QString
-  validationMessage() const override;
-
 protected:
 
   virtual void
@@ -63,7 +55,4 @@ class MathOperationDataModel : public NodeDataModel
   std::weak_ptr<DecimalData> _number2;
 
   std::shared_ptr<DecimalData> _result;
-
-  NodeValidationState modelValidationState = NodeValidationState::Warning;
-  QString modelValidationError = QString("Missing or incorrect inputs");
 };