Material: Material handling enhancements
Rework of the material handling system. This first part concntrates on a rework of the material cards. Rather than use a fixed list of possible properties, properties can be defined separately in their own files and mixed to provide a complete list of possible properties. Properties can be inherited. The cards then provide values for the properties. These can also be inherited allowing for small changes in cards as required. The new property definitions are more extensive than previously. 2 and 3 dimensional arrays of properties can be defined. Values are obtained by calling an API instead of reading from a dictionary. For compatibility, a Python dictionary of values can be obtained similar to how it was done previously, but this is considered a deprecated API and won't support the newer advanced features. The editor is completely reworked. It will be able to edit older format material cards, but can only save them in the new format. For testing during the development phase, a system preference can specifiy wether the old or new material editors are to be used. This option will be removed before release.
This commit is contained in:
David Carter
395
src/Mod/Material/App/MaterialPyImpl.cpp
Normal file
395
src/Mod/Material/App/MaterialPyImpl.cpp
Normal file
@@ -0,0 +1,395 @@
|
||||
/***************************************************************************
|
||||
* Copyright (c) 2008 Werner Mayer <wmayer[at]users.sourceforge.net> *
|
||||
* *
|
||||
* This file is part of the FreeCAD CAx development system. *
|
||||
* *
|
||||
* This library is free software; you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU Library General Public *
|
||||
* License as published by the Free Software Foundation; either *
|
||||
* version 2 of the License, or (at your option) any later version. *
|
||||
* *
|
||||
* This library is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU Library General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU Library General Public *
|
||||
* License along with this library; see the file COPYING.LIB. If not, *
|
||||
* write to the Free Software Foundation, Inc., 59 Temple Place, *
|
||||
* Suite 330, Boston, MA 02111-1307, USA *
|
||||
* *
|
||||
***************************************************************************/
|
||||
|
||||
#include "PreCompiled.h"
|
||||
|
||||
#ifndef _PreComp_
|
||||
#include <boost/uuid/uuid_io.hpp>
|
||||
#endif
|
||||
|
||||
#include <QMetaType>
|
||||
|
||||
#include <Base/Quantity.h>
|
||||
#include <Base/QuantityPy.h>
|
||||
#include <Gui/MetaTypes.h>
|
||||
|
||||
#include "Exceptions.h"
|
||||
#include "MaterialPy.h"
|
||||
#include "Materials.h"
|
||||
|
||||
#include "MaterialPy.cpp"
|
||||
|
||||
using namespace Materials;
|
||||
|
||||
// returns a string which represents the object e.g. when printed in python
|
||||
std::string MaterialPy::representation() const
|
||||
{
|
||||
MaterialPy::PointerType ptr = getMaterialPtr();
|
||||
std::stringstream str;
|
||||
str << "Property [Name=(";
|
||||
str << ptr->getName().toStdString();
|
||||
str << "), UUID=(";
|
||||
str << ptr->getUUID().toStdString();
|
||||
str << "), Library Name=(";
|
||||
str << ptr->getLibrary().getName().toStdString();
|
||||
str << "), Library Root=(";
|
||||
str << ptr->getLibrary().getDirectoryPath().toStdString();
|
||||
str << "), Library Icon=(";
|
||||
str << ptr->getLibrary().getIconPath().toStdString();
|
||||
str << "), Directory=(";
|
||||
str << ptr->getDirectory().toStdString();
|
||||
// str << "), URL=(";
|
||||
// str << ptr->getURL();
|
||||
// str << "), DOI=(";
|
||||
// str << ptr->getDOI();
|
||||
// str << "), Description=(";
|
||||
// str << ptr->getDescription();
|
||||
// str << "), Inherits=[";
|
||||
// const std::vector<std::string> &inherited = getMaterialPtr()->getInheritance();
|
||||
// for (auto it = inherited.begin(); it != inherited.end(); it++)
|
||||
// {
|
||||
// std::string uuid = *it;
|
||||
// if (it != inherited.begin())
|
||||
// str << "), UUID=(";
|
||||
// else
|
||||
// str << "UUID=(";
|
||||
// str << uuid << ")";
|
||||
// }
|
||||
// str << "]]";
|
||||
str << ")]";
|
||||
|
||||
return str.str();
|
||||
}
|
||||
|
||||
PyObject* MaterialPy::PyMake(struct _typeobject*, PyObject*, PyObject*)// Python wrapper
|
||||
{
|
||||
// never create such objects with the constructor
|
||||
return new MaterialPy(new Material());
|
||||
}
|
||||
|
||||
// constructor method
|
||||
int MaterialPy::PyInit(PyObject* /*args*/, PyObject* /*kwd*/)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
Py::String MaterialPy::getLibraryName() const
|
||||
{
|
||||
return Py::String(getMaterialPtr()->getLibrary().getName().toStdString());
|
||||
}
|
||||
|
||||
Py::String MaterialPy::getLibraryRoot() const
|
||||
{
|
||||
return Py::String(getMaterialPtr()->getLibrary().getDirectoryPath().toStdString());
|
||||
}
|
||||
|
||||
Py::String MaterialPy::getLibraryIcon() const
|
||||
{
|
||||
return Py::String(getMaterialPtr()->getLibrary().getIconPath().toStdString());
|
||||
}
|
||||
|
||||
Py::String MaterialPy::getName() const
|
||||
{
|
||||
return Py::String(getMaterialPtr()->getName().toStdString());
|
||||
}
|
||||
|
||||
Py::String MaterialPy::getDirectory() const
|
||||
{
|
||||
return Py::String(getMaterialPtr()->getDirectory().toStdString());
|
||||
}
|
||||
|
||||
Py::String MaterialPy::getUUID() const
|
||||
{
|
||||
return Py::String(getMaterialPtr()->getUUID().toStdString());
|
||||
}
|
||||
|
||||
Py::String MaterialPy::getDescription() const
|
||||
{
|
||||
return Py::String(getMaterialPtr()->getDescription().toStdString());
|
||||
}
|
||||
|
||||
Py::String MaterialPy::getURL() const
|
||||
{
|
||||
return Py::String(getMaterialPtr()->getURL().toStdString());
|
||||
}
|
||||
|
||||
Py::String MaterialPy::getReference() const
|
||||
{
|
||||
return Py::String(getMaterialPtr()->getReference().toStdString());
|
||||
}
|
||||
|
||||
Py::String MaterialPy::getParent() const
|
||||
{
|
||||
return Py::String(getMaterialPtr()->getParentUUID().toStdString());
|
||||
}
|
||||
|
||||
Py::String MaterialPy::getAuthorAndLicense() const
|
||||
{
|
||||
return Py::String(getMaterialPtr()->getAuthorAndLicense().toStdString());
|
||||
}
|
||||
|
||||
Py::List MaterialPy::getPhysicalModels() const
|
||||
{
|
||||
const std::vector<QString>* models = getMaterialPtr()->getPhysicalModels();
|
||||
Py::List list;
|
||||
|
||||
for (auto it = models->begin(); it != models->end(); it++) {
|
||||
QString uuid = *it;
|
||||
|
||||
list.append(Py::String(uuid.toStdString()));
|
||||
}
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
Py::List MaterialPy::getAppearanceModels() const
|
||||
{
|
||||
const std::vector<QString>* models = getMaterialPtr()->getAppearanceModels();
|
||||
Py::List list;
|
||||
|
||||
for (auto it = models->begin(); it != models->end(); it++) {
|
||||
QString uuid = *it;
|
||||
|
||||
list.append(Py::String(uuid.toStdString()));
|
||||
}
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
Py::List MaterialPy::getTags() const
|
||||
{
|
||||
const std::list<QString>& tags = getMaterialPtr()->getTags();
|
||||
Py::List list;
|
||||
|
||||
for (auto it = tags.begin(); it != tags.end(); it++) {
|
||||
QString uuid = *it;
|
||||
|
||||
list.append(Py::String(uuid.toStdString()));
|
||||
}
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
PyObject* MaterialPy::getCustomAttributes(const char* /*attr*/) const
|
||||
{
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
int MaterialPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
PyObject* MaterialPy::hasPhysicalModel(PyObject* args)
|
||||
{
|
||||
char* uuid;
|
||||
if (!PyArg_ParseTuple(args, "s", &uuid)) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
bool hasProperty = getMaterialPtr()->hasPhysicalModel(QString::fromStdString(uuid));
|
||||
return hasProperty ? Py_True : Py_False;
|
||||
}
|
||||
|
||||
PyObject* MaterialPy::hasAppearanceModel(PyObject* args)
|
||||
{
|
||||
char* uuid;
|
||||
if (!PyArg_ParseTuple(args, "s", &uuid)) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
bool hasProperty = getMaterialPtr()->hasAppearanceModel(QString::fromStdString(uuid));
|
||||
return hasProperty ? Py_True : Py_False;
|
||||
}
|
||||
|
||||
PyObject* MaterialPy::isPhysicalModelComplete(PyObject* args)
|
||||
{
|
||||
char* name;
|
||||
if (!PyArg_ParseTuple(args, "s", &name)) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
bool isComplete = getMaterialPtr()->isPhysicalModelComplete(QString::fromStdString(name));
|
||||
return isComplete ? Py_True : Py_False;
|
||||
}
|
||||
|
||||
PyObject* MaterialPy::isAppearanceModelComplete(PyObject* args)
|
||||
{
|
||||
char* name;
|
||||
if (!PyArg_ParseTuple(args, "s", &name)) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
bool isComplete = getMaterialPtr()->isAppearanceModelComplete(QString::fromStdString(name));
|
||||
return isComplete ? Py_True : Py_False;
|
||||
}
|
||||
|
||||
PyObject* MaterialPy::hasPhysicalProperty(PyObject* args)
|
||||
{
|
||||
char* name;
|
||||
if (!PyArg_ParseTuple(args, "s", &name)) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
bool hasProperty = getMaterialPtr()->hasPhysicalProperty(QString::fromStdString(name));
|
||||
return hasProperty ? Py_True : Py_False;
|
||||
}
|
||||
|
||||
PyObject* MaterialPy::hasAppearanceProperty(PyObject* args)
|
||||
{
|
||||
char* name;
|
||||
if (!PyArg_ParseTuple(args, "s", &name)) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
bool hasProperty = getMaterialPtr()->hasAppearanceProperty(QString::fromStdString(name));
|
||||
return hasProperty ? Py_True : Py_False;
|
||||
}
|
||||
|
||||
Py::Dict MaterialPy::getProperties() const
|
||||
{
|
||||
Py::Dict dict;
|
||||
|
||||
// Maintain backwards compatibility
|
||||
dict.setItem(Py::String("CardName"), Py::String(getMaterialPtr()->getName().toStdString()));
|
||||
dict.setItem(Py::String("AuthorAndLicense"),
|
||||
Py::String(getMaterialPtr()->getAuthorAndLicense().toStdString()));
|
||||
dict.setItem(Py::String("Name"), Py::String(getMaterialPtr()->getName().toStdString()));
|
||||
dict.setItem(Py::String("Description"),
|
||||
Py::String(getMaterialPtr()->getDescription().toStdString()));
|
||||
dict.setItem(Py::String("ReferenceSource"),
|
||||
Py::String(getMaterialPtr()->getReference().toStdString()));
|
||||
dict.setItem(Py::String("SourceURL"), Py::String(getMaterialPtr()->getURL().toStdString()));
|
||||
|
||||
auto properties = getMaterialPtr()->getPhysicalProperties();
|
||||
for (auto it = properties.begin(); it != properties.end(); it++) {
|
||||
QString key = it->first;
|
||||
MaterialProperty& materialProperty = it->second;
|
||||
|
||||
if (!materialProperty.isNull()) {
|
||||
auto value = materialProperty.getString();
|
||||
dict.setItem(Py::String(key.toStdString()), Py::String(value.toStdString()));
|
||||
}
|
||||
}
|
||||
|
||||
properties = getMaterialPtr()->getAppearanceProperties();
|
||||
for (auto it = properties.begin(); it != properties.end(); it++) {
|
||||
QString key = it->first;
|
||||
MaterialProperty& materialProperty = it->second;
|
||||
|
||||
if (!materialProperty.isNull()) {
|
||||
auto value = materialProperty.getString();
|
||||
dict.setItem(Py::String(key.toStdString()), Py::String(value.toStdString()));
|
||||
}
|
||||
}
|
||||
|
||||
return dict;
|
||||
}
|
||||
|
||||
Py::Dict MaterialPy::getPhysicalProperties() const
|
||||
{
|
||||
Py::Dict dict;
|
||||
|
||||
auto properties = getMaterialPtr()->getPhysicalProperties();
|
||||
for (auto it = properties.begin(); it != properties.end(); it++) {
|
||||
QString key = it->first;
|
||||
MaterialProperty& materialProperty = it->second;
|
||||
|
||||
if (!materialProperty.isNull()) {
|
||||
auto value = materialProperty.getString();
|
||||
dict.setItem(Py::String(key.toStdString()), Py::String(value.toStdString()));
|
||||
}
|
||||
}
|
||||
|
||||
return dict;
|
||||
}
|
||||
|
||||
Py::Dict MaterialPy::getAppearanceProperties() const
|
||||
{
|
||||
Py::Dict dict;
|
||||
|
||||
auto properties = getMaterialPtr()->getAppearanceProperties();
|
||||
for (auto it = properties.begin(); it != properties.end(); it++) {
|
||||
QString key = it->first;
|
||||
MaterialProperty& materialProperty = it->second;
|
||||
|
||||
if (!materialProperty.isNull()) {
|
||||
auto value = materialProperty.getString();
|
||||
dict.setItem(Py::String(key.toStdString()), Py::String(value.toStdString()));
|
||||
}
|
||||
}
|
||||
|
||||
return dict;
|
||||
}
|
||||
|
||||
static PyObject* _pyObjectFromVariant(const QVariant& value)
|
||||
{
|
||||
if (value.isNull()) {
|
||||
return new PyObject();
|
||||
}
|
||||
|
||||
if (value.userType() == QMetaType::type("Base::Quantity")) {
|
||||
return new Base::QuantityPy(new Base::Quantity(value.value<Base::Quantity>()));
|
||||
}
|
||||
else if (value.userType() == QMetaType::Double) {
|
||||
return PyFloat_FromDouble(value.toDouble());
|
||||
}
|
||||
else if (value.userType() == QMetaType::Float) {
|
||||
return PyFloat_FromDouble(value.toFloat());
|
||||
}
|
||||
else if (value.userType() == QMetaType::Int) {
|
||||
return PyLong_FromLong(value.toInt());
|
||||
}
|
||||
else if (value.userType() == QMetaType::Long) {
|
||||
return PyLong_FromLong(value.toInt());
|
||||
}
|
||||
else if (value.userType() == QMetaType::Bool) {
|
||||
return value.toBool() ? Py_True : Py_False;
|
||||
}
|
||||
else if (value.userType() == QMetaType::QString) {
|
||||
return PyUnicode_FromString(value.toString().toStdString().c_str());
|
||||
}
|
||||
|
||||
throw UnknownValueType();
|
||||
}
|
||||
|
||||
PyObject* MaterialPy::getPhysicalValue(PyObject* args)
|
||||
{
|
||||
char* name;
|
||||
if (!PyArg_ParseTuple(args, "s", &name)) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
QVariant value = getMaterialPtr()->getPhysicalValue(QString::fromStdString(name));
|
||||
return _pyObjectFromVariant(value);
|
||||
}
|
||||
|
||||
PyObject* MaterialPy::getAppearanceValue(PyObject* args)
|
||||
{
|
||||
char* name;
|
||||
if (!PyArg_ParseTuple(args, "s", &name)) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
QVariant value = getMaterialPtr()->getAppearanceValue(QString::fromStdString(name));
|
||||
return _pyObjectFromVariant(value);
|
||||
}
|
||||
Reference in New Issue
Block a user