comdel/display/component_display.cpp

@@ -5,6 +5,7 @@
 
 #include <QMenu>
 #include <QGraphicsSceneContextMenuEvent>
+#include <QGraphicsScene>
 #include <iostream>
 
 namespace display {
@@ -45,66 +46,4 @@ void Bus::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) {
     menu.exec(event->screenPos());
 }
 
-    QVariant BusGroup::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value) {
-        if (change == ItemPositionChange && scene()) {
-            // value is the new position.
-            QPointF newPos = value.toPointF();
-            busInstance->position.first = newPos.x();
-            busInstance->position.second = newPos.y();
-
-            auto view = dynamic_cast<Schema*>(scene()->views()[0]);
-            view->updateConnections();
-        }
-        return QGraphicsItem::itemChange(change, value);
-    }
-
-
-    QVariant ComponentGroup::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value) {
-        if (change == ItemPositionChange && scene()) {
-            // value is the new position.
-            QPointF newPos = value.toPointF();
-            componentInstance->position.first = newPos.x();
-            componentInstance->position.second = newPos.y();
-
-            auto view = dynamic_cast<Schema*>(scene()->views()[0]);
-            view->updateConnections();
-        }
-        return QGraphicsItem::itemChange(change, value);
-    }
-
-    void BusConnection::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) {
-        QMenu menu;
-        menu.addAction("Ukloni poveznicu", [this](){});
-        menu.addSeparator();
-        for(int i=0; i<this->connection->attributes.size(); i++) {
-            auto* attr = &this->connection->attributes[i];
-            bool enabled = attr->attribute.getPopup().has_value();
-
-            auto action = menu.addAction(QString::fromStdString("Izmjeni " + attr->name),
-                                         [attr]() {
-                                            auto dialog = new AttributeDialog(attr);
-                                            dialog->exec();
-                                         });
-            action->setEnabled(enabled);
-        }
-        menu.exec(event->screenPos());
-    }
-
-    void DirectConnection::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) {
-        QMenu menu;
-        menu.addAction("Ukloni poveznicu", [this](){});
-        menu.addSeparator();
-        for(int i=0; i<this->connection->attributes.size(); i++) {
-            auto* attr = &this->connection->attributes[i];
-            bool enabled = attr->attribute.getPopup().has_value();
-
-            auto action = menu.addAction(QString::fromStdString("Izmjeni " + attr->name),
-                                         [attr]() {
-                                             auto dialog = new AttributeDialog(attr);
-                                             dialog->exec();
-                                         });
-            action->setEnabled(enabled);
-        }
-        menu.exec(event->screenPos());
-    }
 } // namespace display

comdel/display/component_display.h

@@ -5,7 +5,6 @@
 #include <comdel/domain/wireinstance.h>
 
 #include <QGraphicsItemGroup>
-#include "comdel/domain/connectioninstance.h"
 
 namespace display {
 
@@ -15,7 +14,7 @@ private:
     domain::Pin pin;
 public:
     Pin(domain::Pin pin): pin(pin) {
-        pin.getDisplayPin().render(this);
+        pin.getDisplay().render(this);
     }
 };
 
@@ -25,12 +24,9 @@ private:
     std::shared_ptr<domain::ComponentInstance> instance;
 public:
     Component(const std::shared_ptr<domain::ComponentInstance>& instance): instance(instance) {
-        setFlag(ItemSendsGeometryChanges, true);
-
         instance->component.getDisplay().render(this);
     }
     void contextMenuEvent(QGraphicsSceneContextMenuEvent *event) override;
-
 };
 
 class Bus: public QGraphicsItemGroup
@@ -41,7 +37,6 @@ public:
         instance->bus.getDisplay()->render(this);
     }
     void contextMenuEvent(QGraphicsSceneContextMenuEvent *event) override;
-
 };
 
 class ComponentGroup: public QGraphicsItemGroup
@@ -52,8 +47,6 @@ private:
 public:
     explicit ComponentGroup(const std::shared_ptr<domain::ComponentInstance>& instance): componentInstance(instance) {
         setFlag(ItemIsMovable, true);
-        setFlag(ItemSendsGeometryChanges, true);
-
         setHandlesChildEvents(false);
 
         addToGroup(new display::Component(instance));
@@ -64,10 +57,6 @@ public:
 
         setPos(instance->position.first, instance->position.second);
     }
-
-protected:
-    virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value);
-
 };
 
 class BusGroup: public QGraphicsItemGroup
@@ -78,70 +67,14 @@ private:
 public:
     explicit BusGroup(const std::shared_ptr<domain::BusInstance>& instance): busInstance(instance) {
         setFlag(ItemIsMovable, true);
-        setFlag(ItemSendsGeometryChanges, true);
-
         setHandlesChildEvents(false);
 
         addToGroup(new display::Bus(instance));
 
         setPos(instance->position.first, instance->position.second);
     }
-
-protected:
-    virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value);
 };
 
-class BusConnection: public QGraphicsLineItem
-{
-private:
-    domain::BusConnectionInstance* connection;
-    ComponentGroup* component;
-    BusGroup* bus;
-
-public:
-    BusConnection(domain::BusConnectionInstance* connection, ComponentGroup *component, BusGroup *bus): connection(connection), component(component), bus(bus) {
-        updateConnection();
-
-        setHandlesChildEvents(false);
-    }
-
-    void updateConnection() {
-        auto busPosition = bus->boundingRect();
-        auto pin = connection->instance->component.getPin(connection->connection.getComponent().pin).getDisplayPin();
-
-        setLine(connection->instance->position.first + pin.getConnectionX(), connection->instance->position.second + pin.getConnectionY(),  connection->bus->position.first + busPosition.width()/2, connection->bus->position.second + busPosition.height()/2);
-    }
-
-    void contextMenuEvent(QGraphicsSceneContextMenuEvent *event) override;
-};
-
-
-    class DirectConnection: public QGraphicsLineItem
-    {
-    private:
-        domain::DirectConnectionInstance* connection;
-        ComponentGroup* first;
-        ComponentGroup* second;
-        BusGroup* bus;
-
-    public:
-        DirectConnection(domain::DirectConnectionInstance* connection, ComponentGroup *first, ComponentGroup *second, BusGroup *bus): connection(connection), first(first), second(second), bus(bus) {
-            updateConnection();
-            setHandlesChildEvents(false);
-        }
-
-        void updateConnection() {
-            auto pin1 = connection->instance->component.getPin(connection->connection.getComponent().pin).getDisplayPin();
-            auto pin2 = connection->secondInstance->component.getPin(connection->connection.getSecondComponent()->pin).getDisplayPin();
-
-            setLine(connection->instance->position.first + pin1.getConnectionX(), connection->instance->position.second + pin1.getConnectionY(),
-                    connection->secondInstance->position.first + pin2.getConnectionX(), connection->secondInstance->position.second + pin2.getConnectionY());
-        }
-
-        void contextMenuEvent(QGraphicsSceneContextMenuEvent *event) override;
-    };
-
-
 } // namespace display
 
 #endif // DISPLAY_COMPONENT_H

comdel/display/schema_display.cpp

@@ -11,41 +11,17 @@ Schema::Schema()
 
 void Schema::setSchema(domain::Schema* _schema)
 {
-    std::map<std::string, display::ComponentGroup*> components;
-    std::map<std::string, display::BusGroup*> buses;
-
     scene.clear();
-    connections.clear();
     this->schema = _schema;
     if(schema != nullptr) {
         for(auto &instance: schema->componentInstances) {
-            auto group = new display::ComponentGroup(instance);
+            scene.addItem(new display::ComponentGroup(instance));
-            components.insert(std::make_pair(instance->name, group));
-            scene.addItem(group);
         }
         for(auto &instance: schema->busInstances) {
             if(instance->bus.getDisplay().has_value()) {
-                auto group = new display::BusGroup(instance);
+                scene.addItem(new display::BusGroup(instance));
-                buses.insert(std::make_pair(instance->name, group));
-                scene.addItem(group);
             }
         }
-        for(auto &connection: schema->connections) {
-            auto busInstance = dynamic_cast<domain::BusConnectionInstance*>(connection.get());
-            if(busInstance != nullptr) {
-                auto con = new display::BusConnection(busInstance, components[busInstance->instance->name], buses[busInstance->bus->name]);
-                connections.push_back(con);
-                scene.addItem(con);
-            }
-        }
-    }
-}
-
-void Schema::updateConnections() {
-    if(schema != nullptr) {
-        for(auto conn: connections) {
-            conn->updateConnection();
-        }
     }
 }
 

comdel/display/schema_display.h

@@ -9,19 +9,13 @@
 
 namespace display {
 
-    class BusConnection;
-
 class Schema: public QGraphicsView
 {
 public:
     Schema();
 
-    std::vector<BusConnection*> connections;
-
     void setSchema(domain::Schema* schema);
 
-    void updateConnections();
-
 private:
     QGraphicsScene scene;
 

comdel/domain/display.h

@@ -61,90 +61,10 @@ public:
     PinType pinType;
     int x, y, w, h;
 
-    Pin(int x, int y, int w, int h, Orientation orientation, PinType pinType): x(x), y(y), w(w), h(h), orientation(orientation), pinType(pinType) {}
+    Pin(int x, int y, int w, int h): x(x), y(y), w(w), h(h) {}
-
-    void renderIn(QGraphicsItemGroup *group) {
-        QPolygon polygon;
-
-        switch (orientation) {
-            case Orientation::TOP:
-                polygon << QPoint(x, y) << QPoint(x, y+h) << QPoint(x+w, y+h)  << QPoint(x+w, y) << QPoint(x+w/2, y+h/2);
-                break;
-            case Orientation::BOTTOM:
-                polygon << QPoint(x, y) << QPoint(x, y+h) << QPoint(x+w/2, y+h/2) << QPoint(x+w, y+h)  << QPoint(x+w, y);
-                break;
-            case Orientation::LEFT:
-                polygon << QPoint(x, y) << QPoint(x+w/2, y+h/2) << QPoint(x, y+h) << QPoint(x+w, y+h)  << QPoint(x+w, y);
-                break;
-            case Orientation::RIGHT:
-                polygon << QPoint(x, y) << QPoint(x, y+h) << QPoint(x+w, y+h) << QPoint(x+w/2, y+h/2) << QPoint(x+w, y);
-                break;
-        }
-        group->addToGroup(new QGraphicsPolygonItem(polygon));
-    }
-
-    void renderOut(QGraphicsItemGroup *group) {
-        QPolygon polygon;
-
-        switch (orientation) {
-            case Orientation::TOP:
-                polygon << QPoint(x, y+h/2) << QPoint(x, y+h) << QPoint(x+w, y+h) << QPoint(x+w, y+h/2) << QPoint(x+w/2, y);
-                break;
-            case Orientation::BOTTOM:
-                polygon << QPoint(x, y) << QPoint(x, y+h/2) << QPoint(x+w/2, y+h) << QPoint(x+w, y+h/2) << QPoint(x+w, y);
-                break;
-            case Orientation::LEFT:
-                polygon << QPoint(x+w, y) << QPoint(x+w/2, y) << QPoint(x, y+h/2) << QPoint(x+w/2, y+h) << QPoint(x+w, y+w);
-                break;
-            case Orientation::RIGHT:
-                polygon << QPoint(x, y) << QPoint(x, y+h) << QPoint(x+w/2, y+h) << QPoint(x+w, y+h/2) << QPoint(x+w/2, y);
-                break;
-        }
-        group->addToGroup(new QGraphicsPolygonItem(polygon));
-    }
-
-    void renderInOut(QGraphicsItemGroup *group) {
-        group->addToGroup(new QGraphicsRectItem(x, y ,w, h));
-    }
 
     void render(QGraphicsItemGroup *group) {
-        switch (pinType) {
+        group->addToGroup(new QGraphicsRectItem(x,y,w,h));
-            case PinType::IN:
-                renderIn(group);
-                break;
-            case PinType::OUT:
-                renderOut(group);
-                break;
-            case PinType::IN_OUT:
-                renderInOut(group);
-                break;
-        }
-    }
-
-    int getConnectionX() {
-        switch (orientation) {
-            case ui::Orientation::TOP:
-            case ui::Orientation::BOTTOM:
-                return x+w/2;
-            case ui::Orientation::LEFT:
-                return x;
-            case ui::Orientation::RIGHT:
-                return x+w;
-        }
-        return 0;
-    }
-
-    int getConnectionY() {
-        switch (orientation) {
-            case ui::Orientation::LEFT:
-            case ui::Orientation::RIGHT:
-                return y+h/2;
-            case ui::Orientation::TOP:
-                return y;
-            case ui::Orientation::BOTTOM:
-                return y+h;
-        }
-        return 0;
     }
 };
 
@@ -189,8 +109,6 @@ public:
         }
     }
 
-    std::vector<ui::Item>& getItems() {return items;}
-
 private:
     std::vector<ui::Item> items;
 };

comdel/domain/pin.cpp

@@ -14,8 +14,8 @@ std::string PinConnection::getMessage() {
 }
 
 
-Pin::Pin(std::string name, PinType type, std::string tooltip, PinConnection connection, domain::ui::Pin pin, std::optional<std::vector<Value>> wires)
+Pin::Pin(std::string name, PinType type, std::string tooltip, PinConnection connection, Display display, std::optional<std::vector<Value>> wires)
-    : name(name), type(type), tooltip(tooltip), connection(connection), displayPin(pin), wires(wires)
+    : name(name), type(type), tooltip(tooltip), connection(connection), display(display), wires(wires)
 {}
 
 std::string &Pin::getName() {
@@ -27,8 +27,8 @@ Pin::PinType Pin::getType() {
 std::string Pin::getTooltip() {
     return tooltip;
 }
-ui::Pin &Pin::getDisplayPin() {
+Display &Pin::getDisplay() {
-    return displayPin;
+    return display;
 }
 PinConnection &Pin::getConnection() {
     return connection;

comdel/domain/pin.h

@@ -43,17 +43,17 @@ private:
     PinType type;
     std::string tooltip;
     PinConnection connection;
-    domain::ui::Pin displayPin;
+    Display display;
 
     std::optional<std::vector<Value>> wires;
 
 public:
-    Pin(std::string name, PinType type, std::string tooltip, PinConnection connection, domain::ui::Pin pin, std::optional<std::vector<Value>> wires);
+    Pin(std::string name, PinType type, std::string tooltip, PinConnection connection, Display display, std::optional<std::vector<Value>> wires);
 
     std::string &getName();
     PinType getType();
     std::string getTooltip();
-    ui::Pin &getDisplayPin();
+    Display &getDisplay();
     PinConnection &getConnection();
     std::optional<std::vector<Value>> &getWires();
 };

comdel/domain/schemacreator.cpp

@@ -542,12 +542,6 @@ optional<Pin> SchemaCreator::loadPin(PinNode node)
     if(!display) {
         return nullopt;
     }
-    if(display->getItems().size() != 1 || !display->getItems()[0].pin.has_value()) {
-        errors.emplace_back(node.span, "@display must contain only exactly one pin definition");
-        return nullopt;
-    }
-    ui::Pin displayPin = *display->getItems()[0].pin;
-
 
     if(!node.connection) {
         errors.emplace_back(node.span, "missing @connection");
@@ -571,7 +565,16 @@ optional<Pin> SchemaCreator::loadPin(PinNode node)
         wiresOpt = wires;
     }
 
-    return Pin(name, type, tooltip, connection, displayPin, wiresOpt);
+    return Pin(name, type, tooltip, connection, *display, wiresOpt);
+}
+
+int getIntProperty(DisplayItemNode &node, std::string property) {
+    for(auto& prop: node.values) {
+        if(prop.key.value == property) {
+            return prop.value.asInt();
+        }
+    }
+    throw std::exception();
 }
 
 std::optional<Display> SchemaCreator::loadDisplay(DisplayNode node)
@@ -581,53 +584,26 @@ std::optional<Display> SchemaCreator::loadDisplay(DisplayNode node)
         ui::Item displayItem;
         std::string type = item.type.value;
         if(type == "rect") {
-            long long int x, y, w, h;
+            int x, y, w, h;
-            x = item.asInt(&errors, "x");
+            x = getIntProperty(item, "x");
-            y = item.asInt(&errors, "y");
+            y = getIntProperty(item, "y");
-            w = item.asInt(&errors, "w");
+            w = getIntProperty(item, "w");
-            h = item.asInt(&errors, "h");
+            h = getIntProperty(item, "h");
             displayItem.rect = ui::Rect(x, y, w, h);
         } else if(type == "line") {
-            long long int x1, y1, x2, y2;
+            int x1, y1, x2, y2;
-            x1 = item.asInt(&errors, "x1");
+            x1 = getIntProperty(item, "x1");
-            y1 = item.asInt(&errors, "y1");
+            y1 = getIntProperty(item, "y1");
-            x2 = item.asInt(&errors, "x2");
+            x2 = getIntProperty(item, "x2");
-            y2 = item.asInt(&errors, "y2");
+            y2 = getIntProperty(item, "y2");
             displayItem.line = ui::Line(x1, y1, x2, y2);
         } else if(type == "pin") {
-            long long int x, y, w, h;
+            int x, y, w, h;
-            x = item.asInt(&errors, "x");
+            x = getIntProperty(item, "x");
-            y = item.asInt(&errors, "y");
+            y = getIntProperty(item, "y");
-            w = item.asInt(&errors, "w");
+            w = getIntProperty(item, "w");
-            h = item.asInt(&errors, "h");
+            h = getIntProperty(item, "h");
-            std::string _orientation = item.asString(&errors, "orientation", "bottom");
+            displayItem.pin = ui::Pin(x, y, w, h);
-            std::string _pinType = item.asString(&errors, "type", "out");
-
-            ui::Orientation orientation;
-            if(_orientation == "left") {
-                orientation = ui::Orientation::LEFT;
-            } else if(_orientation == "right") {
-                orientation = ui::Orientation::RIGHT;
-            } else if(_orientation == "top") {
-                orientation = ui::Orientation::TOP;
-            } else if(_orientation == "bottom") {
-                orientation = ui::Orientation::BOTTOM;
-            } else {
-                errors.emplace_back(item.span, "unknown orientation type '" + _orientation + "'");
-            }
-
-            ui::PinType pinType;
-            if(_pinType == "in") {
-                pinType = ui::PinType::IN;
-            } else if(_pinType == "out") {
-                pinType = ui::PinType::OUT;
-            } else if(_pinType == "in_out") {
-                pinType = ui::PinType::IN_OUT;
-            } else {
-                errors.emplace_back(item.span, "unknown pin type '" + _pinType + "'");
-            }
-
-            displayItem.pin = ui::Pin(x, y, w, h, orientation, pinType);
         } else {
             errors.emplace_back(item.type.span, "unsupported display type");
         }
@@ -970,7 +946,7 @@ vector<Enumeration> SchemaCreator::createWireEnumeration(vector<Value> wireValue
 }
 
 std::optional<Attribute> SchemaCreator::createMemoryAttribute() {
-    return Attribute("_memory", Value::fromMemoryReference(std::nullopt), createMemoryPopup());
+    return Attribute("_memory", Value::fromMemoryReference(nullopt), createMemoryPopup());
 }
 
     std::optional<Popup> SchemaCreator::createMemoryPopup() {

comdel/domain/value.cpp

@@ -162,10 +162,10 @@ std::string Value::stringify() {
         case ATTRIBUTE_REFERENCE:
             return reference;
         case MEMORY_REFERENCE:
-            if(memoryReference.has_value()) {
+            if(memoryReference->empty()) {
-                return memoryReference.value();
-            } else {
                 return "null";
+            } else {
+                return memoryReference.value();
             }
         default:
             throw std::exception();

comdel/domain/value.h

@@ -29,20 +29,22 @@ public:
     };
 
 private:
-    long long intValue = 0;
+    long long intValue;
     std::string stringValue;
-    bool boolValue = false;
+    bool boolValue;
-    std::optional<AddressSpace> addressSpace = std::nullopt;
+    std::optional<AddressSpace> addressSpace;
     std::string reference;
-    domain::ComponentInstance *memory = nullptr;
+    domain::ComponentInstance *memory;
 
-    std::optional<std::string> memoryReference = std::nullopt;
+    std::optional<std::string> memoryReference;
 
-    ValueType type = UNDEFINED;
+    ValueType type;
 
 public:
 
-    Value() {}
+    Value() {
+        this->type = UNDEFINED;
+    }
 
     bool equals(Value value) {
         if(value.getType() == type) {

comdel/parser/astnode.h

@@ -2,7 +2,6 @@
 #define AST_NODE_H
 
 #include "token.h"
-#include "sourceerror.h"
 #include <optional>
 #include <vector>
 
@@ -174,52 +173,6 @@ struct DisplayItemNode: public AstNode
 {
     IdentifierNode type;
     std::vector<PropertyNode> values;
-
-    long long int asInt(std::vector<SourceError>* errors, const std::string& property, long long int _default = 0) {
-        for(auto& prop: values) {
-            if(prop.key.value == property) {
-                if(prop.value.is(ValueNode::INT)) {
-                    return prop.value.asInt();
-                } else {
-                    if(errors != nullptr) {
-                        errors->emplace_back(prop.value.span, "expected number");
-                    }
-                }
-            }
-        }
-        return _default;
-    }
-
-    std::string asIdentifier(std::vector<SourceError>* errors, const std::string& property, std::string _default = "") {
-        for(auto& prop: values) {
-            if(prop.key.value == property) {
-                if(prop.value.is(ValueNode::IDENTIFIER)) {
-                    return prop.value.asIdentifier();
-                } else {
-                    if(errors != nullptr) {
-                        errors->emplace_back(prop.value.span, "expected identifier");
-                    }
-                }
-            }
-        }
-        return _default;
-    }
-
-
-    std::string asString(std::vector<SourceError>* errors, const std::string& property, std::string _default = "") {
-        for(auto& prop: values) {
-            if(prop.key.value == property) {
-                if(prop.value.is(ValueNode::STRING)) {
-                    return prop.value.asString();
-                } else {
-                    if(errors != nullptr) {
-                        errors->emplace_back(prop.value.span, "expected string");
-                    }
-                }
-            }
-        }
-        return _default;
-    }
 };
 
 struct DisplayNode: public AstNode

mainwindow.cpp

@@ -193,8 +193,6 @@ void MainWindow::onValidateSchema(bool /*toggled*/) {
         return;
     }
 
-    log->clear();
-
     this->validationErrors.clear();
 
     domain::ComdelValidator validator{validators};