[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
This commit is contained in:
committed by
WandererFan
parent
a207d11fa4
commit
e92ed45df9
@@ -46,7 +46,7 @@ public:
|
||||
Module()
|
||||
: Py::ExtensionModule<Module>("Surface")
|
||||
{
|
||||
initialize("This module is the Surface module.");// register with Python
|
||||
initialize("This module is the Surface module."); // register with Python
|
||||
}
|
||||
|
||||
private:
|
||||
@@ -57,7 +57,7 @@ PyObject* initModule()
|
||||
return Base::Interpreter().addModule(new Module);
|
||||
}
|
||||
|
||||
}// namespace Surface
|
||||
} // namespace Surface
|
||||
|
||||
/* Python entry */
|
||||
PyMOD_INIT_FUNC(Surface)
|
||||
|
||||
@@ -71,7 +71,7 @@ Handle(Geom_BezierCurve) BlendCurve::compute()
|
||||
}
|
||||
|
||||
Handle(Geom_BezierCurve) curve;
|
||||
if (num_poles > (curve->MaxDegree() + 1)) {// use Geom_BezierCurve max degree
|
||||
if (num_poles > (curve->MaxDegree() + 1)) { // use Geom_BezierCurve max degree
|
||||
Standard_Failure::Raise("number of constraints exceeds bezier curve capacity");
|
||||
}
|
||||
|
||||
|
||||
@@ -57,6 +57,6 @@ public:
|
||||
*/
|
||||
void setSize(int, double, bool);
|
||||
};
|
||||
}// namespace Surface
|
||||
} // namespace Surface
|
||||
|
||||
#endif
|
||||
|
||||
@@ -37,7 +37,7 @@ std::string BlendCurvePy::representation() const
|
||||
return "BlendCurve";
|
||||
}
|
||||
|
||||
PyObject* BlendCurvePy::PyMake(struct _typeobject*, PyObject*, PyObject*)// Python wrapper
|
||||
PyObject* BlendCurvePy::PyMake(struct _typeobject*, PyObject*, PyObject*) // Python wrapper
|
||||
{
|
||||
// create a new instance of BlendCurvePy
|
||||
return new BlendCurvePy(new BlendCurve);
|
||||
|
||||
@@ -70,6 +70,6 @@ public:
|
||||
|
||||
private:
|
||||
};
|
||||
}// namespace Surface
|
||||
} // namespace Surface
|
||||
|
||||
#endif
|
||||
|
||||
@@ -51,7 +51,7 @@ std::string BlendPointPy::representation() const
|
||||
return str.str();
|
||||
}
|
||||
|
||||
PyObject* BlendPointPy::PyMake(struct _typeobject*, PyObject*, PyObject*)// Python wrapper
|
||||
PyObject* BlendPointPy::PyMake(struct _typeobject*, PyObject*, PyObject*) // Python wrapper
|
||||
{
|
||||
// create a new instance of BlendPointPy
|
||||
return new BlendPointPy(new BlendPoint);
|
||||
|
||||
@@ -69,6 +69,6 @@ protected:
|
||||
void onChanged(const App::Property* prop) override;
|
||||
};
|
||||
|
||||
}// Namespace Surface
|
||||
} // Namespace Surface
|
||||
|
||||
#endif
|
||||
|
||||
@@ -64,7 +64,7 @@ App::DocumentObjectExecReturn* Cut::execute()
|
||||
|
||||
// Get first toposhape
|
||||
if (shapes[0]->getTypeId().isDerivedFrom(Part::Feature::getClassTypeId())) {
|
||||
ts1 = static_cast<Part::Feature*>(shapes[0])->Shape.getShape();// Part::TopoShape 1
|
||||
ts1 = static_cast<Part::Feature*>(shapes[0])->Shape.getShape(); // Part::TopoShape 1
|
||||
}
|
||||
else {
|
||||
return new App::DocumentObjectExecReturn("Shape1 not from Part::Feature");
|
||||
|
||||
@@ -38,7 +38,7 @@ class SurfaceExport Cut: public Part::Feature
|
||||
public:
|
||||
Cut();
|
||||
|
||||
App::PropertyLinkSubList ShapeList;// Shapes to be cut.
|
||||
App::PropertyLinkSubList ShapeList; // Shapes to be cut.
|
||||
|
||||
// recalculate the feature
|
||||
App::DocumentObjectExecReturn* execute() override;
|
||||
@@ -49,6 +49,6 @@ public:
|
||||
// }
|
||||
};
|
||||
|
||||
}// Namespace Surface
|
||||
} // Namespace Surface
|
||||
|
||||
#endif
|
||||
|
||||
@@ -68,6 +68,6 @@ private:
|
||||
bool lockOnChangeMutex {false};
|
||||
};
|
||||
|
||||
}// Namespace Surface
|
||||
} // Namespace Surface
|
||||
|
||||
#endif
|
||||
|
||||
@@ -42,29 +42,29 @@ public:
|
||||
|
||||
// Properties of Curves
|
||||
App::PropertyLinkSubList
|
||||
BoundaryEdges;// Boundary Edges (C0 is required for edges without a corresponding face)
|
||||
App::PropertyStringList BoundaryFaces; // Boundary Faces (C0, G1 and G2 are possible)
|
||||
App::PropertyIntegerList BoundaryOrder;// Order of constraint on border faces
|
||||
App::PropertyLinkSubList UnboundEdges; // Unbound constraint edges (C0 is required for edges
|
||||
// without a corresponding face)
|
||||
App::PropertyStringList UnboundFaces; // Unbound constraint faces (C0, G1 and G2 are possible)
|
||||
App::PropertyIntegerList UnboundOrder; // Order of constraint on curve faces
|
||||
App::PropertyLinkSubList FreeFaces; // Free constraint faces
|
||||
App::PropertyIntegerList FreeOrder; // Order of constraint on free faces
|
||||
App::PropertyLinkSubList Points; // Constraint Points (on Surface)
|
||||
App::PropertyLinkSub InitialFace; // Initial Face to use
|
||||
BoundaryEdges; // Boundary Edges (C0 is required for edges without a corresponding face)
|
||||
App::PropertyStringList BoundaryFaces; // Boundary Faces (C0, G1 and G2 are possible)
|
||||
App::PropertyIntegerList BoundaryOrder; // Order of constraint on border faces
|
||||
App::PropertyLinkSubList UnboundEdges; // Unbound constraint edges (C0 is required for edges
|
||||
// without a corresponding face)
|
||||
App::PropertyStringList UnboundFaces; // Unbound constraint faces (C0, G1 and G2 are possible)
|
||||
App::PropertyIntegerList UnboundOrder; // Order of constraint on curve faces
|
||||
App::PropertyLinkSubList FreeFaces; // Free constraint faces
|
||||
App::PropertyIntegerList FreeOrder; // Order of constraint on free faces
|
||||
App::PropertyLinkSubList Points; // Constraint Points (on Surface)
|
||||
App::PropertyLinkSub InitialFace; // Initial Face to use
|
||||
|
||||
// Algorithm Variables
|
||||
App::PropertyInteger Degree; // Starting degree
|
||||
App::PropertyInteger PointsOnCurve; // Number of points on an edge for constraint
|
||||
App::PropertyInteger Iterations; // Number of iterations
|
||||
App::PropertyBool Anisotropy; // Anisotropy
|
||||
App::PropertyFloat Tolerance2d; // 2D Tolerance
|
||||
App::PropertyFloat Tolerance3d; // 3D Tolerance
|
||||
App::PropertyFloat TolAngular; // G1 tolerance
|
||||
App::PropertyFloat TolCurvature; // G2 tolerance
|
||||
App::PropertyInteger MaximumDegree; // Maximum curve degree
|
||||
App::PropertyInteger MaximumSegments;// Maximum number of segments
|
||||
App::PropertyInteger Degree; // Starting degree
|
||||
App::PropertyInteger PointsOnCurve; // Number of points on an edge for constraint
|
||||
App::PropertyInteger Iterations; // Number of iterations
|
||||
App::PropertyBool Anisotropy; // Anisotropy
|
||||
App::PropertyFloat Tolerance2d; // 2D Tolerance
|
||||
App::PropertyFloat Tolerance3d; // 3D Tolerance
|
||||
App::PropertyFloat TolAngular; // G1 tolerance
|
||||
App::PropertyFloat TolCurvature; // G2 tolerance
|
||||
App::PropertyInteger MaximumDegree; // Maximum curve degree
|
||||
App::PropertyInteger MaximumSegments; // Maximum number of segments
|
||||
|
||||
// recalculate the feature
|
||||
App::DocumentObjectExecReturn* execute() override;
|
||||
@@ -87,6 +87,6 @@ private:
|
||||
void addConstraints(BRepFill_Filling& builder, const App::PropertyLinkSubList& points);
|
||||
};
|
||||
|
||||
}// Namespace Surface
|
||||
} // Namespace Surface
|
||||
|
||||
#endif
|
||||
|
||||
@@ -72,13 +72,13 @@ void ShapeValidator::checkEdge(const TopoDS_Shape& shape)
|
||||
Standard_Failure::Raise("Shape is not an edge.\n");
|
||||
}
|
||||
|
||||
TopoDS_Edge etmp = TopoDS::Edge(shape); // Curve TopoDS_Edge
|
||||
TopLoc_Location heloc; // this will be output
|
||||
Standard_Real u0; // contains output
|
||||
Standard_Real u1; // contains output
|
||||
Handle(Geom_Curve) c_geom = BRep_Tool::Curve(etmp, heloc, u0, u1);// The geometric curve
|
||||
TopoDS_Edge etmp = TopoDS::Edge(shape); // Curve TopoDS_Edge
|
||||
TopLoc_Location heloc; // this will be output
|
||||
Standard_Real u0; // contains output
|
||||
Standard_Real u1; // contains output
|
||||
Handle(Geom_Curve) c_geom = BRep_Tool::Curve(etmp, heloc, u0, u1); // The geometric curve
|
||||
Handle(Geom_BezierCurve) bez_geom =
|
||||
Handle(Geom_BezierCurve)::DownCast(c_geom);// Try to get Bezier curve
|
||||
Handle(Geom_BezierCurve)::DownCast(c_geom); // Try to get Bezier curve
|
||||
|
||||
// if not a Bezier then try to create a B-spline surface from the edges
|
||||
if (bez_geom.IsNull()) {
|
||||
@@ -117,7 +117,7 @@ void ShapeValidator::checkAndAdd(const Part::TopoShape& ts,
|
||||
checkAndAdd(ts.getShape(), aWD);
|
||||
}
|
||||
}
|
||||
catch (Standard_Failure&) {// any OCC exception means an inappropriate shape in the selection
|
||||
catch (Standard_Failure&) { // any OCC exception means an inappropriate shape in the selection
|
||||
Standard_Failure::Raise("Wrong shape type.\n");
|
||||
}
|
||||
}
|
||||
@@ -199,7 +199,7 @@ GeomFill_FillingStyle GeomFillSurface::getFillingStyle()
|
||||
default:
|
||||
Standard_Failure::Raise(
|
||||
"Filling style must be 0 (Stretch), 1 (Coons), or 2 (Curved).\n");
|
||||
return GeomFill_StretchStyle;// this is to shut up the compiler
|
||||
return GeomFill_StretchStyle; // this is to shut up the compiler
|
||||
}
|
||||
}
|
||||
|
||||
@@ -209,7 +209,7 @@ bool GeomFillSurface::getWire(TopoDS_Wire& aWire)
|
||||
Handle(ShapeExtend_WireData) aWD = new ShapeExtend_WireData;
|
||||
|
||||
std::vector<App::PropertyLinkSubList::SubSet> boundary = BoundaryList.getSubListValues();
|
||||
if (boundary.size() > 4) {// if too many not even try
|
||||
if (boundary.size() > 4) { // if too many not even try
|
||||
Standard_Failure::Raise("Only 2-4 curves are allowed\n");
|
||||
}
|
||||
|
||||
@@ -233,14 +233,14 @@ bool GeomFillSurface::getWire(TopoDS_Wire& aWire)
|
||||
|
||||
// Reorder the curves and fix the wire if required
|
||||
|
||||
aShFW->Load(aWD); // Load in the wire
|
||||
aShFW->FixReorder(); // Fix the order of the edges if required
|
||||
aShFW->ClosedWireMode() = Standard_True;// Enables closed wire mode
|
||||
aShFW->FixConnected(); // Fix connection between wires
|
||||
aShFW->FixSelfIntersection(); // Fix Self Intersection
|
||||
aShFW->Perform(); // Perform the fixes
|
||||
aShFW->Load(aWD); // Load in the wire
|
||||
aShFW->FixReorder(); // Fix the order of the edges if required
|
||||
aShFW->ClosedWireMode() = Standard_True; // Enables closed wire mode
|
||||
aShFW->FixConnected(); // Fix connection between wires
|
||||
aShFW->FixSelfIntersection(); // Fix Self Intersection
|
||||
aShFW->Perform(); // Perform the fixes
|
||||
|
||||
aWire = aShFW->Wire();// Healed Wire
|
||||
aWire = aShFW->Wire(); // Healed Wire
|
||||
|
||||
if (aWire.IsNull()) {
|
||||
Standard_Failure::Raise("Wire unable to be constructed\n");
|
||||
@@ -273,18 +273,18 @@ void GeomFillSurface::createBezierSurface(TopoDS_Wire& aWire)
|
||||
std::vector<Handle(Geom_BezierCurve)> curves;
|
||||
curves.reserve(4);
|
||||
|
||||
Standard_Real u1, u2;// contains output
|
||||
Standard_Real u1, u2; // contains output
|
||||
TopExp_Explorer anExp(aWire, TopAbs_EDGE);
|
||||
for (; anExp.More(); anExp.Next()) {
|
||||
const TopoDS_Edge hedge = TopoDS::Edge(anExp.Current());
|
||||
TopLoc_Location heloc; // this will be output
|
||||
Handle(Geom_Curve) c_geom = BRep_Tool::Curve(hedge, heloc, u1, u2);// The geometric curve
|
||||
TopLoc_Location heloc; // this will be output
|
||||
Handle(Geom_Curve) c_geom = BRep_Tool::Curve(hedge, heloc, u1, u2); // The geometric curve
|
||||
Handle(Geom_BezierCurve) bezier =
|
||||
Handle(Geom_BezierCurve)::DownCast(c_geom);// Try to get Bezier curve
|
||||
Handle(Geom_BezierCurve)::DownCast(c_geom); // Try to get Bezier curve
|
||||
|
||||
if (!bezier.IsNull()) {
|
||||
gp_Trsf transf = heloc.Transformation();
|
||||
bezier->Transform(transf);// apply original transformation to control points
|
||||
bezier->Transform(transf); // apply original transformation to control points
|
||||
// Store Underlying Geometry
|
||||
curves.push_back(bezier);
|
||||
}
|
||||
@@ -294,7 +294,7 @@ void GeomFillSurface::createBezierSurface(TopoDS_Wire& aWire)
|
||||
}
|
||||
|
||||
GeomFill_FillingStyle fstyle = getFillingStyle();
|
||||
GeomFill_BezierCurves aSurfBuilder;// Create Surface Builder
|
||||
GeomFill_BezierCurves aSurfBuilder; // Create Surface Builder
|
||||
|
||||
std::size_t edgeCount = curves.size();
|
||||
const boost::dynamic_bitset<>& booleans = ReversedList.getValues();
|
||||
@@ -323,17 +323,17 @@ void GeomFillSurface::createBSplineSurface(TopoDS_Wire& aWire)
|
||||
{
|
||||
std::vector<Handle(Geom_BSplineCurve)> curves;
|
||||
curves.reserve(4);
|
||||
Standard_Real u1, u2;// contains output
|
||||
Standard_Real u1, u2; // contains output
|
||||
TopExp_Explorer anExp(aWire, TopAbs_EDGE);
|
||||
for (; anExp.More(); anExp.Next()) {
|
||||
const TopoDS_Edge& edge = TopoDS::Edge(anExp.Current());
|
||||
TopLoc_Location heloc; // this will be output
|
||||
Handle(Geom_Curve) c_geom = BRep_Tool::Curve(edge, heloc, u1, u2);// The geometric curve
|
||||
TopLoc_Location heloc; // this will be output
|
||||
Handle(Geom_Curve) c_geom = BRep_Tool::Curve(edge, heloc, u1, u2); // The geometric curve
|
||||
Handle(Geom_BSplineCurve) bspline =
|
||||
Handle(Geom_BSplineCurve)::DownCast(c_geom);// Try to get BSpline curve
|
||||
Handle(Geom_BSplineCurve)::DownCast(c_geom); // Try to get BSpline curve
|
||||
gp_Trsf transf = heloc.Transformation();
|
||||
if (!bspline.IsNull()) {
|
||||
bspline->Transform(transf);// apply original transformation to control points
|
||||
bspline->Transform(transf); // apply original transformation to control points
|
||||
// Store Underlying Geometry
|
||||
curves.push_back(bspline);
|
||||
}
|
||||
@@ -346,7 +346,7 @@ void GeomFillSurface::createBSplineSurface(TopoDS_Wire& aWire)
|
||||
Convert_ParameterisationType paratype = Convert_Polynomial;
|
||||
Handle(Geom_BSplineCurve) bspline2 = conv.CurveToBSplineCurve(trim, paratype);
|
||||
if (!bspline2.IsNull()) {
|
||||
bspline2->Transform(transf);// apply original transformation to control points
|
||||
bspline2->Transform(transf); // apply original transformation to control points
|
||||
curves.push_back(bspline2);
|
||||
}
|
||||
else {
|
||||
@@ -358,14 +358,14 @@ void GeomFillSurface::createBSplineSurface(TopoDS_Wire& aWire)
|
||||
Standard_Failure::Raise(
|
||||
"A curve was not a B-spline and could not be converted into one.");
|
||||
}
|
||||
spline->Transform(transf);// apply original transformation to control points
|
||||
spline->Transform(transf); // apply original transformation to control points
|
||||
curves.push_back(spline);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
GeomFill_FillingStyle fstyle = getFillingStyle();
|
||||
GeomFill_BSplineCurves aSurfBuilder;// Create Surface Builder
|
||||
GeomFill_BSplineCurves aSurfBuilder; // Create Surface Builder
|
||||
|
||||
std::size_t edgeCount = curves.size();
|
||||
const boost::dynamic_bitset<>& booleans = ReversedList.getValues();
|
||||
|
||||
@@ -67,9 +67,9 @@ class GeomFillSurface: public Part::Spline
|
||||
|
||||
public:
|
||||
GeomFillSurface();
|
||||
App::PropertyLinkSubList BoundaryList;// Curves to be turned into a face (2-4 curves allowed).
|
||||
App::PropertyBoolList ReversedList; // Booleans to handle orientation of the curves
|
||||
App::PropertyEnumeration FillType; // Fill method (1, 2, or 3 for Stretch, Coons, and Curved)
|
||||
App::PropertyLinkSubList BoundaryList; // Curves to be turned into a face (2-4 curves allowed).
|
||||
App::PropertyBoolList ReversedList; // Booleans to handle orientation of the curves
|
||||
App::PropertyEnumeration FillType; // Fill method (1, 2, or 3 for Stretch, Coons, and Curved)
|
||||
|
||||
short mustExecute() const override;
|
||||
void onChanged(const App::Property*) override;
|
||||
@@ -93,6 +93,6 @@ private:
|
||||
static const char* FillTypeEnums[];
|
||||
};
|
||||
|
||||
}// namespace Surface
|
||||
} // namespace Surface
|
||||
|
||||
#endif// FEATUREGEOMFILLSURFACE_H
|
||||
#endif // FEATUREGEOMFILLSURFACE_H
|
||||
|
||||
@@ -49,6 +49,6 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
}// Namespace Surface
|
||||
} // Namespace Surface
|
||||
|
||||
#endif
|
||||
|
||||
@@ -96,9 +96,9 @@ App::DocumentObjectExecReturn* Sewing::execute()
|
||||
}
|
||||
}
|
||||
|
||||
builder.Perform();// Perform Sewing
|
||||
builder.Perform(); // Perform Sewing
|
||||
|
||||
TopoDS_Shape aShape = builder.SewedShape();// Get Shape
|
||||
TopoDS_Shape aShape = builder.SewedShape(); // Get Shape
|
||||
if (aShape.IsNull()) {
|
||||
return new App::DocumentObjectExecReturn("Resulting shape is null");
|
||||
}
|
||||
|
||||
@@ -38,19 +38,19 @@ class SurfaceExport Sewing: public Part::Feature
|
||||
public:
|
||||
Sewing();
|
||||
|
||||
App::PropertyLinkSubList ShapeList;// Shapes to be sewn.
|
||||
App::PropertyLinkSubList ShapeList; // Shapes to be sewn.
|
||||
|
||||
App::PropertyFloat Tolerance;
|
||||
App::PropertyBool SewingOption; // Option for sewing (if false only control)
|
||||
App::PropertyBool DegenerateShape;// Option for analysis of degenerated shapes
|
||||
App::PropertyBool CutFreeEdges; // Option for cutting of free edges
|
||||
App::PropertyBool Nonmanifold; // Option for non-manifold processing
|
||||
App::PropertyBool SewingOption; // Option for sewing (if false only control)
|
||||
App::PropertyBool DegenerateShape; // Option for analysis of degenerated shapes
|
||||
App::PropertyBool CutFreeEdges; // Option for cutting of free edges
|
||||
App::PropertyBool Nonmanifold; // Option for non-manifold processing
|
||||
|
||||
// recalculate the feature
|
||||
App::DocumentObjectExecReturn* execute() override;
|
||||
short mustExecute() const override;
|
||||
};
|
||||
|
||||
}// Namespace Surface
|
||||
} // Namespace Surface
|
||||
|
||||
#endif// SURFACE_FEATURESEWING_H
|
||||
#endif // SURFACE_FEATURESEWING_H
|
||||
|
||||
@@ -33,6 +33,6 @@
|
||||
// opencascade
|
||||
#include <Mod/Part/App/OpenCascadeAll.h>
|
||||
|
||||
#endif//_PreComp_
|
||||
#endif //_PreComp_
|
||||
|
||||
#endif
|
||||
|
||||
@@ -49,7 +49,7 @@ public:
|
||||
Module()
|
||||
: Py::ExtensionModule<Module>("SurfaceGui")
|
||||
{
|
||||
initialize("This module is the SurfaceGui module.");// register with Python
|
||||
initialize("This module is the SurfaceGui module."); // register with Python
|
||||
}
|
||||
|
||||
private:
|
||||
@@ -60,7 +60,7 @@ PyObject* initModule()
|
||||
return Base::Interpreter().addModule(new Module);
|
||||
}
|
||||
|
||||
}// namespace SurfaceGui
|
||||
} // namespace SurfaceGui
|
||||
|
||||
/* Python entry */
|
||||
PyMOD_INIT_FUNC(SurfaceGui)
|
||||
|
||||
@@ -35,4 +35,4 @@ QIcon ViewProviderBlendCurve::getIcon() const
|
||||
return Gui::BitmapFactory().pixmap("Surface_BlendCurve");
|
||||
}
|
||||
|
||||
}// namespace SurfaceGui
|
||||
} // namespace SurfaceGui
|
||||
|
||||
@@ -36,6 +36,6 @@ public:
|
||||
QIcon getIcon() const override;
|
||||
};
|
||||
|
||||
}// namespace SurfaceGui
|
||||
} // namespace SurfaceGui
|
||||
|
||||
#endif// SURFACEGUI_VIEWPROVIDEREXTEND_H
|
||||
#endif // SURFACEGUI_VIEWPROVIDEREXTEND_H
|
||||
|
||||
@@ -48,6 +48,6 @@
|
||||
#include <TopoDS_Edge.hxx>
|
||||
#include <TopoDS_Shape.hxx>
|
||||
|
||||
#endif//_PreComp_
|
||||
#endif //_PreComp_
|
||||
|
||||
#endif// GUI_PRECOMPILED_H
|
||||
#endif // GUI_PRECOMPILED_H
|
||||
|
||||
@@ -38,6 +38,6 @@ enum SelectionMode
|
||||
RemoveVertexConstraint = 7,
|
||||
};
|
||||
|
||||
}// namespace SurfaceGui
|
||||
} // namespace SurfaceGui
|
||||
|
||||
#endif// SURFACEGUI_SELECTIONMODE_H
|
||||
#endif // SURFACEGUI_SELECTIONMODE_H
|
||||
|
||||
@@ -126,7 +126,7 @@ void ViewProviderFilling::highlightReferences(ShapeType type, const References&
|
||||
std::size_t idx =
|
||||
static_cast<std::size_t>(std::stoi(jt.substr(6)) - 1);
|
||||
if (idx < colors.size()) {
|
||||
colors[idx] = App::Color(1.0, 0.0, 1.0);// magenta
|
||||
colors[idx] = App::Color(1.0, 0.0, 1.0); // magenta
|
||||
}
|
||||
}
|
||||
|
||||
@@ -149,7 +149,7 @@ void ViewProviderFilling::highlightReferences(ShapeType type, const References&
|
||||
// check again that the index is in range because it's possible that
|
||||
// the sub-names are invalid
|
||||
if (idx < colors.size()) {
|
||||
colors[idx] = App::Color(1.0, 0.0, 1.0);// magenta
|
||||
colors[idx] = App::Color(1.0, 0.0, 1.0); // magenta
|
||||
}
|
||||
}
|
||||
|
||||
@@ -172,7 +172,7 @@ void ViewProviderFilling::highlightReferences(ShapeType type, const References&
|
||||
// check again that the index is in range because it's possible that
|
||||
// the sub-names are invalid
|
||||
if (idx < colors.size()) {
|
||||
colors[idx] = App::Color(1.0, 0.0, 1.0);// magenta
|
||||
colors[idx] = App::Color(1.0, 0.0, 1.0); // magenta
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1017,6 +1017,6 @@ bool TaskFilling::reject()
|
||||
return ok;
|
||||
}
|
||||
|
||||
}// namespace SurfaceGui
|
||||
} // namespace SurfaceGui
|
||||
|
||||
#include "moc_TaskFilling.cpp"
|
||||
|
||||
@@ -151,6 +151,6 @@ private:
|
||||
FillingVertexPanel* widget3;
|
||||
};
|
||||
|
||||
}// namespace SurfaceGui
|
||||
} // namespace SurfaceGui
|
||||
|
||||
#endif// SURFACEGUI_TASKFILLING_H
|
||||
#endif // SURFACEGUI_TASKFILLING_H
|
||||
|
||||
@@ -653,7 +653,7 @@ void FillingEdgePanel::modifyBoundary(bool on)
|
||||
ui->buttonUnboundAccept->setEnabled(on);
|
||||
ui->buttonUnboundIgnore->setEnabled(on);
|
||||
}
|
||||
}// namespace SurfaceGui
|
||||
} // namespace SurfaceGui
|
||||
|
||||
void FillingEdgePanel::exitSelectionMode()
|
||||
{
|
||||
|
||||
@@ -100,6 +100,6 @@ private:
|
||||
void exitSelectionMode();
|
||||
};
|
||||
|
||||
}// namespace SurfaceGui
|
||||
} // namespace SurfaceGui
|
||||
|
||||
#endif// SURFACEGUI_TASKFILLINGEDGE_H
|
||||
#endif // SURFACEGUI_TASKFILLINGEDGE_H
|
||||
|
||||
@@ -393,6 +393,6 @@ void FillingVertexPanel::exitSelectionMode()
|
||||
Gui::Selection().rmvSelectionGate();
|
||||
}
|
||||
|
||||
}// namespace SurfaceGui
|
||||
} // namespace SurfaceGui
|
||||
|
||||
#include "moc_TaskFillingVertex.cpp"
|
||||
|
||||
@@ -96,6 +96,6 @@ private:
|
||||
void exitSelectionMode();
|
||||
};
|
||||
|
||||
}// namespace SurfaceGui
|
||||
} // namespace SurfaceGui
|
||||
|
||||
#endif// SURFACEGUI_TASKFILLINGVERTEX_H
|
||||
#endif // SURFACEGUI_TASKFILLINGVERTEX_H
|
||||
|
||||
@@ -127,7 +127,7 @@ void ViewProviderGeomFillSurface::highlightReferences(bool on)
|
||||
for (const auto& jt : it.second) {
|
||||
std::size_t idx = static_cast<std::size_t>(std::stoi(jt.substr(4)) - 1);
|
||||
assert(idx < colors.size());
|
||||
colors[idx] = App::Color(1.0, 0.0, 1.0);// magenta
|
||||
colors[idx] = App::Color(1.0, 0.0, 1.0); // magenta
|
||||
}
|
||||
|
||||
svp->setHighlightedEdges(colors);
|
||||
@@ -686,6 +686,6 @@ bool TaskGeomFillSurface::reject()
|
||||
return widget->reject();
|
||||
}
|
||||
|
||||
}// namespace SurfaceGui
|
||||
} // namespace SurfaceGui
|
||||
|
||||
#include "moc_TaskGeomFillSurface.cpp"
|
||||
|
||||
@@ -138,6 +138,6 @@ private:
|
||||
Gui::TaskView::TaskBox* taskbox;
|
||||
};
|
||||
|
||||
}// namespace SurfaceGui
|
||||
} // namespace SurfaceGui
|
||||
|
||||
#endif// SURFACEGUI_TASKGEOMFILLSURFACE_H
|
||||
#endif // SURFACEGUI_TASKGEOMFILLSURFACE_H
|
||||
|
||||
@@ -126,7 +126,7 @@ void ViewProviderSections::highlightReferences(ShapeType type, const References&
|
||||
std::size_t idx =
|
||||
static_cast<std::size_t>(std::stoi(jt.substr(6)) - 1);
|
||||
if (idx < colors.size()) {
|
||||
colors[idx] = App::Color(1.0, 0.0, 1.0);// magenta
|
||||
colors[idx] = App::Color(1.0, 0.0, 1.0); // magenta
|
||||
}
|
||||
}
|
||||
|
||||
@@ -149,7 +149,7 @@ void ViewProviderSections::highlightReferences(ShapeType type, const References&
|
||||
// check again that the index is in range because it's possible that
|
||||
// the sub-names are invalid
|
||||
if (idx < colors.size()) {
|
||||
colors[idx] = App::Color(1.0, 0.0, 1.0);// magenta
|
||||
colors[idx] = App::Color(1.0, 0.0, 1.0); // magenta
|
||||
}
|
||||
}
|
||||
|
||||
@@ -172,7 +172,7 @@ void ViewProviderSections::highlightReferences(ShapeType type, const References&
|
||||
// check again that the index is in range because it's possible that
|
||||
// the sub-names are invalid
|
||||
if (idx < colors.size()) {
|
||||
colors[idx] = App::Color(1.0, 0.0, 1.0);// magenta
|
||||
colors[idx] = App::Color(1.0, 0.0, 1.0); // magenta
|
||||
}
|
||||
}
|
||||
|
||||
@@ -649,6 +649,6 @@ bool TaskSections::reject()
|
||||
return ok;
|
||||
}
|
||||
|
||||
}// namespace SurfaceGui
|
||||
} // namespace SurfaceGui
|
||||
|
||||
#include "moc_TaskSections.cpp"
|
||||
|
||||
@@ -140,6 +140,6 @@ private:
|
||||
SectionsPanel* widget1;
|
||||
};
|
||||
|
||||
}// namespace SurfaceGui
|
||||
} // namespace SurfaceGui
|
||||
|
||||
#endif// SURFACEGUI_TASKSECTIONS_H
|
||||
#endif // SURFACEGUI_TASKSECTIONS_H
|
||||
|
||||
@@ -39,4 +39,4 @@ QIcon ViewProviderExtend::getIcon() const
|
||||
return Gui::BitmapFactory().pixmap("Surface_ExtendFace");
|
||||
}
|
||||
|
||||
}// namespace SurfaceGui
|
||||
} // namespace SurfaceGui
|
||||
|
||||
@@ -37,6 +37,6 @@ public:
|
||||
QIcon getIcon() const override;
|
||||
};
|
||||
|
||||
}// namespace SurfaceGui
|
||||
} // namespace SurfaceGui
|
||||
|
||||
#endif// SURFACEGUI_VIEWPROVIDEREXTEND_H
|
||||
#endif // SURFACEGUI_VIEWPROVIDEREXTEND_H
|
||||
|
||||
@@ -42,7 +42,7 @@ protected:
|
||||
Gui::ToolBarItem* setupToolBars() const override;
|
||||
};
|
||||
|
||||
}// namespace SurfaceGui
|
||||
} // namespace SurfaceGui
|
||||
|
||||
|
||||
#endif// Surface_WORKBENCH_H
|
||||
#endif // Surface_WORKBENCH_H
|
||||
|
||||
@@ -44,4 +44,4 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif// SURFACE_GLOBAL_H
|
||||
#endif // SURFACE_GLOBAL_H
|
||||
|
||||
Reference in New Issue
Block a user