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

Material: use QStringLiteral 2

Browse Source
This commit is contained in:
Benjamin Bræstrup Sayoc
2025-02-14 12:27:52 +01:00
parent 239e4522ec
commit bfb5dfe5da
21 changed files with 209 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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");