updated new attribute dialog, refs #9

annotatorproject · Dec 31, 2016 · 8d5a30f · 8d5a30f
1 parent 8c9e72d
commit 8d5a30f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/source/annotator/source/attribute/attributeitem.cpp b/source/annotator/source/attribute/attributeitem.cpp
@@ -24,6 +24,6 @@ void AttributeItem::reload() {
       AnnotatorLib::AttributeTypeToString(this->attribute->getType()));
   this->ui->typeComboBox->setCurrentText(type);
   QString defaultValue =
-      QString::fromStdString(this->attribute->getDefaultValue()->toString());
+      QString::fromStdString(this->attribute->getValue()->toString());
   this->ui->valueLineEdit->setText(defaultValue);
 }
diff --git a/source/annotator/source/attribute/newattributedialog.cpp b/source/annotator/source/attribute/newattributedialog.cpp
@@ -1,7 +1,10 @@
 // Copyright 2016 Annotator Team
 #include "newattributedialog.h"
+#include "controller/commandcontroller.h"
 #include "ui_newattributedialog.h"
 
+#include <AnnotatorLib/Commands/NewAttribute.h>
+
 NewAttributeDialog::NewAttributeDialog(
     std::shared_ptr<AnnotatorLib::Session> session,
     shared_ptr<AnnotatorLib::Object> object, QWidget *parent)
@@ -22,4 +25,9 @@ void NewAttributeDialog::done(int status) {
 void NewAttributeDialog::createAttribute() {
     std::string name = ui->nameLineEdit->text().toStdString();
     std::string type = ui->typeComboBox->currentText().toStdString();
+    std::string value = ui->valueLineEdit->text().toStdString();
+    shared_ptr<AnnotatorLib::Commands::NewAttribute> nA;
+    nA = std::make_shared<AnnotatorLib::Commands::NewAttribute>(session, object, type, name, value);
+    CommandController::instance()->execute(nA);
 }
+
diff --git a/source/annotator/source/attribute/newattributedialog.h b/source/annotator/source/attribute/newattributedialog.h
@@ -23,6 +23,7 @@ class NewAttributeDialog : public QDialog
 
 protected:
     void createAttribute();
+
 private:
     Ui::NewAttributeDialog *ui;
     void done(int status) override;

diff --git a/source/annotator/source/object/objectwindow.cpp b/source/annotator/source/object/objectwindow.cpp
@@ -80,4 +80,5 @@ void ObjectWindow::on_addAttributeButton_clicked()
 {
     NewAttributeDialog dlg(session, object, this);
     dlg.exec();
+    reloadAttributes();
 }