Updated attribute dialog

comdel/display/attribute_dialog.h

@@ -2,6 +2,8 @@
 #define ATTRIBUTE_DIALOG_H
 
 #include <QIntValidator>
+#include <QPushButton>
+#include <QComboBox>
 #include <QGroupBox>
 #include <QRadioButton>
 #include <QDialog>
@@ -15,9 +17,35 @@
 namespace display {
 
 class AttributeDialog: public QDialog {
+    domain::Value value;
+
+    long long int parseInt(std::string expression) {
+        try {
+            if (expression.size() > 2) {
+                if (expression.substr(0, 2) == "0x") {
+                    return std::stoll(expression, 0, 16);
+                } else if (expression.substr(0, 2) == "0b") {
+                    return std::stoll(expression, 0, 2);
+                } else {
+                    return std::stoll(expression, 0, 10);
+                }
+            } else {
+                return std::stoll(expression, 0, 10);
+            }
+        } catch (std::exception &e) {
+            return 0;
+        }
+    }
+
+    domain::InstanceAttribute* attributeValue;
 
 public:
     AttributeDialog(domain::InstanceAttribute *attribute) {
+
+        setAttribute(Qt::WA_DeleteOnClose);
+
+        attributeValue = attribute;
+
         this->setWindowTitle(QString::fromStdString("Izmjeni " + attribute->attribute.getName()));
 
         auto layout = new QVBoxLayout(this);
@@ -28,12 +56,29 @@ public:
         layout->addWidget(new QLabel(popup.getText().c_str()));
 
         auto type = attribute->attribute.getDefault().getType();
+        value = attribute->value;
 
         if(attribute->attribute.getPopup()->isEnumerated()) {
+            auto* combo = new QComboBox(this);
+            auto enumeration = attribute->attribute.getPopup()->getEnumeration();
+            for(auto entry: enumeration) {
+                combo->addItem(QString::fromStdString(entry.getName()), QVariant::fromValue(NULL));
+            }
+
+            connect(combo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &AttributeDialog::onEnumerationChanged);
+            layout->addWidget(combo);
+
+            for(int i=0; i<enumeration.size(); i++) {
+                if(attributeValue->value.equals(enumeration[i].getValue())) {
+                    combo->setCurrentIndex(i);
+                    break;
+                }
+            }
 
         } else if(!(type == domain::Value::ValueType::WIRE_REFERENCE || type == domain::Value::ValueType::BOOL)) {
 
             auto edit = new QLineEdit(this);
+            connect(edit, &QLineEdit::textChanged, this, &AttributeDialog::onTextChanged);
             layout->addWidget(edit);
 
             switch (attribute->attribute.getDefault().getType()) {
@@ -46,15 +91,20 @@ public:
                     break;
             }
 
-
-
         } else if(type == domain::Value::ValueType::BOOL) {
             auto *group = new QGroupBox(this);
-            group->setCheckable(true);
-            group->setChecked(true);
+
+            auto *radioLayout = new QHBoxLayout(group);
+            group->setLayout(radioLayout);
 
             auto isTrue = new QRadioButton("true", group);
+            connect(isTrue, &QRadioButton::clicked, [this]() {
+                this->value = domain::Value::fromBool(true);
+            });
             auto isFalse = new QRadioButton("false", group);
+            connect(isFalse, &QRadioButton::clicked, [this]() {
+                this->value = domain::Value::fromBool(false);
+            });
 
             if(attribute->value.asBool()) {
                 isTrue->setChecked(true);
@@ -62,10 +112,35 @@ public:
                 isFalse->setChecked(true);
             }
 
-
-
+            radioLayout->addWidget(isTrue);
+            radioLayout->addWidget(isFalse);
             layout->addWidget(group);
         }
+
+        auto button = new QPushButton("Ažuriraj");
+        connect(button, &QPushButton::clicked, this, &AttributeDialog::onUpdate);
+
+        layout->addWidget(button);
+    }
+
+public slots:
+    void onTextChanged(const QString& string) {
+        switch (value.getType()) {
+            case domain::Value::STRING:
+                value.setString(string.toStdString());
+            break;
+            case domain::Value::INT:
+                value = domain::Value::fromInt(parseInt(string.toStdString()));
+        }
+    };
+
+    void onEnumerationChanged(int index) {
+        value = attributeValue->attribute.getPopup()->getEnumeration()[index].getValue();
+    }
+
+    void onUpdate() {
+        attributeValue->value = value;
+        accept();
     }
 
 };

comdel/display/component_display.cpp

@@ -1,4 +1,6 @@
 #include "component_display.h"
+#include "attribute_dialog.h"
+#include "name_dialog.h"
 
 #include <QMenu>
 #include <QGraphicsSceneContextMenuEvent>
@@ -11,11 +13,15 @@ void Component::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) {
     QMenu menu;
     menu.addAction("Izmjeni ime", [this](){});
     menu.addSeparator();
-    for(auto attr: this->instance->attributes) {
-        bool enabled = attr.attribute.getPopup().has_value();
+    for(int i=0; i<this->instance->attributes.size(); i++) {
+        auto* attr = &this->instance->attributes[i];
+        bool enabled = attr->attribute.getPopup().has_value();
 
-        auto action = menu.addAction(QString::fromStdString("Izmjeni " + attr.name),
-                                     [&attr, this]() {});
+        auto action = menu.addAction(QString::fromStdString("Izmjeni " + attr->name),
+                                     [attr]() {
+            auto dialog = new AttributeDialog(attr);
+            dialog->exec();
+        });
         action->setEnabled(enabled);
     }
     menu.exec(event->screenPos());