Skip to content

GitLab

Commit a0977e05 authored by Peter Eastman's avatar Peter Eastman
Browse files

Renamed XML attributes to be consistent with other forces

parent d17167f4
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
plugins/amoeba/serialization/src/AmoebaOutOfPlaneBendForceProxy.cpp
View file @ a0977e05
...@@ -44,10 +44,10 @@ AmoebaOutOfPlaneBendForceProxy::AmoebaOutOfPlaneBendForceProxy() : Serialization ...@@ -44,10 +44,10 @@ AmoebaOutOfPlaneBendForceProxy::AmoebaOutOfPlaneBendForceProxy() : Serialization
void AmoebaOutOfPlaneBendForceProxy::serialize(const void* object, SerializationNode& node) const { void AmoebaOutOfPlaneBendForceProxy::serialize(const void* object, SerializationNode& node) const {
node.setIntProperty("version", 1); node.setIntProperty("version", 1);
const AmoebaOutOfPlaneBendForce& force = *reinterpret_cast<const AmoebaOutOfPlaneBendForce*>(object); const AmoebaOutOfPlaneBendForce& force = *reinterpret_cast<const AmoebaOutOfPlaneBendForce*>(object);
node.setDoubleProperty("OutOfPlaneBendCubic", force.getAmoebaGlobalOutOfPlaneBendCubic()); node.setDoubleProperty("cubic", force.getAmoebaGlobalOutOfPlaneBendCubic());
node.setDoubleProperty("OutOfPlaneBendQuartic", force.getAmoebaGlobalOutOfPlaneBendQuartic()); node.setDoubleProperty("quartic", force.getAmoebaGlobalOutOfPlaneBendQuartic());
node.setDoubleProperty("OutOfPlaneBendPentic", force.getAmoebaGlobalOutOfPlaneBendPentic()); node.setDoubleProperty("pentic", force.getAmoebaGlobalOutOfPlaneBendPentic());
node.setDoubleProperty("OutOfPlaneBendSextic", force.getAmoebaGlobalOutOfPlaneBendSextic()); node.setDoubleProperty("sextic", force.getAmoebaGlobalOutOfPlaneBendSextic());
SerializationNode& bonds = node.createChildNode("OutOfPlaneBend").setIntProperty( "size", force.getNumOutOfPlaneBends() ); SerializationNode& bonds = node.createChildNode("OutOfPlaneBend").setIntProperty( "size", force.getNumOutOfPlaneBends() );
for (unsigned int ii = 0; ii < static_cast<unsigned int>(force.getNumOutOfPlaneBends()); ii++) { for (unsigned int ii = 0; ii < static_cast<unsigned int>(force.getNumOutOfPlaneBends()); ii++) {
...@@ -64,10 +64,10 @@ void* AmoebaOutOfPlaneBendForceProxy::deserialize(const SerializationNode& node) ...@@ -64,10 +64,10 @@ void* AmoebaOutOfPlaneBendForceProxy::deserialize(const SerializationNode& node)
AmoebaOutOfPlaneBendForce* force = new AmoebaOutOfPlaneBendForce(); AmoebaOutOfPlaneBendForce* force = new AmoebaOutOfPlaneBendForce();
try { try {
force->setAmoebaGlobalOutOfPlaneBendCubic(node.getDoubleProperty( "OutOfPlaneBendCubic")); force->setAmoebaGlobalOutOfPlaneBendCubic(node.getDoubleProperty( "cubic"));
force->setAmoebaGlobalOutOfPlaneBendQuartic(node.getDoubleProperty("OutOfPlaneBendQuartic")); force->setAmoebaGlobalOutOfPlaneBendQuartic(node.getDoubleProperty("quartic"));
force->setAmoebaGlobalOutOfPlaneBendPentic(node.getDoubleProperty( "OutOfPlaneBendPentic")); force->setAmoebaGlobalOutOfPlaneBendPentic(node.getDoubleProperty( "pentic"));
force->setAmoebaGlobalOutOfPlaneBendSextic(node.getDoubleProperty( "OutOfPlaneBendSextic")); force->setAmoebaGlobalOutOfPlaneBendSextic(node.getDoubleProperty( "sextic"));
const SerializationNode& bonds = node.getChildNode("OutOfPlaneBend"); const SerializationNode& bonds = node.getChildNode("OutOfPlaneBend");
for (unsigned int ii = 0; ii < bonds.getChildren().size(); ii++) { for (unsigned int ii = 0; ii < bonds.getChildren().size(); ii++) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment