Sketcher: App - Clang-format
This commit is contained in:
committed by
abdullahtahiriyo
parent
c33cdcd68a
commit
987b4bda2a
@@ -32,62 +32,63 @@
|
||||
using namespace Sketcher;
|
||||
|
||||
//---------- Geometry Extension
|
||||
constexpr std::array<const char *, InternalType::NumInternalGeometryType> SketchGeometryExtension::internaltype2str;
|
||||
constexpr std::array<const char *,GeometryMode::NumGeometryMode> SketchGeometryExtension::geometrymode2str;
|
||||
constexpr std::array<const char*, InternalType::NumInternalGeometryType>
|
||||
SketchGeometryExtension::internaltype2str;
|
||||
constexpr std::array<const char*, GeometryMode::NumGeometryMode>
|
||||
SketchGeometryExtension::geometrymode2str;
|
||||
|
||||
TYPESYSTEM_SOURCE(Sketcher::SketchGeometryExtension,Part::GeometryPersistenceExtension)
|
||||
TYPESYSTEM_SOURCE(Sketcher::SketchGeometryExtension, Part::GeometryPersistenceExtension)
|
||||
|
||||
// scoped within the class, multithread ready
|
||||
std::atomic<long> SketchGeometryExtension::_GeometryID;
|
||||
|
||||
SketchGeometryExtension::SketchGeometryExtension(): Id(++SketchGeometryExtension::_GeometryID),
|
||||
InternalGeometryType(InternalType::None),
|
||||
GeometryLayer(0)
|
||||
{
|
||||
SketchGeometryExtension::SketchGeometryExtension()
|
||||
: Id(++SketchGeometryExtension::_GeometryID),
|
||||
InternalGeometryType(InternalType::None),
|
||||
GeometryLayer(0)
|
||||
{}
|
||||
|
||||
}
|
||||
SketchGeometryExtension::SketchGeometryExtension(long cid)
|
||||
: Id(cid),
|
||||
InternalGeometryType(InternalType::None),
|
||||
GeometryLayer(0)
|
||||
{}
|
||||
|
||||
SketchGeometryExtension::SketchGeometryExtension(long cid): Id(cid),
|
||||
InternalGeometryType(InternalType::None),
|
||||
GeometryLayer(0)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void SketchGeometryExtension::copyAttributes(Part::GeometryExtension * cpy) const
|
||||
void SketchGeometryExtension::copyAttributes(Part::GeometryExtension* cpy) const
|
||||
{
|
||||
Part::GeometryPersistenceExtension::copyAttributes(cpy);
|
||||
|
||||
static_cast<SketchGeometryExtension *>(cpy)->Id = this->Id;
|
||||
static_cast<SketchGeometryExtension *>(cpy)->InternalGeometryType = this->InternalGeometryType;
|
||||
static_cast<SketchGeometryExtension *>(cpy)->GeometryModeFlags = this->GeometryModeFlags;
|
||||
static_cast<SketchGeometryExtension *>(cpy)->GeometryLayer = this->GeometryLayer;
|
||||
static_cast<SketchGeometryExtension*>(cpy)->Id = this->Id;
|
||||
static_cast<SketchGeometryExtension*>(cpy)->InternalGeometryType = this->InternalGeometryType;
|
||||
static_cast<SketchGeometryExtension*>(cpy)->GeometryModeFlags = this->GeometryModeFlags;
|
||||
static_cast<SketchGeometryExtension*>(cpy)->GeometryLayer = this->GeometryLayer;
|
||||
}
|
||||
|
||||
void SketchGeometryExtension::restoreAttributes(Base::XMLReader &reader)
|
||||
void SketchGeometryExtension::restoreAttributes(Base::XMLReader& reader)
|
||||
{
|
||||
Part::GeometryPersistenceExtension::restoreAttributes(reader);
|
||||
|
||||
if(reader.hasAttribute("id"))
|
||||
if (reader.hasAttribute("id"))
|
||||
Id = reader.getAttributeAsInteger("id");
|
||||
|
||||
InternalGeometryType = static_cast<InternalType::InternalType>(reader.getAttributeAsInteger("internalGeometryType"));
|
||||
InternalGeometryType = static_cast<InternalType::InternalType>(
|
||||
reader.getAttributeAsInteger("internalGeometryType"));
|
||||
|
||||
GeometryModeFlags = GeometryModeFlagType(reader.getAttribute("geometryModeFlags"));
|
||||
|
||||
if(reader.hasAttribute("geometryLayer"))
|
||||
if (reader.hasAttribute("geometryLayer"))
|
||||
GeometryLayer = reader.getAttributeAsInteger("geometryLayer");
|
||||
|
||||
}
|
||||
|
||||
void SketchGeometryExtension::saveAttributes(Base::Writer &writer) const
|
||||
void SketchGeometryExtension::saveAttributes(Base::Writer& writer) const
|
||||
{
|
||||
Part::GeometryPersistenceExtension::saveAttributes(writer);
|
||||
|
||||
writer.Stream() // << "\" id=\"" << Id // This is removed as the stored Id is not used and it may interfere with RT's future implementation
|
||||
<< "\" internalGeometryType=\"" << (int) InternalGeometryType
|
||||
<< "\" geometryModeFlags=\"" << GeometryModeFlags.to_string()
|
||||
<< "\" geometryLayer=\"" << GeometryLayer;
|
||||
// This is removed as the stored Id is not used and it may interfere with RT's future
|
||||
// implementation
|
||||
writer.Stream()// << "\" id=\"" << Id
|
||||
<< "\" internalGeometryType=\"" << (int)InternalGeometryType << "\" geometryModeFlags=\""
|
||||
<< GeometryModeFlags.to_string() << "\" geometryLayer=\"" << GeometryLayer;
|
||||
}
|
||||
|
||||
std::unique_ptr<Part::GeometryExtension> SketchGeometryExtension::copy() const
|
||||
@@ -96,53 +97,52 @@ std::unique_ptr<Part::GeometryExtension> SketchGeometryExtension::copy() const
|
||||
|
||||
copyAttributes(cpy.get());
|
||||
|
||||
#if defined (__GNUC__) && (__GNUC__ <=4)
|
||||
#if defined(__GNUC__) && (__GNUC__ <= 4)
|
||||
return std::move(cpy);
|
||||
#else
|
||||
return cpy;
|
||||
#endif
|
||||
}
|
||||
|
||||
PyObject * SketchGeometryExtension::getPyObject()
|
||||
PyObject* SketchGeometryExtension::getPyObject()
|
||||
{
|
||||
return new SketchGeometryExtensionPy(new SketchGeometryExtension(*this));
|
||||
}
|
||||
|
||||
bool SketchGeometryExtension::getInternalTypeFromName(std::string str, InternalType::InternalType &type)
|
||||
bool SketchGeometryExtension::getInternalTypeFromName(std::string str,
|
||||
InternalType::InternalType& type)
|
||||
{
|
||||
auto pos = std::find_if( SketchGeometryExtension::internaltype2str.begin(),
|
||||
SketchGeometryExtension::internaltype2str.end(),
|
||||
[str](const char * val) {
|
||||
return strcmp(val,str.c_str())==0;
|
||||
}
|
||||
);
|
||||
auto pos = std::find_if(SketchGeometryExtension::internaltype2str.begin(),
|
||||
SketchGeometryExtension::internaltype2str.end(),
|
||||
[str](const char* val) {
|
||||
return strcmp(val, str.c_str()) == 0;
|
||||
});
|
||||
|
||||
if( pos != SketchGeometryExtension::internaltype2str.end()) {
|
||||
int index = std::distance( SketchGeometryExtension::internaltype2str.begin(), pos );
|
||||
if (pos != SketchGeometryExtension::internaltype2str.end()) {
|
||||
int index = std::distance(SketchGeometryExtension::internaltype2str.begin(), pos);
|
||||
|
||||
type = static_cast<InternalType::InternalType>(index);
|
||||
return true;
|
||||
type = static_cast<InternalType::InternalType>(index);
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
bool SketchGeometryExtension::getGeometryModeFromName(std::string str, GeometryMode::GeometryMode &type)
|
||||
bool SketchGeometryExtension::getGeometryModeFromName(std::string str,
|
||||
GeometryMode::GeometryMode& type)
|
||||
{
|
||||
auto pos = std::find_if( SketchGeometryExtension::geometrymode2str.begin(),
|
||||
SketchGeometryExtension::geometrymode2str.end(),
|
||||
[str](const char * val) {
|
||||
return strcmp(val,str.c_str())==0;
|
||||
}
|
||||
);
|
||||
auto pos = std::find_if(SketchGeometryExtension::geometrymode2str.begin(),
|
||||
SketchGeometryExtension::geometrymode2str.end(),
|
||||
[str](const char* val) {
|
||||
return strcmp(val, str.c_str()) == 0;
|
||||
});
|
||||
|
||||
if( pos != SketchGeometryExtension::geometrymode2str.end()) {
|
||||
int index = std::distance( SketchGeometryExtension::geometrymode2str.begin(), pos );
|
||||
if (pos != SketchGeometryExtension::geometrymode2str.end()) {
|
||||
int index = std::distance(SketchGeometryExtension::geometrymode2str.begin(), pos);
|
||||
|
||||
type = static_cast<GeometryMode::GeometryMode>(index);
|
||||
return true;
|
||||
type = static_cast<GeometryMode::GeometryMode>(index);
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user