study : gate shapes accroding functionality in graph view

Author: joern274

examples/gateicon_demo.zip

@@ -26,9 +26,10 @@
 #pragma once
 
 #include "gui/graph_widget/items/nodes/graphics_node.h"
+#include "hal_core/netlist/gate_library/enums/gate_type_property.h"
 
 #include <memory>
-#include <QHash>
+#include <QPainterPath>
 
 namespace hal
 {
@@ -56,6 +57,17 @@ namespace hal
 
     protected:
 
+        struct GraphicsGatePin
+        {
+            QString name;
+            float textWidth;
+            u32 netId;
+            int index;
+            bool isInput;
+        };
+
+        enum ShapeType { StandardShape, InverterShape, AndShape, OrShape };
+
         /**
          * Pointer to gate in hal core
          */
@@ -66,14 +78,18 @@ namespace hal
          */
         QString mType;
 
+        ShapeType mShapeType;
+
+        QPainterPath mPath;
+
         /**
          * The input pin type identifiers of the underlying gate (from top to bottom)
          */
-        QVector<QString> mInputPins;
+        QVector<struct GraphicsGatePin> mInputPinStruct;
 
         /**
          * The output pin type identifiers of the underlying gate (from top to bottom)
          */
-        QVector<QString> mOutputPins;
+        QVector<struct GraphicsGatePin> mOutputPinStruct;
     };
 }

plugins/gui/include/gui/graph_widget/items/nodes/gates/graphics_gate.h

@@ -66,26 +66,6 @@ namespace hal
          */
         void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override;
 
-        /**
-         * Given the id of a net and the type of the pin of one of its destinations, this function returns
-         * the position of the input pin in the scene.
-         *
-         * @param mNetId - The net id
-         * @param pin_type - The input pin type
-         * @returns The pin's position in the scene
-         */
-        QPointF getInputScenePosition(const u32 mNetId, const QString& pin_type) const override;
-
-        /**
-         * Given the id of a net and the type of the pin of one of its sources, this function returns
-         * the position of the output pin in the scene.
-         *
-         * @param mNetId - The net id
-         * @param pin_type - The output pin type
-         * @returns The pin's position in the scene
-         */
-        QPointF getOutputScenePosition(const u32 mNetId, const QString& pin_type) const override;
-
         /**
          * Given the index of an input/output pin, this function returns the position of this pin in the scene. <br>
          * (Pins are positioned from top (idx=0) to bottom (idx=maxIdx))
@@ -142,14 +122,13 @@ namespace hal
 
         void format(const bool& adjust_size_to_grid);
 
-        QVector<float> mInputPinTextWidth;
-        QVector<float> mOutputPinTextWidth;
         static const int sIconPadding;
         static const QSize sIconSize;
 
-        static QPixmap* sIconInstance;
-        static const QPixmap& iconPixmap();
         static QColor legibleColor(const QColor& bgColor);
 
+        enum FocusType { NoFocus, GateFocus, PinFocus };
+
+        void paintPin(QPainter* painter, QStyle::State state, const GraphicsGatePin& pin, FocusType focusType);
     };
 }

plugins/gui/include/gui/graph_widget/items/nodes/gates/standard_graphics_gate.h

@@ -82,26 +82,6 @@ namespace hal
          */
         virtual QPainterPath shape() const override;
 
-        /**
-         * Given the id of a net and the type of the pin of one of its destinations, this function returns
-         * the position of the input pin in the scene.
-         *
-         * @param mNetId - The net id
-         * @param pin_type - The input pin type
-         * @returns The pin's position in the scene
-         */
-        virtual QPointF getInputScenePosition(const u32 mNetId, const QString& pin_type) const = 0;
-
-        /**
-         * Given the id of a net and the type of the pin of one of its sources, this function returns
-         * the position of the output pin in the scene.
-         *
-         * @param mNetId - The net id
-         * @param pin_type - The output pin type
-         * @returns The pin's position in the scene
-         */
-        virtual QPointF getOutputScenePosition(const u32 mNetId, const QString& pin_type) const = 0;
-
         /**
          * Given the index of an input/output pin, this function returns the position of this pin in the scene. <br>
          * (Pins are positioned from top (idx=0) to bottom (idx=maxIdx))

plugins/gui/include/gui/graph_widget/items/nodes/graphics_node.h

@@ -67,26 +67,6 @@ namespace hal
          */
         void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override;
 
-        /**
-         * Given the id of a net and the type of the pin of one of its destinations, this function returns
-         * the position of the input pin in the scene.
-         *
-         * @param mNetId - The net id
-         * @param pin_type - The input pin type
-         * @returns The pins position in the scene
-         */
-        QPointF getInputScenePosition(const u32 mNetId, const QString& pin_type) const override;
-
-        /**
-         * Given the id of a net and the type of the pin of one of its sources, this function returns
-         * the position of the output pin in the scene.
-         *
-         * @param mNetId - The net id
-         * @param pin_type - The output pin type
-         * @returns The pins position in the scene
-         */
-        QPointF getOutputScenePosition(const u32 mNetId, const QString& pin_type) const override;
-
         /**
          * Given the index of an input/output pin, this function returns the position of this pin in the scene. <br>
          * (Pins are positioned from top (idx=0) to bottom (idx=maxIdx))
@@ -143,7 +123,5 @@ namespace hal
         static const int sIconPadding;
         static const QSize sIconSize;
 
-        static QPixmap* sIconInstance;
-        static const QPixmap& iconPixmap();
     };
 }    // namespace hal

plugins/gui/include/gui/graph_widget/items/nodes/modules/standard_graphics_module.h

@@ -333,7 +333,6 @@ namespace hal
                 // TODO set MIME type and icon
                 mimeData->setText("dragTest");
                 drag->setMimeData(mimeData);
-                // drag->setPixmap(iconPixmap);
 
                 // enable DragMoveEvents until mouse released
                 drag->exec(Qt::MoveAction);

plugins/gui/src/graph_widget/graph_graphics_view.cpp

@@ -2,40 +2,73 @@
 
 #include "hal_core/netlist/gate.h"
 #include "hal_core/netlist/net.h"
+#include <QHash>
 
 namespace hal
 {
-    GraphicsGate::GraphicsGate(Gate* g) : GraphicsNode(ItemType::Gate, g->get_id()), mGate(g), mType(QString::fromStdString(g->get_type()->get_name()))
+    GraphicsGate::GraphicsGate(Gate* g)
+        : GraphicsNode(ItemType::Gate, g->get_id()),
+          mGate(g),
+          mType(QString::fromStdString(g->get_type()->get_name())),
+          mShapeType(StandardShape)
     {
         QString textLines[3];
         textLines[0] = QString::fromStdString(g->get_name());
         const GateType* gt = g->get_type();
+
+        for (GateTypeProperty& gtprop : gt->get_property_list())
+        {
+            switch(gtprop) {
+                case GateTypeProperty::c_inverter:
+                    mShapeType = InverterShape;
+                    break;
+                case hal::GateTypeProperty::c_and:
+                case hal::GateTypeProperty::c_nand:
+                    mShapeType = AndShape;
+                    break;
+                case hal::GateTypeProperty::c_or:
+                case hal::GateTypeProperty::c_nor:
+                case hal::GateTypeProperty::c_xor:
+                case hal::GateTypeProperty::c_xnor:
+                    mShapeType = OrShape;
+                    break;
+                default:
+                    break;
+            }
+        }
+
         for (const GatePin* input_pin : gt->get_input_pins())
         {
+            u32 netId = 0;
+            int index = mInputPinStruct.size();
             const Net* n = g->get_fan_in_net(input_pin);
             if (n)
             {
-                mInputByNet.insert(n->get_id(), mInputPins.size());
+                netId = n->get_id();
+                mInputByNet.insert(netId, index);
             }
             else
             {
-                mInputByNet.insert(0, mInputPins.size());
+                mInputByNet.insert(0, index);
             }
-            mInputPins.append(QString::fromStdString(input_pin->get_name()));
+            mInputPinStruct.append({QString::fromStdString(input_pin->get_name()), 0., netId, index, true});
         }
 
         for (const GatePin* output_pin : gt->get_output_pins())
         {
+            u32 netId = 0;
+            int index = mOutputPinStruct.size();
             const Net* n = g->get_fan_out_net(output_pin);
             if (n)
             {
-                mOutputByNet.insert(n->get_id(), mOutputPins.size());
+                netId = n->get_id();
+                mOutputByNet.insert(netId, index);
             }
             else
             {
-                mOutputByNet.insert(0, mOutputPins.size());
+                mOutputByNet.insert(0, index);
             }
-            mOutputPins.append(QString::fromStdString(output_pin->get_name()));
+            mOutputPinStruct.append({QString::fromStdString(output_pin->get_name()), 0., netId, index, false});
         }
 
         textLines[1] = QString::fromStdString(gt->get_name());