Fix writeTreeNodesModelXML

galou · galou · commit 930ff41f2215 · 2023-05-04T13:58:54.000+02:00
Signed-off-by: Gaël Écorchard &lt;gael.ecorchard@cvut.cz&gt;
diff --git a/include/behaviortree_cpp/tree_node.h b/include/behaviortree_cpp/tree_node.h
@@ -450,10 +450,12 @@ inline void assignDefaultRemapping(NodeConfig& config)
     const auto direction = it.second.direction();
     if (direction != PortDirection::OUTPUT)
     {
+      // PortDirection::{INPUT,INOUT}
       config.input_ports[port_name] = "=";
     }
     if (direction != PortDirection::INPUT)
     {
+      // PortDirection::{OUTPUT,INOUT}
       config.output_ports[port_name] = "=";
     }
   }
diff --git a/src/xml_parsing.cpp b/src/xml_parsing.cpp
@@ -886,7 +886,7 @@ void addNodeModelToXML(const TreeNodeManifest& model,
     {
       port_element->SetAttribute("type", BT::demangle(port_info.type()).c_str());
     }
-    if (!port_info.defaultValue())
+    if (port_info.defaultValue().has_value())
     {
       port_element->SetAttribute("default", port_info.defaultValue()->c_str());
     }

Original file line number	Diff line number	Diff line change
`@@ -450,10 +450,12 @@ inline void assignDefaultRemapping(NodeConfig& config)`
`450`	`450`	`const auto direction = it.second.direction();`
`451`	`451`	`if (direction != PortDirection::OUTPUT)`
`452`	`452`	`{`
	`453`	`+ // PortDirection::{INPUT,INOUT}`
`453`	`454`	`config.input_ports[port_name] = "=";`
`454`	`455`	`}`
`455`	`456`	`if (direction != PortDirection::INPUT)`
`456`	`457`	`{`
	`458`	`+ // PortDirection::{OUTPUT,INOUT}`
`457`	`459`	`config.output_ports[port_name] = "=";`
`458`	`460`	`}`
`459`	`461`	`}`
Original file line number	Diff line number	Diff line change
`@@ -886,7 +886,7 @@ void addNodeModelToXML(const TreeNodeManifest& model,`
`886`	`886`	`{`
`887`	`887`	`port_element->SetAttribute("type", BT::demangle(port_info.type()).c_str());`
`888`	`888`	`}`
`889`		`- if (!port_info.defaultValue())`
	`889`	`+ if (port_info.defaultValue().has_value())`
`890`	`890`	`{`
`891`	`891`	`port_element->SetAttribute("default", port_info.defaultValue()->c_str());`
`892`	`892`	`}`