Misc. typos

Found via `codespell`
This commit is contained in:
luz.paz
2018-04-25 09:41:33 -03:00
committed by Yorik van Havre
parent 8c0b574661
commit 505488c4f9
83 changed files with 112 additions and 112 deletions
+1 -1
View File
@@ -149,7 +149,7 @@ endif(WIN32)
SET(CMAKE_INSTALL_DATADIR data CACHE PATH "Output directory for data and resource files")
SET(CMAKE_INSTALL_INCLUDEDIR include CACHE PATH "Output directory for header files")
SET(CMAKE_INSTALL_DOCDIR doc CACHE PATH "Output directory for documentation and license files")
# Don't set it without manual adaption of LibDir variable in src/App/FreeCADInit.py
# Don't set it without manual adoption of LibDir variable in src/App/FreeCADInit.py
SET(CMAKE_INSTALL_LIBDIR lib CACHE PATH "Output directory for libraries")
if(NOT WIN32)
+1 -1
View File
@@ -62,7 +62,7 @@ Version: 0.14
* Draft Dimensions due not observe Dimension Precision on FreeCAD Windows
* invalid DXF export
* Port wiki, phpbb and mantis to self-hosted
* Crash propably in MeshPart
* Crash probably in MeshPart
* Part.BSplineCurve: allow to set degree and mutliplicites when calling constructor.
* FeaturePython objects should be able to define how POVray output is generated
* Losing Snap when Object is getting more complex.
+2 -2
View File
@@ -1160,7 +1160,7 @@ void my_trans_func( unsigned int code, EXCEPTION_POINTERS* pExp )
//{
// case FLT_DIVIDE_BY_ZERO :
// //throw CMyFunkyDivideByZeroException(code, pExp);
// throw Base::DivisionByZeroError("Devision by zero!");
// throw Base::DivisionByZeroError("Division by zero!");
// break;
//}
@@ -2394,7 +2394,7 @@ std::string Application::FindHomePath(const char* sCall)
#endif
if (nchars < 0 || nchars >= PATH_MAX)
throw Base::FileSystemError("Cannot determine the absolute path of the executable");
resolved[nchars] = '\0'; // enfore null termination
resolved[nchars] = '\0'; // enforce null termination
absPath = resolved;
}
+1 -1
View File
@@ -379,7 +379,7 @@ private:
static Base::ConsoleObserverFile *_pConsoleObserverFile;
};
/// Singleton getter of the Applicaton
/// Singleton getter of the Application
inline App::Application &GetApplication(void){
return *App::Application::_pcSingleton;
}
+1 -1
View File
@@ -324,7 +324,7 @@ void Document::exportGraphviz(std::ostream& out) const
}
/**
* @brief setPropertyVertexAttributes Set vertex attributes for a Porperty node in a graph.
* @brief setPropertyVertexAttributes Set vertex attributes for a Property node in a graph.
* @param g Graph
* @param vertex Property node
* @param name Name of node
+1 -1
View File
@@ -1020,7 +1020,7 @@ Expression * FunctionExpression::eval() const
if (!v2->getUnit().isEmpty())
throw ExpressionError("Exponent is not allowed to have a unit.");
// Compute new unit for exponentation
// Compute new unit for exponentiation
double exponent = v2->getValue();
if (!v1->getUnit().isEmpty()) {
if (exponent - boost::math::round(exponent) < 1e-9)
+1 -1
View File
@@ -172,7 +172,7 @@ template<> void _class_::init(void){\
*
* A special case that needs to be handled for extensions is the possibility of overridden methods.
* Often it is desired to customise extension behaviour by allowing the user to override methods
* provided by the extension. On c++ side this is trival, such methods are simply marked as "virtual"
* provided by the extension. On c++ side this is trivial, such methods are simply marked as "virtual"
* and can than be overridden in any derived class. This is more involved for the python interface and
* here special care needs to be taken.
*
+1 -1
View File
@@ -40,7 +40,7 @@ namespace App {
* In FreeCAD normally inheritance is a chain, it is not possible to use multiple inheritance.
* The reason for this is that all objects need to be exposed to python, and it is basically
* impossible to handle multiple inheritance in the C-API for python extensions. Also using multiple
* parent classes in python is currently not possible with the default object aproach.
* parent classes in python is currently not possible with the default object approach.
*
* The concept of extensions allow to circumvent those problems. Extensions are FreeCAD objects
* which work like normal objects in the sense that they use properties and class methods to define
+2 -2
View File
@@ -136,8 +136,8 @@ DocumentObjectExecReturn *FeatureTest::execute(void)
case 1: throw "Test Exception";
case 2: throw Base::RuntimeError("FeatureTestException::execute(): Testexception");
case 3: *i=0;printf("%i",*i);break; // seg-vault
case 4: j=0; printf("%i",1/j); break; // int devision by zero
case 5: f=0.0; printf("%f",1/f); break; // float devision by zero
case 4: j=0; printf("%i",1/j); break; // int division by zero
case 5: f=0.0; printf("%f",1/f); break; // float division by zero
case 6: s = malloc(3600000000ul); free(s); break; // out-of-memory
}
+3 -3
View File
@@ -44,7 +44,7 @@ public:
~FeatureTest();
// Standard Properties (PorpertyStandard.h)
// Standard Properties (PropertyStandard.h)
App::PropertyInteger Integer;
App::PropertyFloat Float;
App::PropertyBool Bool;
@@ -67,7 +67,7 @@ public:
App::PropertyIntegerConstraint ConstraintInt;
App::PropertyFloatConstraint ConstraintFloat;
// Standard Properties (PorpertyStandard.h)
// Standard Properties (PrppertyStandard.h)
App::PropertyIntegerList IntegerList;
App::PropertyFloatList FloatList;
@@ -107,7 +107,7 @@ public:
/// recalculate the Feature
virtual DocumentObjectExecReturn *execute(void);
/// returns the type name of the ViewProvider
//FIXME: Propably it makes sense to have a view provider for unittests (e.g. Gui::ViewProviderTest)
//FIXME: Probably it makes sense to have a view provider for unittests (e.g. Gui::ViewProviderTest)
virtual const char* getViewProviderName(void) const {
return "Gui::ViewProviderFeature";
}
+1 -1
View File
@@ -35,7 +35,7 @@ import FreeCAD
def removeFromPath(module_name):
"""removes the module from the sys.path. The entry point for imports
will therfor always be FreeCAD.
will therefore always be FreeCAD.
eg.: from FreeCAD.Module.submodule import function"""
import sys, os
paths = sys.path
+1 -1
View File
@@ -130,7 +130,7 @@ public:
return ss.str();
}
/// color values, public accesible
/// color values, public accessible
float r,g,b,a;
};
+1 -1
View File
@@ -332,7 +332,7 @@ std::string ObjectIdentifier::toEscapedString() const
}
/**
* @brief Modifiy object identifier given that document object \a oldName gets the new name \a newName.
* @brief Modify object identifier given that document object \a oldName gets the new name \a newName.
* @param oldName Name of current document object
* @param newName New name of document object
*/
+1 -1
View File
@@ -126,7 +126,7 @@ public:
protected:
/// Checks integrity of the Origin
virtual App::DocumentObjectExecReturn *execute(void);
/// Creates all corresponding Axises and Planes objects for the origin if they not linked yet
/// Creates all corresponding Axes and Planes objects for the origin if they aren't linked yet
virtual void setupObject ();
/// Removes all planes and axis if they are still linked to the document
virtual void unsetupObject ();
+9 -9
View File
@@ -41,14 +41,14 @@
#include <chrono>
//**************************************************************************
// Loging levels
// Logging levels
#ifdef FC_DEBUG
/// switch on the loging of python object creation and destruction
/// switch on the logging of python object creation and destruction
# undef FC_LOGPYOBJECTS
/// switch on the loging of Feature update and execution
/// switch on the logging of Feature update and execution
# define FC_LOGFEATUREUPDATE
/// switch on the loging of the Update execution through Doc, App, GuiApp and GuiDoc
/// switch on the logging of the Update execution through Doc, App, GuiApp and GuiDoc
# undef FC_LOGUPDATECHAIN
#endif
@@ -288,7 +288,7 @@
* You can also use <tt>FC_DURATION_MSG, FC_DURATION_TRACE</tt> as usual.
*
* If you use only macros provided here to do timing, the entire timing code
* can be complied out by defining \c FC_LOG_NO_TIMING before including
* can be compiled out by defining \c FC_LOG_NO_TIMING before including
* \c App/Console.h.
*
* \section Customization
@@ -460,13 +460,13 @@ public:
ConsoleObserver()
:bErr(true),bMsg(true),bLog(true),bWrn(true) {}
virtual ~ConsoleObserver() {}
/// get calles when a Warning is issued
/// get calls when a Warning is issued
virtual void Warning(const char *){}
/// get calles when a Message is issued
/// get calls when a Message is issued
virtual void Message(const char *){}
/// get calles when a Error is issued
/// get calls when a Error is issued
virtual void Error (const char *)=0;
/// get calles when a Log Message is issued
/// get calls when a Log Message is issued
virtual void Log (const char *){}
virtual const char *Name(void){return 0L;}
+1 -1
View File
@@ -145,7 +145,7 @@ const std::string &FileInfo::getTempPath(void)
std::string FileInfo::getTempFileName(const char* FileName, const char* Path)
{
//FIXME: To avoid race conditons we should rather return a file pointer
//FIXME: To avoid race conditions we should rather return a file pointer
//than a file name.
#ifdef FC_OS_WIN32
wchar_t buf[MAX_PATH + 2];
+5 -5
View File
@@ -102,7 +102,7 @@ public:
//@{
/// make a deep copy to the other group
void copyTo(Base::Reference<ParameterGrp>);
/// overwrite everithing similar, leaf the others allone
/// overwrite everything similar, leave the others alone
void insertTo(Base::Reference<ParameterGrp>);
/// export this group to a file
void exportTo(const char* FileName);
@@ -126,7 +126,7 @@ public:
typedef Base::Reference<ParameterGrp> handle;
/// remove a sub group from this group
void RemoveGrp(const char* Name);
/// clears everithing in this group (all types)
/// clears everything in this group (all types)
void Clear(void);
//@}
@@ -240,15 +240,15 @@ protected:
XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *FindNextElement(XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *Prev, const char* Type) const;
/** Find an element specified by Type and Name
* Search in the parent element Start for the first occourrence of an
* Search in the parent element Start for the first occurrence of an
* element of Type and with the attribute Name=Name. On success it returns
* the pointer to that element, otherwise NULL
* If the names not given he returns the first occourence fo Type.
* If the names not given it returns the first occurrence of Type.
*/
XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *FindElement(XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *Start, const char* Type, const char* Name=0L) const;
/** Find an element specified by Type and Name or create it if not found
* Search in the parent element Start for the first occourrence of an
* Search in the parent element Start for the first occurrence of an
* element of Type and with the attribute Name=Name. On success it returns
* the pointer to that element, otherwise it creates the element and returns the pointer.
*/
+1 -1
View File
@@ -65,7 +65,7 @@ class SequencerLauncher;
*
* The implementation of this class also supports several nested instances
* at a time. But note, that only the first instance has an effect. Any further
* sequencer instance doesn't influence the total numer of iteration steps. This
* sequencer instance doesn't influence the total number of iteration steps. This
* is simply because it's impossible to get the exact number of iteration steps
* for nested instances and thus we have either too few steps estimated then the
* sequencer may indicate 100% but the algorithm still running or we have too many
+1 -1
View File
@@ -160,7 +160,7 @@ void UnitsApi::setSchema(UnitSystem s)
//}
//
// === static translation methodes ==========================================
// === static translation methods ==========================================
QString UnitsApi::schemaTranslate(const Base::Quantity& quant, double &factor, QString &unitString)
{
+1 -1
View File
@@ -99,7 +99,7 @@ protected:
// do the real work
//static double parse(const char*,bool &UsedUnit);
protected: // the python API wrapper methodes
protected: // the python API wrapper methods
//static PyObject *sTranslateUnit (PyObject *self,PyObject *args,PyObject *kwd);
//static PyObject *sGetWithPrefs (PyObject *self,PyObject *args,PyObject *kwd);
static PyObject *sParseQuantity (PyObject *self,PyObject *args,PyObject *kwd);
+3 -3
View File
@@ -33,7 +33,7 @@ namespace Base {
/** The schema class for the imperial unit system
* Here are the definitons for the imperial unit system.
* Here are the definitions for the imperial unit system.
* It also defines how the value/units get printed.
*/
class UnitsSchemaImperial1: public UnitsSchema
@@ -45,7 +45,7 @@ public:
};
/** The schema class for the imperial unit system
* Here are the definitons for the imperial unit system.
* Here are the definitions for the imperial unit system.
* It also defines how the value/units get printed.
*/
class UnitsSchemaImperialDecimal: public UnitsSchema
@@ -57,7 +57,7 @@ public:
};
/** The schema class for the imperial unit system
* Here are the definitons for the imperial unit system.
* Here are the definitions for the imperial unit system.
* It also defines how the value/units get printed.
*/
class UnitsSchemaImperialBuilding: public UnitsSchema
@@ -623,7 +623,7 @@ void Gui::GUIApplicationNativeEventAware::OnRawInput(UINT nInputCode, HRAWINPUT
nCount = this->GetRawInputBuffer(pRawInput, &cbSize, sizeof(RAWINPUTHEADER));
}
// If we have mouse input data for the app then tell tha app about it
// If we have mouse input data for the app then tell the app about it
if (b3dmouseInput) {
On3dmouseInput();
}
+1 -1
View File
@@ -44,7 +44,7 @@ class MainWindow;
class MenuItem;
class ViewProvider;
/** The Applcation main class
/** The Application main class
* This is the central class of the GUI
* @author Jürgen Riegel, Werner Mayer
*/
+3 -3
View File
@@ -135,7 +135,7 @@ CommandBase::CommandBase( const char* sMenu, const char* sToolTip, const char* s
CommandBase::~CommandBase()
{
//Note: The Action object becomes a children of MainWindow which gets destoyed _before_ the
//Note: The Action object becomes a children of MainWindow which gets destroyed _before_ the
//command manager hence before any command object. So the action pointer is a dangling pointer
//at this state.
}
@@ -412,9 +412,9 @@ void Command::setGroupName(const char* s)
//--------------------------------------------------------------------------
/** Open a new Undo transaction on the active document
* This method opens a new UNDO transaction on the active document. This transaction
* will later apear in the UNDO REDO dialog with the name of the command. If the user
* will later appear in the UNDO REDO dialog with the name of the command. If the user
* recall the transaction everything changed on the document between OpenCommand() and
* CommitCommand will be undone (or redone). You can use an alternetive name for the
* CommitCommand will be undone (or redone). You can use an alternative name for the
* operation default is the Command name.
* @see CommitCommand(),AbortCommand()
*/
+3 -3
View File
@@ -508,21 +508,21 @@ public:
bool addTo(const char* Name, QWidget* pcWidget);
/** Returns all commands of a special App Module
* delivers a vector of all comands in the given application module. When no
* delivers a vector of all commands in the given application module. When no
* name is given the standard commands (build in ) are returned.
* @see Command
*/
std::vector <Command*> getModuleCommands(const char *sModName) const;
/** Returns all commands registered in the manager
* delivers a vector of all comands. If you intereted in commands of
* delivers a vector of all commands. If you intereted in commands of
* of a special app module use GetModuleCommands()
* @see Command
*/
std::vector <Command*> getAllCommands(void) const;
/** Returns all commands of a group
* delivers a vector of all comands in the given group.
* delivers a vector of all commands in the given group.
*/
std::vector <Command*> getGroupCommands(const char *sGrpName) const;
+1 -1
View File
@@ -332,7 +332,7 @@ void DlgMacroExecuteImp::on_createButton_clicked()
if (suffix != QLatin1String("fcmacro") && suffix != QLatin1String("py"))
fn += QLatin1String(".FCMacro");
QDir dir(this->macroPath);
// create the macroPath if inexistant
// create the macroPath if nonexistent
if (!dir.exists()) {
dir.mkpath(this->macroPath);
}
+1 -1
View File
@@ -99,7 +99,7 @@ void DlgSettingsImageImp::setImageSize( const QSize& s )
}
/**
* Returns the currenty set image size.
* Returns the currently set image size.
*/
QSize DlgSettingsImageImp::imageSize() const
{
+1 -1
View File
@@ -1422,7 +1422,7 @@ Gui::MDIView* Document::getEditingViewOfViewProvider(Gui::ViewProvider* vp) cons
* This method opens a new UNDO transaction on the active document. This transaction
* will later appear in the UNDO/REDO dialog with the name of the command. If the user
* recall the transaction everything changed on the document between OpenCommand() and
* CommitCommand will be undone (or redone). You can use an alternetive name for the
* CommitCommand will be undone (or redone). You can use an alternative name for the
* operation default is the command name.
* @see CommitCommand(),AbortCommand()
*/
+1 -1
View File
@@ -242,7 +242,7 @@ public:
void redo(int iSteps) ;
//@}
/// handels the application close event
/// handles the application close event
bool canClose();
bool isLastView(void);
+1 -1
View File
@@ -454,7 +454,7 @@ FileOptionsDialog::~FileOptionsDialog()
void FileOptionsDialog::accept()
{
// Fixes a bug of the default implementation when entering an asterik
// Fixes a bug of the default implementation when entering an asterisk
QLineEdit* filename = this->findChild<QLineEdit*>();
QString fn = filename->text();
if (fn.startsWith(QLatin1String("*"))) {
+1 -1
View File
@@ -378,7 +378,7 @@ SbBool GestureNavigationStyle::processSoEvent(const SoEvent * const ev)
this->mouseMoveThresholdBroken = false;
pan(viewer->getSoRenderManager()->getCamera());//set up panningplane
int &cnt = this->mousedownConsumedCount;
this->mousedownConsumedEvent[cnt] = *event;//hopefully, a shallow copy is enough. There are no pointers stored in events, apparently. Will loose a subclass, though.
this->mousedownConsumedEvent[cnt] = *event;//hopefully, a shallow copy is enough. There are no pointers stored in events, apparently. Will lose a subclass, though.
cnt++;
assert(cnt<=2);
if(cnt>static_cast<int>(sizeof(mousedownConsumedEvent))){
+1 -1
View File
@@ -105,7 +105,7 @@ private:
* .ui file.
* This class might be very useful for dialogs where a combo box is used to
* define a direction vector by the user. For such classes the programmer don't
* to write a subclass to implement the appropriate singals/slots. Instead it's
* to write a subclass to implement the appropriate signals/slots. Instead it's
* possible to omit this further class and use LocationInterface parametrized
* with the generated Ui class.
* @author Werner Mayer
+1 -1
View File
@@ -383,7 +383,7 @@ SbBool MayaGestureNavigationStyle::processSoEvent(const SoEvent * const ev)
this->mouseMoveThresholdBroken = false;
pan(viewer->getSoRenderManager()->getCamera());//set up panningplane
int &cnt = this->mousedownConsumedCount;
this->mousedownConsumedEvent[cnt] = *event;//hopefully, a shallow copy is enough. There are no pointers stored in events, apparently. Will loose a subclass, though.
this->mousedownConsumedEvent[cnt] = *event;//hopefully, a shallow copy is enough. There are no pointers stored in events, apparently. Will lose a subclass, though.
cnt++;
assert(cnt<=2);
if(cnt>static_cast<int>(sizeof(mousedownConsumedEvent))){
+1 -1
View File
@@ -328,7 +328,7 @@ void MenuManager::retranslate(QMenu* menu) const
// titles. To ease the translation for each menu the native name is set
// as user data. However, there are special menus that are created by
// actions for which the name of the according command name is set. For
// such menus we have to use the command's menu text instaed. Examples
// such menus we have to use the command's menu text instead. Examples
// for such actions are Std_RecentFiles, Std_Workbench or Std_FreezeViews.
CommandManager& mgr = Application::Instance->commandManager();
QByteArray menuName = menu->menuAction()->data().toByteArray();
+1 -1
View File
@@ -444,7 +444,7 @@ bool ProgressBar::eventFilter(QObject* o, QEvent* e)
if (ke->key() == Qt::Key_Escape) {
// eventFilter() was called from the application 50 times without performing a new step (app could hang)
if (d->observeEventFilter > 50) {
// tries to unlock the application if it hangs (propably due to incorrect usage of Base::Sequencer)
// tries to unlock the application if it hangs (probably due to incorrect usage of Base::Sequencer)
if (ke->modifiers() & (Qt::ControlModifier | Qt::AltModifier)) {
sequencer->resetData();
return true;
+1 -1
View File
@@ -95,7 +95,7 @@ protected:
bool canAbort() const;
/** Gets the events under control */
void enterControlEvents();
/** Looses the control over incoming events*/
/** Loses the control over incoming events*/
void leaveControlEvents();
private:
+1 -1
View File
@@ -181,7 +181,7 @@ public:
virtual bool canDragObjects() const;
/** Check whether the object can be removed from the view provider by drag and drop */
virtual bool canDragObject(App::DocumentObject*) const;
/** Tell the tree view if this object should apear there */
/** Tell the tree view if this object should appear there */
virtual bool showInTree() const
{
return true;
+1 -1
View File
@@ -37,7 +37,7 @@ class View3DInventorViewer;
class SoFCCSysDragger;
/**
* The base class for all view providers modifiying the placement
* The base class for all view providers modifying the placement
* of a geometric feature.
* @author Werner Mayer
*/
+2 -2
View File
@@ -5,7 +5,7 @@ VERSION = 1.0
# Do not change this line
CONFIG += qt
# Chose one of the following two lines to configure the build
# Choose one of the following two lines to configure the build
#CONFIG += release
#CONFIG += debug
@@ -38,7 +38,7 @@ CONFIG(release, debug|release) {
RCC_DIR = ./release
}
# Chose one of the following two lines to configure the build
# Choose one of the following two lines to configure the build
#LIB_CONFIG = staticlib
LIB_CONFIG = dll
+1 -1
View File
@@ -135,7 +135,7 @@ def removeFromComponent(compobject,subobject):
class SelectionTaskPanel:
"""A temp taks panel to wait for a selection"""
"""A temporary TaskPanel to wait for a selection"""
def __init__(self):
self.baseform = QtGui.QLabel()
self.baseform.setText(QtGui.QApplication.translate("Arch", "Please select a base object", None))
+1 -1
View File
@@ -40,7 +40,7 @@ else:
# \ingroup ARCH
# \brief The Pipe object and tools
#
# This module provides tools to build Pipe and Pipe conector objects.
# This module provides tools to build Pipe and Pipe connector objects.
# Pipes are tubular objects extruded along a base line.
__title__ = "Arch Pipe tools"
+1 -1
View File
@@ -43,7 +43,7 @@ else:
# \brief Profile tools for ArchStructure
#
# This module provides tools to build base profiles
# for Arch Strucutre elements
# for Arch Structure elements
__title__="FreeCAD Profile"
__author__ = "Yorik van Havre"
+1 -1
View File
@@ -43,7 +43,7 @@ else:
#
# This module provides tools to build Rebar objects.
# Rebars (or Reinforcing Bars) are metallic bars placed
# inside concrete strutures to reinforce them.
# inside concrete structures to reinforce them.
__title__="FreeCAD Rebar"
__author__ = "Yorik van Havre"
+1 -1
View File
@@ -337,7 +337,7 @@ class _Space(ArchComponent.Component):
shape = Part.makeBox(bb.XLength,bb.YLength,bb.ZLength,FreeCAD.Vector(bb.XMin,bb.YMin,bb.ZMin))
#print("created shape from boundbox")
# 3: identifing boundary faces
# 3: identifying boundary faces
goodfaces = []
for b in obj.Boundaries:
if b[0].isDerivedFrom("Part::Feature"):
@@ -99,7 +99,7 @@ namespace dcm {
namespace details {
//return always a geometry3d pointer struct, no matter whats the supplied type
//return always a geometry3d pointer struct, no matter what's the supplied type
template<typename T, typename R>
struct converter_g {
//check if the type T is usable from within module3d, as it could also be a shape type
+1 -1
View File
@@ -199,7 +199,7 @@ void ViewProviderProduct::drop(const std::vector<const App::DocumentObject*> &ob
// Gui::Command::doCommand(Gui::Command::Doc,"App.activeDocument().addObject('App::Plane','%s')",Plane3Name.c_str());
// Gui::Command::doCommand(Gui::Command::Doc,"App.activeDocument().ActiveObject.Placement = App.Placement(App.Vector(),App.Rotation(App.Vector(1,0,0),90))");
// Gui::Command::doCommand(Gui::Command::Doc,"App.activeDocument().ActiveObject.Label = 'XZ-Plane'");
// // add to anotation set of the Part object
// // add to annotation set of the Part object
// Gui::Command::doCommand(Gui::Command::Doc,"App.activeDocument().%s.Annotation = [App.activeDocument().%s,App.activeDocument().%s,App.activeDocument().%s] ",PartName.c_str(),Plane1Name.c_str(),Plane2Name.c_str(),Plane3Name.c_str());
// // add the main body
// Gui::Command::doCommand(Gui::Command::Doc,"App.activeDocument().%s.Model = App.activeDocument().%s ",PartName.c_str(),BodyName.c_str());
@@ -188,7 +188,7 @@ void ViewProviderProductRef::drop(const std::vector<const App::DocumentObject*>
// Gui::Command::doCommand(Gui::Command::Doc,"App.activeDocument().addObject('App::Plane','%s')",Plane3Name.c_str());
// Gui::Command::doCommand(Gui::Command::Doc,"App.activeDocument().ActiveObject.Placement = App.Placement(App.Vector(),App.Rotation(App.Vector(1,0,0),90))");
// Gui::Command::doCommand(Gui::Command::Doc,"App.activeDocument().ActiveObject.Label = 'XZ-Plane'");
// // add to anotation set of the Part object
// // add to annotation set of the Part object
// Gui::Command::doCommand(Gui::Command::Doc,"App.activeDocument().%s.Annotation = [App.activeDocument().%s,App.activeDocument().%s,App.activeDocument().%s] ",PartName.c_str(),Plane1Name.c_str(),Plane2Name.c_str(),Plane3Name.c_str());
// // add the main body
// Gui::Command::doCommand(Gui::Command::Doc,"App.activeDocument().%s.Model = App.activeDocument().%s ",PartName.c_str(),BodyName.c_str());
+2 -2
View File
@@ -4219,10 +4219,10 @@ static PyObject * fit_iter(PyObject *self, PyObject *args)
//PyDoc_STRVAR(open_doc,
//"open(string) -- Not implemnted for this Module so far.");
//"open(string) -- Not implemented for this Module so far.");
//
//PyDoc_STRVAR(inst_doc,
//"insert(string, string) -- Not implemnted for this Module so far.");
//"insert(string, string) -- Not implemented for this Module so far.");
//
//PyDoc_STRVAR(loft_doc,
//"Creates a TopoShape with a test BSPLINE");
+1 -1
View File
@@ -514,7 +514,7 @@ void Approximate::ParameterBoundary()
}
/*! \brief Parameterizing the Inner Points
This function will parameterize the inner points. Using the algorithim based on paper from
This function will parameterize the inner points. Using the algorithm based on paper from
Michael S. Floater, published in Computer Aided Design 14(1997) page 231 - 250,
entitled Parametrization and smooth approximation of surface triangulation
*/
+3 -3
View File
@@ -153,7 +153,7 @@ double Routines::CalcAngle(Base::Vector3f a,Base::Vector3f b,Base::Vector3f c)
/*! \brief Algorithim A2.1 from NURBS Book Page 68*/
/*! \brief Algorithm A2.1 from NURBS Book Page 68*/
int Routines::FindSpan(int n, int p, double u, std::vector<double> KnotSequence)
{
if (u == KnotSequence[n+1])
@@ -178,7 +178,7 @@ int Routines::FindSpan(int n, int p, double u, std::vector<double> KnotSequence)
}
/*! \brief Algorithim A2.4 from NURBS Book page 70*/
/*! \brief Algorithm A2.4 from NURBS Book page 70*/
void Routines::Basisfun(int i, double u, int p, std::vector<double> &KnotSequence, std::vector<double> &output)
{
double temp, saved;
@@ -199,7 +199,7 @@ void Routines::Basisfun(int i, double u, int p, std::vector<double> &KnotSequenc
output[j] = saved;
}
}
/*! \brief Algorithim A2.3 from NURBS Book Page 72 */
/*! \brief Algorithm A2.3 from NURBS Book Page 72 */
void Routines::DersBasisFuns(int i, double u, int p, int n,
std::vector<double> &KnotSequence, std::vector< std::vector<double> > &Derivate)
{
+1 -1
View File
@@ -2044,7 +2044,7 @@ def curvetowire(obj,steps):
def cleanProjection(shape,tessellate=True,seglength=.05):
"returns a valid compound of edges, by recreating them"
# this is because the projection algorithm somehow creates wrong shapes.
# they dispay fine, but on loading the file the shape is invalid
# they display fine, but on loading the file the shape is invalid
# Now with tanderson's fix to ProjectionAlgos, that isn't the case, but this
# can be used for tessellating ellipses and splines for DXF output-DF
oldedges = shape.Edges
+1 -1
View File
@@ -1910,7 +1910,7 @@ def getStrGroup(ob):
# fallback
return l.encode("ascii",errors="replace")
else:
# better encoding, replaces accented latin characters with corrsponding ascii letter
# better encoding, replaces accented latin characters with corresponding ascii letter
return ''.join((c for c in unicodedata.normalize('NFD', l) if unicodedata.category(c) != 'Mn')).encode("ascii",errors="replace")
return l
+1 -1
View File
@@ -44,7 +44,7 @@ step_path=FreeCAD.getHomePath()+ "Mod/Idf/Idflibs/"
ignore_hole_size=0.5 # size in MM to prevent huge number of drilled holes
EmpDisplayMode=2 # 0='Flat Lines', 1='Shaded', 2='Wireframe', 3='Points'; recommended 2 or 0
IDF_sort=0 # 0-sort per refdes [1 - part number (not preffered)/refdes] 2-sort per footprint/refdes
IDF_sort=0 # 0-sort per refdes [1 - part number (not preferred)/refdes] 2-sort per footprint/refdes
IDF_diag=0 # 0/1=disabled/enabled output (footprint.lst/missing_models.lst)
IDF_diag_path="/tmp" # path for output of footprint.lst and missing_models.lst
+2 -2
View File
@@ -130,9 +130,9 @@ class Part21Parser:
line = fp.readline()
if not line:
break
# there may be a multline definition. In this case, we read lines until we found
# there may be a multiline definition. In this case, we read lines until we found
# a ;
while (line.find(';') == -1): #its a multiline
while (line.find(';') == -1): #it's a multiline
line = line.replace("\n","").replace("\r","") + fp.readline()
# parse line
match_instance_definition = INSTANCE_DEFINITION_RE.search(line) # id,name,attrs
+1 -1
View File
@@ -46,7 +46,7 @@ def process_nested_parent_str2(attr_str,idx=0):
current_param = ''
k += progress+1
elif ch==')':
#print "Down one level parenthesis: %i caracters parsed"%k
#print "Down one level parenthesis: %i characters parsed"%k
params.append(current_param)
#print "Current params:",params#k -= acc-2
return params,k
+1 -1
View File
@@ -252,7 +252,7 @@ public:
*/
~MeshEvalInternalFacets () { }
/**
* Identifiy internal facets.
* Identify internal facets.
*/
bool Evaluate ();
/**
+1 -1
View File
@@ -860,7 +860,7 @@ bool MeshGeomFacet::IsPointOf (const Base::Vector3f &P) const
double wv = w * v;
double det = fabs((uu * vv) - (uv * uv));
// Note: Due to roundoff errros it can happen that we get very small
// Note: Due to roundoff errors it can happen that we get very small
// negative values for s or t. This e.g. can happen if the point lies
// at the border of the facet. And as det could also become very small
// we need an adaptive tolerance.
+1 -1
View File
@@ -129,7 +129,7 @@ public:
inline void GetNeighbours (MeshFacetIterator &rclN0, MeshFacetIterator &rclN1, MeshFacetIterator &rclN2) const;
/// Sets the iterator to the current facet's neighbour of the side \a usN.
inline void SetToNeighbour (unsigned short usN);
/// Retruns the property information to the current facet.
/// Returns the property information to the current facet.
inline unsigned long GetProperty (void) const;
/// Checks if the iterator points to a valid element inside the array.
inline bool IsValid (void) const
+2 -2
View File
@@ -166,7 +166,7 @@ public:
* \a fMaxAngle is the maximum allowed angle between the normals of two
* adjacent facets to allow swapping the common edge. A too high value might
* result into folds on the surface.
* @note This is a high-level operation and tries to optimze the mesh as a whole.
* @note This is a high-level operation and tries to optimize the mesh as a whole.
*/
void OptimizeTopology(float fMaxAngle);
void OptimizeTopology();
@@ -184,7 +184,7 @@ public:
/**
* Tries to adjust the edges to the curvature direction with the minimum
* absolute value of maximum and minimum curvature.
* @note This is a high-level operation and tries to optimze the mesh as a
* @note This is a high-level operation and tries to optimize the mesh as a
* whole.
*/
void AdjustEdgesToCurvatureDirection();
+1 -1
View File
@@ -248,7 +248,7 @@ public:
};
/**
* The RemoveComponents class removes topologic indepentent components up to a certain size from the mesh data structure.
* The RemoveComponents class removes topologic independent components up to a certain size from the mesh data structure.
* @author Werner Mayer
*/
class MeshExport RemoveComponents : public Mesh::FixDefects
+1 -1
View File
@@ -28,7 +28,7 @@
// must therefore be careful about how you interface the transformation code
// with graphics APIS.
//
// For memory organization it might seem natural to chose Real[N][N] for the
// For memory organization it might seem natural to choose Real[N][N] for the
// matrix storage, but this can be a problem on a platform/console that
// chooses to store the data in column-major rather than row-major format.
// To avoid potential portability problems, the matrix is stored as Real[N*N]
+1 -1
View File
@@ -28,7 +28,7 @@
// must therefore be careful about how you interface the transformation code
// with graphics APIS.
//
// For memory organization it might seem natural to chose Real[N][N] for the
// For memory organization it might seem natural to choose Real[N][N] for the
// matrix storage, but this can be a problem on a platform/console that
// chooses to store the data in column-major rather than row-major format.
// To avoid potential portability problems, the matrix is stored as Real[N*N]
+1 -1
View File
@@ -28,7 +28,7 @@
// must therefore be careful about how you interface the transformation code
// with graphics APIS.
//
// For memory organization it might seem natural to chose Real[N][N] for the
// For memory organization it might seem natural to choose Real[N][N] for the
// matrix storage, but this can be a problem on a platform/console that
// chooses to store the data in column-major rather than row-major format.
// To avoid potential portability problems, the matrix is stored as Real[N*N]
+1 -1
View File
@@ -458,7 +458,7 @@ void CurveProjectorSimple::projectCurve( const TopoDS_Edge& aEdge,
// if the i'th neighbour is valid
if ( auNeighboursIdx[i] != ULONG_MAX )
{
// try to project next intervall
// try to project next interval
MeshGeomFacet N = MeshK.GetFacet( auNeighboursIdx[i] );
gpPt = hCurve->Value(fAct+fStep);
if(MeshFacetFunc::IntersectWithLine (*It, Base::Vector3f(gpPt.X(),gpPt.Y(),gpPt.Z()), It->GetNormal(), cResultPoint) )
+2 -2
View File
@@ -25,7 +25,7 @@ __author__ = "Sebastian Hoogen"
__url__ = ["http://www.freecadweb.org"]
'''
This Script includes various pyhton helper functions that are shared across
This Script includes various python helper functions that are shared across
the module
'''
@@ -220,7 +220,7 @@ def multiplymat(l,r):
return mat
def isorthogonal(submatrix,precision=4):
"""checking if 3x3 Matrix is ortogonal (M*Transp(M)==I)"""
"""checking if 3x3 Matrix is orthogonal (M*Transp(M)==I)"""
prod=multiplymat(submatrix,zip(*submatrix))
return [[round(f,precision) for f in line] \
for line in prod]==[[1,0,0],[0,1,0],[0,0,1]]
+1 -1
View File
@@ -63,7 +63,7 @@ class Node:
return bool(self.name or self.arguments or self.children)
def __len__(self):
'''return the numer of children'''
'''return the number of children'''
return len(self.children)
def __getitem__(self,key):
+1 -1
View File
@@ -1263,7 +1263,7 @@ PyObject* BSplineCurvePy::buildFromPolesMultsKnots(PyObject *args, PyObject *key
occweights.SetValue(i,1.0);
}
}
// check if the numer of poles matches the sum of mults
// check if the number of poles matches the sum of mults
if ((PyObject_IsTrue(periodic) && sum_of_mults != number_of_poles) ||
(PyObject_Not(periodic) && sum_of_mults - degree -1 != number_of_poles)) {
Standard_Failure::Raise("number of poles and sum of mults mismatch");
@@ -1276,7 +1276,7 @@ PyObject* BSplineCurve2dPy::buildFromPolesMultsKnots(PyObject *args, PyObject *k
occweights.SetValue(i,1.0);
}
}
// check if the numer of poles matches the sum of mults
// check if the number of poles matches the sum of mults
if ((PyObject_IsTrue(periodic) && sum_of_mults != number_of_poles) ||
(PyObject_Not(periodic) && sum_of_mults - degree -1 != number_of_poles)) {
Standard_Failure::Raise("number of poles and sum of mults mismatch");
+1 -1
View File
@@ -171,7 +171,7 @@ bool ViewProviderCurveNet::handleEvent(const SoEvent * const ev, Gui::View3DInve
// get the position of the mouse
const SbVec2s pos(ev->getPosition());
// Keybooard events
// Keyboard events
if (ev->getTypeId().isDerivedFrom(SoKeyboardEvent::getClassTypeId())) {
SoKeyboardEvent * ke = (SoKeyboardEvent *)ev;
switch (ke->getKey()) {
+1 -1
View File
@@ -208,7 +208,7 @@ App::DocumentObjectExecReturn *Pipe::execute(void)
/*//build the law functions instead
else if(Transformation.getValue() == 2) {
if(ScalingData.getValues().size()<1)
return new App::DocumentObjectExecReturn("No valid data given for liinear scaling mode");
return new App::DocumentObjectExecReturn("No valid data given for linear scaling mode");
Handle(Law_Linear) lin = new Law_Linear();
lin->Set(0,1,1,ScalingData[0].x);
@@ -668,7 +668,7 @@ bool ProfileBased::checkLineCrossesFace(const gp_Lin &line, const TopoDS_Face &f
int intersections = 0;
std::vector<gp_Pnt> intersectionpoints;
// Note: We need to look at evey edge separately to catch coincident lines
// Note: We need to look at every edge separately to catch coincident lines
for (ex.Init(outerWire, TopAbs_EDGE); ex.More(); ex.Next()) {
BRepAdaptor_Curve edge(TopoDS::Edge(ex.Current()));
Extrema_ExtCC intersector(axis, edge);
+1 -1
View File
@@ -3,7 +3,7 @@
# (c) 2010 Werner Mayer LGPL
"""
An example for a high-level cutsom feature object to form a full-parametric distance bolt.
An example for a high-level custom feature object to form a full-parametric distance bolt.
"""
__author__ = "Werner Mayer <[email protected]>"
+1 -1
View File
@@ -3,7 +3,7 @@
# (c) 2011 Werner Mayer LGPL
"""
An example for a high-level cutsom feature object to form a full-parametric parallelepiped.
An example for a high-level custom feature object to form a full-parametric parallelepiped.
"""
__author__ = "Werner Mayer <[email protected]>"
+1 -1
View File
@@ -3,7 +3,7 @@
# (c) 2010 Werner Mayer LGPL
"""
An example for a high-level cutsom feature object to make a so called "radial copy".
An example for a high-level custom feature object to make a so called "radial copy".
"""
__author__ = "Werner Mayer <[email protected]>"
+1 -1
View File
@@ -662,7 +662,7 @@ std::size_t PlyReader::readHeader(std::istream& in,
std::string line, element;
std::vector<std::string> list;
std::size_t points = 0;
// a pair of numers of elements and the total size of the properties
// a pair of numbers of elements and the total size of the properties
std::vector<std::pair<std::size_t, std::size_t> > count_props;
// read in the first three characters
+1 -1
View File
@@ -103,7 +103,7 @@ void Robot6Axis::setKinematic(const AxisDefinition KinDef[6])
// for now and testing
Kinematic = temp;
// get the actuall TCP out of tha axis
// get the actual TCP out of the axis
calcTcp();
}
+1 -1
View File
@@ -54,7 +54,7 @@ RobotObject::RobotObject()
ADD_PROPERTY_TYPE(Error,("") ,"Robot kinematic",Prop_None,"Robot error while moving");
ADD_PROPERTY_TYPE(Tcp,(Base::Placement()),"Robot kinematic",Prop_None,"Tcp of the robot");
ADD_PROPERTY_TYPE(Base,(Base::Placement()),"Robot kinematic",Prop_None,"Actuall base frame of the robot");
ADD_PROPERTY_TYPE(Base,(Base::Placement()),"Robot kinematic",Prop_None,"Actual base frame of the robot");
ADD_PROPERTY_TYPE(Tool,(Base::Placement()),"Robot kinematic",Prop_None,"Tool frame of the robot (Tool)");
ADD_PROPERTY_TYPE(ToolShape,(0),"Robot definition",Prop_None,"Link to the Shape is used as Tool");
ADD_PROPERTY_TYPE(ToolBase ,(Base::Placement()),"Robot definition",Prop_None,"Defines where to connect the ToolShape");
@@ -55,7 +55,7 @@ namespace KDL
else
segmentNr = seg_nr;
//Initialize Jacobian to zero since only segmentNr colunns are computed
//Initialize Jacobian to zero since only segmentNr columns are computed
SetToZero(jac) ;
if(q_in.rows()!=chain.getNrOfJoints()||nr_of_unlocked_joints_!=jac.columns())
+1 -1
View File
@@ -50,7 +50,7 @@ namespace KDL {
// simple linear search : TODO : make it binary search
// uses cached_... variables
// returns the relative path length within the segment
// you propably want to use the cached_index variable
// you probably want to use the cached_index variable
double Path_Composite::Lookup(double s) const
{
assert(s>=-1e-12);
@@ -66,7 +66,7 @@ void TaskDlgTrajectoryDressUp::clicked(int button)
{
if(QDialogButtonBox::Apply == button)
{
// transfert the values to the object
// transfer the values to the object
param->writeValues();
// May throw an exception which we must handle here
pcObject->recomputeFeature();
@@ -652,7 +652,7 @@
<rdf:li>page</rdf:li>
</rdf:Bag>
</dc:subject>
<dc:description>3 cirlces drawn on a page with a text box in bottom left</dc:description>
<dc:description>3 circles drawn on a page with a text box in bottom left</dc:description>
</cc:Work>
</rdf:RDF>
</metadata>

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

+1 -1
View File
@@ -177,7 +177,7 @@ class Octahedron:
shell=Part.makeShell([f1,f2,f3,f4,f5,f6,f7,f8])
solid=Part.makeSolid(shell)
fp.Shape = solid
# helper mehod to create the faces
# helper method to create the faces
def make_face(self,v1,v2,v3):
wire = Part.makePolygon([v1,v2,v3,v1])
face = Part.Face(wire)
+1 -1
View File
@@ -25,7 +25,7 @@ def ensureDir(path,mode=0o777):
try:
os.makedirs(path,mode)
except OSError(err):
# raise an error unless it's about a alredy existing directory
# raise an error unless it's about an already existing directory
print("Dir Exist")
#if errno != 17 or not os.path.isdir(path):
# raise