Base: Quantity: return std::string
This commit is contained in:
committed by
Yorik van Havre
parent
9f7218ac75
commit
0b3adee2ab
@@ -288,7 +288,7 @@ QString MaterialValue::getYAMLString() const
|
||||
}
|
||||
if (getType() == MaterialValue::Quantity) {
|
||||
auto quantity = getValue().value<Base::Quantity>();
|
||||
yaml += quantity.getUserString();
|
||||
yaml += QString::fromStdString(quantity.getUserString());
|
||||
}
|
||||
else if (getType() == MaterialValue::Float) {
|
||||
auto value = getValue();
|
||||
@@ -500,7 +500,7 @@ QString Material2DArray::getYAMLString() const
|
||||
}
|
||||
yaml += QString::fromStdString("\"");
|
||||
auto quantity = column.value<Base::Quantity>();
|
||||
yaml += quantity.getUserString();
|
||||
yaml += QString::fromStdString(quantity.getUserString());
|
||||
yaml += QString::fromStdString("\"");
|
||||
}
|
||||
|
||||
@@ -814,7 +814,7 @@ QString Material3DArray::getYAMLString() const
|
||||
}
|
||||
|
||||
yaml += QString::fromStdString("\"");
|
||||
auto value = getDepthValue(depth).getUserString();
|
||||
auto value = QString::fromStdString(getDepthValue(depth).getUserString());
|
||||
yaml += value;
|
||||
yaml += QString::fromStdString("\": [");
|
||||
|
||||
@@ -844,7 +844,7 @@ QString Material3DArray::getYAMLString() const
|
||||
}
|
||||
yaml += QString::fromStdString("\"");
|
||||
// Base::Quantity quantity = column.value<Base::Quantity>();
|
||||
yaml += column.getUserString();
|
||||
yaml += QString::fromStdString(column.getUserString());
|
||||
yaml += QString::fromStdString("\"");
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user