Added PassThrough component via right clicking on links

Author: BenPyton

Components.h

@@ -14,6 +14,7 @@
 #include "Components/RepeatComponent.h"
 #include "Components/ADSRComponent.h"
 #include "Components/OutputComponent.h"
+#include "Components/PassThroughComponent.h"
 
 #endif // COMPONENTS_H
 

Components/Component.h

@@ -36,6 +36,9 @@ class Component
     QString m_name;
 	bool m_hasOutput = true;
     bool m_removable = true;
+    bool m_showTitle = true;
+    bool m_showBackground = true;
+    bool m_canDragPins = true;
 
 public:
     Component();
@@ -45,6 +48,9 @@ class Component
 
     bool isRemovable() const { return m_removable; }
     bool hasOutput() const { return m_hasOutput; }
+    bool showTitle() const { return m_showTitle; }
+    bool showBackground() const { return m_showBackground; }
+    bool canDragPins() const { return m_canDragPins; }
     virtual qreal getOutput(qreal _time) = 0;
 
     ComponentInput* getInput(int _index);

Components/ComponentFactory.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Benoit Pelletier
+ * Copyright 2019-2021 Benoit Pelletier
  *
  * This file is part of Sound Generator.
  *
@@ -21,6 +21,7 @@
 #include "ComponentFactory.h"
 #include "../Components.h"
 
+// TODO: Change those components into data-driven (difficult part is the algorithms and variables for generators)
 Component * ComponentFactory::CreateComponent(const QString & _compName)
 {
 	Component* pComp = nullptr;
@@ -29,6 +30,10 @@ Component * ComponentFactory::CreateComponent(const QString & _compName)
     {
         pComp = new OutputComponent();
     }
+    else if (_compName == "PassThrough")
+    {
+        pComp = new PassThroughComponent();
+    }
     else if (_compName == "Sinusoidal")
 	{
 		pComp = new SinusComponent();

Components/PassThroughComponent.cpp

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2021 Benoit Pelletier
+ *
+ * This file is part of Sound Generator.
+ *
+ * Sound Generator is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Sound Generator is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Sound Generator.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "PassThroughComponent.h"
+
+PassThroughComponent::PassThroughComponent()
+	: Component()
+{
+    m_name = "PassThrough";
+
+	m_inputs.push_back(ComponentInput("", this));
+
+    m_showTitle = false;
+    m_showBackground = false;
+    m_canDragPins = false;
+    m_inputs[0].setDefaultValue(0.0);
+    m_inputs[0].setEditable(false);
+}
+
+qreal PassThroughComponent::getOutput(qreal _time)
+{
+	return m_inputs[0].getValue(_time);
+}

Components/PassThroughComponent.h

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2021 Benoit Pelletier
+ *
+ * This file is part of Sound Generator.
+ *
+ * Sound Generator is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Sound Generator is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Sound Generator.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef PASSTRHOUGHCOMPONENT_H
+#define PASSTRHOUGHCOMPONENT_H
+
+#include "Component.h"
+
+class PassThroughComponent : public Component
+{
+public:
+    PassThroughComponent();
+    virtual qreal getOutput(qreal _time) override;
+};
+
+#endif // PASSTRHOUGHCOMPONENT_H

NodalScene.cpp

@@ -31,6 +31,8 @@
 #include "UndoCommands/DeleteComponentCommand.h"
 #include "UndoCommands/MoveComponentCommand.h"
 #include "UndoCommands/SelectComponentCommand.h"
+#include "UndoCommands/LinkPinCommand.h"
+#include "UndoCommands/UnlinkPinCommand.h"
 #include "AudioSettings.h"
 
 // JSON keys
@@ -69,13 +71,56 @@ NodeItem* NodalScene::createComponent(QString _componentName, qreal _width)
     {
         m_creationPosition = m_contextPosition;
     }
-    qDebug() << "Create Component";
+    qDebug() << "Create Component: " << _componentName;
     NodeItem* item = createNode(_componentName, _width);
     m_creationPosition += QPoint(20, 20);
     setDirty();
     return item;
 }
 
+NodeItem* NodalScene::createPassThrough(LinkItem* _link)
+{
+    Q_ASSERT(_link->firstPin() != nullptr && _link->secondPin() != nullptr);
+
+    PinInputItem* pinIn = nullptr;
+    PinOutputItem* pinOut = nullptr;
+    if (qgraphicsitem_cast<PinInputItem*>(_link->firstPin()) != nullptr)
+    {
+       pinIn = qgraphicsitem_cast<PinInputItem*>(_link->firstPin());
+       pinOut = qgraphicsitem_cast<PinOutputItem*>(_link->secondPin());
+    }
+    else
+    {
+        pinIn = qgraphicsitem_cast<PinInputItem*>(_link->secondPin());
+        pinOut = qgraphicsitem_cast<PinOutputItem*>(_link->firstPin());
+    }
+
+    Q_ASSERT(pinIn != nullptr && pinOut != nullptr);
+
+    QPointF tmp = m_creationPosition;
+    if(m_isContextMenu)
+    {
+        m_creationPosition = m_contextPosition;
+    }
+    else
+    {
+        m_creationPosition = 0.5 * (pinIn->pos() + pinOut->pos());
+    }
+
+    qDebug() << "Create PassThrough";
+
+    m_undoStack->beginMacro("Create PassThrough");
+    NodeItem* item = createNode("PassThrough", 20);
+    m_undoStack->push(new UnlinkPinCommand(this, pinOut, pinIn));
+    m_undoStack->push(new LinkPinCommand(this, pinOut, item->getInput(0)));
+    m_undoStack->push(new LinkPinCommand(this, item->getOutput(), pinIn));
+    m_undoStack->endMacro();
+    setDirty();
+
+    m_creationPosition = tmp;
+    return item;
+}
+
 void NodalScene::addNodeItem(NodeItem *_item)
 {
     addItem(_item);
@@ -234,7 +279,6 @@ void NodalScene::reset()
     m_nodeList[0]->setSelected(false);
 }
 
-
 int NodalScene::deleteSelection()
 {
     int nbRemoved = 0;
@@ -387,7 +431,6 @@ void NodalScene::mousePressEvent(QGraphicsSceneMouseEvent *event)
     }
 }
 
-
 void NodalScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
     QGraphicsScene::mouseReleaseEvent(event);

NodalScene.h

@@ -24,6 +24,7 @@
 #include <QGraphicsScene>
 
 class NodeItem;
+class LinkItem;
 class QUndoStack;
 class AudioSettings;
 
@@ -36,6 +37,7 @@ class NodalScene : public QGraphicsScene
     virtual ~NodalScene() override;
 
     NodeItem* createComponent(QString _componentName, qreal _width = 200.0);
+    NodeItem* createPassThrough(LinkItem* _link);
     void addNodeItem(NodeItem *_item);
     void removeNodeItem(NodeItem* _item);
 

SoundGenerator.pro

@@ -27,6 +27,7 @@ INCLUDEPATH += UI
 CONFIG += c++11
 
 SOURCES += \
+    Components/PassThroughComponent.cpp \
     NodalScene.cpp \
     UndoCommands/ChangeInputValueCommand.cpp \
     UndoCommands/CreateComponentCommand.cpp \
@@ -83,6 +84,7 @@ HEADERS += \
     Components/GeneratorComponent.h \
     Components/MultiplyComponent.h \
     Components/OutputComponent.h \
+    Components/PassThroughComponent.h \
     Components/RandomComponent.h \
     Components/RepeatComponent.h \
     Components/SawToothComponent.h \

UI/NodalView.cpp

@@ -185,13 +185,13 @@ void NodalView::dropEvent(QDropEvent* _event)
 // must be implemented
 void NodalView::dragMoveEvent(QDragMoveEvent* _event)
 {
-    Q_UNUSED(_event);
+    Q_UNUSED(_event)
 }
 
 // must be implemented
 void NodalView::dragLeaveEvent(QDragLeaveEvent* _event)
 {
-    Q_UNUSED(_event);
+    Q_UNUSED(_event)
 }
 
 void NodalView::drawBackground(QPainter* _painter, const QRectF& _rect)
@@ -348,6 +348,7 @@ void NodalView::showCustomContextMenu(const QPoint& _pos)
     QAction act_breakAllLinks("Break all link(s)");
     QAction act_breakLink("Break link");
     QAction act_removeComponents("Remove Component(s)");
+    QAction act_createPassThrough("Add passthrough");
 
     QMenu myMenu;
 
@@ -363,6 +364,7 @@ void NodalView::showCustomContextMenu(const QPoint& _pos)
     if(link != nullptr)
     {
         myMenu.addAction(&act_breakLink);
+        myMenu.addAction(&act_createPassThrough);
     }
     else if(pin != nullptr && pin->isLinked())
     {
@@ -389,9 +391,12 @@ void NodalView::showCustomContextMenu(const QPoint& _pos)
     }
     else if (selectedAction == &act_removeComponents)
     {
-        // something was chosen, do stuff
         getScene()->deleteSelection();
     }
+    else if (selectedAction == &act_createPassThrough)
+    {
+        getScene()->createPassThrough(link);
+    }
     else
     {
         // nothing was chosen