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

fix whitespaces

Browse Source
This commit is contained in:
wmayer
2016-12-28 14:22:42 +01:00
parent 9d8f765738
commit a421803c09
7 changed files with 48 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mod/Sketcher/App/Sketch.h
View File

@@ -339,7 +339,7 @@ public:
Ellipse = 5, // 1 Point(mid), 5 Parameters(x,y,r1,r2,phi) phi=angle xaxis of elipse with respect of sketch xaxis
ArcOfEllipse = 6,
ArcOfHyperbola = 7,
ArcOfParabola = 8
ArcOfParabola = 8
};
float SolveTime;
@@ -385,9 +385,9 @@ protected:
std::vector<GCS::Arc> Arcs;
std::vector<GCS::Circle> Circles;
std::vector<GCS::Ellipse> Ellipses;
std::vector<GCS::ArcOfEllipse> ArcsOfEllipse;
std::vector<GCS::ArcOfHyperbola> ArcsOfHyperbola;
std::vector<GCS::ArcOfParabola> ArcsOfParabola;
std::vector<GCS::ArcOfEllipse> ArcsOfEllipse;
std::vector<GCS::ArcOfHyperbola> ArcsOfHyperbola;
std::vector<GCS::ArcOfParabola> ArcsOfParabola;
bool isInitMove;
bool isFine;

4
src/Mod/Sketcher/App/planegcs/Constraints.h
View File

@@ -66,8 +66,8 @@ namespace GCS
CurveValue = 20,
PointOnHyperbola = 21,
InternalAlignmentPoint2Hyperbola = 22,
PointOnParabola = 23,
EqualFocalDistance = 24
PointOnParabola = 23,
EqualFocalDistance = 24
};
enum InternalAlignmentType {

8
src/Mod/Sketcher/App/planegcs/GCS.h
View File

@@ -182,11 +182,11 @@ namespace GCS
int addConstraintPointOnCircle(Point &p, Circle &c, int tagId=0);
int addConstraintPointOnEllipse(Point &p, Ellipse &e, int tagId=0);
int addConstraintPointOnHyperbolicArc(Point &p, ArcOfHyperbola &e, int tagId=0);
int addConstraintPointOnParabolicArc(Point &p, ArcOfParabola &e, int tagId=0);
int addConstraintPointOnParabolicArc(Point &p, ArcOfParabola &e, int tagId=0);
int addConstraintArcOfEllipseRules(ArcOfEllipse &a, int tagId=0);
int addConstraintCurveValue(Point &p, Curve &a, double *u, int tagId=0);
int addConstraintArcOfHyperbolaRules(ArcOfHyperbola &a, int tagId=0);
int addConstraintArcOfParabolaRules(ArcOfParabola &a, int tagId=0);
int addConstraintArcOfParabolaRules(ArcOfParabola &a, int tagId=0);
int addConstraintPointOnArc(Point &p, Arc &a, int tagId=0);
int addConstraintPerpendicularLine2Arc(Point &p1, Point &p2, Arc &a,
int tagId=0);
@@ -213,7 +213,7 @@ namespace GCS
int addConstraintEqualRadii(ArcOfHyperbola &a1, ArcOfHyperbola &a2, int tagId=0);
int addConstraintEqualRadius(Circle &c1, Arc &a2, int tagId=0);
int addConstraintEqualRadius(Arc &a1, Arc &a2, int tagId=0);
int addConstraintEqualFocus(ArcOfParabola &a1, ArcOfParabola &a2, int tagId=0);
int addConstraintEqualFocus(ArcOfParabola &a1, ArcOfParabola &a2, int tagId=0);
int addConstraintP2PSymmetric(Point &p1, Point &p2, Line &l, int tagId=0);
int addConstraintP2PSymmetric(Point &p1, Point &p2, Point &p, int tagId=0);
int addConstraintSnellsLaw(Curve &ray1, Curve &ray2,
@@ -232,7 +232,7 @@ namespace GCS
int addConstraintInternalAlignmentHyperbolaMajorDiameter(Hyperbola &e, Point &p1, Point &p2, int tagId=0);
int addConstraintInternalAlignmentHyperbolaMinorDiameter(Hyperbola &e, Point &p1, Point &p2, int tagId=0);
int addConstraintInternalAlignmentHyperbolaFocus(Hyperbola &e, Point &p1, int tagId=0);
int addConstraintInternalAlignmentParabolaFocus(Parabola &e, Point &p1, int tagId=0);
int addConstraintInternalAlignmentParabolaFocus(Parabola &e, Point &p1, int tagId=0);
double calculateAngleViaPoint(Curve &crv1, Curve &crv2, Point &p);
double calculateAngleViaPoint(Curve &crv1, Curve &crv2, Point &p1, Point &p2);