diff --git a/ChangeLog.txt b/ChangeLog.txt index a8e276ba52..9196ec867f 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -4,7 +4,7 @@ http://www.freecadweb.org/tracker/changelog_page.php Version: 0.14 * Python path messed up after installation * Installing 0.14 breaks previous python installation - * Python function to retrive direct children of a shape using TopoDS_Iterator + * Python function to retrieve direct children of a shape using TopoDS_Iterator * Update translations for 0.14 * FreeCAD crashes when changing placement of sketch. * Sketcher 180-deg-constraints should not be allowed for lines without intersection point. diff --git a/src/Base/FileTemplate.cpp b/src/Base/FileTemplate.cpp index 95d09a55c5..29905c8436 100644 --- a/src/Base/FileTemplate.cpp +++ b/src/Base/FileTemplate.cpp @@ -83,7 +83,7 @@ int ClassTemplate::testMe(int /*a*/,const char* /*s*/) //************************************************************************** //************************************************************************** -// Seperator for additional classes +// Separator for additional classes //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ diff --git a/src/Base/Parameter.cpp b/src/Base/Parameter.cpp index 706e16e60e..93341eae4b 100644 --- a/src/Base/Parameter.cpp +++ b/src/Base/Parameter.cpp @@ -299,7 +299,7 @@ Base::Reference ParameterGrp::GetGroup(const char* Name) std::string::size_type pos = cName.find('/'); - // is there a path seperator ? + // is there a path separator ? if (pos == std::string::npos) { return _GetGroup(Name); } @@ -710,7 +710,7 @@ std::vector ParameterGrp::GetASCIIs(const char * sFilter) const Name = StrXUTF8( ((DOMElement*)pcTemp)->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str(); // check on filter condition if (sFilter == NULL || Name.find(sFilter)!= std::string::npos) { - // retrive the text element + // retrieve the text element DOMNode *pcElem2 = pcTemp->getFirstChild(); if (pcElem2) vrValues.push_back( std::string(StrXUTF8(pcElem2->getNodeValue()).c_str()) ); @@ -732,7 +732,7 @@ std::vector > ParameterGrp::GetASCIIMap(const Name = StrXUTF8( ((DOMElement*)pcTemp)->getAttributes()->getNamedItem(XStr("Name").unicodeForm())->getNodeValue()).c_str(); // check on filter condition if (sFilter == NULL || Name.find(sFilter)!= std::string::npos) { - // retrive the text element + // retrieve the text element DOMNode *pcElem2 = pcTemp->getFirstChild(); if (pcElem2) vrValues.push_back(std::make_pair(Name, std::string(StrXUTF8(pcElem2->getNodeValue()).c_str()))); diff --git a/src/Base/StackWalker.cpp b/src/Base/StackWalker.cpp index 4b686a5402..ff26189dd0 100644 --- a/src/Base/StackWalker.cpp +++ b/src/Base/StackWalker.cpp @@ -723,7 +723,7 @@ private: ULONGLONG fileVersion = 0; if ( (m_parent != NULL) && (szImg != NULL) ) { - // try to retrive the file-version: + // try to retrieve the file-version: if ( (this->m_parent->m_options & StackWalker::RetrieveFileVersion) != 0) { VS_FIXEDFILEINFO *fInfo = NULL; @@ -750,7 +750,7 @@ private: } } - // Retrive some additional-infos about the module + // retrieve some additional-infos about the module IMAGEHLP_MODULE64_V3 Module; const char *szSymType = "-unknown-"; if (this->GetModuleInfo(hProcess, baseAddr, &Module) != FALSE) @@ -837,7 +837,7 @@ public: s_useV3Version = false; // to prevent unneccessarry calls with the larger struct... } - // could not retrive the bigger structure, try with the smaller one (as defined in VC7.1)... + // could not retrieve the bigger structure, try with the smaller one (as defined in VC7.1)... pModuleInfo->SizeOfStruct = sizeof(IMAGEHLP_MODULE64_V2); memcpy(pData, pModuleInfo, sizeof(IMAGEHLP_MODULE64_V2)); if (this->pSGMI(hProcess, baseAddr, (IMAGEHLP_MODULE64_V3*) pData) != FALSE) diff --git a/src/Base/StackWalker.h b/src/Base/StackWalker.h index 3af2a9323b..ff44e36b5f 100644 --- a/src/Base/StackWalker.h +++ b/src/Base/StackWalker.h @@ -54,7 +54,7 @@ class BaseExport StackWalker public: typedef enum StackWalkOptions { - // No addition info will be retrived + // No addition info will be retrieved // (only the address is available) RetrieveNone = 0, @@ -70,7 +70,7 @@ public: // Also retrieve the version for the DLL/EXE RetrieveFileVersion = 8, - // Contains all the abouve + // Contains all the above RetrieveVerbose = 0xF, // Generate a "good" symbol-search-path @@ -79,7 +79,7 @@ public: // Also use the public Microsoft-Symbol-Server SymUseSymSrv = 0x20, - // Contains all the abouve "Sym"-options + // Contains all the above "Sym"-options SymAll = 0x30, // Contains all options (default) diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp index dc1377c52b..039693e368 100644 --- a/src/Gui/Application.cpp +++ b/src/Gui/Application.cpp @@ -432,7 +432,7 @@ Application::Application(bool GUIenabled) // global access Instance = this; - // instanciate the workbench dictionary + // instantiate the workbench dictionary _pcWorkbenchDictionary = PyDict_New(); if (GUIenabled) { diff --git a/src/Gui/Document.h b/src/Gui/Document.h index ca568a887b..40d09bb399 100644 --- a/src/Gui/Document.h +++ b/src/Gui/Document.h @@ -167,8 +167,8 @@ public: /// Create a clone of the given view Gui::MDIView* cloneView(Gui::MDIView*); /** send messages to the active view - * Send a specific massage to the active view and is able to recive a - * return massage + * Send a specific massage to the active view and is able to receive a + * return message */ /// send Messages to all views bool sendMsgToViews(const char* pMsg); diff --git a/src/Mod/Assembly/App/PartRef.cpp b/src/Mod/Assembly/App/PartRef.cpp index c82d0962ce..f3cf79600c 100644 --- a/src/Mod/Assembly/App/PartRef.cpp +++ b/src/Mod/Assembly/App/PartRef.cpp @@ -193,7 +193,7 @@ boost::shared_ptr< Geometry3D > PartRef::getGeometry3D(const char* Type) { break; } default: - Base::Console().Message("Unsuported Surface Geometrie Type at selection\n"); + Base::Console().Message("Unsupported Surface Geometry Type at selection\n"); return boost::shared_ptr< Geometry3D >(); } @@ -209,7 +209,7 @@ boost::shared_ptr< Geometry3D > PartRef::getGeometry3D(const char* Type) { break; } default: - Base::Console().Message("Unsuported Curve Geometrie Type at selection \n"); + Base::Console().Message("Unsupported Curve Geometry Type at selection \n"); return boost::shared_ptr< Geometry3D >(); } @@ -222,7 +222,7 @@ boost::shared_ptr< Geometry3D > PartRef::getGeometry3D(const char* Type) { } else { - Base::Console().Message("Unsuported Topologie Type at selection\n"); + Base::Console().Message("Unsupported Topology Type at selection\n"); return boost::shared_ptr< Geometry3D >(); } }; diff --git a/src/Mod/Assembly/Gui/CommandConstraints.cpp b/src/Mod/Assembly/Gui/CommandConstraints.cpp index d19c1ea6f9..ec8cc4712a 100644 --- a/src/Mod/Assembly/Gui/CommandConstraints.cpp +++ b/src/Mod/Assembly/Gui/CommandConstraints.cpp @@ -129,7 +129,7 @@ void CmdAssemblyConstraint::activated(int iMsg) //Assembly::ProductRef* Asm = 0; //Assembly::ConstraintGroup* ConstGrp = 0; - //// retrive the standard objects needed + //// retrieve the standard objects needed //if(getConstraintPrerequisits(&Asm, &ConstGrp)) // return; @@ -213,7 +213,7 @@ void CmdAssemblyConstraintDistance::activated(int iMsg) //Assembly::ProductRef* Asm = 0; //Assembly::ConstraintGroup* ConstGrp = 0; - //// retrive the standard objects needed + //// retrieve the standard objects needed //if(getConstraintPrerequisits(&Asm, &ConstGrp)) // return; @@ -280,7 +280,7 @@ void CmdAssemblyConstraintFix::activated(int iMsg) //Assembly::ProductRef* Asm = 0; //Assembly::ConstraintGroup* ConstGrp = 0; - //// retrive the standard objects needed + //// retrieve the standard objects needed //if(getConstraintPrerequisits(&Asm, &ConstGrp)) // return; @@ -345,7 +345,7 @@ void CmdAssemblyConstraintAngle::activated(int iMsg) //Assembly::ProductRef* Asm = 0; //Assembly::ConstraintGroup* ConstGrp = 0; - //// retrive the standard objects needed + //// retrieve the standard objects needed //if(getConstraintPrerequisits(&Asm, &ConstGrp)) // return; @@ -414,7 +414,7 @@ void CmdAssemblyConstraintOrientation::activated(int iMsg) //Assembly::ProductRef* Asm = 0; //Assembly::ConstraintGroup* ConstGrp = 0; - //// retrive the standard objects needed + //// retrieve the standard objects needed //if(getConstraintPrerequisits(&Asm, &ConstGrp)) // return; @@ -482,7 +482,7 @@ void CmdAssemblyConstraintCoincidence::activated(int iMsg) //Assembly::ProductRef* Asm = 0; //Assembly::ConstraintGroup* ConstGrp = 0; - //// retrive the standard objects needed + //// retrieve the standard objects needed //if(getConstraintPrerequisits(&Asm, &ConstGrp)) // return; @@ -550,7 +550,7 @@ void CmdAssemblyConstraintAlignment::activated(int iMsg) //Assembly::ProductRef* Asm = 0; //Assembly::ConstraintGroup* ConstGrp = 0; - //// retrive the standard objects needed + //// retrieve the standard objects needed //if(getConstraintPrerequisits(&Asm, &ConstGrp)) // return; diff --git a/src/Mod/Import/App/SCL/SimpleReader.py b/src/Mod/Import/App/SCL/SimpleReader.py index 67023f059e..1122c6e885 100644 --- a/src/Mod/Import/App/SCL/SimpleReader.py +++ b/src/Mod/Import/App/SCL/SimpleReader.py @@ -31,8 +31,8 @@ """Simple Part21 STEP reader -Reads a given STEP file. Maps the enteties and instaciate the -corosbonding classes. +Reads a given STEP file. Maps the entities and instantiate the +corresponding classes. In addition it writes out a graphwiz file with the entity graph. """ @@ -92,7 +92,7 @@ class SimpleParser: gvFile.write('}\n') def instaciate(self): - """Instaciate the python classe from the enteties""" + """Instantiate the python class from the entities""" import inspect # load the needed schema module if self._p21loader.get_schema_name() == 'config_control_design': @@ -149,7 +149,7 @@ class SimpleParser: else: self._create_entity_instance(key) if key not in self.instanceMape: - raise NameError("Needed instance not instanciated: ",key) + raise NameError("Needed instance not instantiated: ",key) else: attrList[n] = self.instanceMape[key] elif i[0] == '$': diff --git a/src/Mod/Import/App/StepShapePy.xml b/src/Mod/Import/App/StepShapePy.xml index ec17cd9918..e37d435fc7 100644 --- a/src/Mod/Import/App/StepShapePy.xml +++ b/src/Mod/Import/App/StepShapePy.xml @@ -15,13 +15,13 @@ StepShape in a Import StepShape in Import -This class gives a interface to retrive TopoShapes out of an loaded STEP file of any kind. +This class gives a interface to retrieve TopoShapes out of an loaded STEP file of any kind. method read() -Read a STEP file into memory and makeit accessably +Read a STEP file into memory and make it accessible diff --git a/src/Mod/Material/StandardMaterial/Tools/make_FCMats.sh b/src/Mod/Material/StandardMaterial/Tools/make_FCMats.sh index 8c8b3e56cf..ab453a60df 100755 --- a/src/Mod/Material/StandardMaterial/Tools/make_FCMats.sh +++ b/src/Mod/Material/StandardMaterial/Tools/make_FCMats.sh @@ -20,12 +20,12 @@ else exit 1 fi -# Helper function to retrive string from X,Y position in csv file +# Helper function to retrieve string from X,Y position in csv file function get_xy() { VALUE_XY=$(cat $MATERIALS_FILE.csv | awk -v x=$X -v y=$Y -F\| 'NR==y {print $x}' | sed 's/\"//g') } -#Determine number of columns and rows in the Materials.csv file +# Determine number of columns and rows in the Materials.csv file NUMBER_OF_COLUMNS=$(cat $MATERIALS_FILE.csv | awk --field-separator="|" "NR==1 { print NF }") NUMBER_OF_ROWS=$(cat $MATERIALS_FILE.csv | wc -l) diff --git a/src/Mod/MeshPart/App/CurveProjector.cpp b/src/Mod/MeshPart/App/CurveProjector.cpp index 26a98c96b6..0bd4ae178b 100644 --- a/src/Mod/MeshPart/App/CurveProjector.cpp +++ b/src/Mod/MeshPart/App/CurveProjector.cpp @@ -77,7 +77,7 @@ void CurveProjector::writeIntersectionPointsToFile(const char *name) //************************************************************************** //************************************************************************** -// Seperator for additional classes +// Separator for additional classes //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ CurveProjectorShape::CurveProjectorShape(const TopoDS_Shape &aShape, const MeshKernel &pMesh) @@ -243,7 +243,7 @@ bool CurveProjectorShape::findStartPoint(const MeshKernel &MeshK,const Base::Vec //************************************************************************** //************************************************************************** -// Seperator for CurveProjectorSimple classe +// Separator for CurveProjectorSimple classes //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -557,7 +557,7 @@ bool CurveProjectorSimple::findStartPoint(const MeshKernel &MeshK,const Base::Ve //************************************************************************** //************************************************************************** -// Seperator for CurveProjectorSimple classe +// Separator for CurveProjectorSimple classes //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ diff --git a/src/Mod/MeshPart/App/MeshAlgos.cpp b/src/Mod/MeshPart/App/MeshAlgos.cpp index fd68cb6658..d73a0f0633 100644 --- a/src/Mod/MeshPart/App/MeshAlgos.cpp +++ b/src/Mod/MeshPart/App/MeshAlgos.cpp @@ -53,7 +53,7 @@ void MeshAlgos::offset(MeshCore::MeshKernel* Mesh, float fSize) std::vector normals = Mesh->CalcVertexNormals(); unsigned int i = 0; - // go throug all the Vertex normales + // go through all the Vertex normals for(std::vector::iterator It= normals.begin();It != normals.end();++It,i++) // and move each mesh point in the normal direction Mesh->MovePoint(i,It->Normalize() * fSize); @@ -75,7 +75,7 @@ void MeshAlgos::offsetSpecial2(MeshCore::MeshKernel* Mesh, float fSize) unsigned int i = 0; - // go throug all the Vertex normales + // go through all the Vertex normals for(std::vector::iterator It= PointNormals.begin();It != PointNormals.end();++It,i++){ builder.addSingleLine(Mesh->GetPoint(i),Mesh->GetPoint(i)+It->Normalize() * fSize); // and move each mesh point in the normal direction @@ -125,7 +125,7 @@ void MeshAlgos::offsetSpecial(MeshCore::MeshKernel* Mesh, float fSize, float zma std::vector normals = Mesh->CalcVertexNormals(); unsigned int i = 0; - // go throug all the Vertex normales + // go through all the Vertex normals for(std::vector::iterator It= normals.begin();It != normals.end();++It,i++) { Base::Vector3f Pnt = Mesh->GetPoint(i); diff --git a/src/Mod/MeshPart/App/MeshAlgos.h b/src/Mod/MeshPart/App/MeshAlgos.h index b14d7c6be4..42454d280e 100644 --- a/src/Mod/MeshPart/App/MeshAlgos.h +++ b/src/Mod/MeshPart/App/MeshAlgos.h @@ -52,7 +52,7 @@ namespace MeshPart class MeshPartExport MeshAlgos { public: - /** Calculate per Vertex normales and adds the Normal property bag + /** Calculate per Vertex normals and adds the Normal property bag */ static void offset(MeshCore::MeshKernel* Mesh, float fSize); static void offsetSpecial2(MeshCore::MeshKernel* Mesh, float fSize); diff --git a/src/Mod/PartDesign/App/FeatureSketchBased.h b/src/Mod/PartDesign/App/FeatureSketchBased.h index e7acbe5b24..ae7df6503f 100644 --- a/src/Mod/PartDesign/App/FeatureSketchBased.h +++ b/src/Mod/PartDesign/App/FeatureSketchBased.h @@ -70,7 +70,7 @@ public: /** * Verifies the linked Profile and returns it if it is a valid 2D object * @param silent if profile property is malformed and the parameter is true - * silently returns nullptr, otherwice throw a Base::Exception. + * silently returns nullptr, otherwise throw a Base::Exception. * Default is false. */ Part::Part2DObject* getVerifiedSketch(bool silent=false) const; @@ -78,7 +78,7 @@ public: /** * Verifies the linked Profile and returns it if it is a valid object * @param silent if profile property is malformed and the parameter is true - * silently returns nullptr, otherwice throw a Base::Exception. + * silently returns nullptr, otherwise throw a Base::Exception. * Default is false. */ Part::Feature* getVerifiedObject(bool silent=false) const; @@ -86,7 +86,7 @@ public: /** * Verifies the linked Object and returns the shape used as profile * @param silent if profirle property is malformed and the parameter is true - * silently returns nullptr, otherwice throw a Base::Exception. + * silently returns nullptr, otherwise throw a Base::Exception. * Default is false. */ TopoDS_Shape getVerifiedFace(bool silent = false) const; diff --git a/src/Mod/PartDesign/Gui/CommandBody.cpp b/src/Mod/PartDesign/Gui/CommandBody.cpp index 7af01c44df..04faaf92a5 100644 --- a/src/Mod/PartDesign/Gui/CommandBody.cpp +++ b/src/Mod/PartDesign/Gui/CommandBody.cpp @@ -348,7 +348,7 @@ void CmdPartDesignMigrate::activated(int iMsg) std::set migrateFeatures; - // Retrive all PartDesign Features objects and filter out features already belongs to some body + // Retrieve all PartDesign Features objects and filter out features already belonging to some body for ( const auto & feat: doc->getObjects( ) ) { if( feat->isDerivedFrom( PartDesign::Feature::getClassTypeId() ) && !PartDesign::Body::findBodyOf( feat ) && PartDesign::Body::isSolidFeature ( feat ) ) { @@ -414,8 +414,8 @@ void CmdPartDesignMigrate::activated(int iMsg) if ( std::next ( baseFeatIt ) == chainIt->end() ) { // just append our chain to already found chainIt->splice ( chainIt->end(), chain ); - // TODO If we will hit a third part everything will be messed up again. - // Probably it will require a yet another smart-ass find_if. (2015-08-10, Fat-Zer) + // TODO: If we will hit a third part everything will be messed up again. + // Probably it will require a yet another smart-ass find_if. (2015-08-10, Fat-Zer) } else { // We have a fork of a partDesign feature here // add a chain for current body @@ -430,7 +430,7 @@ void CmdPartDesignMigrate::activated(int iMsg) // The feature is not present in list pending for migration, // This generally shouldn't happen but may be if we run into some broken file // Try to find out the body we should insert into - // TODO Some error/warning is needed here (2015-08-10, Fat-Zer) + // TODO: Some error/warning is needed here (2015-08-10, Fat-Zer) auto newChainIt = featureChains.emplace (featureChains.end()); newChainIt->splice (newChainIt->end(), chain); } @@ -438,10 +438,10 @@ void CmdPartDesignMigrate::activated(int iMsg) } migrateFeatures.erase ( featIt ); featIt = migrateFeatures.begin (); - // TODO Align visibility (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) + // TODO: make it work without parts (2015-09-04, Fat-Zer) // add a part if there is no active yet App::Part *actPart = PartDesignGui::assertActivePart (); @@ -518,7 +518,7 @@ void CmdPartDesignMigrate::activated(int iMsg) arg(QString::fromUtf8(sketch->Label.getValue()) ) ); } } else { - // TODO Message that sketchbased is based not on a sketch (2015-08-11, Fat-Zer) + // TODO: Message that sketchbased is based not on a sketch (2015-08-11, Fat-Zer) } } } @@ -922,8 +922,8 @@ void CmdPartDesignMoveFeatureInTree::activated(int iMsg) } // Remove and re-insert the feature to/from the Body - // TODO if tip was moved the new position of tip is quite undetermined (2015-08-07, Fat-Zer) - // TODO warn the user if we are moving an object to some place before the object's link (2015-08-07, Fat-Zer) + // TODO: if tip was moved the new position of tip is quite undetermined (2015-08-07, Fat-Zer) + // TODO: warn the user if we are moving an object to some place before the object's link (2015-08-07, Fat-Zer) doCommand ( Doc,"App.activeDocument().%s.removeObject(App.activeDocument().%s)", body->getNameInDocument(), feat->getNameInDocument() ); doCommand ( Doc, "App.activeDocument().%s.insertObject(App.activeDocument().%s, %s, True)", diff --git a/src/Mod/PartDesign/Gui/ViewProviderDatumPlane.cpp b/src/Mod/PartDesign/Gui/ViewProviderDatumPlane.cpp index a8673fe885..3f3eb34593 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDatumPlane.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderDatumPlane.cpp @@ -69,7 +69,7 @@ void ViewProviderDatumPlane::attach ( App::DocumentObject *obj ) { getShapeRoot ()->addChild(lineSet); PartGui::SoBrepFaceSet *faceSet = new PartGui::SoBrepFaceSet(); - // SoBrepFaceSet supports only triangles (otherwice we recive incorrect highlighting + // SoBrepFaceSet supports only triangles (otherwise we receive incorrect highlighting) faceSet->partIndex.set1Value(0, 2); // One face, two triangles faceSet->coordIndex.setNum(8); // first triangle diff --git a/src/Mod/PartDesign/Gui/WorkflowManager.cpp b/src/Mod/PartDesign/Gui/WorkflowManager.cpp index 0ee052c2a8..974b6244b7 100644 --- a/src/Mod/PartDesign/Gui/WorkflowManager.cpp +++ b/src/Mod/PartDesign/Gui/WorkflowManager.cpp @@ -167,7 +167,7 @@ Workflow WorkflowManager::determinWorkflow( App::Document *doc) { msgBox.addButton ( QMessageBox::No ); } msgBox.setDefaultButton ( yesBtn ); - // TODO Add some description of manual migration mode (2015-08-09, Fat-Zer) + // TODO: Add some description of manual migration mode (2015-08-09, Fat-Zer) msgBox.exec(); @@ -192,7 +192,7 @@ void WorkflowManager::forceWorkflow( const App::Document *doc, Workflow wf) { } Workflow WorkflowManager::guessWorkflow(const App::Document *doc) { - // Retrive bodies of the document + // Retrieve bodies of the document auto features = doc->getObjectsOfType( PartDesign::Feature::getClassTypeId() ); if( features.empty() ) { @@ -212,7 +212,7 @@ Workflow WorkflowManager::guessWorkflow(const App::Document *doc) { break; } } - // if there are features not belonging to any body itmeans that migration was incomplete, otherwice it's Modern + // if there are features not belonging to any body it means that migration was incomplete, otherwise it's Modern return features_without_bodies ? Workflow::Undetermined : Workflow::Modern; } } diff --git a/src/Mod/Path/Gui/ViewProviderPath.cpp b/src/Mod/Path/Gui/ViewProviderPath.cpp index f26f2f4988..3dd94733c0 100644 --- a/src/Mod/Path/Gui/ViewProviderPath.cpp +++ b/src/Mod/Path/Gui/ViewProviderPath.cpp @@ -627,7 +627,7 @@ void ViewProviderPath::updateVisual(bool rebuild) { } } - // count = index + seperators + // count = index + separators edgeStart = -1; int i; for(i=StartIndex.getValue();i<(int)command2Edge.size();++i) diff --git a/src/Mod/Path/PathScripts/PathOpGui.py b/src/Mod/Path/PathScripts/PathOpGui.py index 77308294f8..1c7034fa4f 100644 --- a/src/Mod/Path/PathScripts/PathOpGui.py +++ b/src/Mod/Path/PathScripts/PathOpGui.py @@ -144,7 +144,7 @@ class ViewProvider(object): return self.OpIcon def getTaskPanelOpPage(self, obj): - '''getTaskPanelOpPage(obj) ... use the stored information to instanciate the receiver op's page controller.''' + '''getTaskPanelOpPage(obj) ... use the stored information to instantiate the receiver op's page controller.''' mod = importlib.import_module(self.OpPageModule) cls = getattr(mod, self.OpPageClass) return cls(obj, 0) diff --git a/src/Mod/Raytracing/App/AppRaytracingPy.cpp b/src/Mod/Raytracing/App/AppRaytracingPy.cpp index 03218f1366..d48c51c97a 100644 --- a/src/Mod/Raytracing/App/AppRaytracingPy.cpp +++ b/src/Mod/Raytracing/App/AppRaytracingPy.cpp @@ -187,7 +187,7 @@ private: &Arg[0],&PyTuple_Type, &Arg[1],&PyTuple_Type, &Arg[2],&PyTuple_Type, &Arg[3])) throw Py::Exception(); - // go throug the Tuple of Tuples + // go through the Tuple of Tuples for (int i=0;i<4;i++) { // check the right size of the Tuple of floats if (PyTuple_GET_SIZE(Arg[i]) != 3) diff --git a/src/Mod/Robot/App/Edge2TracObject.cpp b/src/Mod/Robot/App/Edge2TracObject.cpp index 5da88c93da..4038438dc0 100644 --- a/src/Mod/Robot/App/Edge2TracObject.cpp +++ b/src/Mod/Robot/App/Edge2TracObject.cpp @@ -79,13 +79,13 @@ App::DocumentObjectExecReturn *Edge2TracObject::execute(void) // container for all the edges std::vector edges; - // run throug the edge name and get the real objects from the TopoShape + // run through the edge name and get the real objects from the TopoShape for (std::vector::const_iterator it= SubVals.begin();it!=SubVals.end();++it) { TopoDS_Edge edge = TopoDS::Edge(TopShape.getSubShape(it->c_str())); edges.push_back(edge); } - // instanciate a edge cluster sorter and get the result + // instantiate an edge cluster sorter and get the result Part::Edgecluster acluster(edges); Part::tEdgeClusterVector aclusteroutput = acluster.GetClusters(); @@ -102,7 +102,7 @@ App::DocumentObjectExecReturn *Edge2TracObject::execute(void) Robot::Trajectory trac; bool first = true; - // cycle trough the cluster + // cycle through the cluster for(std::vector >::const_iterator it=aclusteroutput.begin();it!=aclusteroutput.end();++it) { // cycle through the edges of the cluster diff --git a/src/Mod/Robot/RobotExample.py b/src/Mod/Robot/RobotExample.py index eee4297123..a990086f31 100644 --- a/src/Mod/Robot/RobotExample.py +++ b/src/Mod/Robot/RobotExample.py @@ -67,7 +67,7 @@ App.activeDocument().Robot.RobotKinematicFile = App.getResourceDir()+"Mod/Robot/ App.activeDocument().Robot.Axis2 = -90 App.activeDocument().Robot.Axis3 = 90 -# retrive the Tcp position +# retrieve the Tcp position pos = App.getDocument("Unnamed").getObject("Robot").Tcp # move the robot pos.move(App.Vector(-10,0,0)) diff --git a/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp b/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp index e1b0801230..c474952a07 100644 --- a/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp @@ -116,7 +116,7 @@ void QGIViewAnnotation::draw() } } -//TODO: text is position slightly high (and left??) on page save to SVG file +//TODO: text is positioned slightly high (and left??) on page save to SVG file void QGIViewAnnotation::drawAnnotation() { @@ -127,7 +127,7 @@ void QGIViewAnnotation::drawAnnotation() const std::vector& annoText = viewAnno->Text.getValues(); - //build HTML/CSS formating around Text lines + //build HTML/CSS formatting around Text lines std::stringstream ss; ss << "\n\n