suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ fix indentation and strip trailing spaces

Browse Source 
git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5021 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d
This commit is contained in:
logari81 2011-10-14 18:04:08 +00:00
parent 4682540efc
commit 895267799e
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Mod/Sketcher/App/SketchObject.cpp
View File

@ -558,7 +558,7 @@ int SketchObject::trim(int GeoId, const Base::Vector3d& point)
}
this->Constraints.setValues(newVals);
movePoint(GeoId, end, point1);
movePoint(newGeoId, start, point2);
@ -662,7 +662,6 @@ int SketchObject::trim(int GeoId, const Base::Vector3d& point)
std::vector< Part::Geometry * > newVals(geomlist);
newVals[GeoId] = geoNew;
Geometry.setValues(newVals);
delete geoNew;
rebuildVertexIndex();
@ -716,7 +715,7 @@ int SketchObject::trim(int GeoId, const Base::Vector3d& point)
// Getting Arc Trim Parameters - Note: for some reason aoc->getRange is not reliable
Handle_Geom_TrimmedCurve curve = Handle_Geom_TrimmedCurve::DownCast(aoc->handle());
double u = (double) curve->FirstParameter(),v = (double) curve->LastParameter();
// aoc->getRange(u,v);
// aoc->getRange(u,v);
u = fmod(u, 2.f*M_PI);
v = fmod(v, 2.f*M_PI);
@ -748,11 +747,11 @@ int SketchObject::trim(int GeoId, const Base::Vector3d& point)
constNew->First = newGeoId;
newVals[i] = constNew;
} else if (constraints[i]->Second == GeoId &&
constraints[i]->SecondPos == end) {
constraints[i]->SecondPos == end) {
Constraint *constNew = newVals[i]->clone();
constNew->Second = newGeoId;
newVals[i] = constNew;
Constraint *constNew = newVals[i]->clone();
constNew->Second = newGeoId;
newVals[i] = constNew;
}
}
@ -823,7 +822,7 @@ int SketchObject::trim(int GeoId, const Base::Vector3d& point)
if (GeoId1 >= 0) {
Handle_Geom_TrimmedCurve curve = Handle_Geom_TrimmedCurve::DownCast(aoc->handle());
double u = (double) curve->FirstParameter(),v = (double) curve->LastParameter();
// aoc->getRange(u,v);
// aoc->getRange(u,v);
u = fmod(u, 2.f*M_PI);
v = fmod(v, 2.f*M_PI);
@ -834,7 +833,7 @@ int SketchObject::trim(int GeoId, const Base::Vector3d& point)
if (theta1 < 0)
theta1 += 2*M_PI;
if ((theta1 > theta0) ||
(swap && theta1 < theta0 && theta1 < v)) { // trim en
delConstraintOnPoint(GeoId, start, false);