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

Sketcher: Reformat to current clang-format standard

Browse Source
This commit is contained in:
Chris Hennes
2023-09-02 12:32:58 -05:00
committed by Chris Hennes
parent 41a1a7a8e6
commit 791fe02934
96 changed files with 2132 additions and 1185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/Mod/Sketcher/Gui/EditModeGeometryCoinConverter.cpp
View File

@@ -35,8 +35,10 @@
using namespace SketcherGui;
EditModeGeometryCoinConverter::EditModeGeometryCoinConverter(
ViewProviderSketch& vp, GeometryLayerNodes& geometrylayernodes,
DrawingParameters& drawingparameters, GeometryLayerParameters& geometryLayerParams,
ViewProviderSketch& vp,
GeometryLayerNodes& geometrylayernodes,
DrawingParameters& drawingparameters,
GeometryLayerParameters& geometryLayerParams,
CoinMapping& coinMap)
: viewProvider(vp)
, geometryLayerNodes(geometrylayernodes)
@@ -147,15 +149,17 @@ void EditModeGeometryCoinConverter::convert(const Sketcher::GeoListFacade& geoli
coinMapping.PointIdToVertexId[coinLayer].push_back(vertexCounter++);
}
if (numberCurves > 0)// insert the first segment of the curve into the map
if (numberCurves > 0) {// insert the first segment of the curve into the map
coinMapping.GeoElementId2SetId.emplace(
std::piecewise_construct,
std::forward_as_tuple(geoId, Sketcher::PointPos::none),
std::forward_as_tuple(static_cast<int>(coinMapping.CurvIdToGeoId[coinLayer].size()),
coinLayer));
}
for (int i = 0; i < numberCurves; i++)
for (int i = 0; i < numberCurves; i++) {
coinMapping.CurvIdToGeoId[coinLayer].push_back(geoId);
}
};
for (size_t i = 0; i < geolistfacade.geomlist.size() - 2; i++) {
@@ -173,32 +177,40 @@ void EditModeGeometryCoinConverter::convert(const Sketcher::GeoListFacade& geoli
EditModeGeometryCoinConverter::PointsMode::InsertSingle,
EditModeGeometryCoinConverter::CurveMode::NoCurve,
EditModeGeometryCoinConverter::AnalyseMode::BoundingBoxMagnitude>(geom, GeoId);
setTracking(
GeoId, coinLayer, EditModeGeometryCoinConverter::PointsMode::InsertSingle, 0);
setTracking(GeoId,
coinLayer,
EditModeGeometryCoinConverter::PointsMode::InsertSingle,
0);
}
else if (type == Part::GeomLineSegment::getClassTypeId()) {// add a line
convert<Part::GeomLineSegment,
EditModeGeometryCoinConverter::PointsMode::InsertStartEnd,
EditModeGeometryCoinConverter::CurveMode::StartEndPointsOnly,
EditModeGeometryCoinConverter::AnalyseMode::BoundingBoxMagnitude>(geom, GeoId);
setTracking(
GeoId, coinLayer, EditModeGeometryCoinConverter::PointsMode::InsertStartEnd, 1);
setTracking(GeoId,
coinLayer,
EditModeGeometryCoinConverter::PointsMode::InsertStartEnd,
1);
}
else if (type.isDerivedFrom(Part::GeomConic::getClassTypeId())) {// add a closed curve conic
convert<Part::GeomConic,
EditModeGeometryCoinConverter::PointsMode::InsertMidOnly,
EditModeGeometryCoinConverter::CurveMode::ClosedCurve,
EditModeGeometryCoinConverter::AnalyseMode::BoundingBoxMagnitude>(geom, GeoId);
setTracking(
GeoId, coinLayer, EditModeGeometryCoinConverter::PointsMode::InsertMidOnly, 1);
setTracking(GeoId,
coinLayer,
EditModeGeometryCoinConverter::PointsMode::InsertMidOnly,
1);
}
else if (type.isDerivedFrom(Part::GeomArcOfConic::getClassTypeId())) {// add an arc of conic
convert<Part::GeomArcOfConic,
EditModeGeometryCoinConverter::PointsMode::InsertStartEndMid,
EditModeGeometryCoinConverter::CurveMode::OpenCurve,
EditModeGeometryCoinConverter::AnalyseMode::BoundingBoxMagnitude>(geom, GeoId);
setTracking(
GeoId, coinLayer, EditModeGeometryCoinConverter::PointsMode::InsertStartEndMid, 1);
setTracking(GeoId,
coinLayer,
EditModeGeometryCoinConverter::PointsMode::InsertStartEndMid,
1);
arcGeoIds.push_back(GeoId);
}
else if (type == Part::GeomBSplineCurve::getClassTypeId()) {// add a bspline (a bounded
@@ -208,8 +220,10 @@ void EditModeGeometryCoinConverter::convert(const Sketcher::GeoListFacade& geoli
EditModeGeometryCoinConverter::CurveMode::OpenCurve,
EditModeGeometryCoinConverter::AnalyseMode::
BoundingBoxMagnitudeAndBSplineCurvature>(geom, GeoId);
setTracking(
GeoId, coinLayer, EditModeGeometryCoinConverter::PointsMode::InsertStartEnd, 1);
setTracking(GeoId,
coinLayer,
EditModeGeometryCoinConverter::PointsMode::InsertStartEnd,
1);
bsplineGeoIds.push_back(GeoId);
}
}
@@ -230,26 +244,29 @@ void EditModeGeometryCoinConverter::convert(const Sketcher::GeoListFacade& geoli
int i = 0;// setting up the line set
for (std::vector<Base::Vector3d>::const_iterator it = Coords[l].begin();
it != Coords[l].end();
++it, i++)
++it, i++) {
verts[i].setValue(it->x,
it->y,
ViewProviderSketchCoinAttorney::getViewOrientationFactor(viewProvider)
* drawingParameters.zLowLines);
}
i = 0;// setting up the indexes of the line set
for (std::vector<unsigned int>::const_iterator it = Index[l].begin(); it != Index[l].end();
++it, i++)
++it, i++) {
index[i] = *it;
}
i = 0;// setting up the point set
for (std::vector<Base::Vector3d>::const_iterator it = Points[l].begin();
it != Points[l].end();
++it, i++)
++it, i++) {
pverts[i].setValue(
it->x,
it->y,
ViewProviderSketchCoinAttorney::getViewOrientationFactor(viewProvider)
* drawingParameters.zLowPoints);
}
geometryLayerNodes.CurvesCoordinate[l]->point.finishEditing();
geometryLayerNodes.CurveSet[l]->numVertices.finishEditing();
@@ -257,7 +274,8 @@ void EditModeGeometryCoinConverter::convert(const Sketcher::GeoListFacade& geoli
}
}
template<typename GeoType, EditModeGeometryCoinConverter::PointsMode pointmode,
template<typename GeoType,
EditModeGeometryCoinConverter::PointsMode pointmode,
EditModeGeometryCoinConverter::CurveMode curvemode,
EditModeGeometryCoinConverter::AnalyseMode analysemode>
void EditModeGeometryCoinConverter::convert(const Sketcher::GeometryFacade* geometryfacade,
@@ -303,8 +321,9 @@ void EditModeGeometryCoinConverter::convert(const Sketcher::GeometryFacade* geom
}
else if constexpr (curvemode == CurveMode::ClosedCurve) {
int numSegments = drawingParameters.curvedEdgeCountSegments;
if constexpr (std::is_same<GeoType, Part::GeomBSplineCurve>::value)
if constexpr (std::is_same<GeoType, Part::GeomBSplineCurve>::value) {
numSegments *= geo->countKnots();
}
double segment = (geo->getLastParameter() - geo->getFirstParameter()) / numSegments;
@@ -320,8 +339,9 @@ void EditModeGeometryCoinConverter::convert(const Sketcher::GeometryFacade* geom
}
else if constexpr (curvemode == CurveMode::OpenCurve) {
int numSegments = drawingParameters.curvedEdgeCountSegments;
if constexpr (std::is_same<GeoType, Part::GeomBSplineCurve>::value)
if constexpr (std::is_same<GeoType, Part::GeomBSplineCurve>::value) {
numSegments *= (geo->countKnots() - 1);// one less segments than knots
}
double segment = (geo->getLastParameter() - geo->getFirstParameter()) / numSegments;
@@ -383,22 +403,26 @@ void EditModeGeometryCoinConverter::convert(const Sketcher::GeometryFacade* geom
curvaturelist[i] = 0;
}
if (curvaturelist[i] > maxcurv)
if (curvaturelist[i] > maxcurv) {
maxcurv = curvaturelist[i];
}
double tempf = (pointatcurvelist[i] - midp).Length();
if (tempf > maxdisttocenterofmass)
if (tempf > maxdisttocenterofmass) {
maxdisttocenterofmass = tempf;
}
}
double temprepscale = 0;
if (maxcurv > 0)
if (maxcurv > 0) {
temprepscale = (0.5 * maxdisttocenterofmass)
/ maxcurv;// just a factor to make a comb reasonably visible
}
if (temprepscale > combrepscale)
if (temprepscale > combrepscale) {
combrepscale = temprepscale;
}
}
}
}