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

App: Apply clang format (part 1)

Browse Source
This commit is contained in:
wmayer
2024-11-15 17:43:49 +01:00
committed by wwmayer
parent 463cc08f3f
commit 6f5259af26
124 changed files with 6733 additions and 4886 deletions
Download Patch File Download Diff File Expand all files Collapse all files

247
src/App/DynamicProperty.cpp
View File

@@ -33,7 +33,7 @@
#include "PropertyContainer.h"
FC_LOG_LEVEL_INIT("Property",true,true)
FC_LOG_LEVEL_INIT("Property", true, true)
using namespace App;
@@ -46,65 +46,75 @@ DynamicProperty::~DynamicProperty()
clear();
}
void DynamicProperty::clear() {
auto &index = props.get<0>();
for(auto &v : index)
void DynamicProperty::clear()
{
auto& index = props.get<0>();
for (auto& v : index) {
delete v.property;
}
index.clear();
}
void DynamicProperty::getPropertyList(std::vector<Property*> &List) const
void DynamicProperty::getPropertyList(std::vector<Property*>& List) const
{
for (auto &v : props.get<0>())
for (auto& v : props.get<0>()) {
List.push_back(v.property);
}
}
void DynamicProperty::getPropertyNamedList(std::vector<std::pair<const char*, Property*> > &List) const
void DynamicProperty::getPropertyNamedList(
std::vector<std::pair<const char*, Property*>>& List) const
{
for (auto &v : props.get<0>())
List.emplace_back(v.getName(),v.property);
for (auto& v : props.get<0>()) {
List.emplace_back(v.getName(), v.property);
}
}
void DynamicProperty::getPropertyMap(std::map<std::string,Property*> &Map) const
void DynamicProperty::getPropertyMap(std::map<std::string, Property*>& Map) const
{
for (auto &v : props.get<0>())
for (auto& v : props.get<0>()) {
Map[v.name] = v.property;
}
}
Property *DynamicProperty::getDynamicPropertyByName(const char* name) const
Property* DynamicProperty::getDynamicPropertyByName(const char* name) const
{
auto &index = props.get<0>();
auto& index = props.get<0>();
auto it = index.find(name);
if (it != index.end())
if (it != index.end()) {
return it->property;
}
return nullptr;
}
std::vector<std::string> DynamicProperty::getDynamicPropertyNames() const
{
std::vector<std::string> names;
auto &index = props.get<0>();
auto& index = props.get<0>();
names.reserve(index.size());
for(auto &v : index)
for (auto& v : index) {
names.push_back(v.name);
}
return names;
}
short DynamicProperty::getPropertyType(const Property* prop) const
{
return prop?prop->getType():0;
return prop ? prop->getType() : 0;
}
short DynamicProperty::getPropertyType(const char *name) const
short DynamicProperty::getPropertyType(const char* name) const
{
auto &index = props.get<0>();
auto& index = props.get<0>();
auto it = index.find(name);
if (it != index.end()) {
short attr = it->attr;
if (it->hidden)
if (it->hidden) {
attr |= Prop_Hidden;
if (it->readonly)
}
if (it->readonly) {
attr |= Prop_ReadOnly;
}
return attr;
}
return 0;
@@ -112,92 +122,113 @@ short DynamicProperty::getPropertyType(const char *name) const
const char* DynamicProperty::getPropertyGroup(const Property* prop) const
{
auto &index = props.get<1>();
auto& index = props.get<1>();
auto it = index.find(const_cast<Property*>(prop));
if(it!=index.end())
if (it != index.end()) {
return it->group.c_str();
}
return nullptr;
}
const char* DynamicProperty::getPropertyGroup(const char *name) const
const char* DynamicProperty::getPropertyGroup(const char* name) const
{
auto &index = props.get<0>();
auto& index = props.get<0>();
auto it = index.find(name);
if (it != index.end())
if (it != index.end()) {
return it->group.c_str();
}
return nullptr;
}
const char* DynamicProperty::getPropertyDocumentation(const Property* prop) const
{
auto &index = props.get<1>();
auto& index = props.get<1>();
auto it = index.find(const_cast<Property*>(prop));
if(it!=index.end())
if (it != index.end()) {
return it->doc.c_str();
}
return nullptr;
}
const char* DynamicProperty::getPropertyDocumentation(const char *name) const
const char* DynamicProperty::getPropertyDocumentation(const char* name) const
{
auto &index = props.get<0>();
auto& index = props.get<0>();
auto it = index.find(name);
if (it != index.end())
if (it != index.end()) {
return it->doc.c_str();
}
return nullptr;
}
Property* DynamicProperty::addDynamicProperty(PropertyContainer &pc, const char* type,
const char* name, const char* group, const char* doc, short attr, bool ro, bool hidden)
Property* DynamicProperty::addDynamicProperty(PropertyContainer& pc,
const char* type,
const char* name,
const char* group,
const char* doc,
short attr,
bool ro,
bool hidden)
{
if(!type)
if (!type) {
type = "<null>";
}
std::string _name;
static ParameterGrp::handle hGrp = GetApplication().GetParameterGroupByPath(
"User parameter:BaseApp/Preferences/Document");
if(hGrp->GetBool("AutoNameDynamicProperty",false)) {
if(!name || !name[0])
static ParameterGrp::handle hGrp =
GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Document");
if (hGrp->GetBool("AutoNameDynamicProperty", false)) {
if (!name || !name[0]) {
name = type;
_name = getUniquePropertyName(pc,name);
if(_name != name) {
FC_WARN(pc.getFullName() << " rename dynamic property from '"
<< name << "' to '" << _name << "'");
}
_name = getUniquePropertyName(pc, name);
if (_name != name) {
FC_WARN(pc.getFullName()
<< " rename dynamic property from '" << name << "' to '" << _name << "'");
}
name = _name.c_str();
} else if(!name)
name = "<null>"; // setting a bad name to trigger exception
}
else if (!name) {
name = "<null>"; // setting a bad name to trigger exception
}
auto prop = pc.getPropertyByName(name);
if(prop && prop->getContainer()==&pc)
FC_THROWM(Base::NameError, "Property " << pc.getFullName() << '.' << name << " already exists");
if (prop && prop->getContainer() == &pc) {
FC_THROWM(Base::NameError,
"Property " << pc.getFullName() << '.' << name << " already exists");
}
if(Base::Tools::getIdentifier(name) != name)
if (Base::Tools::getIdentifier(name) != name) {
FC_THROWM(Base::NameError, "Invalid property name '" << name << "'");
}
Base::Type propType = Base::Type::getTypeIfDerivedFrom(type, App::Property::getClassTypeId(), true);
Base::Type propType =
Base::Type::getTypeIfDerivedFrom(type, App::Property::getClassTypeId(), true);
if (propType.isBad()) {
FC_THROWM(Base::TypeError, "Invalid type "
<< type << " for property " << pc.getFullName() << '.' << name);
FC_THROWM(Base::TypeError,
"Invalid type " << type << " for property " << pc.getFullName() << '.' << name);
}
void* propInstance = propType.createInstance();
if (!propInstance) {
FC_THROWM(Base::RuntimeError, "Failed to create property "
<< pc.getFullName() << '.' << name << " of type " << type);
FC_THROWM(Base::RuntimeError,
"Failed to create property " << pc.getFullName() << '.' << name << " of type "
<< type);
}
Property* pcProperty = static_cast<Property*>(propInstance);
auto res = props.get<0>().emplace(pcProperty,name, nullptr, group, doc, attr, ro, hidden);
auto res = props.get<0>().emplace(pcProperty, name, nullptr, group, doc, attr, ro, hidden);
pcProperty->setContainer(&pc);
pcProperty->myName = res.first->name.c_str();
if(ro)
if (ro) {
attr |= Prop_ReadOnly;
if(hidden)
}
if (hidden) {
attr |= Prop_Hidden;
}
pcProperty->syncType(attr);
pcProperty->StatusBits.set((size_t)Property::PropDynamic);
@@ -207,21 +238,29 @@ Property* DynamicProperty::addDynamicProperty(PropertyContainer &pc, const char*
return pcProperty;
}
bool DynamicProperty::addProperty(Property *prop)
bool DynamicProperty::addProperty(Property* prop)
{
if(!prop || !prop->hasName())
if (!prop || !prop->hasName()) {
return false;
auto &index = props.get<0>();
if(index.count(prop->getName()))
}
auto& index = props.get<0>();
if (index.count(prop->getName())) {
return false;
index.emplace(prop,std::string(),prop->getName(),
prop->getGroup(),prop->getDocumentation(),prop->getType(),false,false);
}
index.emplace(prop,
std::string(),
prop->getName(),
prop->getGroup(),
prop->getDocumentation(),
prop->getType(),
false,
false);
return true;
}
bool DynamicProperty::removeProperty(const Property *prop)
bool DynamicProperty::removeProperty(const Property* prop)
{
auto &index = props.get<1>();
auto& index = props.get<1>();
auto it = index.find(const_cast<Property*>(prop));
if (it != index.end()) {
index.erase(it);
@@ -232,14 +271,16 @@ bool DynamicProperty::removeProperty(const Property *prop)
bool DynamicProperty::removeDynamicProperty(const char* name)
{
auto &index = props.get<0>();
auto& index = props.get<0>();
auto it = index.find(name);
if (it != index.end()) {
if(it->property->testStatus(Property::LockDynamic))
if (it->property->testStatus(Property::LockDynamic)) {
throw Base::RuntimeError("property is locked");
else if(!it->property->testStatus(Property::PropDynamic))
}
else if (!it->property->testStatus(Property::PropDynamic)) {
throw Base::RuntimeError("property is not dynamic");
Property *prop = it->property;
}
Property* prop = it->property;
GetApplication().signalRemoveDynamicProperty(*prop);
// Handle possible recursive calls of removeDynamicProperty
@@ -255,12 +296,12 @@ bool DynamicProperty::removeDynamicProperty(const char* name)
return false;
}
std::string DynamicProperty::getUniquePropertyName(PropertyContainer &pc, const char *Name) const
std::string DynamicProperty::getUniquePropertyName(PropertyContainer& pc, const char* Name) const
{
std::string CleanName = Base::Tools::getIdentifier(Name);
// name in use?
std::map<std::string,Property*> objectProps;
std::map<std::string, Property*> objectProps;
pc.getPropertyMap(objectProps);
auto pos = objectProps.find(CleanName);
@@ -271,38 +312,42 @@ std::string DynamicProperty::getUniquePropertyName(PropertyContainer &pc, const
else {
std::vector<std::string> names;
names.reserve(objectProps.size());
for (pos = objectProps.begin();pos != objectProps.end();++pos) {
for (pos = objectProps.begin(); pos != objectProps.end(); ++pos) {
names.push_back(pos->first);
}
return Base::Tools::getUniqueName(CleanName, names);
}
}
void DynamicProperty::save(const Property *prop, Base::Writer &writer) const
void DynamicProperty::save(const Property* prop, Base::Writer& writer) const
{
auto &index = props.get<1>();
auto& index = props.get<1>();
auto it = index.find(const_cast<Property*>(prop));
if(it != index.end()) {
auto &data = *it;
if (it != index.end()) {
auto& data = *it;
writer.Stream() << "\" group=\"" << Base::Persistence::encodeAttribute(data.group)
<< "\" doc=\"" << Base::Persistence::encodeAttribute(data.doc)
<< "\" attr=\"" << data.attr << "\" ro=\"" << data.readonly
<< "\" hide=\"" << data.hidden;
<< "\" attr=\"" << data.attr << "\" ro=\"" << data.readonly << "\" hide=\""
<< data.hidden;
}
}
Property *DynamicProperty::restore(PropertyContainer &pc,
const char *PropName, const char *TypeName, Base::XMLReader &reader)
Property* DynamicProperty::restore(PropertyContainer& pc,
const char* PropName,
const char* TypeName,
Base::XMLReader& reader)
{
if (!reader.hasAttribute("group"))
if (!reader.hasAttribute("group")) {
return nullptr;
}
short attribute = 0;
bool readonly = false, hidden = false;
const char *group=nullptr, *doc=nullptr, *attr=nullptr, *ro=nullptr, *hide=nullptr;
const char *group = nullptr, *doc = nullptr, *attr = nullptr, *ro = nullptr, *hide = nullptr;
group = reader.getAttribute("group");
if (reader.hasAttribute("doc"))
if (reader.hasAttribute("doc")) {
doc = reader.getAttribute("doc");
}
if (reader.hasAttribute("attr")) {
attr = reader.getAttribute("attr");
if (attr) {
@@ -312,42 +357,54 @@ Property *DynamicProperty::restore(PropertyContainer &pc,
}
if (reader.hasAttribute("ro")) {
ro = reader.getAttribute("ro");
if (ro) readonly = (ro[0]-48) != 0;
if (ro) {
readonly = (ro[0] - 48) != 0;
}
}
if (reader.hasAttribute("hide")) {
hide = reader.getAttribute("hide");
if (hide) hidden = (hide[0]-48) != 0;
if (hide) {
hidden = (hide[0] - 48) != 0;
}
}
return addDynamicProperty(pc,TypeName, PropName, group, doc, attribute, readonly, hidden);
return addDynamicProperty(pc, TypeName, PropName, group, doc, attribute, readonly, hidden);
}
DynamicProperty::PropData DynamicProperty::getDynamicPropertyData(const Property *prop) const
DynamicProperty::PropData DynamicProperty::getDynamicPropertyData(const Property* prop) const
{
auto &index = props.get<1>();
auto& index = props.get<1>();
auto it = index.find(const_cast<Property*>(prop));
if(it != index.end())
if (it != index.end()) {
return *it;
}
return {};
}
bool DynamicProperty::changeDynamicProperty(const Property *prop, const char *group, const char *doc) {
auto &index = props.get<1>();
bool DynamicProperty::changeDynamicProperty(const Property* prop,
const char* group,
const char* doc)
{
auto& index = props.get<1>();
auto it = index.find(const_cast<Property*>(prop));
if (it == index.end())
if (it == index.end()) {
return false;
if(group)
}
if (group) {
it->group = group;
if(doc)
}
if (doc) {
it->doc = doc;
}
return true;
}
const char *DynamicProperty::getPropertyName(const Property *prop) const
const char* DynamicProperty::getPropertyName(const Property* prop) const
{
auto &index = props.get<1>();
auto& index = props.get<1>();
auto it = index.find(const_cast<Property*>(prop));
if(it != index.end())
if (it != index.end()) {
return it->getName();
}
return nullptr;
}