This commit is contained in:
Zheng, Lei
2022-09-05 12:06:06 +05:00
committed by Uwe
parent b470cfeaf1
commit 28ca0cf7b1
4 changed files with 12 additions and 12 deletions
+1 -1
View File
@@ -100,7 +100,7 @@ public:
virtual void extensionGetDisplayModes(std::vector<std::string> &) const {}
virtual void extensionSetupContextMenu(QMenu*, QObject*, const char*) {}
//update data of extended opject
//update data of extended object
virtual void extensionUpdateData(const App::Property*);
virtual PyObject* getExtensionPyObject();
+6 -6
View File
@@ -142,7 +142,7 @@ Feature::getElementName(const char *name, ElementNameType type) const
if (type != ElementNameType::Export)
return App::GeoFeature::getElementName(name, type);
// This function is overriden to provide higher level shape topo names that
// This function is overridden to provide higher level shape topo names that
// are generated on demand, e.g. Wire, Shell, Solid, etc.
auto prop = Base::freecad_dynamic_cast<PropertyPartShape>(getPropertyOfGeometry());
@@ -164,12 +164,12 @@ Feature::getElementName(const char *name, ElementNameType type) const
//
// In theory, all it takes to find one lower element that only appear
// in the given higher element. To make the algorithm more robust
// agains model changes, we shall take minimum MinLowerTopoNames lower
// against model changes, we shall take minimum MinLowerTopoNames lower
// elements.
//
// On the other hand, it may be possible to take too many elements for
// disambiguation. We shall limit to maximum MaxLowerTopoNames. If the
// choosen elements are not enough to disambiguate the higher element,
// chosen elements are not enough to disambiguate the higher element,
// we'll include an index for disambiguation.
auto subshape = shape.getSubTopoShape(res.first, res.second, true);
@@ -248,7 +248,7 @@ Feature::getElementName(const char *name, ElementNameType type) const
// disambiguation.
auto it = std::find(ancestors.begin(), ancestors.end(), res.second);
if (it == ancestors.end())
assert(0 && "ancestor not found"); // this shouldn't happend
assert(0 && "ancestor not found"); // this shouldn't happened
else
op = Data::ComplexGeoData::indexPostfix() + std::to_string(it - ancestors.begin());
}
@@ -476,10 +476,10 @@ getElementSource(App::DocumentObject *owner,
&& !tagSet.insert(std::make_pair(doc,tag)).second) {
// Because an object might be deleted, which may be a link/binder
// that points to an external object that contain element name
// using external hash table. We shall prepare for cicular element
// using external hash table. We shall prepare for circular element
// map due to looking up in the wrong table.
if (FC_LOG_INSTANCE.isEnabled(FC_LOGLEVEL_LOG))
FC_WARN("circular elelement mapping");
FC_WARN("circular element mapping");
break;
}
ret.emplace_back(tag,original);
+4 -4
View File
@@ -4747,10 +4747,10 @@ struct MapperPrism: MapperMaker {
std::unordered_map<TopoDS_Shape, TopoDS_Shape, ShapeHasher, ShapeHasher> vertexMap;
ShapeMapper::ShapeMap edgeMap;
MapperPrism(BRepFeat_MakePrism &maker, const TopoShape &upto)
MapperPrism(BRepFeat_MakePrism &maker, const TopoShape &upTo)
:MapperMaker(maker)
{
(void)upto;
(void)upTo;
std::vector<TopoShape> shapes;
for(TopTools_ListIteratorOfListOfShape it(maker.FirstShape());it.More();it.Next())
@@ -4842,11 +4842,11 @@ struct MapperPrism: MapperMaker {
TopoShape &TopoShape::makEShape(BRepFeat_MakePrism &mkShape,
const std::vector<TopoShape> &sources,
const TopoShape &upto,
const TopoShape &upTo,
const char *op)
{
if(!op) op = Part::OpCodes::Prism;
MapperPrism mapper(mkShape, upto);
MapperPrism mapper(mkShape, upTo);
makESHAPE(mkShape.Shape(),mapper,sources,op);
return *this;
}
@@ -668,7 +668,7 @@ bool ProfileBased::checkLineCrossesFace(const gp_Lin& line, const TopoDS_Face& f
TopoDS_Wire outerWire = ShapeAnalysis::OuterWire(face);
BRepBuilderAPI_MakeEdge mkEdge(line);
if (!mkEdge.IsDone())
throw Base::RuntimeError("Revolve: Unexpected OCE failure");
throw Base::RuntimeError("Revolve: Unexpected OCC failure");
BRepAdaptor_Curve axis(TopoDS::Edge(mkEdge.Shape()));
TopExp_Explorer ex;