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

[Gui] fix some CI warnings

Browse Source 
- narrowing conversion from 'unsigned long' to signed type 'int' is implementation-defined
- floating point literal has suffix 'f', which is not uppercase
- narrowing conversion from 'double' to 'float'
- Slots named on_foo_bar are error prone
- also tome Clang style fixes

(see here for the reports: https://github.com/FreeCAD/FreeCAD/pull/7522/commits/d9c2efcc)
This commit is contained in:
Uwe
2022-09-24 19:58:11 +02:00
parent 2849d7bec3
commit 2ef4b7a06b
5 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Mod/Sketcher/Gui/CommandConstraints.cpp
View File

@@ -94,17 +94,17 @@ void finishDatumConstraint (Gui::Command* cmd, Sketcher::SketchObject* sketch, b
// Get the latest constraint
const std::vector<Sketcher::Constraint *> &ConStr = sketch->Constraints.getValues();
int lastConstraintIndex = ConStr.size() - 1;
auto lastConstraintIndex = ConStr.size() - 1;
Sketcher::Constraint *constr = ConStr[lastConstraintIndex];
auto lastConstraintType = constr->Type;
// Guess some reasonable distance for placing the datum text
Gui::Document *doc = cmd->getActiveGuiDocument();
float scaleFactor = 1.f;
float labelPosition = 0.f;
float labelPositionRandomness = 0.f;
float scaleFactor = 1.0;
double labelPosition = 0.0;
float labelPositionRandomness = 0.0;
if(lastConstraintType == Radius || lastConstraintType == Diameter) {
if (lastConstraintType == Radius || lastConstraintType == Diameter) {
labelPosition = hGrp->GetFloat("RadiusDiameterConstraintDisplayBaseAngle", 15.0) * (M_PI / 180); // Get radius/diameter constraint display angle
labelPositionRandomness = hGrp->GetFloat("RadiusDiameterConstraintDisplayAngleRandomness", 0.0) * (M_PI / 180); // Get randomness
@@ -1996,7 +1996,7 @@ void CmdSketcherConstrainCoincident::activated(int iMsg)
getIdsFromName(SubNames[i], Obj, GeoId2, PosId2);
// check if the edge already has a Block constraint
if ( areBothPointsOrSegmentsFixed(Obj,GeoId1,GeoId2) ) {
if (areBothPointsOrSegmentsFixed(Obj,GeoId1,GeoId2)) {
showNoConstraintBetweenFixedGeometry();
return;
}
@@ -2005,7 +2005,7 @@ void CmdSketcherConstrainCoincident::activated(int iMsg)
// arise and substitute them with more appropriate counterparts, examples:
// - coincidence + tangency on edge
// - point on object + tangency on edge
if(substituteConstraintCombinations(Obj, GeoId1, PosId1,GeoId2, PosId2)) {
if (substituteConstraintCombinations(Obj, GeoId1, PosId1,GeoId2, PosId2)) {
constraintsAdded = true;
break;
}
@@ -2045,7 +2045,7 @@ void CmdSketcherConstrainCoincident::applyConstraint(std::vector<SelIdPair> &sel
Sketcher::PointPos PosId1 = selSeq.at(0).PosId, PosId2 = selSeq.at(1).PosId;
// check if the edge already has a Block constraint
if ( areBothPointsOrSegmentsFixed(Obj, GeoId1, GeoId2) ) {
if (areBothPointsOrSegmentsFixed(Obj, GeoId1, GeoId2)) {
showNoConstraintBetweenFixedGeometry();
return;
}