Skip to content

Commit

Permalink
source typo fixes pt4 (only on py3 merged code)
Browse files Browse the repository at this point in the history
  • Loading branch information
luzpaz authored and wwmayer committed Mar 2, 2017
1 parent 30979dc commit 99c9900
Show file tree
Hide file tree
Showing 50 changed files with 99 additions and 95 deletions.
4 changes: 2 additions & 2 deletions src/Main/MainGui.cpp
Expand Up @@ -345,7 +345,7 @@ static LONG __stdcall MyCrashHandlerExceptionFilter(EXCEPTION_POINTERS* pEx)
NULL
))
{
bFailed = false; // suceeded
bFailed = false; // succeeded
}
CloseHandle(hFile);
}
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Part/App/AttachEnginePy.xml
Expand Up @@ -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">
Expand Down
6 changes: 3 additions & 3 deletions src/Mod/Part/App/Attacher.cpp
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/Part/App/Attacher.h
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions src/Mod/Part/App/BodyBase.h
Expand Up @@ -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).
Expand Down Expand Up @@ -81,9 +81,9 @@ class PartExport BodyBase : public Part::Feature, public App::OriginGroupExtensi
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);

};
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/Part/App/FeatureExtrusion.cpp
Expand Up @@ -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.
}
Expand Down
8 changes: 4 additions & 4 deletions src/Mod/Part/App/Geometry.cpp
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Part/App/TopoShapeFacePy.xml
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Part/App/TopoShapePy.xml
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Part/Gui/DlgRevolution.ui
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Part/Gui/TaskAttacher.cpp
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Part/Gui/TaskCheckGeometry.cpp
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Part/Gui/TaskDimension.cpp
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Part/Gui/TaskDimension.h
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Part/Gui/ViewProvider2DObject.cpp
Expand Up @@ -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");

Expand Down
4 changes: 2 additions & 2 deletions src/Mod/PartDesign/App/AppPartDesignPy.cpp
Expand Up @@ -22,7 +22,7 @@


#include "PreCompiled.h"
#ifndef _PreComp_
#ifndef _PreComp_
# include <Python.h>
#endif

Expand Down Expand Up @@ -88,7 +88,7 @@ class Module : public Py::ExtensionModule<Module>
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;
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/PartDesign/App/Feature.cpp
Expand Up @@ -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);
}
Expand Down
12 changes: 6 additions & 6 deletions src/Mod/PartDesign/App/FeatureDressUp.h
Expand Up @@ -38,7 +38,7 @@ class PartDesignExport DressUp : public PartDesign::Feature
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.
*/
Expand All @@ -48,15 +48,15 @@ class PartDesignExport DressUp : public PartDesign::Feature
/// 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:
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/PartDesign/App/FeatureSketchBased.cpp
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
12 changes: 6 additions & 6 deletions src/Mod/PartDesign/App/ShapeBinder.h
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/PartDesign/Gui/Command.cpp
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions src/Mod/PartDesign/Gui/CommandBody.cpp
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 );
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/PartDesign/Gui/ReferenceSelection.cpp
Expand Up @@ -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) ) {
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/PartDesign/Gui/ReferenceSelection.h
Expand Up @@ -64,7 +64,7 @@ class NoDependentsSelection : public Gui::SelectionFilterGate
{
}
/**
* 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;
};
Expand Down

0 comments on commit 99c9900

Please sign in to comment.