source typo fixes pt4 (only on py3 merged code)
This commit is contained in:
parent
30979dcd64
commit
99c99006b8
|
@ -345,7 +345,7 @@ static LONG __stdcall MyCrashHandlerExceptionFilter(EXCEPTION_POINTERS* pEx)
|
|||
NULL
|
||||
))
|
||||
{
|
||||
bFailed = false; // suceeded
|
||||
bFailed = false; // succeeded
|
||||
}
|
||||
CloseHandle(hFile);
|
||||
}
|
||||
|
@ -372,7 +372,7 @@ void InitMiniDumpWriter(const std::string& filename)
|
|||
return;
|
||||
s_szMiniDumpFileName = filename;
|
||||
|
||||
// Initialize the member, so we do not load the dll after the exception has occured
|
||||
// Initialize the member, so we do not load the dll after the exception has occurred
|
||||
// which might be not possible anymore...
|
||||
s_hDbgHelpMod = LoadLibrary(("dbghelp.dll"));
|
||||
if (s_hDbgHelpMod != NULL)
|
||||
|
|
|
@ -89,7 +89,7 @@
|
|||
</Methode>
|
||||
<Methode Name="downgradeRefType">
|
||||
<Documentation>
|
||||
<UserDocu>downgradeRefType(type): returns next more general type. E.g. downgradeType('Circle') yeilds 'Curve'.</UserDocu>
|
||||
<UserDocu>downgradeRefType(type): returns next more general type. E.g. downgradeType('Circle') yields 'Curve'.</UserDocu>
|
||||
</Documentation>
|
||||
</Methode>
|
||||
<Methode Name="getRefTypeInfo">
|
||||
|
|
|
@ -563,7 +563,7 @@ int AttachEngine::getTypeRank(eRefType type)
|
|||
while (type != rtAnything) {
|
||||
type = downgradeType(type);
|
||||
rank++;
|
||||
assert(rank<8);//downgrading never yeilds rtAnything, something's wrong with downgrader.
|
||||
assert(rank<8);//downgrading never yields rtAnything, something's wrong with downgrader.
|
||||
}
|
||||
return rank;
|
||||
}
|
||||
|
@ -1157,7 +1157,7 @@ Base::Placement AttachEngine3D::calculateAttachedPlacement(Base::Placement origP
|
|||
|
||||
gp_Dir dirX;
|
||||
prop.TangentU(dirX); //if normal is defined, this should be defined too
|
||||
SketchXAxis = gp_Vec(dirX).Reversed();//yeilds upside-down sketches less often.
|
||||
SketchXAxis = gp_Vec(dirX).Reversed();//yields upside-down sketches less often.
|
||||
|
||||
if (face.Orientation() == TopAbs_REVERSED) {
|
||||
SketchNormal.Reverse();
|
||||
|
@ -1732,7 +1732,7 @@ Base::Placement AttachEngineLine::calculateAttachedPlacement(Base::Placement ori
|
|||
throw Base::Exception("Null shape in AttachEngineLine::calculateAttachedPlacement()!");
|
||||
const TopoDS_Edge &e = TopoDS::Edge(*(shapes[0]));
|
||||
BRepAdaptor_Curve adapt (e);
|
||||
gp_Ax1 dx1, dx2;//vars to recieve directrices
|
||||
gp_Ax1 dx1, dx2;//vars to receive directrices
|
||||
switch(adapt.GetType()){
|
||||
case GeomAbs_Ellipse:{
|
||||
gp_Elips cc = adapt.Ellipse();
|
||||
|
|
|
@ -153,13 +153,13 @@ struct SuggestResult{
|
|||
srOK, //references are valid for at least one mode
|
||||
srLinkBroken, //failed to resolve out some of current references. Exception info is stored in SuggestResult::error.
|
||||
srUnexpectedError,
|
||||
srNoModesFit,//none of the avaliable mapping modes accepts the set of topological type
|
||||
srNoModesFit,//none of the available mapping modes accepts the set of topological type
|
||||
srIncompatibleGeometry,//there is a mode that could fit, but geometry is wrong (e.g. a line is required, but a curve was passed).
|
||||
};
|
||||
eSuggestResult message;
|
||||
|
||||
/**
|
||||
* @brief allApplicableModes. Vector array that will recieve the list of
|
||||
* @brief allApplicableModes. Vector array that will receive the list of
|
||||
* all modes that are applicable to current set of references. It doesn't
|
||||
* guarantee that all modes will work, it only checks that subelemnts are
|
||||
* of right type.
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
namespace Part
|
||||
{
|
||||
/** Base class of all body objects in FreeCAD
|
||||
* A body is used, e.g. in PartDesign, to agregate
|
||||
* A body is used, e.g. in PartDesign, to aggregate
|
||||
* some modeling features to one shape. As long as not
|
||||
* in edit or active on a workbench, the body shows only the
|
||||
* resulting shape to the outside (Tip link).
|
||||
|
@ -81,9 +81,9 @@ public:
|
|||
virtual PyObject* getPyObject();
|
||||
|
||||
protected:
|
||||
/// If BaseFeature is getting changed and Tip points to it resets the Tip
|
||||
/// If BaseFeature is getting changed and Tip points to it reset the Tip
|
||||
virtual void onBeforeChange (const App::Property* prop);
|
||||
/// If BaseFeature is setted and Tip is null sets the Tip to it
|
||||
/// If BaseFeature is set and Tip is null set the Tip to it
|
||||
virtual void onChanged (const App::Property* prop);
|
||||
|
||||
};
|
||||
|
|
|
@ -72,10 +72,10 @@ Extrusion::Extrusion()
|
|||
ADD_PROPERTY_TYPE(DirLink,(nullptr), "Extrude", App::Prop_None, "Link to edge defining extrusion direction.");
|
||||
ADD_PROPERTY_TYPE(LengthFwd,(0.0), "Extrude", App::Prop_None, "Length of extrusion along direction. If both LengthFwd and LengthRev are zero, magnitude of Dir is used.");
|
||||
ADD_PROPERTY_TYPE(LengthRev,(0.0), "Extrude", App::Prop_None, "Length of additional extrusion, against direction.");
|
||||
ADD_PROPERTY_TYPE(Solid,(false), "Extrude", App::Prop_None, "If true, extruding a wire yeilds a solid. If false, a shell.");
|
||||
ADD_PROPERTY_TYPE(Solid,(false), "Extrude", App::Prop_None, "If true, extruding a wire yields a solid. If false, a shell.");
|
||||
ADD_PROPERTY_TYPE(Reversed,(false), "Extrude", App::Prop_None, "Set to true to swap the direction of extrusion.");
|
||||
ADD_PROPERTY_TYPE(Symmetric,(false), "Extrude", App::Prop_None, "If true, extrusion is done in both directions to a total of LengthFwd. LengthRev is ignored.");
|
||||
ADD_PROPERTY_TYPE(TaperAngle,(0.0), "Extrude", App::Prop_None, "Sets the angle of slope (draft) to apply to the sides. The angle is for outward taper; negative value yeilds inward tapering.");
|
||||
ADD_PROPERTY_TYPE(TaperAngle,(0.0), "Extrude", App::Prop_None, "Sets the angle of slope (draft) to apply to the sides. The angle is for outward taper; negative value yields inward tapering.");
|
||||
ADD_PROPERTY_TYPE(TaperAngleRev,(0.0), "Extrude", App::Prop_None, "Taper angle of reverse part of extrusion.");
|
||||
ADD_PROPERTY_TYPE(FaceMakerClass,("Part::FaceMakerExtrusion"), "Extrude", App::Prop_None, "If Solid is true, this sets the facemaker class to use when converting wires to faces. Otherwise, ignored."); //default for old documents. See setupObject for default for new extrusions.
|
||||
}
|
||||
|
|
|
@ -1341,7 +1341,7 @@ void GeomArcOfConic::setXAxisDir(const Base::Vector3d& newdir)
|
|||
|
||||
try {
|
||||
gp_Ax2 pos = c->Position();
|
||||
//OCC should keep the old main Direction (Z), and change YDirection to accomodate the new XDirection.
|
||||
//OCC should keep the old main Direction (Z), and change YDirection to accommodate the new XDirection.
|
||||
pos.SetXDirection(gp_Dir(newdir.x, newdir.y, newdir.z));
|
||||
c->SetPosition(pos);
|
||||
}
|
||||
|
@ -1881,7 +1881,7 @@ void GeomEllipse::setMajorAxisDir(Base::Vector3d newdir)
|
|||
return;//zero vector was passed. Keep the old orientation.
|
||||
try {
|
||||
gp_Ax2 pos = myCurve->Position();
|
||||
pos.SetXDirection(gp_Dir(newdir.x, newdir.y, newdir.z));//OCC should keep the old main Direction (Z), and change YDirection to accomodate the new XDirection.
|
||||
pos.SetXDirection(gp_Dir(newdir.x, newdir.y, newdir.z));//OCC should keep the old main Direction (Z), and change YDirection to accommodate the new XDirection.
|
||||
myCurve->SetPosition(pos);
|
||||
}
|
||||
catch (Standard_Failure) {
|
||||
|
@ -2100,7 +2100,7 @@ void GeomArcOfEllipse::setMajorAxisDir(Base::Vector3d newdir)
|
|||
return;//zero vector was passed. Keep the old orientation.
|
||||
try {
|
||||
gp_Ax2 pos = c->Position();
|
||||
pos.SetXDirection(gp_Dir(newdir.x, newdir.y, newdir.z));//OCC should keep the old main Direction (Z), and change YDirection to accomodate the new XDirection.
|
||||
pos.SetXDirection(gp_Dir(newdir.x, newdir.y, newdir.z));//OCC should keep the old main Direction (Z), and change YDirection to accommodate the new XDirection.
|
||||
c->SetPosition(pos);
|
||||
}
|
||||
catch (Standard_Failure) {
|
||||
|
@ -2528,7 +2528,7 @@ void GeomArcOfHyperbola::setMajorAxisDir(Base::Vector3d newdir)
|
|||
|
||||
try {
|
||||
gp_Ax2 pos = c->Position();
|
||||
pos.SetXDirection(gp_Dir(newdir.x, newdir.y, newdir.z));//OCC should keep the old main Direction (Z), and change YDirection to accomodate the new XDirection.
|
||||
pos.SetXDirection(gp_Dir(newdir.x, newdir.y, newdir.z));//OCC should keep the old main Direction (Z), and change YDirection to accommodate the new XDirection.
|
||||
c->SetPosition(pos);
|
||||
}
|
||||
catch (Standard_Failure) {
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
</Documentation>
|
||||
<Methode Name="makeOffset" Const="true">
|
||||
<Documentation>
|
||||
<UserDocu>Offset the face by a given ammount. Returns Compound of Wires. Deprecated - use makeOffset2D instead.</UserDocu>
|
||||
<UserDocu>Offset the face by a given amount. Returns Compound of Wires. Deprecated - use makeOffset2D instead.</UserDocu>
|
||||
</Documentation>
|
||||
</Methode>
|
||||
<Methode Name="tangentAt" Const="true">
|
||||
|
|
|
@ -381,7 +381,7 @@ shape.
|
|||
* join: method of offsetting non-tangent joints. 0 = arcs, 1 = tangent, 2 =
|
||||
intersection
|
||||
|
||||
* fill: if true, offsetting a shell is to yeild a solid
|
||||
* fill: if true, offsetting a shell is to yield a solid
|
||||
|
||||
Returns: result of offsetting.</UserDocu>
|
||||
</Documentation>
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
<item row="5" column="3">
|
||||
<widget class="QCheckBox" name="checkSolid">
|
||||
<property name="toolTip">
|
||||
<string>If checked, revolving wires will produce solids. If not, revolving a wire yeilds a shell.</string>
|
||||
<string>If checked, revolving wires will produce solids. If not, revolving a wire yields a shell.</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Create Solid</string>
|
||||
|
|
|
@ -247,7 +247,7 @@ void TaskAttacher::updateReferencesUI()
|
|||
|
||||
// Get hints for further required references...
|
||||
// DeepSOIC: hint system became useless since inertial system attachment
|
||||
// modes have been introduced, becuase they accept any number of references
|
||||
// modes have been introduced, because they accept any number of references
|
||||
// of any type, so the hint will always be 'Any'. I keep the logic
|
||||
// nevertheless, in case it is decided to resurrect hint system.
|
||||
|
||||
|
|
|
@ -587,7 +587,7 @@ int TaskCheckGeometryResults::goBOPSingleCheck(const TopoDS_Shape& shapeIn, Resu
|
|||
//BRepAlgoAPI_Check also makes a copy of the shape.
|
||||
|
||||
//didn't use BRepAlgoAPI_Check because it calls BRepCheck_Analyzer itself and
|
||||
//doesnt give us access to it. so I didn't want to run BRepCheck_Analyzer twice to get invalid results.
|
||||
//doesn't give us access to it. so I didn't want to run BRepCheck_Analyzer twice to get invalid results.
|
||||
|
||||
//BOPAlgo_ArgumentAnalyzer can check 2 objects with respect to a boolean op.
|
||||
//this is left for another time.
|
||||
|
|
|
@ -331,7 +331,7 @@ PartGui::DimensionLinear::DimensionLinear()
|
|||
|
||||
SO_KIT_INIT_INSTANCE();
|
||||
|
||||
SO_NODE_ADD_FIELD(rotate, (1.0, 0.0, 0.0, 0.0));//postion orientation of the dimension.
|
||||
SO_NODE_ADD_FIELD(rotate, (1.0, 0.0, 0.0, 0.0));//position orientation of the dimension.
|
||||
SO_NODE_ADD_FIELD(length, (1.0));//turns into dimension length
|
||||
SO_NODE_ADD_FIELD(origin, (0.0, 0.0, 0.0));//static
|
||||
SO_NODE_ADD_FIELD(text, ("test"));//dimension text
|
||||
|
|
|
@ -99,7 +99,7 @@ namespace PartGui
|
|||
void toggle3d();
|
||||
/*!toggles the display status of the delta dimensions*/
|
||||
void toggleDelta();
|
||||
/*!make sure measure command isn't working with everthing invisible. Confusing the user*/
|
||||
/*!make sure measure command isn't working with everything invisible. Confusing the user*/
|
||||
void ensureSomeDimensionVisible();
|
||||
/*!make sure angle measure command isn't working with 3d off. Confusing the user*/
|
||||
void ensure3dDimensionVisible();
|
||||
|
|
|
@ -63,7 +63,7 @@ ViewProvider2DObject::ViewProvider2DObject()
|
|||
{
|
||||
ADD_PROPERTY_TYPE(ShowGrid,(false),"Grid",(App::PropertyType)(App::Prop_None),"Switch the grid on/off");
|
||||
ADD_PROPERTY_TYPE(GridSize,(10),"Grid",(App::PropertyType)(App::Prop_None),"Gap size of the grid");
|
||||
ADD_PROPERTY_TYPE(GridStyle,((long)0),"Grid",(App::PropertyType)(App::Prop_None),"Appearence style of the grid");
|
||||
ADD_PROPERTY_TYPE(GridStyle,((long)0),"Grid",(App::PropertyType)(App::Prop_None),"Appearance style of the grid");
|
||||
ADD_PROPERTY_TYPE(TightGrid,(true),"Grid",(App::PropertyType)(App::Prop_None),"Switch the tight grid mode on/off");
|
||||
ADD_PROPERTY_TYPE(GridSnap,(false),"Grid",(App::PropertyType)(App::Prop_None),"Switch the grid snap on/off");
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
|
||||
#include "PreCompiled.h"
|
||||
#ifndef _PreComp_
|
||||
#ifndef _PreComp_
|
||||
# include <Python.h>
|
||||
#endif
|
||||
|
||||
|
@ -88,7 +88,7 @@ private:
|
|||
double cc = 2.0 * r2 * (b * v - r1);
|
||||
double d = uv * uv - uu * cc;
|
||||
if (d < 0) {
|
||||
throw Py::RuntimeError("Unable to caluclate intersection points");
|
||||
throw Py::RuntimeError("Unable to calculate intersection points");
|
||||
}
|
||||
|
||||
double t;
|
||||
|
|
|
@ -106,7 +106,7 @@ Part::Feature* Feature::getBaseObject(bool silent) const {
|
|||
err = "Base property not set";
|
||||
}
|
||||
|
||||
// If the funtion not in silent mode throw the exception discribing the error
|
||||
// If the function not in silent mode throw the exception describing the error
|
||||
if (!silent && err) {
|
||||
throw Base::Exception(err);
|
||||
}
|
||||
|
|
|
@ -38,7 +38,7 @@ public:
|
|||
DressUp();
|
||||
|
||||
/**
|
||||
* Base feature and it's subelements to which dressup operation will be aplied to.
|
||||
* Base feature and it's subelements to which dressup operation will be applied to.
|
||||
* Unlike Feature::BaseFeature it includes Sublinks and set not only inside a body.
|
||||
* But for consistancy if BaseFeature is nonzero this links to the same body as it.
|
||||
*/
|
||||
|
@ -48,15 +48,15 @@ public:
|
|||
/// updates the Placement property from the Placement of the BaseFeature
|
||||
void positionByBaseFeature(void);
|
||||
/**
|
||||
* Returns the BaseFeature property's object if it's set othervice returns Base's
|
||||
* feature property object otherviceeature property's object (if any)
|
||||
* Returns the BaseFeature property's object if it's set otherwise returns Base's
|
||||
* feature property object otherwise feature property's object (if any)
|
||||
* @param silent if couldn't determine the base feature and silent == true,
|
||||
* silently return a nullptr, otherwice throw Base::Exception.
|
||||
* silently return a nullptr, otherwise throw Base::Exception.
|
||||
* Default is false.
|
||||
*/
|
||||
virtual Part::Feature* getBaseObject(bool silent=false) const;
|
||||
/// extracts all edges from the subshapes (inkluding face edges) and furthermore adds
|
||||
/// all C0 continius edges to the vector
|
||||
/// extracts all edges from the subshapes (including face edges) and furthermore adds
|
||||
/// all C0 continuos edges to the vector
|
||||
void getContiniusEdges(Part::TopoShape, std::vector< std::string >&);
|
||||
|
||||
protected:
|
||||
|
|
|
@ -566,7 +566,7 @@ bool ProfileBased::checkLineCrossesFace(const gp_Lin &line, const TopoDS_Face &f
|
|||
// now check if we get a change in the sign of the distances
|
||||
Standard_Real dist_p_eps1_pnt = gp_Vec(p_eps1, pnt).Dot(gp_Vec(dir));
|
||||
Standard_Real dist_p_eps2_pnt = gp_Vec(p_eps2, pnt).Dot(gp_Vec(dir));
|
||||
// distance to the plane must be noticable
|
||||
// distance to the plane must be noticeable
|
||||
if (fabs(dist_p_eps1_pnt) > 5*Precision::Confusion() &&
|
||||
fabs(dist_p_eps2_pnt) > 5*Precision::Confusion()) {
|
||||
if (dist_p_eps1_pnt * dist_p_eps2_pnt < 0)
|
||||
|
@ -610,7 +610,7 @@ bool ProfileBased::checkLineCrossesFace(const gp_Lin &line, const TopoDS_Face &f
|
|||
// now check if we get a change in the sign of the distances
|
||||
Standard_Real dist_p_eps1_pnt = gp_Vec(p_eps1, pnt).Dot(gp_Vec(dir));
|
||||
Standard_Real dist_p_eps2_pnt = gp_Vec(p_eps2, pnt).Dot(gp_Vec(dir));
|
||||
// distance to the plane must be noticable
|
||||
// distance to the plane must be noticeable
|
||||
if (fabs(dist_p_eps1_pnt) > Precision::Confusion() &&
|
||||
fabs(dist_p_eps2_pnt) > Precision::Confusion()) {
|
||||
if (dist_p_eps1_pnt * dist_p_eps2_pnt < 0)
|
||||
|
|
|
@ -31,13 +31,13 @@
|
|||
namespace PartDesign
|
||||
{
|
||||
|
||||
/*This feature is not realy a classical datum. It is a fully defined shape and not
|
||||
*infinit geometrie like a plane and a line. Also it is not calculated by references and hence
|
||||
*is not "attaced" to anything. Furthermore real shapes must be visualized. This makes it hard
|
||||
*to reuse the existing datum infrastructure and a special handling for this type is
|
||||
*created.
|
||||
/* This feature is not really a classical datum. It is a fully defined shape and not
|
||||
* infinite geometry like a plane and a line. Also it is not calculated by references and hence
|
||||
* is not "attached" to anything. Furthermore real shapes must be visualized. This makes it hard
|
||||
* to reuse the existing datum infrastructure and a special handling for this type is
|
||||
* created.
|
||||
*/
|
||||
// TODO Add a better documentation (2015-09-11, Fat-Zer)
|
||||
// TODO Add better documentation (2015-09-11, Fat-Zer)
|
||||
|
||||
class PartDesignExport ShapeBinder : public Part::Feature
|
||||
{
|
||||
|
|
|
@ -779,7 +779,7 @@ void prepareProfileBased(Gui::Command* cmd, const std::string& which,
|
|||
base_worker(features.front(), "");
|
||||
};
|
||||
|
||||
//if there is a sketch selected which is from annother body or part we need to bring up the
|
||||
//if there is a sketch selected which is from another body or part we need to bring up the
|
||||
//pick task dialog to decide how those are handled
|
||||
bool ext = std::find_if( status.begin(), status.end(),
|
||||
[] (const PartDesignGui::TaskFeaturePick::featureStatus& s) {
|
||||
|
|
|
@ -168,7 +168,7 @@ void CmdPartDesignBody::activated(int iMsg)
|
|||
else if ( baseFeature->isDerivedFrom ( Part::BodyBase::getClassTypeId() ) ) {
|
||||
// Prevent creating bodies based on bodies
|
||||
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Bad base feature"),
|
||||
QObject::tr("Body can't be based on annother body."));
|
||||
QObject::tr("Body can't be based on another body."));
|
||||
baseFeature = nullptr;
|
||||
}
|
||||
else {
|
||||
|
@ -311,7 +311,7 @@ void CmdPartDesignMigrate::activated(int iMsg)
|
|||
auto newChainIt = featureChains.emplace (featureChains.end());
|
||||
newChainIt->splice (newChainIt->end(), chain);
|
||||
} else {
|
||||
// we are basing on some partdesign feature wich supposed to belong to some body
|
||||
// we are basing on some partdesign feature which supposed to belong to some body
|
||||
PartDesign::Feature *baseFeat = static_cast <PartDesign::Feature *>( base );
|
||||
|
||||
auto baseFeatSetIt = find ( migrateFeatures.begin (), migrateFeatures.end (), baseFeat );
|
||||
|
@ -360,7 +360,7 @@ void CmdPartDesignMigrate::activated(int iMsg)
|
|||
}
|
||||
migrateFeatures.erase ( featIt );
|
||||
featIt = migrateFeatures.begin ();
|
||||
// TODO Align visability (2015-08-17, Fat-Zer)
|
||||
// TODO Align visibility (2015-08-17, Fat-Zer)
|
||||
} /* for */
|
||||
|
||||
// TODO make it work without parts (2015-09-04, Fat-Zer)
|
||||
|
|
|
@ -94,7 +94,7 @@ bool ReferenceSelection::allow(App::Document* pDoc, App::DocumentObject* pObj, c
|
|||
fits = true;
|
||||
}
|
||||
|
||||
if (fits) { // check that it is actually belongs to the choosen body or part
|
||||
if (fits) { // check that it is actually belongs to the chosen body or part
|
||||
try { // here are some throwers
|
||||
if (body) {
|
||||
if (body->getOrigin ()->hasObject (pObj) ) {
|
||||
|
|
|
@ -64,7 +64,7 @@ public:
|
|||
{
|
||||
}
|
||||
/**
|
||||
* Allow the user to pick only objects wich are not in objs getDependencyList
|
||||
* Allow the user to pick only objects which are not in objs getDependencyList
|
||||
*/
|
||||
bool allow(App::Document* pDoc, App::DocumentObject* pObj, const char* sSubName) override;
|
||||
};
|
||||
|
|
|
@ -292,7 +292,7 @@ App::DocumentObject* TaskFeaturePick::makeCopy(App::DocumentObject* obj, std::st
|
|||
auto it = cprops.begin();
|
||||
for( App::Property* prop : props ) {
|
||||
|
||||
//independent copys dont have links and are not attached
|
||||
//independent copies don't have links and are not attached
|
||||
if(independent && (
|
||||
prop->getTypeId() == App::PropertyLink::getClassTypeId() ||
|
||||
prop->getTypeId() == App::PropertyLinkList::getClassTypeId() ||
|
||||
|
@ -455,7 +455,7 @@ TaskDlgFeaturePick::TaskDlgFeaturePick(std::vector<App::DocumentObject*> &object
|
|||
TaskDlgFeaturePick::~TaskDlgFeaturePick()
|
||||
{
|
||||
//do the work now as before in accept() the dialog is still open, hence the work
|
||||
//function could not open annother dialog
|
||||
//function could not open another dialog
|
||||
if (accepted)
|
||||
workFunction(pick->buildFeatures());
|
||||
}
|
||||
|
|
|
@ -195,7 +195,7 @@ void TaskLinearPatternParameters::updateUI()
|
|||
unsigned occurrences = pcLinearPattern->Occurrences.getValue();
|
||||
|
||||
if (dirLinks.setCurrentLink(pcLinearPattern->Direction) == -1){
|
||||
//failed to set current, because the link isnt in the list yet
|
||||
//failed to set current, because the link isn't in the list yet
|
||||
dirLinks.addLink(pcLinearPattern->Direction, getRefStr(pcLinearPattern->Direction.getValue(),pcLinearPattern->Direction.getSubValues()));
|
||||
dirLinks.setCurrentLink(pcLinearPattern->Direction);
|
||||
}
|
||||
|
|
|
@ -169,7 +169,7 @@ void TaskMirroredParameters::updateUI()
|
|||
PartDesign::Mirrored* pcMirrored = static_cast<PartDesign::Mirrored*>(getObject());
|
||||
|
||||
if (planeLinks.setCurrentLink(pcMirrored->MirrorPlane) == -1){
|
||||
//failed to set current, because the link isnt in the list yet
|
||||
//failed to set current, because the link isn't in the list yet
|
||||
planeLinks.addLink(pcMirrored->MirrorPlane, getRefStr(pcMirrored->MirrorPlane.getValue(),pcMirrored->MirrorPlane.getSubValues()));
|
||||
planeLinks.setCurrentLink(pcMirrored->MirrorPlane);
|
||||
}
|
||||
|
|
|
@ -91,7 +91,7 @@ TaskPipeParameters::TaskPipeParameters(ViewProviderPipe *PipeView, bool /*newObj
|
|||
Gui::Document* doc = PipeView->getDocument();
|
||||
|
||||
//make sure the user sees all important things: the
|
||||
//spine/auxilliary spine he already selected
|
||||
//spine/auxiliary spine he already selected
|
||||
if (pipe->Spine.getValue()) {
|
||||
auto* svp = doc->getViewProvider(pipe->Spine.getValue());
|
||||
spineShow = svp->isShow();
|
||||
|
@ -156,7 +156,7 @@ TaskPipeParameters::~TaskPipeParameters()
|
|||
Gui::Document* doc = vp->getDocument();
|
||||
|
||||
//make sure the user sees all important things: the
|
||||
//spine/auxilliary spine he already selected
|
||||
//spine/auxiliary spine he already selected
|
||||
if (pipe->Spine.getValue()) {
|
||||
auto* svp = doc->getViewProvider(pipe->Spine.getValue());
|
||||
svp->setVisible(spineShow);
|
||||
|
@ -350,7 +350,7 @@ TaskPipeOrientation::~TaskPipeOrientation()
|
|||
Gui::Document* doc = vp->getDocument();
|
||||
|
||||
//make sure the user sees al important things: the base feature to select edges and the
|
||||
//spine/auxilliary spine he already selected
|
||||
//spine/auxiliary spine he already selected
|
||||
if (pipe->AuxillerySpine.getValue()) {
|
||||
auto* svp = doc->getViewProvider(pipe->AuxillerySpine.getValue());
|
||||
svp->setVisible(auxSpineShow);
|
||||
|
|
|
@ -167,9 +167,9 @@ void TaskPocketParameters::updateUI(int index)
|
|||
} else if (index == 2) { // up to first
|
||||
isOffsetEditVisable = true;
|
||||
isReversedEnabled = true; // Will change the direction it seeks for its first face?
|
||||
// It may work not quite as expected but usefull if sketch oriented upside down.
|
||||
// It may work not quite as expected but useful if sketch oriented upside-down.
|
||||
// (may happen in bodies)
|
||||
// Fix probably lies somwhere in IF block on line 125 of FeaturePocket.cpp
|
||||
// FIXME: Fix probably lies somewhere in IF block on line 125 of FeaturePocket.cpp
|
||||
} else if (index == 3) { // up to face
|
||||
isOffsetEditVisable = true;
|
||||
isFaceEditEnabled = true;
|
||||
|
@ -273,7 +273,7 @@ void TaskPocketParameters::onModeChanged(int index)
|
|||
pcPocket->Type.setValue("UpToFirst");
|
||||
break;
|
||||
case 3:
|
||||
// Because of the code at the begining of Pocket::execute() which is used to detect
|
||||
// Because of the code at the beginning of Pocket::execute() which is used to detect
|
||||
// broken legacy parts, we must set the length to zero here!
|
||||
oldLength = pcPocket->Length.getValue();
|
||||
pcPocket->Type.setValue("UpToFace");
|
||||
|
|
|
@ -194,7 +194,7 @@ void TaskPolarPatternParameters::updateUI()
|
|||
unsigned occurrences = pcPolarPattern->Occurrences.getValue();
|
||||
|
||||
if (axesLinks.setCurrentLink(pcPolarPattern->Axis) == -1){
|
||||
//failed to set current, because the link isnt in the list yet
|
||||
//failed to set current, because the link isn't in the list yet
|
||||
axesLinks.addLink(pcPolarPattern->Axis, getRefStr(pcPolarPattern->Axis.getValue(),pcPolarPattern->Axis.getSubValues()));
|
||||
axesLinks.setCurrentLink(pcPolarPattern->Axis);
|
||||
}
|
||||
|
|
|
@ -101,7 +101,7 @@ void ViewProviderBody::attach(App::DocumentObject *pcFeat)
|
|||
}
|
||||
|
||||
// TODO on activating the body switch to the "Through" mode (2015-09-05, Fat-Zer)
|
||||
// TODO differnt icon in tree if mode is Through (2015-09-05, Fat-Zer)
|
||||
// TODO different icon in tree if mode is Through (2015-09-05, Fat-Zer)
|
||||
// TODO drag&drop (2015-09-05, Fat-Zer)
|
||||
// TODO Add activate () call (2015-09-08, Fat-Zer)
|
||||
|
||||
|
@ -325,7 +325,7 @@ void ViewProviderBody::slotChangedObjectApp ( const App::DocumentObject& obj, co
|
|||
void ViewProviderBody::slotChangedObjectGui (
|
||||
const Gui::ViewProviderDocumentObject& vp, const App::Property& prop )
|
||||
{
|
||||
if (&vp.Visibility != &prop) { // react only on visability changes
|
||||
if (&vp.Visibility != &prop) { // react only on visibility changes
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -35,8 +35,8 @@ class SoGetBoundingBoxAction;
|
|||
namespace PartDesignGui {
|
||||
|
||||
/** ViewProvider of the Body feature
|
||||
* This class manage the visual apperance of the features in the
|
||||
* Body feature. That mean while editing all visible features are shown.
|
||||
* This class manages the visual appearance of the features in the
|
||||
* Body feature. That means while editing all visible features are shown.
|
||||
* If the Body is not active it shows only the result shape (tip).
|
||||
* \author jriegel
|
||||
*/
|
||||
|
|
|
@ -63,7 +63,7 @@ public:
|
|||
/**
|
||||
* Enable/Disable the selectability of the datum
|
||||
* This differs from the normal ViewProvider selectability in that, that with this enabled one
|
||||
* can pick through the datum and select stuff behind it.
|
||||
* can pick through the datum and select stuff behind it.
|
||||
*/
|
||||
bool isPickable();
|
||||
void setPickable(bool val);
|
||||
|
@ -83,11 +83,11 @@ public:
|
|||
void updateExtents ();
|
||||
|
||||
/// The datum type (Plane, Line or Point)
|
||||
// TODO remove this atribute (2015-09-08, Fat-Zer)
|
||||
// TODO remove this attribute (2015-09-08, Fat-Zer)
|
||||
QString datumType;
|
||||
|
||||
/**
|
||||
* Computes apropriate bounding box for the given list of objects to be passed to setExtents ()
|
||||
* Computes appropriate bounding box for the given list of objects to be passed to setExtents ()
|
||||
* @param bboxAction a coin action for traverse the given objects views.
|
||||
* @param objs the list of objects to traverse, due to we traverse the scene graph, the geo children
|
||||
* will likely be traveresed too.
|
||||
|
@ -99,7 +99,7 @@ public:
|
|||
/// Default size used to produce the default bbox
|
||||
static const double defaultSize;
|
||||
|
||||
// Returnd default bounding box if relevant is can't be used for some reason
|
||||
// Returned default bounding box if relevant is can't be used for some reason
|
||||
static SbBox3f defaultBoundBox ();
|
||||
|
||||
// Returns a default marging factor (part of size )
|
||||
|
@ -110,8 +110,8 @@ protected:
|
|||
virtual void unsetEdit(int ModNum);
|
||||
|
||||
/**
|
||||
* Gueses the context this datum belongs to and returns apropriate bounding box of all
|
||||
* visiable content of the feature
|
||||
* Guesses the context this datum belongs to and returns appropriate bounding box of all
|
||||
* visible content of the feature
|
||||
*
|
||||
* Currently known contexts are:
|
||||
* - PartDesign::Body
|
||||
|
|
|
@ -146,7 +146,7 @@ void ViewProviderDatumCoordinateSystem::updateData(const App::Property* prop)
|
|||
}
|
||||
|
||||
void ViewProviderDatumCoordinateSystem::setExtents (Base::BoundBox3d bbox) {
|
||||
// Axis lingth of the CS is 1/3 of maximum bbox dimention, any smarter sizing will make it only worser
|
||||
// Axis lingth of the CS is 1/3 of maximum bbox dimension, any smarter sizing will make it only worser
|
||||
double axisLength = std::max ( { bbox.LengthX (), bbox.LengthY(), bbox.LengthZ() } );
|
||||
axisLength *= (1 + marginFactor ()) / 3;
|
||||
|
||||
|
|
|
@ -164,7 +164,7 @@ void Workbench::setupContextMenu(const char* recipient, Gui::MenuItem* item) con
|
|||
if ( selection.size () >= 1 ) {
|
||||
App::DocumentObject *feature = selection.front().pObject;
|
||||
PartDesign::Body *body = PartDesignGui::getBodyFor ( feature, false );
|
||||
// lote of assertion so feature sould be marked as a tip
|
||||
// lote of assertion so feature should be marked as a tip
|
||||
if ( selection.size () == 1 && feature && (
|
||||
feature->isDerivedFrom ( PartDesign::Body::getClassTypeId () ) ||
|
||||
( feature->isDerivedFrom ( PartDesign::Feature::getClassTypeId () ) && body ) ||
|
||||
|
@ -191,7 +191,7 @@ void Workbench::setupContextMenu(const char* recipient, Gui::MenuItem* item) con
|
|||
if ( addMoveFeature && !PartDesign::Body::isAllowed ( sel.pObject ) ) {
|
||||
addMoveFeature = false;
|
||||
}
|
||||
// if all at lest one selected feature doesn't belongs to the same body
|
||||
// if all at least one selected feature doesn't belong to the same body
|
||||
// disable the menu entry
|
||||
if ( addMoveFeatureInTree && !body->hasObject ( sel.pObject ) ) {
|
||||
addMoveFeatureInTree = false;
|
||||
|
|
|
@ -71,7 +71,7 @@ WorkflowManager::~WorkflowManager() {
|
|||
|
||||
|
||||
// Those destruction/construction is not really needed and could be done in the instance()
|
||||
// but to make things a bit more cleare better to keep them around.
|
||||
// but to make things a bit more clear, better to keep them around.
|
||||
void WorkflowManager::init() {
|
||||
if (!_instance) {
|
||||
_instance = new WorkflowManager();
|
||||
|
@ -122,7 +122,7 @@ Workflow WorkflowManager::getWorkflowForDocument( App::Document *doc) {
|
|||
return it->second;
|
||||
} else {
|
||||
// We haven't yet checked the file workflow
|
||||
// May happen if e.g. file not compleatly loaded yet
|
||||
// May happen if e.g. file not completely loaded yet
|
||||
return Workflow::Undetermined;
|
||||
}
|
||||
}
|
||||
|
@ -141,7 +141,7 @@ Workflow WorkflowManager::determinWorkflow( App::Document *doc) {
|
|||
QMessageBox msgBox;
|
||||
|
||||
if ( rv == Workflow::Legacy ) { // legacy messages
|
||||
msgBox.setText( QObject::tr( "The document \"%1\" you are editing was design with old version of "
|
||||
msgBox.setText( QObject::tr( "The document \"%1\" you are editing was designed with an old version of "
|
||||
"PartDesign workbench." ).arg( QString::fromStdString ( doc->getName()) ) );
|
||||
msgBox.setInformativeText (
|
||||
QObject::tr( "Do you want to migrate in order to use modern PartDesign features?" ) );
|
||||
|
@ -152,8 +152,8 @@ Workflow WorkflowManager::determinWorkflow( App::Document *doc) {
|
|||
msgBox.setInformativeText (
|
||||
QObject::tr( "Do you want to make the migration automatically?" ) );
|
||||
}
|
||||
msgBox.setDetailedText( QObject::tr( "Note If you choose to migrate you won't be able to edit"
|
||||
" the file wtih old FreeCAD versions.\n"
|
||||
msgBox.setDetailedText( QObject::tr( "Note: If you choose to migrate you won't be able to edit"
|
||||
" the file with an old FreeCAD versions.\n"
|
||||
"If you refuse to migrate you won't be able to use new PartDesign features"
|
||||
" like Bodies and Parts. As a result you also won't be able to use your parts"
|
||||
" in the assembly workbench.\n"
|
||||
|
|
|
@ -37,7 +37,7 @@ namespace PartDesignGui {
|
|||
* Legacy mode provides a free PartDesign features but forbids bodies and parts
|
||||
*/
|
||||
enum class Workflow {
|
||||
Undetermined = 0, ///< No workflow was choosen yet
|
||||
Undetermined = 0, ///< No workflow was chosen yet
|
||||
Legacy = 1<<0, ///< Old-style workflow with free features and no bodies
|
||||
Modern = 1<<1, ///< New-style workflow with bodies, parts etc
|
||||
};
|
||||
|
@ -60,7 +60,7 @@ public:
|
|||
/**
|
||||
* Asserts the workflow of the document to be determined and prompt user to migrate if it is not modern.
|
||||
*
|
||||
* If workflow was already choosen return it.
|
||||
* If workflow was already chosen return it.
|
||||
* If the guesed workflow is Workflow::Legacy or Workflow::Mixed the user will be prompted to migrate.
|
||||
* If the user agrees the file will be migrated and the workflow will be set as modern.
|
||||
* If the user refuses to migrate use the old workflow.
|
||||
|
|
|
@ -29,7 +29,7 @@ if FreeCAD.GuiUp:
|
|||
from PySide import QtCore, QtGui
|
||||
from FreeCADGui import PySideUic as uic
|
||||
|
||||
__title__="PartDesign InvoluteGearObject managment"
|
||||
__title__="PartDesign InvoluteGearObject management"
|
||||
__author__ = "Juergen Riegel"
|
||||
__url__ = "http://www.freecadweb.org"
|
||||
|
||||
|
|
|
@ -75,7 +75,7 @@ def makeFilletArc(M1,P,Q,N,r2,ccw):
|
|||
cc = 2.0 * r2 * (b.dot(v)-r1)
|
||||
dd = uv * uv - uu * cc
|
||||
if dd < 0:
|
||||
raise RuntimeError("Unable to caluclate intersection points")
|
||||
raise RuntimeError("Unable to calculate intersection points")
|
||||
t1 = (-uv + math.sqrt(dd)) / uu
|
||||
t2 = (-uv - math.sqrt(dd)) / uu
|
||||
|
||||
|
|
|
@ -80,7 +80,7 @@ class FCWireBuilder(object):
|
|||
|
||||
def midpoints(p1, p2, r):
|
||||
"""A very ugly function that returns the midpoint of a p1 and p2
|
||||
on the circle which radius is r and which pass throught p1 and
|
||||
on the circle which radius is r and which pass through p1 and
|
||||
p2
|
||||
|
||||
Return the 2 possible solutions
|
||||
|
|
|
@ -3308,7 +3308,7 @@ TopoShape Sketch::toShape(void) const
|
|||
else if (wires.size() > 1) {
|
||||
// FIXME: The right way here would be to determine the outer and inner wires and
|
||||
// generate a face with holes (inner wires have to be taged REVERSE or INNER).
|
||||
// thats the only way to transport a somwhat more complex sketch...
|
||||
// thats the only way to transport a somewhat more complex sketch...
|
||||
//result = *wires.begin();
|
||||
|
||||
// I think a compound can be used as container because it is just a collection of
|
||||
|
@ -3333,7 +3333,7 @@ TopoShape Sketch::toShape(void) const
|
|||
return result;
|
||||
}
|
||||
|
||||
// Persistance implementer -------------------------------------------------
|
||||
// Persistence implementer -------------------------------------------------
|
||||
|
||||
unsigned int Sketch::getMemSize(void) const
|
||||
{
|
||||
|
|
|
@ -300,7 +300,7 @@ public:
|
|||
rlOtherBody,
|
||||
};
|
||||
/// Return true if this object is allowed as external geometry for the
|
||||
/// sketch. rsn argument recieves the reason for disallowing.
|
||||
/// sketch. rsn argument receives the reason for disallowing.
|
||||
bool isExternalAllowed(App::Document *pDoc, App::DocumentObject *pObj, eReasonList* rsn = 0) const;
|
||||
|
||||
protected:
|
||||
|
|
|
@ -191,7 +191,7 @@
|
|||
<Documentation>
|
||||
<UserDocu>
|
||||
isPointOnObject(GeoIdCurve, float x, float y) - tests if the point (x,y)
|
||||
geometrically lies on a curve (e.g. ellipse). It treats lines as infinte,
|
||||
geometrically lies on a curve (e.g. ellipse). It treats lines as infinite,
|
||||
arcs as full circles/ellipses/etc. Returns boolean value.
|
||||
</UserDocu>
|
||||
</Documentation>
|
||||
|
|
|
@ -264,7 +264,7 @@ PyObject* SketchObjectPy::addConstraint(PyObject *args)
|
|||
// 2. This solve happens before the command is committed
|
||||
// 3. A constraint, may effect a geometry change (think of coincident,
|
||||
// a line's point moves to meet the other line's point
|
||||
// 4. The transaction is comitted before any other solve, for example
|
||||
// 4. The transaction is committed before any other solve, for example
|
||||
// the one of execute() triggered by a recompute (UpdateActive) is generated.
|
||||
// 5. Upon "undo", the constraint is removed (it was before the command was committed)
|
||||
// however, the geometry changed after the command was committed, so the point that
|
||||
|
|
|
@ -116,7 +116,11 @@ namespace GCS
|
|||
virtual double grad(double *);
|
||||
// virtual void grad(MAP_pD_D &deriv); --> TODO: vectorized grad version
|
||||
virtual double maxStep(MAP_pD_D &dir, double lim=1.);
|
||||
int findParamInPvec(double* param);//finds first occurence of param in pvec. This is useful to test if a constraint depends on the parameter (it may not actually depend on it, e.g. angle-via-point doesn't depend on ellipse's b (radmin), but b will be included within the constraint anyway. Returns -1 if not found.
|
||||
// Finds first occurrence of param in pvec. This is useful to test if a constraint depends
|
||||
// on the parameter (it may not actually depend on it, e.g. angle-via-point doesn't depend
|
||||
// on ellipse's b (radmin), but b will be included within the constraint anyway.
|
||||
// Returns -1 if not found.
|
||||
int findParamInPvec(double* param);
|
||||
};
|
||||
|
||||
// Equal
|
||||
|
|
|
@ -514,7 +514,7 @@ DeriVector2 Parabola::CalculateNormal(Point &p, double* derivparam)
|
|||
DeriVector2 pv (p, derivparam);
|
||||
|
||||
// the normal is the vector from the focus to the intersection of ano thru the point p and direction
|
||||
// of the symetry axis of the parabola with the directrix.
|
||||
// of the symmetry axis of the parabola with the directrix.
|
||||
// As both point to directrix and point to focus are of equal magnitude, we can work with unitary vectors
|
||||
// to calculate the normal, substraction of those vectors.
|
||||
|
||||
|
@ -614,7 +614,7 @@ DeriVector2 BSpline::CalculateNormal(Point& p, double* derivparam)
|
|||
DeriVector2 ret;
|
||||
|
||||
if (mult[0] > degree && mult[mult.size()-1] > degree) {
|
||||
// if endpoints thru end poles
|
||||
// if endpoints through end poles
|
||||
if(*p.x == *start.x && *p.y == *start.y) {
|
||||
// and you are asking about the normal at start point
|
||||
// then tangency is defined by first to second poles
|
||||
|
|
|
@ -188,7 +188,7 @@ int DrawSketchHandler::seekAutoConstraint(std::vector<AutoConstraint> &suggested
|
|||
double cosangle=dir3d.Normalize()*hitShapeDir.Normalize();
|
||||
|
||||
// the angle between the line and the hitting direction are over around 6 degrees (it is substantially parallel)
|
||||
// or if it is an sketch axis (that can not move to accomodate to the shape), then only if it is around 6 degrees with the normal (around 84 degrees)
|
||||
// or if it is an sketch axis (that can not move to accommodate to the shape), then only if it is around 6 degrees with the normal (around 84 degrees)
|
||||
if (fabs(cosangle) < 0.995f || ((GeoId==Sketcher::GeoEnum::HAxis || GeoId==Sketcher::GeoEnum::VAxis) && fabs(cosangle) < 0.1))
|
||||
suggestedConstraints.push_back(constr);
|
||||
|
||||
|
|
|
@ -568,7 +568,7 @@ void SoDatumLabel::GLRender(SoGLRenderAction * action)
|
|||
bool flipTriang = false;
|
||||
|
||||
if ((par3-par1).dot(dir) > (par4 - par1).length()) {
|
||||
// Increase Margin to improve visability
|
||||
// Increase Margin to improve visibility
|
||||
float tmpMargin = this->imgHeight /0.75;
|
||||
par3 = par4;
|
||||
if((par2-par1).dot(dir) > (par4 - par1).length()) {
|
||||
|
|
|
@ -68,7 +68,7 @@ void SoZoomTranslation::initClass()
|
|||
// * SoGetPrimitiveCountAction
|
||||
// The element SoViewportRegionElement is enabled by the
|
||||
// above listed actions.
|
||||
// Addionally, SoViewVolumeElement is enabled for
|
||||
// Additionally, SoViewVolumeElement is enabled for
|
||||
// * SoAudioRenderAction
|
||||
// * SoHandleEventAction
|
||||
// And SoViewportRegionElement is enabled for
|
||||
|
|
|
@ -614,7 +614,7 @@ bool ViewProviderSketch::mouseButtonPressed(int Button, bool pressed, const SbVe
|
|||
(point - prvClickPoint).length() < dblClickRadius &&
|
||||
(SbTime::getTimeOfDay() - prvClickTime).getValue() < dci) {
|
||||
|
||||
// Double Click Event Occured
|
||||
// Double Click Event Occurred
|
||||
editDoubleClicked();
|
||||
// Reset Double Click Static Variables
|
||||
prvClickTime = SbTime();
|
||||
|
@ -3202,7 +3202,7 @@ void ViewProviderSketch::draw(bool temp /*=false*/, bool rebuildinformationlayer
|
|||
|
||||
// information layer
|
||||
if(rebuildinformationlayer) {
|
||||
// everytime we start with empty information layer
|
||||
// every time we start with empty information layer
|
||||
edit->infoGroup->removeAllChildren();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user