3838bddcdb
AngleViaPoint: fixes in UI routines + new messages Goofed undo message in tangency via point is fixed. Forgotten updateActive, clearSelection have been added. New more informative error messages for tangent constraint. AngleViaPoint: using it instead of via line tangency * replaced the helper construction line for ellipse-to-ellipse and similar tangency with a point. Using tangent-via-point there * deleted tangency via line for point-to-point on (cherry picked from commit 9e3fa8c8de0f49c0ef3c978e015eb905358dbdd9) AngleViaPoint: internal/external tangency locking *Added automatic tangency type lockdown for all new constraints (only for point-wise tangency). Tangency type is stored in the constraint datum field, as an angle value shifted by Pi/2 (to be able to treat 0.0 as undefined type). Added ability to switch the tangency by setting datum value from python (can be abused by passing arbitrary angle). Further simplified the tangency related code in Sketch.cpp. AngleViaPoint: added license to Geo.cpp AngleViaPoint: renames in Constraints.cpp/.h Changed some names to increase self-explanatoryness: bool "remapped" renamed to "pvecChangedFlag" "ReconstructEverything()" renamed to "ReconstructGeomPointers()" AngleViaPoint: renames in Constraints.cpp/.h Changed some names to increase self-explanatoryness: bool "remapped" renamed to "pvecChangedFlag" "ReconstructEverything()" renamed to "ReconstructGeomPointers()" AngleViaPoint: using for endpoint perpendicularity + direction lockdown, just as with tangency. + quite a lot of old code is gone because of that AngleViaPoint: perp-ty UI routine made similar to tangent (Git has made a very messy diff.) The changes are: * Perpendicularity-via-point (3-element selection) support added. * Endpoint-to-curve and endpoint-to-endpoint supports all shape combinations. * a bit of code cleanup and clarifications. AngleViaPoint: placement of perpendicular icon in 3d view AngleViaPoint: fix: allow setDatum of perpendicular constraint AngleViaPoint: fix: centers of ellipses are not endpoints isSimpleVertex used to return false for centers of ellipses and arcs of ellipses, which made them being accepted for point-to-point tangency. Should be fixed forever, mo more changes are expected to be necessary for new types of geometry. AngleViaPoint: precalc with OCC (work in progress) Work in progress (not yet working). Using OCC's tangent to replace implementation of SketchObject::calculateAngleViaPoint. AngleViaPoint: fix math: normal now points inwards, where it was intended initially and goofed up. AngleViaPoint: adding comments to the code AngleViaPoint: using GeomCurve::closestParameterToBasicCurve for angle precalculation AngleViaPoint: Py method: changeConstraintsLocking changeConstraintsLocking(True) - locks/re-locks all lockable tangency/perpendicularity constraints of the sketch (applicable to existing sketches). changeConstraintsLocking(False) - removes locking information from lockable constraints AngleViaPoint: final SketchObject::calculateAngleViaPoint Now, finally, using OCC functionality (thanks Abdullah!), without composing temporary Sketch object.
59 lines
3.4 KiB
C++
59 lines
3.4 KiB
C++
/***************************************************************************
|
|
* Copyright (c) 2014 Abdullah.tahiri.yo@gmail.com *
|
|
* *
|
|
* This file is part of the FreeCAD CAx development system. *
|
|
* *
|
|
* This library is free software; you can redistribute it and/or *
|
|
* modify it under the terms of the GNU Library General Public *
|
|
* License as published by the Free Software Foundation; either *
|
|
* version 2 of the License, or (at your option) any later version. *
|
|
* *
|
|
* This library is distributed in the hope that it will be useful, *
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
|
* GNU Library General Public License for more details. *
|
|
* *
|
|
* You should have received a copy of the GNU Library General Public *
|
|
* License along with this library; see the file COPYING.LIB. If not, *
|
|
* write to the Free Software Foundation, Inc., 59 Temple Place, *
|
|
* Suite 330, Boston, MA 02111-1307, USA *
|
|
* *
|
|
***************************************************************************/
|
|
|
|
|
|
#ifndef SKETCHERGUI_CommandConstraints_H
|
|
#define SKETCHERGUI_CommandConstraints_H
|
|
|
|
namespace SketcherGui {
|
|
|
|
// These functions are declared here to promote code reuse from other modules
|
|
|
|
/// Makes a tangency constraint using external construction line between
|
|
/// geom1 => an ellipse
|
|
/// geom2 => any of an ellipse, an arc of ellipse, a circle, or an arc (of circle)
|
|
/// NOTE: A command must be opened before calling this function, which this function
|
|
/// commits or aborts as appropriate. The reason is for compatibility reasons with
|
|
/// other code e.g. "Autoconstraints" in DrawSketchHandler.cpp
|
|
void makeTangentToEllipseviaNewPoint(const Sketcher::SketchObject* Obj,
|
|
const Part::Geometry *geom1,
|
|
const Part::Geometry *geom2,
|
|
int geoId1,
|
|
int geoId2
|
|
);
|
|
/// Makes a tangency constraint using external construction line between
|
|
/// geom1 => an arc of ellipse
|
|
/// geom2 => any of an arc of ellipse, a circle, or an arc (of circle)
|
|
/// NOTE: A command must be opened before calling this function, which this function
|
|
/// commits or aborts as appropriate. The reason is for compatibility reasons with
|
|
/// other code e.g. "Autoconstraints" in DrawSketchHandler.cpp
|
|
void makeTangentToArcOfEllipseviaNewPoint(const Sketcher::SketchObject* Obj,
|
|
const Part::Geometry *geom1,
|
|
const Part::Geometry *geom2,
|
|
int geoId1,
|
|
int geoId2
|
|
);
|
|
|
|
}
|
|
#endif // SKETCHERGUI_DrawSketchHandler_H
|
|
|