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

Part/Sketcher: Refactor Geometry Extensions copy/save/restore AND attachment notification

Browse Source 
=========================================================================================

- Long overdue refactor to avoid repetition during save/restore and copy.
- New interface to notify an extension when it is attached. It also enables the extension to gain
a pointer to the geometry container. This is intended to extend the functionality already existing
in Part::Geometry.
This commit is contained in:
Abdullah Tahiri
2021-01-08 14:18:52 +01:00
committed by abdullahtahiriyo
parent 927fdc9edc
commit e6af511f39
14 changed files with 141 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/Mod/Part/App/GeometryDefaultExtension.cpp
View File

@@ -44,36 +44,36 @@ GeometryDefaultExtension<T>::GeometryDefaultExtension(const T& val, std::string
setName(name);
}
// Persistence implementer
template <typename T>
void GeometryDefaultExtension<T>::Save(Base::Writer &writer) const
void GeometryDefaultExtension<T>::copyAttributes(Part::GeometryExtension * cpy) const
{
writer.Stream() << writer.ind() << "<GeoExtension type=\"" << this->getTypeId().getName();
const std::string name = getName();
if(name.size() > 0)
writer.Stream() << "\" name=\"" << name;
writer.Stream() << "\" value=\"" << value << "\"/>" << std::endl;
Part::GeometryPersistenceExtension::copyAttributes(cpy);
static_cast<GeometryDefaultExtension<T> *>(cpy)->value = this->value;
}
template <typename T>
void GeometryDefaultExtension<T>::Restore(Base::XMLReader &reader)
void GeometryDefaultExtension<T>::restoreAttributes(Base::XMLReader &reader)
{
restoreNameAttribute(reader);
Part::GeometryPersistenceExtension::restoreAttributes(reader);
value = reader.getAttribute("value");
}
template <typename T>
void GeometryDefaultExtension<T>::saveAttributes(Base::Writer &writer) const
{
Part::GeometryPersistenceExtension::saveAttributes(writer);
writer.Stream() << "\" value=\"" << value;
}
template <typename T>
std::unique_ptr<Part::GeometryExtension> GeometryDefaultExtension<T>::copy(void) const
{
std::unique_ptr<GeometryDefaultExtension<T>> cpy = std::make_unique<GeometryDefaultExtension<T>>();
cpy->value = this->value;
cpy->setName(this->getName());
copyAttributes(cpy.get());
#if (defined(__GNUC__) && __GNUC__ < 7 ) || defined(_MSC_VER)
return std::move(cpy); // GCC 4.8 and MSC do not support automatic move constructor call if the compiler fails to elide
@@ -117,9 +117,9 @@ PyObject * GeometryDefaultExtension<long>::getPyObject(void)
}
template <>
void GeometryDefaultExtension<long>::Restore(Base::XMLReader &reader)
void GeometryDefaultExtension<long>::restoreAttributes(Base::XMLReader &reader)
{
restoreNameAttribute(reader);
Part::GeometryPersistenceExtension::restoreAttributes(reader);
value = reader.getAttributeAsInteger("value");
}
@@ -143,9 +143,9 @@ PyObject * GeometryDefaultExtension<bool>::getPyObject(void)
}
template <>
void GeometryDefaultExtension<bool>::Restore(Base::XMLReader &reader)
void GeometryDefaultExtension<bool>::restoreAttributes(Base::XMLReader &reader)
{
restoreNameAttribute(reader);
Part::GeometryPersistenceExtension::restoreAttributes(reader);
value = (bool)reader.getAttributeAsInteger("value");
}
@@ -160,9 +160,9 @@ PyObject * GeometryDefaultExtension<double>::getPyObject(void)
}
template <>
void GeometryDefaultExtension<double>::Restore(Base::XMLReader &reader)
void GeometryDefaultExtension<double>::restoreAttributes(Base::XMLReader &reader)
{
restoreNameAttribute(reader);
Part::GeometryPersistenceExtension::restoreAttributes(reader);
value = reader.getAttributeAsFloat("value");
}