natsirt/noggit-red
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add bounds check to vector nodes

Browse Source
This commit is contained in:
sshumakov3
2020-12-26 21:11:17 +03:00
parent 76508852c4
commit 4dec8200fb
2 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/noggit/Red/NodeEditor/Nodes/ListAddNode.cpp
View File

@@ -20,7 +20,7 @@ ListAddNode::ListAddNode()
_validation_state = NodeValidationState::Valid;
_operation = new QComboBox(&_embedded_widget);
_operation->addItems({"Append", "Prepend", "Insert"});
_operation->addItems({"Append", "Prepend", "Insert", "Set"});
QComboBox::connect(_operation, qOverload<int>(&QComboBox::currentIndexChanged)
,[this](int index)
@@ -33,6 +33,7 @@ ListAddNode::ListAddNode()
switch (index)
{
case 2:
case 3:
addPortDynamic<UnsignedIntegerData>(PortType::In, 3, "Index<UInteger>", true);
addDefaultWidget(_in_ports[3].data_type->default_widget(&_embedded_widget), PortType::In, 3);
break;
@@ -78,9 +79,35 @@ void ListAddNode::compute()
list->insert(list->begin(), value);
break;
case 2:
{
auto index_ptr = static_cast<UnsignedIntegerData*>(_in_ports[3].in_value.lock().get());
list->insert(list->begin() + (index_ptr ? index_ptr->value() : static_cast<QSpinBox*>(_in_ports[3].default_widget)->value()), value);
auto index = index_ptr ? index_ptr->value() : static_cast<QSpinBox*>(_in_ports[3].default_widget)->value();
if (index < 0 || index > list->size())
{
setValidationState(NodeValidationState::Error);
setValidationMessage("Error: invalid index.");
return;
}
list->insert(list->begin() + index, value);
break;
}
case 3:
{
auto index_ptr = static_cast<UnsignedIntegerData *>(_in_ports[3].in_value.lock().get());
auto index = index_ptr ? index_ptr->value() : static_cast<QSpinBox*>(_in_ports[3].default_widget)->value();
if (index < 0 || index >= list->size())
{
setValidationState(NodeValidationState::Error);
setValidationMessage("Error: invalid index.");
return;
}
(*list)[index] = value;
break;
}
}
_out_ports[0].out_value = std::make_shared<LogicData>(true);

11
src/noggit/Red/NodeEditor/Nodes/ListGetNode.cpp
View File

@@ -43,7 +43,16 @@ void ListGetNode::compute()
auto list = static_cast<ListData*>(_in_ports[1].in_value.lock().get())->value();
auto index_ptr = static_cast<UnsignedIntegerData*>(_in_ports[2].in_value.lock().get());;
_out_ports[1].out_value = list->at((index_ptr ? index_ptr->value() : static_cast<QSpinBox*>(_in_ports[2].default_widget)->value()));
auto index = index_ptr ? index_ptr->value() : static_cast<QSpinBox*>(_in_ports[2].default_widget)->value();
if (index < 0 || index >= list->size())
{
setValidationState(NodeValidationState::Error);
setValidationMessage("Error: invalid index.");
return;
}
_out_ports[1].out_value = list->at(index);
Q_EMIT dataUpdated(1);