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

[pre-commit.ci] auto fixes from pre-commit.com hooks

Browse Source 
for more information, see https://pre-commit.ci
This commit is contained in:
pre-commit-ci[bot]
2023-09-08 12:13:32 +00:00
parent 93679b2729
commit e64c5ee399
5 changed files with 47 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/Mod/Sketcher/Gui/PropertyVisualLayerList.cpp
View File

@@ -23,10 +23,10 @@
#include "PreCompiled.h"
#include <Base/Console.h>
#include <Base/DocumentReader.h>
#include <Base/Interpreter.h>
#include <Base/Reader.h>
#include <Base/Writer.h>
#include <Base/DocumentReader.h>
#include "PropertyVisualLayerList.h"
@@ -92,33 +92,34 @@ void PropertyVisualLayerList::Restore(Base::XMLReader& reader)
setValues(std::move(layers));
}
void PropertyVisualLayerList::Restore(Base::DocumentReader &reader, XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *containerEl)
void PropertyVisualLayerList::Restore(Base::DocumentReader& reader,
XERCES_CPP_NAMESPACE_QUALIFIER DOMElement* containerEl)
{
auto Prop_VisualLayerListDOM = reader.FindElementByField(containerEl,"Property","name","VisualLayerList");
if(Prop_VisualLayerListDOM){
auto VisualLayerListDOM = reader.FindElement(Prop_VisualLayerListDOM,"VisualLayerList");
const char* count_cstr = reader.GetAttribute(VisualLayerListDOM,"count");
if(count_cstr){
int count = reader.ContentToInt( count_cstr );
std::vector<VisualLayer> layers;
layers.reserve(count);
auto prev_VisualLayerDOM = reader.FindElement(VisualLayerListDOM,"VisualLayer");
VisualLayer visualLayer;
visualLayer.Restore(reader,prev_VisualLayerDOM);
layers.push_back(std::move(visualLayer));
for (int i = 1; i < count; i++) {
auto VisualLayerDOM_i = reader.FindNextElement(prev_VisualLayerDOM,"VisualLayer");
VisualLayer visualLayer;
visualLayer.Restore(reader,VisualLayerDOM_i);
layers.push_back(std::move(visualLayer));
prev_VisualLayerDOM = VisualLayerDOM_i;
}
setValues(std::move(layers));
}
}
auto Prop_VisualLayerListDOM =
reader.FindElementByField(containerEl, "Property", "name", "VisualLayerList");
if (Prop_VisualLayerListDOM) {
auto VisualLayerListDOM = reader.FindElement(Prop_VisualLayerListDOM, "VisualLayerList");
const char* count_cstr = reader.GetAttribute(VisualLayerListDOM, "count");
if (count_cstr) {
int count = reader.ContentToInt(count_cstr);
std::vector<VisualLayer> layers;
layers.reserve(count);
auto prev_VisualLayerDOM = reader.FindElement(VisualLayerListDOM, "VisualLayer");
VisualLayer visualLayer;
visualLayer.Restore(reader, prev_VisualLayerDOM);
layers.push_back(std::move(visualLayer));
for (int i = 1; i < count; i++) {
auto VisualLayerDOM_i = reader.FindNextElement(prev_VisualLayerDOM, "VisualLayer");
VisualLayer visualLayer;
visualLayer.Restore(reader, VisualLayerDOM_i);
layers.push_back(std::move(visualLayer));
prev_VisualLayerDOM = VisualLayerDOM_i;
}
setValues(std::move(layers));
}
}
}
Property* PropertyVisualLayerList::Copy() const

3
src/Mod/Sketcher/Gui/PropertyVisualLayerList.h
View File

@@ -61,7 +61,8 @@ public:
void Save(Base::Writer& writer) const override;
void Restore(Base::XMLReader& reader) override;
void Restore(Base::DocumentReader &reader, XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *containerEl) override;
void Restore(Base::DocumentReader& reader,
XERCES_CPP_NAMESPACE_QUALIFIER DOMElement* containerEl) override;
Property* Copy() const override;
void Paste(const Property& from) override;

31
src/Mod/Sketcher/Gui/VisualLayer.cpp
View File

@@ -23,9 +23,9 @@
#include "PreCompiled.h"
#include <Base/Console.h>
#include <Base/DocumentReader.h>
#include <Base/Reader.h>
#include <Base/Writer.h>
#include <Base/DocumentReader.h>
#include "VisualLayer.h"
@@ -89,20 +89,19 @@ void VisualLayer::Restore(Base::XMLReader& reader)
lineWidth = reader.getAttributeAsFloat("lineWidth");
}
void VisualLayer::Restore(Base::DocumentReader &reader,XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *ContainerDOM)
void VisualLayer::Restore(Base::DocumentReader& reader,
XERCES_CPP_NAMESPACE_QUALIFIER DOMElement* ContainerDOM)
{
const char* visible_cstr = reader.GetAttribute(ContainerDOM,"visible");
if(visible_cstr){
std::string str = visible_cstr;
visible = (str == "true");
const char* linePattern_cstr = reader.GetAttribute(ContainerDOM,"linePattern");
const char* lineWidth_cstr = reader.GetAttribute(ContainerDOM,"lineWidth");
if(linePattern_cstr && lineWidth_cstr){
linePattern = reader.ContentToUnsigned( linePattern_cstr );
lineWidth = reader.ContentToUnsigned( lineWidth_cstr );
}
}
const char* visible_cstr = reader.GetAttribute(ContainerDOM, "visible");
if (visible_cstr) {
std::string str = visible_cstr;
visible = (str == "true");
const char* linePattern_cstr = reader.GetAttribute(ContainerDOM, "linePattern");
const char* lineWidth_cstr = reader.GetAttribute(ContainerDOM, "lineWidth");
if (linePattern_cstr && lineWidth_cstr) {
linePattern = reader.ContentToUnsigned(linePattern_cstr);
lineWidth = reader.ContentToUnsigned(lineWidth_cstr);
}
}
}

3
src/Mod/Sketcher/Gui/VisualLayer.h
View File

@@ -51,7 +51,8 @@ public:
void Save(Base::Writer& /*writer*/) const;
void Restore(Base::XMLReader& /*reader*/);
void Restore(Base::DocumentReader &reader, XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *containerEl);
void Restore(Base::DocumentReader& reader,
XERCES_CPP_NAMESPACE_QUALIFIER DOMElement* containerEl);
private:
unsigned int linePattern;

1
src/Tools/_TEMPLATE_/Gui/PreCompiled.h
View File

@@ -61,7 +61,6 @@
#include <xercesc/util/XercesDefs.hpp>
// Qt Toolkit
#ifndef __QtAll__
#include <Gui/QtAll.h>