Rework styling

CMakeLists.txt

@@ -42,7 +42,7 @@ set(CPP_SOURCE_FILES
   src/NodeState.cpp
   src/NodeStyle.cpp
   src/Properties.cpp
-  src/StyleCollection.cpp
+  src/StyleImport.cpp
 )
 
 # If we want to give the option to build a static library,

examples/calculator/main.cpp

@@ -60,27 +60,24 @@ registerDataModels()
 
 
 static
-void
-setStyle()
+auto
+connectionStyle()
 {
-  ConnectionStyle::setConnectionStyle(
-  R"(
-  {
-    "ConnectionStyle": {
-      "ConstructionColor": "gray",
-      "NormalColor": "black",
-      "SelectedColor": "gray",
-      "SelectedHaloColor": "deepskyblue",
-      "HoveredColor": "deepskyblue",
-
-      "LineWidth": 3.0,
-      "ConstructionLineWidth": 2.0,
-      "PointDiameter": 10.0,
-
-      "UseDataDefinedColors": true
-    }
-  }
-  )");
+  auto style = ConnectionStyle::defaultStyle();
+
+  style.setConstructionColor(QColor("gray"));
+  style.setNormalColor(QColor("black"));
+  style.setSelectedColor(QColor("gray"));
+  style.setSelectedHaloColor(QColor("deepskyblue"));
+  style.setHoveredColor(QColor("deepskyblue"));
+
+  style.setLineWidth(3.0);
+  style.setConstructionLineWidth(2.0);
+  style.setPointDiameter(10.0);
+
+  style.useDataDefinedColors(true);
+
+  return style;
 }
 
 
@@ -89,8 +86,6 @@ main(int argc, char *argv[])
 {
   QApplication app(argc, argv);
 
-  setStyle();
-
   QWidget mainWidget;
 
   auto menuBar    = new QMenuBar();
@@ -101,6 +96,7 @@ main(int argc, char *argv[])
 
   l->addWidget(menuBar);
   auto scene = new FlowScene(registerDataModels(), &mainWidget);
+  scene->setConnectionStyle(connectionStyle());
   l->addWidget(new FlowView(scene));
   l->setContentsMargins(0, 0, 0, 0);
   l->setSpacing(0);

examples/connection_colors/main.cpp

@@ -33,31 +33,18 @@ registerDataModels()
 }
 
 
-static
-void
-setStyle()
-{
-  ConnectionStyle::setConnectionStyle(
-    R"(
-  {
-    "ConnectionStyle": {
-      "UseDataDefinedColors": true
-    }
-  }
-  )");
-}
-
-
 //------------------------------------------------------------------------------
 
 int
 main(int argc, char* argv[])
 {
   QApplication app(argc, argv);
 
-  setStyle();
+  auto connectionStyle = ConnectionStyle::defaultStyle();
+  connectionStyle.useDataDefinedColors(true);
 
   FlowScene scene(registerDataModels());
+  scene.setConnectionStyle(std::move(connectionStyle));
 
   FlowView view(&scene);
 

examples/styles/main.cpp

@@ -30,9 +30,9 @@ registerDataModels()
 
 static
 void
-setStyle()
+setStyle(FlowScene& scene, FlowView& view)
 {
-  FlowViewStyle::setStyle(
+  view.setStyle(FlowViewStyle::fromJson(
   R"(
   {
     "FlowViewStyle": {
@@ -41,9 +41,9 @@ setStyle()
       "CoarseGridColor": [235, 235, 220]
     }
   }
-  )");
+  )"));
 
-  NodeStyle::setNodeStyle(
+  scene.setNodeStyle(NodeStyle::fromJson(
   R"(
   {
     "NodeStyle": {
@@ -63,9 +63,9 @@ setStyle()
       "Opacity": 1.0
     }
   }
-  )");
+  )"));
 
-  ConnectionStyle::setConnectionStyle(
+  scene.setConnectionStyle(ConnectionStyle::fromJson(
   R"(
   {
     "ConnectionStyle": {
@@ -82,7 +82,7 @@ setStyle()
       "UseDataDefinedColors": false
     }
   }
-  )");
+  )"));
 }
 
 
@@ -93,11 +93,9 @@ main(int argc, char* argv[])
 {
   QApplication app(argc, argv);
 
-  setStyle();
-
   FlowScene scene(registerDataModels());
-
   FlowView view(&scene);
+  setStyle(scene, view);
 
   view.setWindowTitle("Style example");
   view.resize(800, 600);

include/nodes/internal/Connection.hpp

@@ -23,6 +23,7 @@ namespace QtNodes
 class Node;
 class NodeData;
 class ConnectionGraphicsObject;
+class ConnectionStyle;
 
 ///
 class NODE_EDITOR_PUBLIC Connection
@@ -36,15 +37,17 @@ class NODE_EDITOR_PUBLIC Connection
 
   /// New Connection is attached to the port of the given Node.
   /// The port has parameters (portType, portIndex).
-  /// The opposite connection end will require anothre port.
+  /// The opposite connection end will require another port.
   Connection(PortType portType,
              Node& node,
-             PortIndex portIndex);
+             PortIndex portIndex,
+             ConnectionStyle const &style);
 
   Connection(Node& nodeIn,
              PortIndex portIndexIn,
              Node& nodeOut,
              PortIndex portIndexOut,
+             ConnectionStyle const &style,
              TypeConverter converter =
                TypeConverter{});
 
@@ -118,6 +121,9 @@ class NODE_EDITOR_PUBLIC Connection
   void
   setTypeConverter(TypeConverter converter);
 
+  ConnectionStyle const &
+  connectionStyle() const;
+
 public: // data propagation
 
   void
@@ -139,10 +145,11 @@ class NODE_EDITOR_PUBLIC Connection
   PortIndex _inPortIndex;
 
 private:
-
   ConnectionState    _connectionState;
   ConnectionGeometry _connectionGeometry;
 
+  ConnectionStyle const &_connectionStyle;
+
   std::unique_ptr<ConnectionGraphicsObject>_connectionGraphicsObject;
 
   TypeConverter _converter;

include/nodes/internal/ConnectionGeometry.hpp

@@ -10,11 +10,12 @@
 namespace QtNodes
 {
 
+class ConnectionStyle;
+
 class ConnectionGeometry
 {
 public:
-
-  ConnectionGeometry();
+  ConnectionGeometry(ConnectionStyle const &style);
 
 public:
 
@@ -56,5 +57,7 @@ class ConnectionGeometry
   double _lineWidth;
 
   bool _hovered;
+
+  ConnectionStyle const* _style;
 };
 }

include/nodes/internal/ConnectionStyle.hpp

@@ -2,37 +2,27 @@
 
 #include <QtGui/QColor>
 
+#include <QtCore/QByteArray>
+#include <QtCore/QString>
+
 #include "Export.hpp"
-#include "Style.hpp"
 
 namespace QtNodes
 {
 
-class NODE_EDITOR_PUBLIC ConnectionStyle : public Style
+class NODE_EDITOR_PUBLIC ConnectionStyle
 {
 public:
-
   ConnectionStyle();
 
-  ConnectionStyle(QString jsonText);
-
-public:
-
-  static void setConnectionStyle(QString jsonText);
-
-private:
-
-  void loadJsonText(QString jsonText) override;
+  static ConnectionStyle const&
+  defaultStyle();
 
-  void loadJsonFile(QString fileName) override;
-
-  void loadJsonFromByteArray(QByteArray const &byteArray) override;
-
-public:
+  static ConnectionStyle
+  fromJson(QString const& jsonText);
 
   QColor constructionColor() const;
   QColor normalColor() const;
-  QColor normalColor(QString typeId) const;
   QColor selectedColor() const;
   QColor selectedHaloColor() const;
   QColor hoveredColor() const;
@@ -43,18 +33,35 @@ class NODE_EDITOR_PUBLIC ConnectionStyle : public Style
 
   bool useDataDefinedColors() const;
 
+  void setConstructionColor(QColor);
+  void setNormalColor(QColor);
+  void setSelectedColor(QColor);
+  void setSelectedHaloColor(QColor);
+  void setHoveredColor(QColor);
+
+  void setLineWidth(float);
+  void setConstructionLineWidth(float);
+  void setPointDiameter(float);
+
+  void useDataDefinedColors(bool);
+
+  static QColor
+  computeNormalColor(QString const& typeId);
+
 private:
+  ConnectionStyle(QByteArray const& jsonBytes);
+  void loadJson(QByteArray const& jsonBytes);
 
-  QColor ConstructionColor;
-  QColor NormalColor;
-  QColor SelectedColor;
-  QColor SelectedHaloColor;
-  QColor HoveredColor;
+  QColor _constructionColor;
+  QColor _normalColor;
+  QColor _selectedColor;
+  QColor _selectedHaloColor;
+  QColor _hoveredColor;
 
-  float LineWidth;
-  float ConstructionLineWidth;
-  float PointDiameter;
+  float _lineWidth;
+  float _constructionLineWidth;
+  float _pointDiameter;
 
-  bool UseDataDefinedColors;
+  bool _useDataDefinedColors;
 };
 }

include/nodes/internal/FlowScene.hpp

@@ -13,6 +13,9 @@
 #include "TypeConverter.hpp"
 #include "memory.hpp"
 
+#include "ConnectionStyle.hpp"
+#include "NodeStyle.hpp"
+
 namespace QtNodes
 {
 
@@ -22,7 +25,6 @@ class Node;
 class NodeGraphicsObject;
 class Connection;
 class ConnectionGraphicsObject;
-class NodeStyle;
 
 /// Scene holds connections and nodes.
 class NODE_EDITOR_PUBLIC FlowScene
@@ -97,6 +99,12 @@ class NODE_EDITOR_PUBLIC FlowScene
 
   void loadFromMemory(const QByteArray& data);
 
+  ConnectionStyle const& connectionStyle() const;
+  NodeStyle const& nodeStyle() const;
+
+  void setConnectionStyle(ConnectionStyle style);
+  void setNodeStyle(NodeStyle style);
+
 signals:
 
   void nodeCreated(Node &n);
@@ -125,6 +133,10 @@ class NODE_EDITOR_PUBLIC FlowScene
   using SharedConnection = std::shared_ptr<Connection>;
   using UniqueNode       = std::unique_ptr<Node>;
 
+  // styles MUST come before _connections and _nodes, so that the styles outlive them
+  ConnectionStyle _connectionStyle;
+  NodeStyle       _nodeStyle;
+
   std::unordered_map<QUuid, SharedConnection> _connections;
   std::unordered_map<QUuid, UniqueNode>       _nodes;
   std::shared_ptr<DataModelRegistry>          _registry;