kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge pull request #19591 from benj5378/qStringLiteral2

Browse Source 
Use QStringLiteral 2
This commit is contained in:
Chris Hennes
2025-02-17 10:25:31 -06:00
committed by GitHub
parent 6fcbafb121 34a77cfbb7
commit c18a671f99
32 changed files with 474 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Base/UnitsSchema.cpp
View File

@@ -44,7 +44,5 @@ std::string UnitsSchema::toLocale(const Base::Quantity& quant,
}
QString Ln = Lc.toString((quant.getValue() / factor), format.toFormat(), format.precision);
return QString::fromStdString("%1 %2")
.arg(Ln, QString::fromStdString(unitString))
.toStdString();
return QStringLiteral("%1 %2").arg(Ln, QString::fromStdString(unitString)).toStdString();
}

2
src/Gui/3Dconnexion/navlib/NavlibPivot.cpp
View File

@@ -284,7 +284,7 @@ void NavlibInterface::initializePivot()
pivot.pDepthTestAlways->function.setValue(SoDepthBufferElement::ALWAYS);
pivot.pDepthTestLess->function.setValue(SoDepthBufferElement::LESS);
pivot.pivotImage = QImage(QString::fromStdString(":/icons/3dx_pivot.png"));
pivot.pivotImage = QImage(QStringLiteral(":/icons/3dx_pivot.png"));
Gui::BitmapFactory().convert(pivot.pivotImage, pivot.pImage->image);
pivot.pVisibility->ref();

18
src/Gui/Dialogs/DlgMacroExecuteImp.cpp
View File

@@ -471,7 +471,7 @@ void DlgMacroExecuteImp::onCreateButtonClicked()
Qt::MSWindowsFixedSizeDialogHint);
if (replaceSpaces) {
fn = fn.replace(QString::fromStdString(" "), QString::fromStdString("_"));
fn = fn.replace(QStringLiteral(" "), QStringLiteral("_"));
}
if (!fn.isEmpty()) {
@@ -867,7 +867,7 @@ void DlgMacroExecuteImp::onRenameButtonClicked()
Qt::MSWindowsFixedSizeDialogHint);
if (replaceSpaces) {
fn = fn.replace(QString::fromStdString(" "), QString::fromStdString("_"));
fn = fn.replace(QStringLiteral(" "), QStringLiteral("_"));
}
if (!fn.isEmpty() && fn != oldName) {
@@ -957,11 +957,11 @@ void DlgMacroExecuteImp::onDuplicateButtonClicked()
QString completeSuffix = oldfi.completeSuffix(); // everything after the first "."
QString extraNote = completeSuffix.left(completeSuffix.size() - oldfi.suffix().size());
QString baseName = oldfi.baseName(); // everything before first "."
QString neutralSymbol = QString::fromStdString("@");
QString neutralSymbol = QStringLiteral("@");
QString last3 = baseName.right(3);
bool ok = true; // was conversion to int successful?
int nLast3 = last3.toInt(&ok);
last3 = QString::fromStdString("001"); // increment beginning with 001 unless from001 = false
last3 = QStringLiteral("001"); // increment beginning with 001 unless from001 = false
if (ok) {
// last3 were all digits, so we strip them from the base name
if (baseName.size() > 3) { // if <= 3 leave be (e.g. 2.py becomes 2@001.py)
@@ -987,13 +987,13 @@ void DlgMacroExecuteImp::onDuplicateButtonClicked()
nLast3++;
last3 = QString::number(nLast3);
while (last3.size() < 3) {
last3.prepend(QString::fromStdString("0")); // pad 0's if needed
last3.prepend(QStringLiteral("0")); // pad 0's if needed
}
}
QString oldNameDigitized =
baseName + neutralSymbol + last3 + QString::fromStdString(".") + completeSuffix;
baseName + neutralSymbol + last3 + QStringLiteral(".") + completeSuffix;
QFileInfo fi(dir, oldNameDigitized);
@@ -1007,10 +1007,10 @@ void DlgMacroExecuteImp::onDuplicateButtonClicked()
}
last3 = QString::number(nLast3);
while (last3.size() < 3) {
last3.prepend(QString::fromStdString("0")); // pad 0's if needed
last3.prepend(QStringLiteral("0")); // pad 0's if needed
}
oldNameDigitized =
baseName + neutralSymbol + last3 + QString::fromStdString(".") + completeSuffix;
baseName + neutralSymbol + last3 + QStringLiteral(".") + completeSuffix;
fi = QFileInfo(dir, oldNameDigitized);
}
@@ -1027,7 +1027,7 @@ void DlgMacroExecuteImp::onDuplicateButtonClicked()
nullptr,
Qt::MSWindowsFixedSizeDialogHint);
if (replaceSpaces) {
fn = fn.replace(QString::fromStdString(" "), QString::fromStdString("_"));
fn = fn.replace(QStringLiteral(" "), QStringLiteral("_"));
}
if (!fn.isEmpty() && fn != oldName) {
QString suffix = QFileInfo(fn).suffix().toLower();

2
src/Gui/MainWindow.cpp
View File

@@ -1493,7 +1493,7 @@ void MainWindow::processMessages(const QList<QString> & msg)
try {
WaitCursor wc;
std::list<std::string> files;
QString action = QString::fromStdString("OpenFile:");
QString action = QStringLiteral("OpenFile:");
for (const auto & it : msg) {
if (it.startsWith(action))
files.emplace_back(it.mid(action.size()).toStdString());

44
src/Mod/Material/App/MaterialConfigLoader.cpp
View File

@@ -96,11 +96,11 @@ bool MaterialConfigLoader::readFile(const QString& path, QMap<QString, QString>&
// read prefix
auto end = line.indexOf(QLatin1Char(']'));
if (end > 1) {
prefix = line.mid(1, end - 1) + QString::fromStdString("/");
prefix = line.mid(1, end - 1) + QStringLiteral("/");
// Render WB uses both Render and Rendering
if (prefix == QString::fromStdString("Rendering/")) {
prefix = QString::fromStdString("Render/");
if (prefix == QStringLiteral("Rendering/")) {
prefix = QStringLiteral("Render/");
}
}
}
@@ -152,9 +152,9 @@ void MaterialConfigLoader::splitTextureObject(const QString& value,
QString* object)
{
splitTexture(value, texture, remain);
if (*remain == QString::fromStdString("Object")) {
if (*remain == QStringLiteral("Object")) {
*remain = QString(); // Empty string
*object = QString::fromStdString("true");
*object = QStringLiteral("true");
}
}
@@ -279,17 +279,17 @@ void MaterialConfigLoader::addRendering(const QMap<QString, QString>& fcmat,
QString MaterialConfigLoader::multiLineKey(QMap<QString, QString>& fcmat, const QString& prefix)
{
// fcmat.beginGroup(QString::fromStdString("Render"));
// fcmat.beginGroup(QStringLiteral("Render"));
QString multiLineString;
auto keys = fcmat.keys();
for (const auto& key : keys) {
if (key.startsWith(prefix) || key.startsWith(QString::fromStdString("Render/") + prefix)) {
if (key.startsWith(prefix) || key.startsWith(QStringLiteral("Render/") + prefix)) {
QString string = value(fcmat, key.toStdString(), "");
if (multiLineString.isEmpty()) {
multiLineString += string;
}
else {
multiLineString += QString::fromStdString("\n") + string;
multiLineString += QStringLiteral("\n") + string;
}
}
}
@@ -301,7 +301,7 @@ QString MaterialConfigLoader::multiLineKey(QMap<QString, QString>& fcmat, const
void MaterialConfigLoader::addRenderAppleseed(QMap<QString, QString>& fcmat,
const std::shared_ptr<Material>& finalModel)
{
QString prefix = QString::fromStdString("Render.Appleseed");
QString prefix = QStringLiteral("Render.Appleseed");
QString string = multiLineKey(fcmat, prefix);
if (!string.isEmpty()) {
@@ -346,7 +346,7 @@ void MaterialConfigLoader::addRenderCarpaint(QMap<QString, QString>& fcmat,
void MaterialConfigLoader::addRenderCycles(QMap<QString, QString>& fcmat,
const std::shared_ptr<Material>& finalModel)
{
QString prefix = QString::fromStdString("Render.Cycles");
QString prefix = QStringLiteral("Render.Cycles");
QString string = multiLineKey(fcmat, prefix);
if (!string.isEmpty()) {
finalModel->addAppearance(ModelUUIDs::ModelUUID_Render_Cycles);
@@ -569,7 +569,7 @@ void MaterialConfigLoader::addRenderGlass(QMap<QString, QString>& fcmat,
void MaterialConfigLoader::addRenderLuxcore(QMap<QString, QString>& fcmat,
const std::shared_ptr<Material>& finalModel)
{
QString prefix = QString::fromStdString("Render.Luxcore");
QString prefix = QStringLiteral("Render.Luxcore");
QString string = multiLineKey(fcmat, prefix);
if (!string.isEmpty()) {
@@ -583,7 +583,7 @@ void MaterialConfigLoader::addRenderLuxcore(QMap<QString, QString>& fcmat,
void MaterialConfigLoader::addRenderLuxrender(QMap<QString, QString>& fcmat,
const std::shared_ptr<Material>& finalModel)
{
QString prefix = QString::fromStdString("Render.Luxrender");
QString prefix = QStringLiteral("Render.Luxrender");
QString string = multiLineKey(fcmat, prefix);
if (!string.isEmpty()) {
@@ -658,7 +658,7 @@ void MaterialConfigLoader::addRenderMixed(QMap<QString, QString>& fcmat,
void MaterialConfigLoader::addRenderOspray(QMap<QString, QString>& fcmat,
const std::shared_ptr<Material>& finalModel)
{
QString prefix = QString::fromStdString("Render.Ospray");
QString prefix = QStringLiteral("Render.Ospray");
QString string = multiLineKey(fcmat, prefix);
if (!string.isEmpty()) {
@@ -672,7 +672,7 @@ void MaterialConfigLoader::addRenderOspray(QMap<QString, QString>& fcmat,
void MaterialConfigLoader::addRenderPbrt(QMap<QString, QString>& fcmat,
const std::shared_ptr<Material>& finalModel)
{
QString prefix = QString::fromStdString("Render.Pbrt");
QString prefix = QStringLiteral("Render.Pbrt");
QString string = multiLineKey(fcmat, prefix);
if (!string.isEmpty()) {
@@ -686,7 +686,7 @@ void MaterialConfigLoader::addRenderPbrt(QMap<QString, QString>& fcmat,
void MaterialConfigLoader::addRenderPovray(QMap<QString, QString>& fcmat,
const std::shared_ptr<Material>& finalModel)
{
QString prefix = QString::fromStdString("Render.Povray");
QString prefix = QStringLiteral("Render.Povray");
QString string = multiLineKey(fcmat, prefix);
if (!string.isEmpty()) {
@@ -767,24 +767,24 @@ void MaterialConfigLoader::addRenderTexture(QMap<QString, QString>& fcmat,
auto keys = fcmat.keys();
for (const auto& key : keys) {
if (key.startsWith(QString::fromStdString("Render/Render.Textures."))) {
if (key.startsWith(QStringLiteral("Render/Render.Textures."))) {
QStringList list1 = key.split(QLatin1Char('.'));
if (renderName.isEmpty()) {
renderName = list1[2];
}
if (list1[3] == QString::fromStdString("Images")) {
if (list1[3] == QStringLiteral("Images")) {
renderImage->push_back(value(fcmat, key.toStdString(), ""));
}
else if (list1[3] == QString::fromStdString("Scale")) {
else if (list1[3] == QStringLiteral("Scale")) {
renderScale = value(fcmat, key.toStdString(), "");
}
else if (list1[3] == QString::fromStdString("Rotation")) {
else if (list1[3] == QStringLiteral("Rotation")) {
renderRotation = value(fcmat, key.toStdString(), "");
}
else if (list1[3] == QString::fromStdString("TranslationU")) {
else if (list1[3] == QStringLiteral("TranslationU")) {
renderTranslationU = value(fcmat, key.toStdString(), "");
}
else if (list1[3] == QString::fromStdString(" TranslationV")) {
else if (list1[3] == QStringLiteral(" TranslationV")) {
renderTranslationV = value(fcmat, key.toStdString(), "");
}
}
@@ -1049,7 +1049,7 @@ MaterialConfigLoader::getMaterialFromPath(const std::shared_ptr<MaterialLibrary>
// QString name = value(fcmat, "Name", ""); - always get the name from the filename
QFileInfo filepath(path);
QString name =
filepath.fileName().remove(QString::fromStdString(".FCMat"), Qt::CaseInsensitive);
filepath.fileName().remove(QStringLiteral(".FCMat"), Qt::CaseInsensitive);
QString uuid = QUuid::createUuid().toString(QUuid::WithoutBraces);
QString description = value(fcmat, "Description", "");

2
src/Mod/Material/App/MaterialConfigLoader.h
View File

@@ -96,7 +96,7 @@ private:
static bool isTexture(const QString& value)
{
return value.contains(QString::fromStdString("Texture"), Qt::CaseInsensitive);
return value.contains(QStringLiteral("Texture"), Qt::CaseInsensitive);
}
static bool readFile(const QString& path, QMap<QString, QString>& map);

8
src/Mod/Material/App/MaterialLibrary.cpp
View File

@@ -120,7 +120,7 @@ void MaterialLibrary::deleteFile(MaterialManager& manager, const QString& path)
_materialPathMap->erase(rPath);
}
else {
QString error = QString::fromStdString("DeleteError: Unable to delete ") + path;
QString error = QStringLiteral("DeleteError: Unable to delete ") + path;
throw DeleteError(error);
}
}
@@ -295,13 +295,13 @@ MaterialLibrary::getMaterialTree(const std::shared_ptr<Materials::MaterialFilter
auto material = it.second;
if (materialInTree(material, filter, options)) {
QStringList list = filename.split(QString::fromStdString("/"));
QStringList list = filename.split(QStringLiteral("/"));
// Start at the root
std::shared_ptr<std::map<QString, std::shared_ptr<MaterialTreeNode>>> node =
materialTree;
for (auto& itp : list) {
if (itp.endsWith(QString::fromStdString(".FCMat"))) {
if (itp.endsWith(QStringLiteral(".FCMat"))) {
std::shared_ptr<MaterialTreeNode> child = std::make_shared<MaterialTreeNode>();
child->setData(material);
(*node)[itp] = child;
@@ -330,7 +330,7 @@ MaterialLibrary::getMaterialTree(const std::shared_ptr<Materials::MaterialFilter
if (!filter || options.includeEmptyFolders()) {
auto folderList = MaterialLoader::getMaterialFolders(*this);
for (auto& folder : *folderList) {
QStringList list = folder.split(QString::fromStdString("/"));
QStringList list = folder.split(QStringLiteral("/"));
// Start at the root
auto node = materialTree;

26
src/Mod/Material/App/MaterialLoader.cpp
View File

@@ -82,7 +82,7 @@ std::shared_ptr<QList<QVariant>> MaterialYamlEntry::readList(const YAML::Node& n
QVariant nodeValue;
if (isImageList) {
nodeValue = QString::fromStdString(it->as<std::string>())
.remove(QRegularExpression(QString::fromStdString("[\r\n]")));
.remove(QRegularExpression(QStringLiteral("[\r\n]")));
}
else {
nodeValue = QString::fromStdString(it->as<std::string>());
@@ -168,8 +168,8 @@ void MaterialYamlEntry::addToTree(
std::shared_ptr<std::map<QString, std::shared_ptr<Material>>> materialMap)
{
std::set<QString> exclude;
exclude.insert(QString::fromStdString("General"));
exclude.insert(QString::fromStdString("Inherits"));
exclude.insert(QStringLiteral("General"));
exclude.insert(QStringLiteral("Inherits"));
auto yamlModel = getModel();
auto library = getLibrary();
@@ -244,7 +244,7 @@ void MaterialYamlEntry::addToTree(
QString::fromStdString((itp->second).as<std::string>());
if (type == MaterialValue::Image) {
propertyValue = propertyValue.remove(
QRegularExpression(QString::fromStdString("[\r\n]")));
QRegularExpression(QStringLiteral("[\r\n]")));
}
finalModel->setPhysicalValue(QString::fromStdString(propertyName),
propertyValue);
@@ -311,7 +311,7 @@ void MaterialYamlEntry::addToTree(
QString::fromStdString((itp->second).as<std::string>());
if (type == MaterialValue::Image) {
propertyValue = propertyValue.remove(
QRegularExpression(QString::fromStdString("[\r\n]")));
QRegularExpression(QStringLiteral("[\r\n]")));
}
finalModel->setAppearanceValue(QString::fromStdString(propertyName),
propertyValue);
@@ -368,7 +368,7 @@ MaterialLoader::getMaterialFromYAML(const std::shared_ptr<MaterialLibrary>& libr
// Always get the name from the filename
QFileInfo filepath(path);
QString name =
filepath.fileName().remove(QString::fromStdString(".FCMat"), Qt::CaseInsensitive);
filepath.fileName().remove(QStringLiteral(".FCMat"), Qt::CaseInsensitive);
model = std::make_shared<MaterialYamlEntry>(library,
name,
@@ -568,9 +568,9 @@ std::shared_ptr<std::list<std::shared_ptr<MaterialLibrary>>> MaterialLoader::get
QString resourceDir = QString::fromStdString(App::Application::getResourceDir()
+ "/Mod/Material/Resources/Materials");
auto libData =
std::make_shared<MaterialLibrary>(QString::fromStdString("System"),
std::make_shared<MaterialLibrary>(QStringLiteral("System"),
resourceDir,
QString::fromStdString(":/icons/freecad.svg"),
QStringLiteral(":/icons/freecad.svg"),
true);
_libraryList->push_back(libData);
}
@@ -612,9 +612,9 @@ std::shared_ptr<std::list<std::shared_ptr<MaterialLibrary>>> MaterialLoader::get
}
if (materialDir.exists()) {
auto libData = std::make_shared<MaterialLibrary>(
QString::fromStdString("User"),
QStringLiteral("User"),
resourceDir,
QString::fromStdString(":/icons/preferences-general.svg"),
QStringLiteral(":/icons/preferences-general.svg"),
false);
_libraryList->push_back(libData);
}
@@ -627,9 +627,9 @@ std::shared_ptr<std::list<std::shared_ptr<MaterialLibrary>>> MaterialLoader::get
QDir materialDir(resourceDir);
if (materialDir.exists()) {
auto libData =
std::make_shared<MaterialLibrary>(QString::fromStdString("Custom"),
std::make_shared<MaterialLibrary>(QStringLiteral("Custom"),
resourceDir,
QString::fromStdString(":/icons/user.svg"),
QStringLiteral(":/icons/user.svg"),
false);
_libraryList->push_back(libData);
}
@@ -649,7 +649,7 @@ MaterialLoader::getMaterialFolders(const MaterialLibrary& library)
QFileInfo file(pathname);
if (file.isDir()) {
QString path = QDir(library.getDirectory()).relativeFilePath(file.absoluteFilePath());
if (!path.startsWith(QString::fromStdString("."))) {
if (!path.startsWith(QStringLiteral("."))) {
pathList->push_back(path);
}
}

2
src/Mod/Material/App/MaterialManager.cpp
View File

@@ -132,7 +132,7 @@ bool MaterialManager::isMaterial(const QFileInfo& file) const
return false;
}
// check file extension
if (file.suffix() == QString::fromStdString("FCMat")) {
if (file.suffix() == QStringLiteral("FCMat")) {
return true;
}
return false;

96
src/Mod/Material/App/MaterialValue.cpp
View File

@@ -41,23 +41,23 @@ using namespace Materials;
TYPESYSTEM_SOURCE(Materials::MaterialValue, Base::BaseClass)
QMap<QString, MaterialValue::ValueType> MaterialValue::_typeMap {
{QString::fromStdString("String"), String},
{QString::fromStdString("Boolean"), Boolean},
{QString::fromStdString("Integer"), Integer},
{QString::fromStdString("Float"), Float},
{QString::fromStdString("Quantity"), Quantity},
{QString::fromStdString("Distribution"), Distribution},
{QString::fromStdString("List"), List},
{QString::fromStdString("2DArray"), Array2D},
{QString::fromStdString("3DArray"), Array3D},
{QString::fromStdString("Color"), Color},
{QString::fromStdString("Image"), Image},
{QString::fromStdString("File"), File},
{QString::fromStdString("URL"), URL},
{QString::fromStdString("MultiLineString"), MultiLineString},
{QString::fromStdString("FileList"), FileList},
{QString::fromStdString("ImageList"), ImageList},
{QString::fromStdString("SVG"), SVG}};
{QStringLiteral("String"), String},
{QStringLiteral("Boolean"), Boolean},
{QStringLiteral("Integer"), Integer},
{QStringLiteral("Float"), Float},
{QStringLiteral("Quantity"), Quantity},
{QStringLiteral("Distribution"), Distribution},
{QStringLiteral("List"), List},
{QStringLiteral("2DArray"), Array2D},
{QStringLiteral("3DArray"), Array3D},
{QStringLiteral("Color"), Color},
{QStringLiteral("Image"), Image},
{QStringLiteral("File"), File},
{QStringLiteral("URL"), URL},
{QStringLiteral("MultiLineString"), MultiLineString},
{QStringLiteral("FileList"), FileList},
{QStringLiteral("ImageList"), ImageList},
{QStringLiteral("SVG"), SVG}};
MaterialValue::MaterialValue()
: _valueType(None)
@@ -106,8 +106,8 @@ bool MaterialValue::operator==(const MaterialValue& other) const
QString MaterialValue::escapeString(const QString& source)
{
QString res = source;
res.replace(QString::fromStdString("\\"), QString::fromStdString("\\\\"));
res.replace(QString::fromStdString("\""), QString::fromStdString("\\\""));
res.replace(QStringLiteral("\\"), QStringLiteral("\\\\"));
res.replace(QStringLiteral("\""), QStringLiteral("\\\""));
return res;
}
@@ -225,10 +225,10 @@ bool MaterialValue::isNull() const
QString MaterialValue::getYAMLStringImage() const
{
QString yaml;
yaml = QString::fromStdString(" |-2");
yaml = QStringLiteral(" |-2");
QString base64 = getValue().toString();
while (!base64.isEmpty()) {
yaml += QString::fromStdString("\n ") + base64.left(74);
yaml += QStringLiteral("\n ") + base64.left(74);
base64.remove(0, 74);
}
return yaml;
@@ -238,8 +238,8 @@ QString MaterialValue::getYAMLStringList() const
{
QString yaml;
for (auto& it : getList()) {
yaml += QString::fromStdString("\n - \"") + escapeString(it.toString())
+ QString::fromStdString("\"");
yaml += QStringLiteral("\n - \"") + escapeString(it.toString())
+ QStringLiteral("\"");
}
return yaml;
}
@@ -248,10 +248,10 @@ QString MaterialValue::getYAMLStringImageList() const
{
QString yaml;
for (auto& it : getList()) {
yaml += QString::fromStdString("\n - |-2");
yaml += QStringLiteral("\n - |-2");
QString base64 = it.toString();
while (!base64.isEmpty()) {
yaml += QString::fromStdString("\n ") + base64.left(72);
yaml += QStringLiteral("\n ") + base64.left(72);
base64.remove(0, 72);
}
}
@@ -261,11 +261,11 @@ QString MaterialValue::getYAMLStringImageList() const
QString MaterialValue::getYAMLStringMultiLine() const
{
QString yaml;
yaml = QString::fromStdString(" |2");
yaml = QStringLiteral(" |2");
auto list =
getValue().toString().split(QRegularExpression(QString::fromStdString("[\r\n]")), Qt::SkipEmptyParts);
getValue().toString().split(QRegularExpression(QStringLiteral("[\r\n]")), Qt::SkipEmptyParts);
for (auto& it : list) {
yaml += QString::fromStdString("\n ") + it;
yaml += QStringLiteral("\n ") + it;
}
return yaml;
}
@@ -477,36 +477,36 @@ QString Material2DArray::getYAMLString() const
pad.fill(QChar::fromLatin1(' '), 9);
// Save the array contents
QString yaml = QString::fromStdString("\n - [");
QString yaml = QStringLiteral("\n - [");
bool firstRow = true;
for (auto& row : _rows) {
if (!firstRow) {
// Each row is on its own line, padded for correct indentation
yaml += QString::fromStdString(",\n") + pad;
yaml += QStringLiteral(",\n") + pad;
}
else {
firstRow = false;
}
yaml += QString::fromStdString("[");
yaml += QStringLiteral("[");
bool first = true;
for (auto& column : *row) {
if (!first) {
// TODO: Fix for arrays with too many columns to fit on a single line
yaml += QString::fromStdString(", ");
yaml += QStringLiteral(", ");
}
else {
first = false;
}
yaml += QString::fromStdString("\"");
yaml += QStringLiteral("\"");
auto quantity = column.value<Base::Quantity>();
yaml += QString::fromStdString(quantity.getUserString());
yaml += QString::fromStdString("\"");
yaml += QStringLiteral("\"");
}
yaml += QString::fromStdString("]");
yaml += QStringLiteral("]");
}
yaml += QString::fromStdString("]");
yaml += QStringLiteral("]");
return yaml;
}
@@ -806,17 +806,17 @@ QString Material3DArray::getYAMLString() const
pad.fill(QChar::fromLatin1(' '), 9);
// Save the array contents
QString yaml = QString::fromStdString("\n - [");
QString yaml = QStringLiteral("\n - [");
for (int depth = 0; depth < this->depth(); depth++) {
if (depth > 0) {
// Each row is on its own line, padded for correct indentation
yaml += QString::fromStdString(",\n") + pad;
yaml += QStringLiteral(",\n") + pad;
}
yaml += QString::fromStdString("\"");
yaml += QStringLiteral("\"");
auto value = QString::fromStdString(getDepthValue(depth).getUserString());
yaml += value;
yaml += QString::fromStdString("\": [");
yaml += QStringLiteral("\": [");
QString pad2;
pad2.fill(QChar::fromLatin1(' '), 14 + value.length());
@@ -826,32 +826,32 @@ QString Material3DArray::getYAMLString() const
for (auto& row : *rows) {
if (!firstRow) {
// Each row is on its own line, padded for correct indentation
yaml += QString::fromStdString(",\n") + pad2;
yaml += QStringLiteral(",\n") + pad2;
}
else {
firstRow = false;
}
yaml += QString::fromStdString("[");
yaml += QStringLiteral("[");
bool first = true;
for (auto& column : *row) {
if (!first) {
// TODO: Fix for arrays with too many columns to fit on a single line
yaml += QString::fromStdString(", ");
yaml += QStringLiteral(", ");
}
else {
first = false;
}
yaml += QString::fromStdString("\"");
yaml += QStringLiteral("\"");
// Base::Quantity quantity = column.value<Base::Quantity>();
yaml += QString::fromStdString(column.getUserString());
yaml += QString::fromStdString("\"");
yaml += QStringLiteral("\"");
}
yaml += QString::fromStdString("]");
yaml += QStringLiteral("]");
}
yaml += QString::fromStdString("]");
yaml += QStringLiteral("]");
}
yaml += QString::fromStdString("]");
yaml += QStringLiteral("]");
return yaml;
}

4
src/Mod/Material/App/Model.h
View File

@@ -182,8 +182,8 @@ public:
}
const QString getBase() const
{
return (_type == ModelType_Physical) ? QString::fromStdString("Model")
: QString::fromStdString("AppearanceModel");
return (_type == ModelType_Physical) ? QStringLiteral("Model")
: QStringLiteral("AppearanceModel");
}
const QString getName() const
{

10
src/Mod/Material/App/ModelLibrary.cpp
View File

@@ -55,7 +55,7 @@ QString LibraryBase::getLocalPath(const QString& path) const
}
QString cleanPath = QDir::cleanPath(path);
QString prefix = QString::fromStdString("/") + getName();
QString prefix = QStringLiteral("/") + getName();
if (cleanPath.startsWith(prefix)) {
// Remove the library name from the path
filePath += cleanPath.right(cleanPath.length() - prefix.length());
@@ -70,7 +70,7 @@ QString LibraryBase::getLocalPath(const QString& path) const
bool LibraryBase::isRoot(const QString& path) const
{
QString localPath = getLocalPath(path);
QString cleanPath = getLocalPath(QString::fromStdString(""));
QString cleanPath = getLocalPath(QStringLiteral(""));
std::string pLocal = localPath.toStdString();
std::string pclean = cleanPath.toStdString();
return (cleanPath == localPath);
@@ -80,7 +80,7 @@ QString LibraryBase::getRelativePath(const QString& path) const
{
QString filePath;
QString cleanPath = QDir::cleanPath(path);
QString prefix = QString::fromStdString("/") + getName();
QString prefix = QStringLiteral("/") + getName();
if (cleanPath.startsWith(prefix)) {
// Remove the library name from the path
filePath = cleanPath.right(cleanPath.length() - prefix.length());
@@ -96,7 +96,7 @@ QString LibraryBase::getRelativePath(const QString& path) const
}
// Remove any leading '/'
if (filePath.startsWith(QString::fromStdString("/"))) {
if (filePath.startsWith(QStringLiteral("/"))) {
filePath.remove(0, 1);
}
@@ -151,7 +151,7 @@ ModelLibrary::getModelTree(ModelFilter filter) const
auto model = it.second;
if (ModelManager::passFilter(filter, model->getType())) {
QStringList list = filename.split(QString::fromStdString("/"));
QStringList list = filename.split(QStringLiteral("/"));
// Start at the root
std::shared_ptr<std::map<QString, std::shared_ptr<ModelTreeNode>>> node = modelTree;

40
src/Mod/Material/App/ModelLoader.cpp
View File

@@ -151,12 +151,12 @@ void ModelLoader::dereference(const QString& uuid,
auto childBase = child->getBase().toStdString();
std::set<QString> exclude;
exclude.insert(QString::fromStdString("Name"));
exclude.insert(QString::fromStdString("UUID"));
exclude.insert(QString::fromStdString("URL"));
exclude.insert(QString::fromStdString("Description"));
exclude.insert(QString::fromStdString("DOI"));
exclude.insert(QString::fromStdString("Inherits"));
exclude.insert(QStringLiteral("Name"));
exclude.insert(QStringLiteral("UUID"));
exclude.insert(QStringLiteral("URL"));
exclude.insert(QStringLiteral("Description"));
exclude.insert(QStringLiteral("DOI"));
exclude.insert(QStringLiteral("Inherits"));
auto parentProperties = (*parentPtr)[parentBase];
auto childProperties = childYaml[childBase];
@@ -220,12 +220,12 @@ void ModelLoader::addToTree(std::shared_ptr<ModelEntry> model,
std::map<std::pair<QString, QString>, QString>* inheritances)
{
std::set<QString> exclude;
exclude.insert(QString::fromStdString("Name"));
exclude.insert(QString::fromStdString("UUID"));
exclude.insert(QString::fromStdString("URL"));
exclude.insert(QString::fromStdString("Description"));
exclude.insert(QString::fromStdString("DOI"));
exclude.insert(QString::fromStdString("Inherits"));
exclude.insert(QStringLiteral("Name"));
exclude.insert(QStringLiteral("UUID"));
exclude.insert(QStringLiteral("URL"));
exclude.insert(QStringLiteral("Description"));
exclude.insert(QStringLiteral("DOI"));
exclude.insert(QStringLiteral("Inherits"));
auto yamlModel = model->getModel();
auto library = model->getLibrary();
@@ -274,8 +274,8 @@ void ModelLoader::addToTree(std::shared_ptr<ModelEntry> model,
propURL,
propDescription);
if (propType == QString::fromStdString("2DArray")
|| propType == QString::fromStdString("3DArray")) {
if (propType == QStringLiteral("2DArray")
|| propType == QStringLiteral("3DArray")) {
// Base::Console().Log("Reading columns\n");
// Read the columns
auto cols = yamlProp["Columns"];
@@ -369,9 +369,9 @@ void ModelLoader::getModelLibraries()
QString resourceDir = QString::fromStdString(App::Application::getResourceDir()
+ "/Mod/Material/Resources/Models");
auto libData =
std::make_shared<ModelLibrary>(QString::fromStdString("System"),
std::make_shared<ModelLibrary>(QStringLiteral("System"),
resourceDir,
QString::fromStdString(":/icons/freecad.svg"));
QStringLiteral(":/icons/freecad.svg"));
_libraryList->push_back(libData);
}
@@ -401,9 +401,9 @@ void ModelLoader::getModelLibraries()
QDir materialDir(resourceDir);
if (materialDir.exists()) {
auto libData = std::make_shared<ModelLibrary>(
QString::fromStdString("User"),
QStringLiteral("User"),
resourceDir,
QString::fromStdString(":/icons/preferences-general.svg"));
QStringLiteral(":/icons/preferences-general.svg"));
_libraryList->push_back(libData);
}
}
@@ -415,9 +415,9 @@ void ModelLoader::getModelLibraries()
QDir materialDir(resourceDir);
if (materialDir.exists()) {
auto libData =
std::make_shared<ModelLibrary>(QString::fromStdString("Custom"),
std::make_shared<ModelLibrary>(QStringLiteral("Custom"),
resourceDir,
QString::fromStdString(":/icons/user.svg"));
QStringLiteral(":/icons/user.svg"));
_libraryList->push_back(libData);
}
}

2
src/Mod/Material/App/ModelManager.cpp
View File

@@ -66,7 +66,7 @@ bool ModelManager::isModel(const QString& file)
// if (!fs::is_regular_file(p))
// return false;
// check file extension
if (file.endsWith(QString::fromStdString(".yml"))) {
if (file.endsWith(QStringLiteral(".yml"))) {
return true;
}
return false;

14
src/Mod/Material/App/ModelManagerPyImp.cpp
View File

@@ -64,16 +64,16 @@ PyObject* ModelManagerPy::getModel(PyObject* args)
return new ModelPy(new Model(*model));
}
catch (ModelNotFound const&) {
QString error = QString::fromStdString("Model not found:\n");
QString error = QStringLiteral("Model not found:\n");
auto _modelMap = getModelManagerPtr()->getModels();
error += QString::fromStdString("ModelMap:\n");
error += QStringLiteral("ModelMap:\n");
for (auto itp = _modelMap->begin(); itp != _modelMap->end(); itp++) {
error += QString::fromStdString("\t_modelMap[") + itp->first
+ QString::fromStdString("] = '") + itp->second->getName()
+ QString::fromStdString("'\n");
error += QStringLiteral("\t_modelMap[") + itp->first
+ QStringLiteral("] = '") + itp->second->getName()
+ QStringLiteral("'\n");
}
error += QString::fromStdString("\tuuid = '") + QString::fromStdString(uuid)
+ QString::fromStdString("'\n");
error += QStringLiteral("\tuuid = '") + QString::fromStdString(uuid)
+ QStringLiteral("'\n");
PyErr_SetString(PyExc_LookupError, error.toStdString().c_str());
return nullptr;
}

98
src/Mod/Material/App/ModelUuids.cpp
View File

@@ -30,110 +30,110 @@ using namespace Materials;
TYPESYSTEM_SOURCE(Materials::ModelUUIDs, Base::BaseClass)
const QString ModelUUIDs::ModelUUID_Legacy_Father =
QString::fromStdString("9cdda8b6-b606-4778-8f13-3934d8668e67");
QStringLiteral("9cdda8b6-b606-4778-8f13-3934d8668e67");
const QString ModelUUIDs::ModelUUID_Legacy_MaterialStandard =
QString::fromStdString("1e2c0088-904a-4537-925f-64064c07d700");
QStringLiteral("1e2c0088-904a-4537-925f-64064c07d700");
const QString ModelUUIDs::ModelUUID_Machining_Machinability =
QString::fromStdString("9d81fcb2-bf81-48e3-bb57-d45ecf380096");
QStringLiteral("9d81fcb2-bf81-48e3-bb57-d45ecf380096");
const QString ModelUUIDs::ModelUUID_Mechanical_ArrudaBoyce =
QString::fromStdString("e10d00de-c7de-4e59-bcdd-058c2ea19ec6");
QStringLiteral("e10d00de-c7de-4e59-bcdd-058c2ea19ec6");
const QString ModelUUIDs::ModelUUID_Mechanical_Density =
QString::fromStdString("454661e5-265b-4320-8e6f-fcf6223ac3af");
QStringLiteral("454661e5-265b-4320-8e6f-fcf6223ac3af");
const QString ModelUUIDs::ModelUUID_Mechanical_Hardness =
QString::fromStdString("3d1a6141-d032-4d82-8bb5-a8f339fff8ad");
QStringLiteral("3d1a6141-d032-4d82-8bb5-a8f339fff8ad");
const QString ModelUUIDs::ModelUUID_Mechanical_IsotropicLinearElastic =
QString::fromStdString("f6f9e48c-b116-4e82-ad7f-3659a9219c50");
QStringLiteral("f6f9e48c-b116-4e82-ad7f-3659a9219c50");
const QString ModelUUIDs::ModelUUID_Mechanical_LinearElastic =
QString::fromStdString("7b561d1d-fb9b-44f6-9da9-56a4f74d7536");
QStringLiteral("7b561d1d-fb9b-44f6-9da9-56a4f74d7536");
const QString ModelUUIDs::ModelUUID_Mechanical_MooneyRivlin =
QString::fromStdString("beeed169-7770-4da0-ab67-c9172cf7d23d");
QStringLiteral("beeed169-7770-4da0-ab67-c9172cf7d23d");
const QString ModelUUIDs::ModelUUID_Mechanical_NeoHooke =
QString::fromStdString("569ebc58-ef29-434a-83be-555a0980d505");
QStringLiteral("569ebc58-ef29-434a-83be-555a0980d505");
const QString ModelUUIDs::ModelUUID_Mechanical_OgdenN1 =
QString::fromStdString("a2634a2c-412f-468d-9bec-74ae5d87a9c0");
QStringLiteral("a2634a2c-412f-468d-9bec-74ae5d87a9c0");
const QString ModelUUIDs::ModelUUID_Mechanical_OgdenN2 =
QString::fromStdString("233540bb-7b13-4f49-ac12-126a5c82cedf");
QStringLiteral("233540bb-7b13-4f49-ac12-126a5c82cedf");
const QString ModelUUIDs::ModelUUID_Mechanical_OgdenN3 =
QString::fromStdString("a917d6b8-209f-429e-9972-fe4bbb97af3f");
QStringLiteral("a917d6b8-209f-429e-9972-fe4bbb97af3f");
const QString ModelUUIDs::ModelUUID_Mechanical_OgdenYld2004p18 =
QString::fromStdString("3ef9e427-cc25-43f7-817f-79ff0d49625f");
QStringLiteral("3ef9e427-cc25-43f7-817f-79ff0d49625f");
const QString ModelUUIDs::ModelUUID_Mechanical_OrthotropicLinearElastic =
QString::fromStdString("b19ccc6b-a431-418e-91c2-0ac8c649d146");
QStringLiteral("b19ccc6b-a431-418e-91c2-0ac8c649d146");
const QString ModelUUIDs::ModelUUID_Mechanical_PolynomialN1 =
QString::fromStdString("285a6042-0f0c-4a36-a898-4afadd6408ce");
QStringLiteral("285a6042-0f0c-4a36-a898-4afadd6408ce");
const QString ModelUUIDs::ModelUUID_Mechanical_PolynomialN2 =
QString::fromStdString("4c2fb7b2-5121-4d6f-be0d-8c5970c9e682");
QStringLiteral("4c2fb7b2-5121-4d6f-be0d-8c5970c9e682");
const QString ModelUUIDs::ModelUUID_Mechanical_PolynomialN3 =
QString::fromStdString("e83ada22-947e-4beb-91e7-482a16f5ba77");
QStringLiteral("e83ada22-947e-4beb-91e7-482a16f5ba77");
const QString ModelUUIDs::ModelUUID_Mechanical_ReducedPolynomialN1 =
QString::fromStdString("f8052a3c-db17-42ea-b2be-13aa5ef30730");
QStringLiteral("f8052a3c-db17-42ea-b2be-13aa5ef30730");
const QString ModelUUIDs::ModelUUID_Mechanical_ReducedPolynomialN2 =
QString::fromStdString("c52b5021-4bb8-441c-80d4-855fce9de15e");
QStringLiteral("c52b5021-4bb8-441c-80d4-855fce9de15e");
const QString ModelUUIDs::ModelUUID_Mechanical_ReducedPolynomialN3 =
QString::fromStdString("fa4e58b4-74c7-4292-8e79-7d5fd232fb55");
QStringLiteral("fa4e58b4-74c7-4292-8e79-7d5fd232fb55");
const QString ModelUUIDs::ModelUUID_Mechanical_Yeoh =
QString::fromStdString("cd13c492-21a9-4578-8191-deec003e4c01");
QStringLiteral("cd13c492-21a9-4578-8191-deec003e4c01");
const QString ModelUUIDs::ModelUUID_Fluid_Default =
QString::fromStdString("1ae66d8c-1ba1-4211-ad12-b9917573b202");
QStringLiteral("1ae66d8c-1ba1-4211-ad12-b9917573b202");
const QString ModelUUIDs::ModelUUID_Thermal_Default =
QString::fromStdString("9959d007-a970-4ea7-bae4-3eb1b8b883c7");
QStringLiteral("9959d007-a970-4ea7-bae4-3eb1b8b883c7");
const QString ModelUUIDs::ModelUUID_Electromagnetic_Default =
QString::fromStdString("b2eb5f48-74b3-4193-9fbb-948674f427f3");
QStringLiteral("b2eb5f48-74b3-4193-9fbb-948674f427f3");
const QString ModelUUIDs::ModelUUID_Architectural_Default =
QString::fromStdString("32439c3b-262f-4b7b-99a8-f7f44e5894c8");
QStringLiteral("32439c3b-262f-4b7b-99a8-f7f44e5894c8");
const QString ModelUUIDs::ModelUUID_Rendering_Architectural =
QString::fromStdString("27e48ac9-54e1-4a1f-aa49-d5d690242705");
QStringLiteral("27e48ac9-54e1-4a1f-aa49-d5d690242705");
const QString ModelUUIDs::ModelUUID_Costs_Default =
QString::fromStdString("881df808-8726-4c2e-be38-688bb6cce466");
QStringLiteral("881df808-8726-4c2e-be38-688bb6cce466");
const QString ModelUUIDs::ModelUUID_Rendering_Basic =
QString::fromStdString("f006c7e4-35b7-43d5-bbf9-c5d572309e6e");
QStringLiteral("f006c7e4-35b7-43d5-bbf9-c5d572309e6e");
const QString ModelUUIDs::ModelUUID_Rendering_Texture =
QString::fromStdString("bbdcc65b-67ca-489c-bd5c-a36e33d1c160");
QStringLiteral("bbdcc65b-67ca-489c-bd5c-a36e33d1c160");
const QString ModelUUIDs::ModelUUID_Rendering_Advanced =
QString::fromStdString("c880f092-cdae-43d6-a24b-55e884aacbbf");
QStringLiteral("c880f092-cdae-43d6-a24b-55e884aacbbf");
const QString ModelUUIDs::ModelUUID_Rendering_Vector =
QString::fromStdString("fdf5a80e-de50-4157-b2e5-b6e5f88b680e");
QStringLiteral("fdf5a80e-de50-4157-b2e5-b6e5f88b680e");
const QString ModelUUIDs::ModelUUID_Render_Appleseed =
QString::fromStdString("b0a10f70-13bf-4598-ab63-bcfbbcd813e3");
QStringLiteral("b0a10f70-13bf-4598-ab63-bcfbbcd813e3");
const QString ModelUUIDs::ModelUUID_Render_Carpaint =
QString::fromStdString("4d2cc163-0707-40e2-a9f7-14288c4b97bd");
QStringLiteral("4d2cc163-0707-40e2-a9f7-14288c4b97bd");
const QString ModelUUIDs::ModelUUID_Render_Cycles =
QString::fromStdString("a6da1b66-929c-48bf-ae80-3b0495c7b50b");
QStringLiteral("a6da1b66-929c-48bf-ae80-3b0495c7b50b");
const QString ModelUUIDs::ModelUUID_Render_Diffuse =
QString::fromStdString("c19b2d30-c55b-48aa-a938-df9e2f7779cf");
QStringLiteral("c19b2d30-c55b-48aa-a938-df9e2f7779cf");
const QString ModelUUIDs::ModelUUID_Render_Disney =
QString::fromStdString("f8723572-4470-4c39-a749-6d3b71358a5b");
QStringLiteral("f8723572-4470-4c39-a749-6d3b71358a5b");
const QString ModelUUIDs::ModelUUID_Render_Emission =
QString::fromStdString("9f6cb588-c89d-4a74-9d0f-2786a8568cec");
QStringLiteral("9f6cb588-c89d-4a74-9d0f-2786a8568cec");
const QString ModelUUIDs::ModelUUID_Render_Glass =
QString::fromStdString("d76a56f5-7250-4efb-bb89-8ea0a9ccaa6b");
QStringLiteral("d76a56f5-7250-4efb-bb89-8ea0a9ccaa6b");
const QString ModelUUIDs::ModelUUID_Render_Luxcore =
QString::fromStdString("6b992304-33e0-490b-a391-e9d0af79bb69");
QStringLiteral("6b992304-33e0-490b-a391-e9d0af79bb69");
const QString ModelUUIDs::ModelUUID_Render_Luxrender =
QString::fromStdString("67ac6a63-e173-4e05-898b-af743f1f9563");
QStringLiteral("67ac6a63-e173-4e05-898b-af743f1f9563");
const QString ModelUUIDs::ModelUUID_Render_Mixed =
QString::fromStdString("84bab333-984f-47fe-a512-d17c7cb2daa9");
QStringLiteral("84bab333-984f-47fe-a512-d17c7cb2daa9");
const QString ModelUUIDs::ModelUUID_Render_Ospray =
QString::fromStdString("a4792c23-0be9-47c2-b16d-47b2d2d5efd6");
QStringLiteral("a4792c23-0be9-47c2-b16d-47b2d2d5efd6");
const QString ModelUUIDs::ModelUUID_Render_Pbrt =
QString::fromStdString("35b34b82-4325-4d27-97bd-d10bb2c56586");
QStringLiteral("35b34b82-4325-4d27-97bd-d10bb2c56586");
const QString ModelUUIDs::ModelUUID_Render_Povray =
QString::fromStdString("6ec8b415-4c7b-4206-a80b-2ea64101f34b");
QStringLiteral("6ec8b415-4c7b-4206-a80b-2ea64101f34b");
const QString ModelUUIDs::ModelUUID_Render_SubstancePBR =
QString::fromStdString("f212b643-db96-452e-8428-376a4534e5ab");
QStringLiteral("f212b643-db96-452e-8428-376a4534e5ab");
const QString ModelUUIDs::ModelUUID_Render_Texture = // ???
QString::fromStdString("fc9b6135-95cd-4ba8-ad9a-0972caeebad2");
QStringLiteral("fc9b6135-95cd-4ba8-ad9a-0972caeebad2");
const QString ModelUUIDs::ModelUUID_RenderWB =
QString::fromStdString("344008be-a837-43af-90bc-f795f277b309");
QStringLiteral("344008be-a837-43af-90bc-f795f277b309");
const QString ModelUUIDs::ModelUUID_Test_Model =
QString::fromStdString("34d0583d-f999-49ba-99e6-aa40bd5c3a6b");
QStringLiteral("34d0583d-f999-49ba-99e6-aa40bd5c3a6b");

2
src/Mod/Material/Gui/ArrayDelegate.cpp
View File

@@ -146,7 +146,7 @@ QWidget* ArrayDelegate::createWidget(QWidget* parent, const QVariant& item) cons
}
else if (_type == Materials::MaterialValue::Boolean) {
auto combo = new Gui::PrefComboBox(parent);
combo->insertItem(0, QString::fromStdString(""));
combo->insertItem(0, QStringLiteral(""));
combo->insertItem(1, tr("False"));
combo->insertItem(2, tr("True"));
combo->setCurrentText(item.toString());

6
src/Mod/Material/Gui/ArrayModel.cpp
View File

@@ -117,7 +117,7 @@ QVariant Array2DModel::headerData(int section, Qt::Orientation orientation, int
else if (orientation == Qt::Vertical) {
// Vertical header
if (section == (rowCount() - 1)) {
return QString::fromStdString("*");
return QStringLiteral("*");
}
return {section + 1};
}
@@ -258,7 +258,7 @@ QVariant Array3DDepthModel::headerData(int section, Qt::Orientation orientation,
if (orientation == Qt::Vertical) {
// Vertical header
if (section == (rowCount() - 1)) {
return QString::fromStdString("*");
return QStringLiteral("*");
}
return {section + 1};
}
@@ -416,7 +416,7 @@ QVariant Array3DModel::headerData(int section, Qt::Orientation orientation, int
if (orientation == Qt::Vertical) {
// Vertical header
if (section == (rowCount() - 1)) {
return QString::fromStdString("*");
return QStringLiteral("*");
}
return {section + 1};
}

14
src/Mod/Material/Gui/BaseDelegate.cpp
View File

@@ -75,9 +75,9 @@ QString BaseDelegate::getStringValue(const QModelIndex& index) const
QRgb BaseDelegate::parseColor(const QString& color) const
{
QString trimmed = color;
trimmed.replace(QRegularExpression(QString::fromStdString("\\(([^<]*)\\)")),
QString::fromStdString("\\1"));
QStringList parts = trimmed.split(QString::fromStdString(","));
trimmed.replace(QRegularExpression(QStringLiteral("\\(([^<]*)\\)")),
QStringLiteral("\\1"));
QStringList parts = trimmed.split(QStringLiteral(","));
if (parts.length() < 3) {
return qRgba(0, 0, 0, 255);
}
@@ -194,7 +194,7 @@ void BaseDelegate::paintList(QPainter* painter,
painter->save();
QImage list(QString::fromStdString(":/icons/list.svg"));
QImage list(QStringLiteral(":/icons/list.svg"));
QRect target(option.rect);
if (target.width() > target.height()) {
target.setWidth(target.height());
@@ -215,7 +215,7 @@ void BaseDelegate::paintMultiLineString(QPainter* painter,
painter->save();
QImage table(QString::fromStdString(":/icons/multiline.svg"));
QImage table(QStringLiteral(":/icons/multiline.svg"));
QRect target(option.rect);
if (target.width() > target.height()) {
target.setWidth(target.height());
@@ -236,7 +236,7 @@ void BaseDelegate::paintArray(QPainter* painter,
painter->save();
QImage table(QString::fromStdString(":/icons/table.svg"));
QImage table(QStringLiteral(":/icons/table.svg"));
QRect target(option.rect);
if (target.width() > target.height()) {
target.setWidth(target.height());
@@ -435,7 +435,7 @@ BaseDelegate::createWidget(QWidget* parent, const QVariant& item, const QModelIn
}
else if (type == Materials::MaterialValue::Boolean) {
auto combo = new Gui::PrefComboBox(parent);
combo->insertItem(0, QString::fromStdString(""));
combo->insertItem(0, QStringLiteral(""));
combo->insertItem(1, tr("False"));
combo->insertItem(2, tr("True"));
combo->setCurrentText(item.toString());

2
src/Mod/Material/Gui/ImageEdit.cpp
View File

@@ -111,7 +111,7 @@ ImageEdit::ImageEdit(const QString& propertyName,
: QDialog(parent)
, ui(new Ui_ImageEdit)
, _material(material)
, _pixmap(QString::fromStdString(":/images/default_image.png"))
, _pixmap(QStringLiteral(":/images/default_image.png"))
{
ui->setupUi(this);

4
src/Mod/Material/Gui/MaterialDelegate.cpp
View File

@@ -250,7 +250,7 @@ void MaterialDelegate::showColorModal(const QString& propertyName, QStandardItem
if (result == QDialog::Accepted) {
QColor color = dlg->selectedColor();
if (color.isValid()) {
QString colorText = QString(QString::fromStdString("(%1,%2,%3,%4)"))
QString colorText = QString(QStringLiteral("(%1,%2,%3,%4)"))
.arg(color.red() / 255.0)
.arg(color.green() / 255.0)
.arg(color.blue() / 255.0)
@@ -445,7 +445,7 @@ QWidget* MaterialDelegate::createWidget(QWidget* parent,
}
else if (type == Materials::MaterialValue::Boolean) {
auto combo = new Gui::PrefComboBox(parent);
combo->insertItem(0, QString::fromStdString(""));
combo->insertItem(0, QStringLiteral(""));
combo->insertItem(1, tr("False"));
combo->insertItem(2, tr("True"));
combo->setCurrentText(item.toString());

24
src/Mod/Material/Gui/MaterialSave.cpp
View File

@@ -44,8 +44,8 @@ MaterialSave::MaterialSave(const std::shared_ptr<Materials::Material>& material,
, ui(new Ui_MaterialSave)
, _material(material)
, _saveInherited(true)
, _selectedPath(QString::fromStdString("/"))
, _selectedFull(QString::fromStdString("/"))
, _selectedPath(QStringLiteral("/"))
, _selectedFull(QStringLiteral("/"))
, _selectedUUID()
, _deleteAction(this)
{
@@ -56,10 +56,10 @@ MaterialSave::MaterialSave(const std::shared_ptr<Materials::Material>& material,
showSelectedTree();
if (_material->getName().length() > 0) {
ui->editFilename->setText(_material->getName() + QString::fromStdString(".FCMat"));
ui->editFilename->setText(_material->getName() + QStringLiteral(".FCMat"));
}
else {
ui->editFilename->setText(QString::fromStdString("NewMaterial.FCMat"));
ui->editFilename->setText(QStringLiteral("NewMaterial.FCMat"));
}
_filename = QString(ui->editFilename->text()); // No filename by default
@@ -126,7 +126,7 @@ void MaterialSave::onOk(bool checked)
{
Q_UNUSED(checked)
QString name = _filename.remove(QString::fromStdString(".FCMat"), Qt::CaseInsensitive);
QString name = _filename.remove(QStringLiteral(".FCMat"), Qt::CaseInsensitive);
if (name != _material->getName()) {
_material->setName(name);
_material->setEditStateAlter(); // ? Does a name change count?
@@ -134,8 +134,8 @@ void MaterialSave::onOk(bool checked)
auto variant = ui->comboLibrary->currentData();
auto library = variant.value<std::shared_ptr<Materials::MaterialLibrary>>();
QFileInfo filepath(_selectedPath + QString::fromStdString("/") + name
+ QString::fromStdString(".FCMat"));
QFileInfo filepath(_selectedPath + QStringLiteral("/") + name
+ QStringLiteral(".FCMat"));
if (library->fileExists(filepath.filePath())) {
// confirm overwrite
@@ -359,9 +359,9 @@ void MaterialSave::showSelectedTree()
auto variant = ui->comboLibrary->currentData();
auto library = variant.value<std::shared_ptr<Materials::MaterialLibrary>>();
QIcon icon(library->getIconPath());
QIcon folderIcon(QString::fromStdString(":/icons/folder.svg"));
QIcon folderIcon(QStringLiteral(":/icons/folder.svg"));
_libraryName = library->getName();
_selectedPath = QString::fromStdString("/") + _libraryName;
_selectedPath = QStringLiteral("/") + _libraryName;
_selectedFull = _selectedPath;
auto lib = new QStandardItem(library->getName());
@@ -380,7 +380,7 @@ void MaterialSave::showSelectedTree()
QString MaterialSave::getPath(const QStandardItem* item) const
{
QString path = QString::fromStdString("/");
QString path = QStringLiteral("/");
if (item) {
path = path + item->text();
if (item->parent()) {
@@ -400,7 +400,7 @@ void MaterialSave::onSelectModel(const QItemSelection& selected, const QItemSele
auto model = static_cast<QStandardItemModel*>(ui->treeMaterials->model());
QModelIndexList indexes = selected.indexes();
if (indexes.count() == 0) {
_selectedPath = QString::fromStdString("/") + _libraryName;
_selectedPath = QStringLiteral("/") + _libraryName;
_selectedFull = _selectedPath;
_selectedUUID = QString();
return;
@@ -487,7 +487,7 @@ void MaterialSave::onNewFolder(bool checked)
// Folders have no associated data
if (item->data(Qt::UserRole).isNull()) {
QIcon folderIcon(QString::fromStdString(":/icons/folder.svg"));
QIcon folderIcon(QStringLiteral(":/icons/folder.svg"));
QString folderName = tr("New Folder");
if (newCount > 0) {

2
src/Mod/Material/Gui/MaterialTreeWidget.cpp
View File

@@ -570,7 +570,7 @@ void MaterialTreeWidget::fillMaterialTree()
addExpanded(model, lib, param);
QIcon icon(library->getIconPath());
QIcon folderIcon(QString::fromStdString(":/icons/folder.svg"));
QIcon folderIcon(QStringLiteral(":/icons/folder.svg"));
addMaterials(*lib, modelTree, folderIcon, icon, param);
}

2
src/Mod/Material/Gui/MaterialsEditor.cpp
View File

@@ -871,7 +871,7 @@ void MaterialsEditor::fillMaterialTree()
addExpanded(tree, model, lib, param);
QIcon icon(library->getIconPath());
QIcon folderIcon(QString::fromStdString(":/icons/folder.svg"));
QIcon folderIcon(QStringLiteral(":/icons/folder.svg"));
addMaterials(*lib, modelTree, folderIcon, icon, param);
}

16
src/Mod/Material/Gui/ModelSelect.cpp
View File

@@ -54,8 +54,8 @@ ModelSelect::ModelSelect(QWidget* parent, Materials::ModelFilter filter)
createModelTree();
createModelProperties();
ui->buttonURL->setIcon(QIcon(QString::fromStdString(":/icons/internet-web-browser.svg")));
ui->buttonDOI->setIcon(QIcon(QString::fromStdString(":/icons/internet-web-browser.svg")));
ui->buttonURL->setIcon(QIcon(QStringLiteral(":/icons/internet-web-browser.svg")));
ui->buttonDOI->setIcon(QIcon(QStringLiteral(":/icons/internet-web-browser.svg")));
connect(ui->standardButtons, &QDialogButtonBox::accepted, this, &ModelSelect::accept);
connect(ui->standardButtons, &QDialogButtonBox::rejected, this, &ModelSelect::reject);
@@ -446,10 +446,10 @@ void ModelSelect::updateMaterialModel(const QString& uuid)
void ModelSelect::clearMaterialModel()
{
// Update the general information
ui->editName->setText(QString::fromStdString(""));
ui->editURL->setText(QString::fromStdString(""));
ui->editDOI->setText(QString::fromStdString(""));
ui->editDescription->setText(QString::fromStdString(""));
ui->editName->setText(QStringLiteral(""));
ui->editURL->setText(QStringLiteral(""));
ui->editDOI->setText(QStringLiteral(""));
ui->editDescription->setText(QStringLiteral(""));
ui->tabWidget->setTabText(1, tr("Properties"));
@@ -477,7 +477,7 @@ void ModelSelect::onSelectModel(const QItemSelection& selected, const QItemSelec
ui->buttonFavorite->setEnabled(true);
}
catch (const std::exception&) {
_selected = QString::fromStdString("");
_selected = QStringLiteral("");
clearMaterialModel();
ui->standardButtons->button(QDialogButtonBox::Ok)->setEnabled(false);
ui->buttonFavorite->setEnabled(false);
@@ -507,7 +507,7 @@ void ModelSelect::onDOI(bool checked)
{
Q_UNUSED(checked)
QString url = QString::fromStdString("https://doi.org/") + ui->editDOI->text();
QString url = QStringLiteral("https://doi.org/") + ui->editDOI->text();
if (url.length() > 0) {
QDesktopServices::openUrl(QUrl(url, QUrl::TolerantMode));
}

4
src/Mod/TechDraw/App/DimensionFormatter.cpp
View File

@@ -372,8 +372,8 @@ std::string DimensionFormatter::getDefaultFormatSpec(bool isToleranceFormat) con
QString formatSpec;
QString qPrefix;
if (prefFormat.empty()) {
QString format1 = QString::fromStdString("%.");
QString format2 = QString::fromStdString("f");
QString format1 = QStringLiteral("%.");
QString format2 = QStringLiteral("f");
int precision;
if (m_dimension->useDecimals()) {
precision = Base::UnitsApi::getDecimals();

56
tests/src/Mod/Material/App/TestMaterialCards.cpp
View File

@@ -53,18 +53,18 @@ protected:
void SetUp() override {
// Create a temporary library
QString libPath = QDir::tempPath() + QString::fromStdString("/TestMaterialCards");
QString libPath = QDir::tempPath() + QStringLiteral("/TestMaterialCards");
QDir libDir(libPath);
libDir.removeRecursively(); // Clear old run data
libDir.mkdir(libPath);
_library = std::make_shared<Materials::MaterialLibrary>(QString::fromStdString("Testing"),
_library = std::make_shared<Materials::MaterialLibrary>(QStringLiteral("Testing"),
libPath,
QString::fromStdString(":/icons/preferences-general.svg"),
QStringLiteral(":/icons/preferences-general.svg"),
false);
_modelManager = new Materials::ModelManager();
_materialManager = new Materials::MaterialManager();
_testMaterialUUID = QString::fromStdString("c6c64159-19c1-40b5-859c-10561f20f979");
_testMaterialUUID = QStringLiteral("c6c64159-19c1-40b5-859c-10561f20f979");
}
// void TearDown() override {}
@@ -89,92 +89,92 @@ TEST_F(TestMaterialCards, TestCopy)
// Save the material
_materialManager->saveMaterial(_library,
newMaterial,
QString::fromStdString("/Test Material2.FCMat"),
QStringLiteral("/Test Material2.FCMat"),
false, // overwrite
true, // saveAsCopy
false); // saveInherited
EXPECT_EQ(newMaterial->getUUID(), _testMaterialUUID);
EXPECT_EQ(newMaterial->getName(), QString::fromStdString("Test Material2"));
EXPECT_EQ(newMaterial->getName(), QStringLiteral("Test Material2"));
// Save it when it already exists throwing an error
EXPECT_THROW(_materialManager->saveMaterial(_library,
newMaterial,
QString::fromStdString("/Test Material2.FCMat"),
QStringLiteral("/Test Material2.FCMat"),
false, // overwrite
true, // saveAsCopy
false) // saveInherited
, Materials::MaterialExists);
EXPECT_EQ(newMaterial->getUUID(), _testMaterialUUID);
EXPECT_EQ(newMaterial->getName(), QString::fromStdString("Test Material2"));
EXPECT_EQ(newMaterial->getName(), QStringLiteral("Test Material2"));
// Overwrite the existing file
_materialManager->saveMaterial(_library,
newMaterial,
QString::fromStdString("/Test Material2.FCMat"),
QStringLiteral("/Test Material2.FCMat"),
true, // overwrite
true, // saveAsCopy
false);// saveInherited
EXPECT_EQ(newMaterial->getUUID(), _testMaterialUUID);
EXPECT_EQ(newMaterial->getName(), QString::fromStdString("Test Material2"));
EXPECT_EQ(newMaterial->getName(), QStringLiteral("Test Material2"));
// Save to a new file, inheritance mode
_materialManager->saveMaterial(_library,
newMaterial,
QString::fromStdString("/Test Material3.FCMat"),
QStringLiteral("/Test Material3.FCMat"),
false, // overwrite
true, // saveAsCopy
true);// saveInherited
EXPECT_EQ(newMaterial->getUUID(), _testMaterialUUID);
EXPECT_EQ(newMaterial->getName(), QString::fromStdString("Test Material3"));
EXPECT_EQ(newMaterial->getName(), QStringLiteral("Test Material3"));
// Save to a new file, inheritance mode. no copy
_materialManager->saveMaterial(_library,
newMaterial,
QString::fromStdString("/Test Material4.FCMat"),
QStringLiteral("/Test Material4.FCMat"),
false, // overwrite
false, // saveAsCopy
true);// saveInherited
EXPECT_NE(newMaterial->getUUID(), _testMaterialUUID);
EXPECT_EQ(newMaterial->getName(), QString::fromStdString("Test Material4"));
EXPECT_EQ(newMaterial->getName(), QStringLiteral("Test Material4"));
QString uuid1 = newMaterial->getUUID();
// Save to a new file, inheritance mode, testing overwrite, new copy
_materialManager->saveMaterial(_library,
newMaterial,
QString::fromStdString("/Test Material5.FCMat"),
QStringLiteral("/Test Material5.FCMat"),
false, // overwrite
true, // saveAsCopy
true);// saveInherited
EXPECT_EQ(newMaterial->getUUID(), uuid1);
EXPECT_EQ(newMaterial->getName(), QString::fromStdString("Test Material5"));
EXPECT_EQ(newMaterial->getName(), QStringLiteral("Test Material5"));
_materialManager->saveMaterial(_library,
newMaterial,
QString::fromStdString("/Test Material5.FCMat"),
QStringLiteral("/Test Material5.FCMat"),
true, // overwrite
true, // saveAsCopy
true);// saveInherited
EXPECT_EQ(newMaterial->getUUID(), uuid1);
EXPECT_EQ(newMaterial->getName(), QString::fromStdString("Test Material5"));
EXPECT_EQ(newMaterial->getName(), QStringLiteral("Test Material5"));
// Save to a new file, inheritance mode, testing overwrite as no copy, new copy
_materialManager->saveMaterial(_library,
newMaterial,
QString::fromStdString("/Test Material6.FCMat"),
QStringLiteral("/Test Material6.FCMat"),
false, // overwrite
true, // saveAsCopy
true);// saveInherited
EXPECT_EQ(newMaterial->getUUID(), uuid1);
EXPECT_EQ(newMaterial->getName(), QString::fromStdString("Test Material6"));
EXPECT_EQ(newMaterial->getName(), QStringLiteral("Test Material6"));
_materialManager->saveMaterial(_library,
newMaterial,
QString::fromStdString("/Test Material6.FCMat"),
QStringLiteral("/Test Material6.FCMat"),
true, // overwrite
false, // saveAsCopy
true);// saveInherited
EXPECT_EQ(newMaterial->getUUID(), uuid1);
EXPECT_EQ(newMaterial->getName(), QString::fromStdString("Test Material6"));
EXPECT_EQ(newMaterial->getName(), QStringLiteral("Test Material6"));
}
TEST_F(TestMaterialCards, TestColumns)
@@ -184,18 +184,18 @@ TEST_F(TestMaterialCards, TestColumns)
auto testMaterial = _materialManager->getMaterial(_testMaterialUUID);
EXPECT_TRUE(testMaterial->hasPhysicalProperty(QString::fromStdString("TestArray2D")));
auto array2d = testMaterial->getPhysicalProperty(QString::fromStdString("TestArray2D"))->getMaterialValue();
EXPECT_TRUE(testMaterial->hasPhysicalProperty(QStringLiteral("TestArray2D")));
auto array2d = testMaterial->getPhysicalProperty(QStringLiteral("TestArray2D"))->getMaterialValue();
EXPECT_TRUE(array2d);
EXPECT_EQ(dynamic_cast<Materials::Material2DArray &>(*array2d).columns(), 2);
EXPECT_TRUE(testMaterial->hasPhysicalProperty(QString::fromStdString("TestArray2D3Column")));
auto array2d3Column = testMaterial->getPhysicalProperty(QString::fromStdString("TestArray2D3Column"))->getMaterialValue();
EXPECT_TRUE(testMaterial->hasPhysicalProperty(QStringLiteral("TestArray2D3Column")));
auto array2d3Column = testMaterial->getPhysicalProperty(QStringLiteral("TestArray2D3Column"))->getMaterialValue();
EXPECT_TRUE(array2d3Column);
EXPECT_EQ(dynamic_cast<Materials::Material2DArray &>(*array2d3Column).columns(), 3);
EXPECT_TRUE(testMaterial->hasPhysicalProperty(QString::fromStdString("TestArray3D")));
auto array3d = testMaterial->getPhysicalProperty(QString::fromStdString("TestArray3D"))->getMaterialValue();
EXPECT_TRUE(testMaterial->hasPhysicalProperty(QStringLiteral("TestArray3D")));
auto array3d = testMaterial->getPhysicalProperty(QStringLiteral("TestArray3D"))->getMaterialValue();
EXPECT_TRUE(array3d);
EXPECT_EQ(dynamic_cast<Materials::Material3DArray &>(*array3d).columns(), 2);
}

88
tests/src/Mod/Material/App/TestMaterialProperties.cpp
View File

@@ -48,56 +48,56 @@ protected:
void SetUp() override
{
// 2D Properties
modelProp = Materials::ModelProperty(QString::fromStdString("Density"), // Name
QString::fromStdString("D"), // Header
QString::fromStdString("2DArray"), // Type
QString::fromStdString(""), // Units
QString::fromStdString(""), // URL
QString::fromStdString("desc")); // Description
modelProp1 = Materials::ModelProperty(QString::fromStdString("Temperature"),
QString::fromStdString("T"),
QString::fromStdString("Quantity"),
QString::fromStdString("C"),
QString::fromStdString(""),
QString::fromStdString("desc1"));
modelProp2 = Materials::ModelProperty(
QString::fromStdString("Density"),
QString::fromStdString("D"),
QString::fromStdString("Quantity"),
QString::fromStdString("kg/m^3"),
QString::fromStdString("https://en.wikipedia.org/wiki/Density"),
QString::fromStdString("desc2"));
modelProp = Materials::ModelProperty(QStringLiteral("Density"), // Name
QStringLiteral("D"), // Header
QStringLiteral("2DArray"), // Type
QStringLiteral(""), // Units
QStringLiteral(""), // URL
QStringLiteral("desc")); // Description
modelProp1 = Materials::ModelProperty(QStringLiteral("Temperature"),
QStringLiteral("T"),
QStringLiteral("Quantity"),
QStringLiteral("C"),
QStringLiteral(""),
QStringLiteral("desc1"));
modelProp2 =
Materials::ModelProperty(QStringLiteral("Density"),
QStringLiteral("D"),
QStringLiteral("Quantity"),
QStringLiteral("kg/m^3"),
QStringLiteral("https://en.wikipedia.org/wiki/Density"),
QStringLiteral("desc2"));
modelProp.addColumn(modelProp1);
modelProp.addColumn(modelProp2);
// 3D properties
model3DProp = Materials::ModelProperty(
QString::fromStdString("StressStrain"), // Name
QString::fromStdString("Stress / Strain"), // Header
QString::fromStdString("3DArray"), // Type
QString::fromStdString(""), // Units
QString::fromStdString(""), // URL
QString::fromStdString("3 Dimensional array showing stress and strain as a function of "
"temperature")); // Description
model3DProp1 = Materials::ModelProperty(QString::fromStdString("Temperature"),
QString::fromStdString("T"),
QString::fromStdString("Quantity"),
QString::fromStdString("C"),
QString::fromStdString(""),
QString::fromStdString("desc1"));
model3DProp2 = Materials::ModelProperty(QString::fromStdString("Stress"),
QString::fromStdString("Stress"),
QString::fromStdString("Quantity"),
QString::fromStdString("MPa"),
QString::fromStdString(""),
QString::fromStdString("desc2"));
model3DProp3 = Materials::ModelProperty(QString::fromStdString("Strain"),
QString::fromStdString("Strain"),
QString::fromStdString("Quantity"),
QString::fromStdString("MPa"),
QString::fromStdString(""),
QString::fromStdString("desc3"));
QStringLiteral("StressStrain"), // Name
QStringLiteral("Stress / Strain"), // Header
QStringLiteral("3DArray"), // Type
QStringLiteral(""), // Units
QStringLiteral(""), // URL
QStringLiteral("3 Dimensional array showing stress and strain as a function of "
"temperature")); // Description
model3DProp1 = Materials::ModelProperty(QStringLiteral("Temperature"),
QStringLiteral("T"),
QStringLiteral("Quantity"),
QStringLiteral("C"),
QStringLiteral(""),
QStringLiteral("desc1"));
model3DProp2 = Materials::ModelProperty(QStringLiteral("Stress"),
QStringLiteral("Stress"),
QStringLiteral("Quantity"),
QStringLiteral("MPa"),
QStringLiteral(""),
QStringLiteral("desc2"));
model3DProp3 = Materials::ModelProperty(QStringLiteral("Strain"),
QStringLiteral("Strain"),
QStringLiteral("Quantity"),
QStringLiteral("MPa"),
QStringLiteral(""),
QStringLiteral("desc3"));
model3DProp.addColumn(model3DProp1);
model3DProp.addColumn(model3DProp2);

6
tests/src/Mod/Material/App/TestMaterialValue.cpp
View File

@@ -82,7 +82,7 @@ TEST_F(TestMaterialValue, TestBooleanType)
EXPECT_FALSE(variant.toString().isNull());
EXPECT_FALSE(variant.toString().isEmpty());
EXPECT_EQ(variant.toString().size(), 5);
EXPECT_EQ(variant.toString(), QString::fromStdString("false"));
EXPECT_EQ(variant.toString(), QStringLiteral("false"));
EXPECT_EQ(variant.toBool(), false);
}
@@ -97,7 +97,7 @@ TEST_F(TestMaterialValue, TestIntegerType)
EXPECT_FALSE(variant.toString().isNull());
EXPECT_FALSE(variant.toString().isEmpty());
EXPECT_EQ(variant.toString().size(), 1);
EXPECT_EQ(variant.toString(), QString::fromStdString("0"));
EXPECT_EQ(variant.toString(), QStringLiteral("0"));
EXPECT_EQ(variant.toInt(), 0);
}
@@ -112,7 +112,7 @@ TEST_F(TestMaterialValue, TestFloatType)
EXPECT_FALSE(variant.toString().isNull());
EXPECT_FALSE(variant.toString().isEmpty());
EXPECT_EQ(variant.toString().size(), 1);
EXPECT_EQ(variant.toString(), QString::fromStdString("0"));
EXPECT_EQ(variant.toString(), QStringLiteral("0"));
EXPECT_EQ(variant.toFloat(), 0);
}

222
tests/src/Mod/Material/App/TestMaterials.cpp
View File

@@ -85,15 +85,15 @@ TEST_F(TestMaterial, TestMaterialsWithModel)
ASSERT_NE(_materialManager, nullptr);
auto materials = _materialManager->materialsWithModel(
QString::fromStdString("f6f9e48c-b116-4e82-ad7f-3659a9219c50")); // IsotropicLinearElastic
QStringLiteral("f6f9e48c-b116-4e82-ad7f-3659a9219c50")); // IsotropicLinearElastic
EXPECT_GT(materials->size(), 0);
auto materialsComplete = _materialManager->materialsWithModelComplete(
QString::fromStdString("f6f9e48c-b116-4e82-ad7f-3659a9219c50")); // IsotropicLinearElastic
QStringLiteral("f6f9e48c-b116-4e82-ad7f-3659a9219c50")); // IsotropicLinearElastic
EXPECT_LE(materialsComplete->size(), materials->size());
auto materialsLinearElastic = _materialManager->materialsWithModel(
QString::fromStdString("7b561d1d-fb9b-44f6-9da9-56a4f74d7536")); // LinearElastic
QStringLiteral("7b561d1d-fb9b-44f6-9da9-56a4f74d7536")); // LinearElastic
// All LinearElastic models should be in IsotropicLinearElastic since it is inherited
EXPECT_LE(materialsLinearElastic->size(), materials->size());
@@ -108,27 +108,27 @@ TEST_F(TestMaterial, TestMaterialByPath)
ASSERT_NE(_materialManager, nullptr);
auto steel = _materialManager->getMaterialByPath(
QString::fromStdString("Standard/Metal/Steel/CalculiX-Steel.FCMat"),
QString::fromStdString("System"));
QStringLiteral("Standard/Metal/Steel/CalculiX-Steel.FCMat"),
QStringLiteral("System"));
EXPECT_NE(&steel, nullptr);
EXPECT_EQ(steel->getName(), QString::fromStdString("CalculiX-Steel"));
EXPECT_EQ(steel->getUUID(), QString::fromStdString("92589471-a6cb-4bbc-b748-d425a17dea7d"));
EXPECT_EQ(steel->getName(), QStringLiteral("CalculiX-Steel"));
EXPECT_EQ(steel->getUUID(), QStringLiteral("92589471-a6cb-4bbc-b748-d425a17dea7d"));
// The same but with a leading '/'
auto steel2 = _materialManager->getMaterialByPath(
QString::fromStdString("/Standard/Metal/Steel/CalculiX-Steel.FCMat"),
QString::fromStdString("System"));
QStringLiteral("/Standard/Metal/Steel/CalculiX-Steel.FCMat"),
QStringLiteral("System"));
EXPECT_NE(&steel2, nullptr);
EXPECT_EQ(steel2->getName(), QString::fromStdString("CalculiX-Steel"));
EXPECT_EQ(steel2->getUUID(), QString::fromStdString("92589471-a6cb-4bbc-b748-d425a17dea7d"));
EXPECT_EQ(steel2->getName(), QStringLiteral("CalculiX-Steel"));
EXPECT_EQ(steel2->getUUID(), QStringLiteral("92589471-a6cb-4bbc-b748-d425a17dea7d"));
// Same with the library name as a prefix
auto steel3 = _materialManager->getMaterialByPath(
QString::fromStdString("/System/Standard/Metal/Steel/CalculiX-Steel.FCMat"),
QString::fromStdString("System"));
QStringLiteral("/System/Standard/Metal/Steel/CalculiX-Steel.FCMat"),
QStringLiteral("System"));
EXPECT_NE(&steel3, nullptr);
EXPECT_EQ(steel3->getName(), QString::fromStdString("CalculiX-Steel"));
EXPECT_EQ(steel3->getUUID(), QString::fromStdString("92589471-a6cb-4bbc-b748-d425a17dea7d"));
EXPECT_EQ(steel3->getName(), QStringLiteral("CalculiX-Steel"));
EXPECT_EQ(steel3->getUUID(), QStringLiteral("92589471-a6cb-4bbc-b748-d425a17dea7d"));
}
TEST_F(TestMaterial, TestAddPhysicalModel)
@@ -232,9 +232,9 @@ TEST_F(TestMaterial, TestCalculiXSteel)
{
ASSERT_NE(_materialManager, nullptr);
auto steel = _materialManager->getMaterial(QString::fromStdString("92589471-a6cb-4bbc-b748-d425a17dea7d"));
EXPECT_EQ(steel->getName(), QString::fromStdString("CalculiX-Steel"));
EXPECT_EQ(steel->getUUID(), QString::fromStdString("92589471-a6cb-4bbc-b748-d425a17dea7d"));
auto steel = _materialManager->getMaterial(QStringLiteral("92589471-a6cb-4bbc-b748-d425a17dea7d"));
EXPECT_EQ(steel->getName(), QStringLiteral("CalculiX-Steel"));
EXPECT_EQ(steel->getUUID(), QStringLiteral("92589471-a6cb-4bbc-b748-d425a17dea7d"));
EXPECT_TRUE(steel->hasPhysicalModel(Materials::ModelUUIDs::ModelUUID_Mechanical_Density)); // Density
EXPECT_TRUE(steel->hasPhysicalModel(Materials::ModelUUIDs::ModelUUID_Mechanical_IsotropicLinearElastic)); // IsotropicLinearElastic
@@ -248,105 +248,105 @@ TEST_F(TestMaterial, TestCalculiXSteel)
EXPECT_FALSE(steel->isPhysicalModelComplete(Materials::ModelUUIDs::ModelUUID_Mechanical_LinearElastic)); // Legacy linear elastic - Not in the model
EXPECT_TRUE(steel->isAppearanceModelComplete(Materials::ModelUUIDs::ModelUUID_Rendering_Basic)); // BasicRendering - inherited from Steel.FCMat
EXPECT_TRUE(steel->hasPhysicalProperty(QString::fromStdString("Density")));
EXPECT_TRUE(steel->hasPhysicalProperty(QString::fromStdString("BulkModulus")));
EXPECT_TRUE(steel->hasPhysicalProperty(QString::fromStdString("PoissonRatio")));
EXPECT_TRUE(steel->hasPhysicalProperty(QString::fromStdString("YoungsModulus")));
EXPECT_TRUE(steel->hasPhysicalProperty(QString::fromStdString("ShearModulus")));
EXPECT_TRUE(steel->hasPhysicalProperty(QString::fromStdString("SpecificHeat")));
EXPECT_TRUE(steel->hasPhysicalProperty(QString::fromStdString("ThermalConductivity")));
EXPECT_TRUE(steel->hasPhysicalProperty(QString::fromStdString("ThermalExpansionCoefficient")));
EXPECT_TRUE(steel->hasAppearanceProperty(QString::fromStdString("AmbientColor")));
EXPECT_TRUE(steel->hasAppearanceProperty(QString::fromStdString("DiffuseColor")));
EXPECT_TRUE(steel->hasAppearanceProperty(QString::fromStdString("EmissiveColor")));
EXPECT_TRUE(steel->hasAppearanceProperty(QString::fromStdString("Shininess")));
EXPECT_TRUE(steel->hasAppearanceProperty(QString::fromStdString("SpecularColor")));
EXPECT_TRUE(steel->hasAppearanceProperty(QString::fromStdString("Transparency")));
EXPECT_TRUE(steel->hasPhysicalProperty(QStringLiteral("Density")));
EXPECT_TRUE(steel->hasPhysicalProperty(QStringLiteral("BulkModulus")));
EXPECT_TRUE(steel->hasPhysicalProperty(QStringLiteral("PoissonRatio")));
EXPECT_TRUE(steel->hasPhysicalProperty(QStringLiteral("YoungsModulus")));
EXPECT_TRUE(steel->hasPhysicalProperty(QStringLiteral("ShearModulus")));
EXPECT_TRUE(steel->hasPhysicalProperty(QStringLiteral("SpecificHeat")));
EXPECT_TRUE(steel->hasPhysicalProperty(QStringLiteral("ThermalConductivity")));
EXPECT_TRUE(steel->hasPhysicalProperty(QStringLiteral("ThermalExpansionCoefficient")));
EXPECT_TRUE(steel->hasAppearanceProperty(QStringLiteral("AmbientColor")));
EXPECT_TRUE(steel->hasAppearanceProperty(QStringLiteral("DiffuseColor")));
EXPECT_TRUE(steel->hasAppearanceProperty(QStringLiteral("EmissiveColor")));
EXPECT_TRUE(steel->hasAppearanceProperty(QStringLiteral("Shininess")));
EXPECT_TRUE(steel->hasAppearanceProperty(QStringLiteral("SpecularColor")));
EXPECT_TRUE(steel->hasAppearanceProperty(QStringLiteral("Transparency")));
auto& properties = steel->getPhysicalProperties();
EXPECT_NO_THROW(properties.at(QString::fromStdString("Density")));
EXPECT_NO_THROW(properties.at(QString::fromStdString("BulkModulus"))); // This is different from the Python behaviour
EXPECT_NO_THROW(properties.at(QString::fromStdString("PoissonRatio")));
EXPECT_NO_THROW(properties.at(QString::fromStdString("YoungsModulus")));
EXPECT_NO_THROW(properties.at(QString::fromStdString("ShearModulus")));
EXPECT_NO_THROW(properties.at(QString::fromStdString("SpecificHeat")));
EXPECT_NO_THROW(properties.at(QString::fromStdString("ThermalConductivity")));
EXPECT_NO_THROW(properties.at(QString::fromStdString("ThermalExpansionCoefficient")));
EXPECT_THROW(properties.at(QString::fromStdString("AmbientColor")), std::out_of_range);
EXPECT_THROW(properties.at(QString::fromStdString("DiffuseColor")), std::out_of_range);
EXPECT_THROW(properties.at(QString::fromStdString("EmissiveColor")), std::out_of_range);
EXPECT_THROW(properties.at(QString::fromStdString("Shininess")), std::out_of_range);
EXPECT_THROW(properties.at(QString::fromStdString("SpecularColor")), std::out_of_range);
EXPECT_THROW(properties.at(QString::fromStdString("Transparency")), std::out_of_range);
EXPECT_NO_THROW(properties.at(QStringLiteral("Density")));
EXPECT_NO_THROW(properties.at(QStringLiteral("BulkModulus"))); // This is different from the Python behaviour
EXPECT_NO_THROW(properties.at(QStringLiteral("PoissonRatio")));
EXPECT_NO_THROW(properties.at(QStringLiteral("YoungsModulus")));
EXPECT_NO_THROW(properties.at(QStringLiteral("ShearModulus")));
EXPECT_NO_THROW(properties.at(QStringLiteral("SpecificHeat")));
EXPECT_NO_THROW(properties.at(QStringLiteral("ThermalConductivity")));
EXPECT_NO_THROW(properties.at(QStringLiteral("ThermalExpansionCoefficient")));
EXPECT_THROW(properties.at(QStringLiteral("AmbientColor")), std::out_of_range);
EXPECT_THROW(properties.at(QStringLiteral("DiffuseColor")), std::out_of_range);
EXPECT_THROW(properties.at(QStringLiteral("EmissiveColor")), std::out_of_range);
EXPECT_THROW(properties.at(QStringLiteral("Shininess")), std::out_of_range);
EXPECT_THROW(properties.at(QStringLiteral("SpecularColor")), std::out_of_range);
EXPECT_THROW(properties.at(QStringLiteral("Transparency")), std::out_of_range);
auto& properties1 = steel->getAppearanceProperties();
EXPECT_THROW(properties1.at(QString::fromStdString("Density")), std::out_of_range);
EXPECT_THROW(properties1.at(QString::fromStdString("BulkModulus")), std::out_of_range);
EXPECT_THROW(properties1.at(QString::fromStdString("PoissonRatio")), std::out_of_range);
EXPECT_THROW(properties1.at(QString::fromStdString("YoungsModulus")), std::out_of_range);
EXPECT_THROW(properties1.at(QString::fromStdString("ShearModulus")), std::out_of_range);
EXPECT_THROW(properties1.at(QString::fromStdString("SpecificHeat")), std::out_of_range);
EXPECT_THROW(properties1.at(QString::fromStdString("ThermalConductivity")), std::out_of_range);
EXPECT_THROW(properties1.at(QString::fromStdString("ThermalExpansionCoefficient")), std::out_of_range);
EXPECT_NO_THROW(properties1.at(QString::fromStdString("AmbientColor")));
EXPECT_NO_THROW(properties1.at(QString::fromStdString("DiffuseColor")));
EXPECT_NO_THROW(properties1.at(QString::fromStdString("EmissiveColor")));
EXPECT_NO_THROW(properties1.at(QString::fromStdString("Shininess")));
EXPECT_NO_THROW(properties1.at(QString::fromStdString("SpecularColor")));
EXPECT_NO_THROW(properties1.at(QString::fromStdString("Transparency")));
EXPECT_THROW(properties1.at(QStringLiteral("Density")), std::out_of_range);
EXPECT_THROW(properties1.at(QStringLiteral("BulkModulus")), std::out_of_range);
EXPECT_THROW(properties1.at(QStringLiteral("PoissonRatio")), std::out_of_range);
EXPECT_THROW(properties1.at(QStringLiteral("YoungsModulus")), std::out_of_range);
EXPECT_THROW(properties1.at(QStringLiteral("ShearModulus")), std::out_of_range);
EXPECT_THROW(properties1.at(QStringLiteral("SpecificHeat")), std::out_of_range);
EXPECT_THROW(properties1.at(QStringLiteral("ThermalConductivity")), std::out_of_range);
EXPECT_THROW(properties1.at(QStringLiteral("ThermalExpansionCoefficient")), std::out_of_range);
EXPECT_NO_THROW(properties1.at(QStringLiteral("AmbientColor")));
EXPECT_NO_THROW(properties1.at(QStringLiteral("DiffuseColor")));
EXPECT_NO_THROW(properties1.at(QStringLiteral("EmissiveColor")));
EXPECT_NO_THROW(properties1.at(QStringLiteral("Shininess")));
EXPECT_NO_THROW(properties1.at(QStringLiteral("SpecularColor")));
EXPECT_NO_THROW(properties1.at(QStringLiteral("Transparency")));
EXPECT_FALSE(properties[QString::fromStdString("Density")]->isNull());
EXPECT_TRUE(properties[QString::fromStdString("BulkModulus")]->isNull());
EXPECT_FALSE(properties[QString::fromStdString("PoissonRatio")]->isNull());
EXPECT_FALSE(properties[QString::fromStdString("YoungsModulus")]->isNull());
EXPECT_TRUE(properties[QString::fromStdString("ShearModulus")]->isNull());
EXPECT_FALSE(properties[QString::fromStdString("SpecificHeat")]->isNull());
EXPECT_FALSE(properties[QString::fromStdString("ThermalConductivity")]->isNull());
EXPECT_FALSE(properties[QString::fromStdString("ThermalExpansionCoefficient")]->isNull());
EXPECT_FALSE(properties1[QString::fromStdString("AmbientColor")]->isNull());
EXPECT_FALSE(properties1[QString::fromStdString("DiffuseColor")]->isNull());
EXPECT_FALSE(properties1[QString::fromStdString("EmissiveColor")]->isNull());
EXPECT_FALSE(properties1[QString::fromStdString("Shininess")]->isNull());
EXPECT_FALSE(properties1[QString::fromStdString("SpecularColor")]->isNull());
EXPECT_FALSE(properties1[QString::fromStdString("Transparency")]->isNull());
EXPECT_FALSE(properties[QStringLiteral("Density")]->isNull());
EXPECT_TRUE(properties[QStringLiteral("BulkModulus")]->isNull());
EXPECT_FALSE(properties[QStringLiteral("PoissonRatio")]->isNull());
EXPECT_FALSE(properties[QStringLiteral("YoungsModulus")]->isNull());
EXPECT_TRUE(properties[QStringLiteral("ShearModulus")]->isNull());
EXPECT_FALSE(properties[QStringLiteral("SpecificHeat")]->isNull());
EXPECT_FALSE(properties[QStringLiteral("ThermalConductivity")]->isNull());
EXPECT_FALSE(properties[QStringLiteral("ThermalExpansionCoefficient")]->isNull());
EXPECT_FALSE(properties1[QStringLiteral("AmbientColor")]->isNull());
EXPECT_FALSE(properties1[QStringLiteral("DiffuseColor")]->isNull());
EXPECT_FALSE(properties1[QStringLiteral("EmissiveColor")]->isNull());
EXPECT_FALSE(properties1[QStringLiteral("Shininess")]->isNull());
EXPECT_FALSE(properties1[QStringLiteral("SpecularColor")]->isNull());
EXPECT_FALSE(properties1[QStringLiteral("Transparency")]->isNull());
QLocale locale;
EXPECT_EQ(properties[QString::fromStdString("Density")]->getString(), parseQuantity("7900.00 kg/m^3"));
EXPECT_EQ(properties[QString::fromStdString("PoissonRatio")]->getString(), locale.toString(0.3));
EXPECT_EQ(properties[QString::fromStdString("YoungsModulus")]->getString(), parseQuantity("210.00 GPa"));
EXPECT_EQ(properties[QString::fromStdString("SpecificHeat")]->getString(), parseQuantity("590.00 J/kg/K"));
EXPECT_EQ(properties[QString::fromStdString("ThermalConductivity")]->getString(), parseQuantity("43.00 W/m/K"));
EXPECT_EQ(properties[QString::fromStdString("ThermalExpansionCoefficient")]->getString(), parseQuantity("12.00 µm/m/K"));
EXPECT_EQ(properties1[QString::fromStdString("AmbientColor")]->getString(), QString::fromStdString("(0.0020, 0.0020, 0.0020, 1.0)"));
EXPECT_EQ(properties1[QString::fromStdString("DiffuseColor")]->getString(), QString::fromStdString("(0.0000, 0.0000, 0.0000, 1.0)"));
EXPECT_EQ(properties1[QString::fromStdString("EmissiveColor")]->getString(), QString::fromStdString("(0.0000, 0.0000, 0.0000, 1.0)"));
EXPECT_EQ(properties1[QString::fromStdString("Shininess")]->getString(), locale.toString(0.06));
EXPECT_EQ(properties1[QString::fromStdString("SpecularColor")]->getString(), QString::fromStdString("(0.9800, 0.9800, 0.9800, 1.0)"));
EXPECT_EQ(properties1[QString::fromStdString("Transparency")]->getString(), QString::fromStdString("0"));
EXPECT_EQ(properties[QStringLiteral("Density")]->getString(), parseQuantity("7900.00 kg/m^3"));
EXPECT_EQ(properties[QStringLiteral("PoissonRatio")]->getString(), locale.toString(0.3));
EXPECT_EQ(properties[QStringLiteral("YoungsModulus")]->getString(), parseQuantity("210.00 GPa"));
EXPECT_EQ(properties[QStringLiteral("SpecificHeat")]->getString(), parseQuantity("590.00 J/kg/K"));
EXPECT_EQ(properties[QStringLiteral("ThermalConductivity")]->getString(), parseQuantity("43.00 W/m/K"));
EXPECT_EQ(properties[QStringLiteral("ThermalExpansionCoefficient")]->getString(), parseQuantity("12.00 µm/m/K"));
EXPECT_EQ(properties1[QStringLiteral("AmbientColor")]->getString(), QStringLiteral("(0.0020, 0.0020, 0.0020, 1.0)"));
EXPECT_EQ(properties1[QStringLiteral("DiffuseColor")]->getString(), QStringLiteral("(0.0000, 0.0000, 0.0000, 1.0)"));
EXPECT_EQ(properties1[QStringLiteral("EmissiveColor")]->getString(), QStringLiteral("(0.0000, 0.0000, 0.0000, 1.0)"));
EXPECT_EQ(properties1[QStringLiteral("Shininess")]->getString(), locale.toString(0.06));
EXPECT_EQ(properties1[QStringLiteral("SpecularColor")]->getString(), QStringLiteral("(0.9800, 0.9800, 0.9800, 1.0)"));
EXPECT_EQ(properties1[QStringLiteral("Transparency")]->getString(), QStringLiteral("0"));
EXPECT_TRUE(properties[QString::fromStdString("BulkModulus")]->getString().isEmpty());
EXPECT_TRUE(properties[QString::fromStdString("ShearModulus")]->getString().isEmpty());
EXPECT_TRUE(properties[QStringLiteral("BulkModulus")]->getString().isEmpty());
EXPECT_TRUE(properties[QStringLiteral("ShearModulus")]->getString().isEmpty());
// These are the preferred method of access
//
EXPECT_DOUBLE_EQ(steel->getPhysicalQuantity(QString::fromStdString("Density")).getValue(), 7.9e-06);
EXPECT_NEAR(steel->getPhysicalValue(QString::fromStdString("PoissonRatio")).toDouble(), 0.3, 1e-6);
EXPECT_DOUBLE_EQ(steel->getPhysicalQuantity(QString::fromStdString("YoungsModulus")).getValue(), 210000000.0);
EXPECT_DOUBLE_EQ(steel->getPhysicalQuantity(QString::fromStdString("SpecificHeat")).getValue(), 590000000.0);
EXPECT_DOUBLE_EQ(steel->getPhysicalQuantity(QString::fromStdString("ThermalConductivity")).getValue(), 43000.0);
EXPECT_DOUBLE_EQ(steel->getPhysicalQuantity(QString::fromStdString("ThermalExpansionCoefficient")).getValue(), 1.2e-05);
EXPECT_EQ(steel->getAppearanceValue(QString::fromStdString("AmbientColor")), QString::fromStdString("(0.0020, 0.0020, 0.0020, 1.0)"));
EXPECT_EQ(steel->getAppearanceValue(QString::fromStdString("DiffuseColor")), QString::fromStdString("(0.0000, 0.0000, 0.0000, 1.0)"));
EXPECT_EQ(steel->getAppearanceValue(QString::fromStdString("EmissiveColor")), QString::fromStdString("(0.0000, 0.0000, 0.0000, 1.0)"));
EXPECT_NEAR(steel->getAppearanceValue(QString::fromStdString("Shininess")).toDouble(), 0.06, 1e-6);
EXPECT_EQ(steel->getAppearanceValue(QString::fromStdString("SpecularColor")), QString::fromStdString("(0.9800, 0.9800, 0.9800, 1.0)"));
EXPECT_DOUBLE_EQ(steel->getAppearanceValue(QString::fromStdString("Transparency")).toDouble(), 0.0);
EXPECT_DOUBLE_EQ(steel->getPhysicalQuantity(QStringLiteral("Density")).getValue(), 7.9e-06);
EXPECT_NEAR(steel->getPhysicalValue(QStringLiteral("PoissonRatio")).toDouble(), 0.3, 1e-6);
EXPECT_DOUBLE_EQ(steel->getPhysicalQuantity(QStringLiteral("YoungsModulus")).getValue(), 210000000.0);
EXPECT_DOUBLE_EQ(steel->getPhysicalQuantity(QStringLiteral("SpecificHeat")).getValue(), 590000000.0);
EXPECT_DOUBLE_EQ(steel->getPhysicalQuantity(QStringLiteral("ThermalConductivity")).getValue(), 43000.0);
EXPECT_DOUBLE_EQ(steel->getPhysicalQuantity(QStringLiteral("ThermalExpansionCoefficient")).getValue(), 1.2e-05);
EXPECT_EQ(steel->getAppearanceValue(QStringLiteral("AmbientColor")), QStringLiteral("(0.0020, 0.0020, 0.0020, 1.0)"));
EXPECT_EQ(steel->getAppearanceValue(QStringLiteral("DiffuseColor")), QStringLiteral("(0.0000, 0.0000, 0.0000, 1.0)"));
EXPECT_EQ(steel->getAppearanceValue(QStringLiteral("EmissiveColor")), QStringLiteral("(0.0000, 0.0000, 0.0000, 1.0)"));
EXPECT_NEAR(steel->getAppearanceValue(QStringLiteral("Shininess")).toDouble(), 0.06, 1e-6);
EXPECT_EQ(steel->getAppearanceValue(QStringLiteral("SpecularColor")), QStringLiteral("(0.9800, 0.9800, 0.9800, 1.0)"));
EXPECT_DOUBLE_EQ(steel->getAppearanceValue(QStringLiteral("Transparency")).toDouble(), 0.0);
EXPECT_EQ(steel->getPhysicalQuantity(QString::fromStdString("Density")).getUserString(), parseQuantity("7900.00 kg/m^3").toStdString());
EXPECT_EQ(steel->getPhysicalQuantity(QString::fromStdString("YoungsModulus")).getUserString(), parseQuantity("210.00 GPa").toStdString());
EXPECT_EQ(steel->getPhysicalQuantity(QString::fromStdString("SpecificHeat")).getUserString(), parseQuantity("590.00 J/kg/K").toStdString());
EXPECT_EQ(steel->getPhysicalQuantity(QString::fromStdString("ThermalConductivity")).getUserString(), parseQuantity("43.00 W/m/K").toStdString());
EXPECT_EQ(steel->getPhysicalQuantity(QString::fromStdString("ThermalExpansionCoefficient")).getUserString(), parseQuantity("12.00 µm/m/K").toStdString());
EXPECT_EQ(steel->getPhysicalQuantity(QStringLiteral("Density")).getUserString(), parseQuantity("7900.00 kg/m^3").toStdString());
EXPECT_EQ(steel->getPhysicalQuantity(QStringLiteral("YoungsModulus")).getUserString(), parseQuantity("210.00 GPa").toStdString());
EXPECT_EQ(steel->getPhysicalQuantity(QStringLiteral("SpecificHeat")).getUserString(), parseQuantity("590.00 J/kg/K").toStdString());
EXPECT_EQ(steel->getPhysicalQuantity(QStringLiteral("ThermalConductivity")).getUserString(), parseQuantity("43.00 W/m/K").toStdString());
EXPECT_EQ(steel->getPhysicalQuantity(QStringLiteral("ThermalExpansionCoefficient")).getUserString(), parseQuantity("12.00 µm/m/K").toStdString());
}
TEST_F(TestMaterial, TestColumns)
@@ -362,18 +362,18 @@ TEST_F(TestMaterial, TestColumns)
models = testMaterial.getPhysicalModels();
EXPECT_EQ(models->size(), 1);
EXPECT_TRUE(testMaterial.hasPhysicalProperty(QString::fromStdString("TestArray2D")));
auto array2d = testMaterial.getPhysicalProperty(QString::fromStdString("TestArray2D"))->getMaterialValue();
EXPECT_TRUE(testMaterial.hasPhysicalProperty(QStringLiteral("TestArray2D")));
auto array2d = testMaterial.getPhysicalProperty(QStringLiteral("TestArray2D"))->getMaterialValue();
EXPECT_TRUE(array2d);
EXPECT_EQ(dynamic_cast<Materials::Material2DArray &>(*array2d).columns(), 2);
EXPECT_TRUE(testMaterial.hasPhysicalProperty(QString::fromStdString("TestArray2D3Column")));
auto array2d3Column = testMaterial.getPhysicalProperty(QString::fromStdString("TestArray2D3Column"))->getMaterialValue();
EXPECT_TRUE(testMaterial.hasPhysicalProperty(QStringLiteral("TestArray2D3Column")));
auto array2d3Column = testMaterial.getPhysicalProperty(QStringLiteral("TestArray2D3Column"))->getMaterialValue();
EXPECT_TRUE(array2d3Column);
EXPECT_EQ(dynamic_cast<Materials::Material2DArray &>(*array2d3Column).columns(), 3);
EXPECT_TRUE(testMaterial.hasPhysicalProperty(QString::fromStdString("TestArray3D")));
auto array3d = testMaterial.getPhysicalProperty(QString::fromStdString("TestArray3D"))->getMaterialValue();
EXPECT_TRUE(testMaterial.hasPhysicalProperty(QStringLiteral("TestArray3D")));
auto array3d = testMaterial.getPhysicalProperty(QStringLiteral("TestArray3D"))->getMaterialValue();
EXPECT_TRUE(array3d);
EXPECT_EQ(dynamic_cast<Materials::Material3DArray &>(*array3d).columns(), 2);
}

42
tests/src/Mod/Material/App/TestModel.cpp
View File

@@ -88,12 +88,12 @@ TEST_F(TestModel, TestModelLoad)
{
ASSERT_NE(_modelManager, nullptr);
auto density = _modelManager->getModel(QString::fromStdString("454661e5-265b-4320-8e6f-fcf6223ac3af"));
EXPECT_EQ(density->getName(), QString::fromStdString("Density"));
EXPECT_EQ(density->getUUID(), QString::fromStdString("454661e5-265b-4320-8e6f-fcf6223ac3af"));
auto density = _modelManager->getModel(QStringLiteral("454661e5-265b-4320-8e6f-fcf6223ac3af"));
EXPECT_EQ(density->getName(), QStringLiteral("Density"));
EXPECT_EQ(density->getUUID(), QStringLiteral("454661e5-265b-4320-8e6f-fcf6223ac3af"));
auto& prop = (*density)[QString::fromStdString("Density")];
EXPECT_EQ(prop.getName(), QString::fromStdString("Density"));
auto& prop = (*density)[QStringLiteral("Density")];
EXPECT_EQ(prop.getName(), QStringLiteral("Density"));
}
TEST_F(TestModel, TestModelByPath)
@@ -101,40 +101,40 @@ TEST_F(TestModel, TestModelByPath)
ASSERT_NE(_modelManager, nullptr);
auto linearElastic = _modelManager->getModelByPath(
QString::fromStdString("Mechanical/LinearElastic.yml"),
QString::fromStdString("System"));
QStringLiteral("Mechanical/LinearElastic.yml"),
QStringLiteral("System"));
EXPECT_NE(&linearElastic, nullptr);
EXPECT_EQ(linearElastic->getName(), QString::fromStdString("Linear Elastic"));
EXPECT_EQ(linearElastic->getUUID(), QString::fromStdString("7b561d1d-fb9b-44f6-9da9-56a4f74d7536"));
EXPECT_EQ(linearElastic->getName(), QStringLiteral("Linear Elastic"));
EXPECT_EQ(linearElastic->getUUID(), QStringLiteral("7b561d1d-fb9b-44f6-9da9-56a4f74d7536"));
// The same but with a leading '/'
auto linearElastic2 = _modelManager->getModelByPath(
QString::fromStdString("/Mechanical/LinearElastic.yml"),
QString::fromStdString("System"));
QStringLiteral("/Mechanical/LinearElastic.yml"),
QStringLiteral("System"));
EXPECT_NE(&linearElastic2, nullptr);
EXPECT_EQ(linearElastic2->getName(), QString::fromStdString("Linear Elastic"));
EXPECT_EQ(linearElastic2->getUUID(), QString::fromStdString("7b561d1d-fb9b-44f6-9da9-56a4f74d7536"));
EXPECT_EQ(linearElastic2->getName(), QStringLiteral("Linear Elastic"));
EXPECT_EQ(linearElastic2->getUUID(), QStringLiteral("7b561d1d-fb9b-44f6-9da9-56a4f74d7536"));
// Same with the library name as a prefix
auto linearElastic3 = _modelManager->getModelByPath(
QString::fromStdString("/System/Mechanical/LinearElastic.yml"),
QString::fromStdString("System"));
QStringLiteral("/System/Mechanical/LinearElastic.yml"),
QStringLiteral("System"));
EXPECT_NE(&linearElastic3, nullptr);
EXPECT_EQ(linearElastic3->getName(), QString::fromStdString("Linear Elastic"));
EXPECT_EQ(linearElastic3->getUUID(), QString::fromStdString("7b561d1d-fb9b-44f6-9da9-56a4f74d7536"));
EXPECT_EQ(linearElastic3->getName(), QStringLiteral("Linear Elastic"));
EXPECT_EQ(linearElastic3->getUUID(), QStringLiteral("7b561d1d-fb9b-44f6-9da9-56a4f74d7536"));
// Test with the file system path
ASSERT_NO_THROW(linearElastic->getLibrary());
ASSERT_NO_THROW(linearElastic->getLibrary()->getName());
ASSERT_NO_THROW(linearElastic->getLibrary()->getDirectoryPath());
EXPECT_EQ(linearElastic->getLibrary()->getName(), QString::fromStdString("System"));
QString path = linearElastic->getLibrary()->getDirectoryPath() + QString::fromStdString("/Mechanical/LinearElastic.yml");
EXPECT_EQ(linearElastic->getLibrary()->getName(), QStringLiteral("System"));
QString path = linearElastic->getLibrary()->getDirectoryPath() + QStringLiteral("/Mechanical/LinearElastic.yml");
ASSERT_NO_THROW(_modelManager->getModelByPath(path));
auto linearElastic4 = _modelManager->getModelByPath(path);
EXPECT_NE(&linearElastic4, nullptr);
EXPECT_EQ(linearElastic4->getName(), QString::fromStdString("Linear Elastic"));
EXPECT_EQ(linearElastic4->getUUID(), QString::fromStdString("7b561d1d-fb9b-44f6-9da9-56a4f74d7536"));
EXPECT_EQ(linearElastic4->getName(), QStringLiteral("Linear Elastic"));
EXPECT_EQ(linearElastic4->getUUID(), QStringLiteral("7b561d1d-fb9b-44f6-9da9-56a4f74d7536"));
}
// clang-format on

88
tests/src/Mod/Material/App/TestModelProperties.cpp
View File

@@ -60,47 +60,47 @@ TEST_F(TestModelProperties, TestEmpty)
TEST_F(TestModelProperties, TestBasic)
{
auto prop = Materials::ModelProperty(QString::fromStdString("1"),
QString::fromStdString("2"),
QString::fromStdString("3"),
QString::fromStdString("4"),
QString::fromStdString("5"),
QString::fromStdString("6"));
EXPECT_EQ(prop.getName(), QString::fromStdString("1"));
EXPECT_EQ(prop.getDisplayName(), QString::fromStdString("2"));
EXPECT_EQ(prop.getPropertyType(), QString::fromStdString("3"));
EXPECT_EQ(prop.getUnits(), QString::fromStdString("4"));
EXPECT_EQ(prop.getURL(), QString::fromStdString("5"));
EXPECT_EQ(prop.getDescription(), QString::fromStdString("6"));
auto prop = Materials::ModelProperty(QStringLiteral("1"),
QStringLiteral("2"),
QStringLiteral("3"),
QStringLiteral("4"),
QStringLiteral("5"),
QStringLiteral("6"));
EXPECT_EQ(prop.getName(), QStringLiteral("1"));
EXPECT_EQ(prop.getDisplayName(), QStringLiteral("2"));
EXPECT_EQ(prop.getPropertyType(), QStringLiteral("3"));
EXPECT_EQ(prop.getUnits(), QStringLiteral("4"));
EXPECT_EQ(prop.getURL(), QStringLiteral("5"));
EXPECT_EQ(prop.getDescription(), QStringLiteral("6"));
EXPECT_TRUE(prop.getInheritance().isNull());
EXPECT_FALSE(prop.isInherited());
EXPECT_EQ(prop.columns(), 0);
prop.setInheritance(QString::fromStdString("12345"));
EXPECT_EQ(prop.getInheritance(), QString::fromStdString("12345"));
prop.setInheritance(QStringLiteral("12345"));
EXPECT_EQ(prop.getInheritance(), QStringLiteral("12345"));
EXPECT_TRUE(prop.isInherited());
}
TEST_F(TestModelProperties, TestAddColumns)
{
auto prop = Materials::ModelProperty(QString::fromStdString("1"),
QString::fromStdString("2"),
QString::fromStdString("3"),
QString::fromStdString("4"),
QString::fromStdString("5"),
QString::fromStdString("6"));
auto prop1 = Materials::ModelProperty(QString::fromStdString("10"),
QString::fromStdString("9"),
QString::fromStdString("8"),
QString::fromStdString("7"),
QString::fromStdString("6"),
QString::fromStdString("5"));
auto prop2 = Materials::ModelProperty(QString::fromStdString("a"),
QString::fromStdString("b"),
QString::fromStdString("c"),
QString::fromStdString("d"),
QString::fromStdString("e"),
QString::fromStdString("f"));
auto prop = Materials::ModelProperty(QStringLiteral("1"),
QStringLiteral("2"),
QStringLiteral("3"),
QStringLiteral("4"),
QStringLiteral("5"),
QStringLiteral("6"));
auto prop1 = Materials::ModelProperty(QStringLiteral("10"),
QStringLiteral("9"),
QStringLiteral("8"),
QStringLiteral("7"),
QStringLiteral("6"),
QStringLiteral("5"));
auto prop2 = Materials::ModelProperty(QStringLiteral("a"),
QStringLiteral("b"),
QStringLiteral("c"),
QStringLiteral("d"),
QStringLiteral("e"),
QStringLiteral("f"));
EXPECT_EQ(prop.columns(), 0);
prop.addColumn(prop1);
@@ -110,23 +110,23 @@ TEST_F(TestModelProperties, TestAddColumns)
auto columns = prop.getColumns();
auto entry1 = columns.at(0);
EXPECT_EQ(entry1.getName(), QString::fromStdString("10"));
EXPECT_EQ(entry1.getDisplayName(), QString::fromStdString("9"));
EXPECT_EQ(entry1.getPropertyType(), QString::fromStdString("8"));
EXPECT_EQ(entry1.getUnits(), QString::fromStdString("7"));
EXPECT_EQ(entry1.getURL(), QString::fromStdString("6"));
EXPECT_EQ(entry1.getDescription(), QString::fromStdString("5"));
EXPECT_EQ(entry1.getName(), QStringLiteral("10"));
EXPECT_EQ(entry1.getDisplayName(), QStringLiteral("9"));
EXPECT_EQ(entry1.getPropertyType(), QStringLiteral("8"));
EXPECT_EQ(entry1.getUnits(), QStringLiteral("7"));
EXPECT_EQ(entry1.getURL(), QStringLiteral("6"));
EXPECT_EQ(entry1.getDescription(), QStringLiteral("5"));
EXPECT_TRUE(entry1.getInheritance().isNull());
EXPECT_FALSE(entry1.isInherited());
EXPECT_EQ(entry1.columns(), 0);
auto entry2 = columns.at(1);
EXPECT_EQ(entry2.getName(), QString::fromStdString("a"));
EXPECT_EQ(entry2.getDisplayName(), QString::fromStdString("b"));
EXPECT_EQ(entry2.getPropertyType(), QString::fromStdString("c"));
EXPECT_EQ(entry2.getUnits(), QString::fromStdString("d"));
EXPECT_EQ(entry2.getURL(), QString::fromStdString("e"));
EXPECT_EQ(entry2.getDescription(), QString::fromStdString("f"));
EXPECT_EQ(entry2.getName(), QStringLiteral("a"));
EXPECT_EQ(entry2.getDisplayName(), QStringLiteral("b"));
EXPECT_EQ(entry2.getPropertyType(), QStringLiteral("c"));
EXPECT_EQ(entry2.getUnits(), QStringLiteral("d"));
EXPECT_EQ(entry2.getURL(), QStringLiteral("e"));
EXPECT_EQ(entry2.getDescription(), QStringLiteral("f"));
EXPECT_TRUE(entry2.getInheritance().isNull());
EXPECT_FALSE(entry2.isInherited());
EXPECT_EQ(entry2.columns(), 0);