Skip to content

Graph values serialization quick fixes #886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eprikazchikov merged 1 commit into from
Nov 29, 2024
Merged

Graph values serialization quick fixes #886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions modules/editor/grapheditor/editor/graph/graphcontroller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ void GraphController::setGraph(AbstractNodeGraph *graph) {
GraphNode *defaultNode = m_graph->defaultNode();
if(defaultNode) {
setSelected({ defaultNode });
emit m_view->itemsSelected(m_selectedItems);
}
}

Expand All @@ -53,6 +52,7 @@ const QList<QObject *> &GraphController::selectedItems() const {

void GraphController::setSelected(const QList<QObject *> &selected) {
m_selectedItems = selected;
emit m_view->itemsSelected(m_selectedItems);
}

void GraphController::composeLinks() {
Expand Down Expand Up @@ -150,7 +150,6 @@ void GraphController::update() {
}
m_softSelectedItems.clear();
}
emit m_view->itemsSelected(m_selectedItems);
}
}

Expand All @@ -169,7 +168,7 @@ void GraphController::update() {
widget->setSelected(true);
setSelected({ node });
m_softSelectedItems.clear();
emit m_view->itemsSelected(m_selectedItems);

} else {
widget->setSelected(false);
}
Expand Down Expand Up @@ -250,7 +249,6 @@ void GraphController::update() {
reinterpret_cast<NodeWidget *>(node->widget())->setSelected(false);
}
setSelected({ m_focusedWidget->node() });
emit m_view->itemsSelected(m_selectedItems);
m_focusedWidget->setSelected(true);
}

Expand Down
17 changes: 13 additions & 4 deletions modules/editor/grapheditor/editor/graph/graphnode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,10 @@ QDomElement GraphNode::fromVariant(const QVariant &value, QDomDocument &xml) {
valueElement.setAttribute(gType, "Color");

QColor col = value.value<QColor>();
valueElement.appendChild(xml.createTextNode(QString::number(col.red()) + ", " + col.green() + ", " + col.blue() + ", " + col.alpha()));
valueElement.appendChild(xml.createTextNode(QString::number(col.red()) + ", " +
QString::number(col.green()) + ", " +
QString::number(col.blue()) + ", " +
QString::number(col.alpha()) ));
} break;
default: {
if(value.canConvert<Template>()) {
Expand All @@ -163,17 +166,23 @@ QDomElement GraphNode::fromVariant(const QVariant &value, QDomDocument &xml) {
valueElement.setAttribute(gType, "Vector2");

Vector2 vec = value.value<Vector2>();
valueElement.appendChild(xml.createTextNode(QString::number(vec.x) + ", " + vec.y));
valueElement.appendChild(xml.createTextNode(QString::number(vec.x) + ", " +
QString::number(vec.y) ));
} else if(value.canConvert<Vector3>()) {
valueElement.setAttribute(gType, "Vector3");

Vector3 vec = value.value<Vector3>();
valueElement.appendChild(xml.createTextNode(QString::number(vec.x) + ", " + vec.y + ", " + vec.z));
valueElement.appendChild(xml.createTextNode(QString::number(vec.x) + ", " +
QString::number(vec.y) + ", " +
QString::number(vec.z) ));
} else if(value.canConvert<Vector4>()) {
valueElement.setAttribute(gType, "Vector3");

Vector4 vec = value.value<Vector4>();
valueElement.appendChild(xml.createTextNode(QString::number(vec.x) + ", " + vec.y + ", " + vec.z + ", " + vec.w));
valueElement.appendChild(xml.createTextNode(QString::number(vec.x) + ", " +
QString::number(vec.y) + ", " +
QString::number(vec.z) + ", " +
QString::number(vec.w) ));
} else {
QString type = value.typeName();
if(type == "QString") {
Expand Down
Loading