electron-rare/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Misc. typo fixes

Browse Source 
Various workbenches
This commit is contained in:
Unknown
2017-12-23 14:30:30 +01:00
committed by wmayer
parent 3df389f5f2
commit a8ecffb652
98 changed files with 169 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1 -1
View File
@@ -1077,7 +1077,7 @@ IF(MSVC)
ENDIF(FREECAD_RELEASE_PDB)
# Mark 32 bit executables large address aware so they can use > 2GB address space
# NOTE: This setting only has an effect on machines with at least 3GB of RAM, although it sets the linker option it doesn't set the the linker switch 'Enable Large Addresses'
# NOTE: This setting only has an effect on machines with at least 3GB of RAM, although it sets the linker option it doesn't set the linker switch 'Enable Large Addresses'
IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /LARGEADDRESSAWARE")
SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")
ChangeLog.txt
+2 -2
View File
@@ -430,7 +430,7 @@ Version: V0.5B5 Date: Sat Feb 25 2006 +++++++++++++++++++++++++++++++
* Return the edge list by reference in mesh kernel (to avoid memory leak)
* PropertyVectorList implemented
* Use PropertyVectorLists and PropertyFloatLists in Mesh::Curvature feature and its associated view provider
* PropertyColor(List) implemeted
* PropertyColor(List) implemented
* PropertyMeshKernel added
* move all Projects to NODEFAULTLIBS
* move all Projects to xcopy
@@ -912,7 +912,7 @@ Version: V0.1B48 Date: Sun Mar 30 15:06:23 2003 +++++++++++++++++++++++++++++++
* Big patch from Werner about:
- feeding toolbars and Commandbar and menus from the parameterts
- customizing works with positions in command bar and toolbar
- customizing by draging from menu into toolbar and commandbar
- customizing by dragging from menu into toolbar and commandbar
Version: V0.1B47 Date: Fri Mar 28 18:24:36 2003 +++++++++++++++++++++++++++++++
* Import App Module added
package/debian/changelog
+1 -1
View File
@@ -92,7 +92,7 @@ freecad (0.10.3247.dfsg-2) unstable; urgency=low
* control:
- Update to standars-version 3.9.0.
- Remove libblas-dev, libatlas-dev from build-deps.
* Add debian/shlibs.local file containing the the correct binary dep
* Add debian/shlibs.local file containing the correct binary dep
to libsoqt4-20 (closes: #575239).
* copyright: Add a verbatim copy of Tiddlywiki BSD license. Fixes
the lintian warning copyright-refers-to-deprecated-bsd-license-file.
package/debian/diff/freecad_lucid.diff
+1 -1
View File
@@ -49,7 +49,7 @@
+ * control:
+ - Update to standars-version 3.9.0.
+ - Remove libblas-dev, libatlas-dev from build-deps.
+ * Add debian/shlibs.local file containing the the correct binary dep
+ * Add debian/shlibs.local file containing the correct binary dep
+ to libsoqt4-20 (closes: #575239).
+ * copyright: Add a verbatim copy of Tiddlywiki BSD license. Fixes
+ the lintian warning copyright-refers-to-deprecated-bsd-license-file.
package/debian/diff/freecad_natty.diff
+1 -1
View File
@@ -62,7 +62,7 @@
+ * control:
+ - Update to standars-version 3.9.0.
+ - Remove libblas-dev, libatlas-dev from build-deps.
+ * Add debian/shlibs.local file containing the the correct binary dep
+ * Add debian/shlibs.local file containing the correct binary dep
+ to libsoqt4-20 (closes: #575239).
+ * copyright: Add a verbatim copy of Tiddlywiki BSD license. Fixes
+ the lintian warning copyright-refers-to-deprecated-bsd-license-file.
package/debian/diff/freecad_precise.diff
+1 -1
View File
@@ -71,7 +71,7 @@
+ * control:
+ - Update to standars-version 3.9.0.
+ - Remove libblas-dev, libatlas-dev from build-deps.
+ * Add debian/shlibs.local file containing the the correct binary dep
+ * Add debian/shlibs.local file containing the correct binary dep
+ to libsoqt4-20 (closes: #575239).
+ * copyright: Add a verbatim copy of Tiddlywiki BSD license. Fixes
+ the lintian warning copyright-refers-to-deprecated-bsd-license-file.
src/App/Application.cpp
+2 -2
View File
@@ -1125,7 +1125,7 @@ void segmentation_fault_handler(int sig)
case SIGABRT:
std::cerr << "Abnormal program termination..." << std::endl;
#if !defined(_DEBUG)
throw Base::AbnormalProgramTermination("Break signal occoured");
throw Base::AbnormalProgramTermination("Break signal occurred");
#endif
break;
default:
@@ -1690,7 +1690,7 @@ void Application::runApplication()
Interpreter().runString(Base::ScriptFactory().ProduceScript(mConfig["ScriptFileName"].c_str()));
}
else if (mConfig["RunMode"] == "Exit") {
// geting out
// getting out
Console().Log("Exiting on purpose\n");
}
else {
src/App/Application.h
+2 -2
View File
@@ -77,7 +77,7 @@ public:
App::Document* newDocument(const char * Name=0l, const char * UserName=0l);
/// Closes the document \a name and removes it from the application.
bool closeDocument(const char* name);
/// find a unique docuement name
/// find a unique document name
std::string getUniqueDocumentName(const char *Name) const;
/// Open an existing document from a file
App::Document* openDocument(const char * FileName=0l);
@@ -164,7 +164,7 @@ public:
/** Gets a parameter group by a full qualified path
* It's an easy method to get a group:
* \code
* // geting standard parameter
* // getting standard parameter
* ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Raytracing");
* std::string cDir = hGrp->GetASCII("ProjectPath", "");
* std::string cCameraName = hGrp->GetASCII("CameraName", "TempCamera.inc");
src/App/Document.cpp
+5 -5
View File
@@ -1169,7 +1169,7 @@ Document::Document(void)
ADD_PROPERTY_TYPE(CreationDate,(CreationDateString.c_str()),0,Prop_ReadOnly,"Date of creation");
ADD_PROPERTY_TYPE(LastModifiedBy,(""),0,Prop_None,0);
ADD_PROPERTY_TYPE(LastModifiedDate,("Unknown"),0,Prop_ReadOnly,"Date of last modification");
ADD_PROPERTY_TYPE(Company,(AuthorComp.c_str()),0,Prop_None,"Additional tag to save the the name of the company");
ADD_PROPERTY_TYPE(Company,(AuthorComp.c_str()),0,Prop_None,"Additional tag to save the name of the company");
ADD_PROPERTY_TYPE(Comment,(""),0,Prop_None,"Additional tag to save a comment");
ADD_PROPERTY_TYPE(Meta,(),0,Prop_None,"Map with additional meta information");
ADD_PROPERTY_TYPE(Material,(),0,Prop_None,"Map with material properties");
@@ -1742,7 +1742,7 @@ bool Document::save (void)
void Document::restore (void)
{
// clean up if the document is not empty
// !TODO mind exeptions while restoring!
// !TODO mind exceptions while restoring!
clearUndos();
// first notify the objects to being deleted and then delete them in a second loop (#0002521)
// FIXME: To delete every object individually is inefficient. Add a new signal 'signalClear'
@@ -2164,7 +2164,7 @@ int Document::recompute()
if (recomputeList.find(Cur) != recomputeList.end() ||
Cur->ExpressionEngine.depsAreTouched()) {
if ( _recomputeFeature(Cur)) {
// if somthing happen break execution of recompute
// if something happened break execution of recompute
d->vertexMap.clear();
return -1;
}
@@ -2225,7 +2225,7 @@ int Document::recompute()
if ((*objIt)->isTouched() || (*objIt)->mustExecute() == 1){
objectCount++;
if (_recomputeFeature(*objIt)) {
// if something happen break execution of recompute
// if something happened break execution of recompute
return -1;
}
else{
@@ -2465,7 +2465,7 @@ bool Document::_recomputeFeature(DocumentObject* Feat)
#ifndef FC_DEBUG
catch (...) {
Base::Console().Error("App::Document::_RecomputeFeature(): Unknown exception in Feature \"%s\" thrown\n",Feat->getNameInDocument());
_RecomputeLog.push_back(new DocumentObjectExecReturn("Unknown exeption!"));
_RecomputeLog.push_back(new DocumentObjectExecReturn("Unknown exception!"));
Feat->setError();
return true;
}
src/App/Document.h
+1 -1
View File
@@ -232,7 +232,7 @@ public:
/// Returns a list of all Objects
std::vector<DocumentObject*> getObjects() const;
std::vector<DocumentObject*> getObjectsOfType(const Base::Type& typeId) const;
/// Returns all object with given extensions. If derived=true also all objects with extenions derived from the given one
/// Returns all object with given extensions. If derived=true also all objects with extensions derived from the given one
std::vector<DocumentObject*> getObjectsWithExtension(const Base::Type& typeId, bool derived = true) const;
std::vector<DocumentObject*> findObjects(const Base::Type& typeId, const char* objname) const;
/// Returns an array with the correct types already.
src/App/DynamicProperty.cpp
+1 -1
View File
@@ -306,7 +306,7 @@ std::string DynamicProperty::getUniquePropertyName(const char *Name) const
void DynamicProperty::Save (Base::Writer &writer) const
{
//extenions must be saved first, as they need to be read and initialised before properties (as
//extensions must be saved first, as they need to be read and initialised before properties (as
//they have their own properties which they need to handle on restore)
if(this->pc->isDerivedFrom(App::ExtensionContainer::getClassTypeId()))
static_cast<App::ExtensionContainer*>(this->pc)->saveExtensions(writer);
src/App/Expression.cpp
+7 -7
View File
@@ -224,7 +224,7 @@ NumberExpression::NumberExpression(const DocumentObject *_owner, const Quantity
}
/**
* Evalute the expression. For NumberExpressions, it is a simply copy().
* Evaluate the expression. For NumberExpressions, it is a simply copy().
*/
Expression * NumberExpression::eval() const
@@ -334,7 +334,7 @@ static bool definitelyLessThan(double a, double b, double epsilon)
}
/**
* Evalutate the expression. Returns a new Expression with the result, or throws
* Evaluate the expression. Returns a new Expression with the result, or throws
* an exception if something is wrong, i.e the expression cannot be evaluated.
*/
@@ -1274,7 +1274,7 @@ int FunctionExpression::priority() const
}
/**
* Compute the dependecy set of the expression. The set contains the names
* Compute the dependency set of the expression. The set contains the names
* of all Property objects this expression relies on.
*/
@@ -1355,7 +1355,7 @@ const Property * VariableExpression::getProperty() const
}
/**
* Evalute the expression. For a VariableExpression, this means to return the
* Evaluate the expression. For a VariableExpression, this means to return the
* value of the referenced Property. Quantities are converted to NumberExpression with unit,
* int and floats are converted to a NumberExpression without unit. Strings properties
* are converted to StringExpression objects.
@@ -1449,7 +1449,7 @@ int VariableExpression::priority() const
}
/**
* Compute the dependecy of the expression. In this case \a props
* Compute the dependency of the expression. In this case \a props
* is a set of strings, i.e the names of the Property objects, and
* the variable name this expression relies on is inserted into the set.
* Notice that the variable may be unqualified, i.e without any reference
@@ -1500,7 +1500,7 @@ StringExpression::StringExpression(const DocumentObject *_owner, const std::stri
}
/**
* Evalute the string. For strings, this is a simple copy of the object.
* Evaluate the string. For strings, this is a simple copy of the object.
*/
Expression * StringExpression::eval() const
@@ -1759,7 +1759,7 @@ static const App::DocumentObject * DocumentObject = 0; /**< The DocumentObject t
static bool unitExpression = false; /**< True if the parsed string is a unit only */
static bool valueExpression = false; /**< True if the parsed string is a full expression */
static std::stack<std::string> labels; /**< Label string primitive */
static std::map<std::string, FunctionExpression::Function> registered_functions; /**< Registerd functions */
static std::map<std::string, FunctionExpression::Function> registered_functions; /**< Registered functions */
static int last_column;
static int column;
src/App/Extension.cpp
+1 -1
View File
@@ -175,7 +175,7 @@ void Extension::extensionGetPropertyMap(std::map< std::string, Property* >& Map)
void Extension::initExtensionSubclass(Base::Type& toInit, const char* ClassName, const char* ParentName,
Base::Type::instantiationMethod method) {
// dont't init twice!
// don't init twice!
assert(toInit == Base::Type::badType());
// get the parent class
Base::Type parentType(Base::Type::fromName(ParentName));
src/App/Extension.h
+2 -2
View File
@@ -131,7 +131,7 @@ template<> void _class_::init(void){\
*
* Extensions are like every other FreeCAD object and based on properties. All information storage
* and persistence should be achieved by use of those. Additional any number of methods can be
* added to provide funtionality around the properties. There are 3 samll difference to normal objects:
* added to provide functionality around the properties. There are 3 small difference to normal objects:
* 1. They must be derived from Extension class
* 2. Properties must be handled with special extension macros
* 3. Extensions must be initialised
@@ -159,7 +159,7 @@ template<> void _class_::init(void){\
* This means one should carefully design the API and make only necessary methods public or protected.
* Every internal method should be private.
*
* The automatic availibility of methods in the class does not hold for the python interface, only
* The automatic availability of methods in the class does not hold for the python interface, only
* for c++ classes. This is like every where else in FreeCAD, there is no automatic creation of python
* API from c++ classes. Hence the extension creator must also create a custom python object of its
* extension, which works exactly like the normal FreeCAD python object workflow. There is nothing
src/App/ExtensionContainer.h
+1 -1
View File
@@ -182,7 +182,7 @@ public:
virtual void Save(Base::Writer& writer) const override;
virtual void Restore(Base::XMLReader& reader) override;
//those methods save/restore the dynamic extenions without handling properties, which is something
//those methods save/restore the dynamic extensions without handling properties, which is something
//done by the default Save/Restore methods.
void saveExtensions(Base::Writer& writer) const;
void restoreExtensions(Base::XMLReader& reader);
src/App/FeatureTest.cpp
+1 -1
View File
@@ -133,7 +133,7 @@ DocumentObjectExecReturn *FeatureTest::execute(void)
switch(ExceptionType.getValue())
{
case 0: break;
case 1: throw "Test Exeption";
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
src/App/FeatureTest.h
+1 -1
View File
@@ -125,7 +125,7 @@ public:
/// this property defines which kind of exceptio the feature throw on you
App::PropertyInteger ExceptionType;
/// recalculate the Feature and throw an exeption
/// recalculate the Feature and throw an exception
virtual DocumentObjectExecReturn *execute(void);
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName(void) const {
src/App/ObjectIdentifier.cpp
+1 -1
View File
@@ -322,7 +322,7 @@ std::string ObjectIdentifier::toString() const
}
/**
* @brief Escape toString representation so it is suitable for being embeddded in a python command.
* @brief Escape toString representation so it is suitable for being embedded in a python command.
* @return Escaped string.
*/
src/App/OriginGroupExtension.h
+1 -1
View File
@@ -30,7 +30,7 @@ namespace App {
class Origin;
/**
* Represents an abstact placeable group of objects with an associated Origin
* Represents an abstract placeable group of objects with an associated Origin
*/
class AppExport OriginGroupExtension : public App::GeoFeatureGroupExtension
{
src/App/PropertyGeo.h
+1 -1
View File
@@ -343,7 +343,7 @@ private:
};
/** the general Link Poperty
* Main Purpose of this property is to Link Objects and Feautures in a document.
* Main Purpose of this property is to Link Objects and Features in a document.
*/
class AppExport PropertyPlacementLink : public PropertyLink
{
src/App/PropertyLinks.cpp
+1 -1
View File
@@ -379,7 +379,7 @@ void PropertyLinkList::Restore(Base::XMLReader &reader)
std::string name = reader.getAttribute("value");
// In order to do copy/paste it must be allowed to have defined some
// referenced objects in XML which do not exist anymore in the new
// document. Thus, we should silently ingore this.
// document. Thus, we should silently ignore this.
// Property not in an object!
DocumentObject* father = static_cast<DocumentObject*>(getContainer());
App::Document* document = father->getDocument();
src/App/PropertyLinks.h
+1 -1
View File
@@ -88,7 +88,7 @@ protected:
};
/** The general Link Property
* Main Purpose of this property is to Link Objects and Feautures in a document. Like all links this
* Main Purpose of this property is to Link Objects and Features in a document. Like all links this
* property is scope aware, meaning it does define which objects are allowed to be linked depending
* of the GeoFeatureGroup where it is in. Default is Local.
*
src/App/PropertyStandard.h
+1 -1
View File
@@ -578,7 +578,7 @@ protected:
/** Precision properties
* This property fulfills the need of a floating value with many decimal points,
* e.g. for holding values like Precision::Confusion(). The value has a default
* constraint for non-negative, but can be overidden
* constraint for non-negative, but can be overridden
*/
class AppExport PropertyPrecision: public PropertyFloatConstraint
{
src/App/Transactions.cpp
+1 -1
View File
@@ -124,7 +124,7 @@ void Transaction::removeProperty(TransactionalObject *Obj,
}
//**************************************************************************
// separator for other implemetation aspects
// separator for other implementation aspects
void Transaction::apply(Document &Doc, bool forward)
src/Base/BaseClass.cpp
+1 -1
View File
@@ -58,7 +58,7 @@ BaseClass::~BaseClass()
//**************************************************************************
// separator for other implemetation aspects
// separator for other implementation aspects
void BaseClass::init(void)
{
src/Base/Factory.h
+2 -2
View File
@@ -42,7 +42,7 @@ class BaseExport AbstractProducer
public:
AbstractProducer() {}
virtual ~AbstractProducer() {}
/// overwriten by a concret producer to produce the needed object
/// overwritten by a concrete producer to produce the needed object
virtual void* Produce (void) const = 0;
};
@@ -101,7 +101,7 @@ inline ScriptFactorySingleton& ScriptFactory(void)
// --------------------------------------------------------------------
/** Script Factory
* This class produce Scirpts.
* This class produce Scripts.
* @see Factory
*/
class BaseExport ScriptProducer: public AbstractProducer
src/Base/FileTemplate.cpp
+1 -1
View File
@@ -58,7 +58,7 @@ ClassTemplate::~ClassTemplate()
//**************************************************************************
// separator for other implemetation aspects
// separator for other implementation aspects
/**
* a normal member taking two arguments and returning an integer value.
src/Base/Interpreter.cpp
+1 -1
View File
@@ -118,7 +118,7 @@ void PyException::ReportException (void) const
SystemExitException::SystemExitException()
{
// Set exception message and code based upon the pthon sys.exit() code and/or message
// based upon the the following sys.exit() call semantics.
// based upon the following sys.exit() call semantics.
//
// Invocation | _exitCode | _sErrMsg
// ---------------- + --------- + --------
src/Base/MemDebug.cpp
+1 -1
View File
@@ -161,7 +161,7 @@ MemDebug::~MemDebug()
//**************************************************************************
// separator for other implemetation aspects
// separator for other implementation aspects
/* REPORT HOOK FUNCTION
src/Base/Parameter.cpp
+2 -2
View File
@@ -319,7 +319,7 @@ Base::Reference<ParameterGrp> ParameterGrp::GetGroup(const char* Name)
else {
// path, split the first path
std::string cTemp;
// geting the first part
// getting the first part
cTemp.assign(cName,0,pos);
// removing the first part from the original
cName.erase(0,pos+1);
@@ -373,7 +373,7 @@ std::vector<Base::Reference<ParameterGrp> > ParameterGrp::GetGroups(void)
return vrParamGrp;
}
/// test if this group is emty
/// test if this group is empty
bool ParameterGrp::IsEmpty(void) const
{
if ( _pGroupNode->getFirstChild() )
src/Base/Parameter.h
+1 -1
View File
@@ -118,7 +118,7 @@ public:
Base::Reference<ParameterGrp> GetGroup(const char* Name);
/// get a vector of all sub groups in this group
std::vector<Base::Reference<ParameterGrp> > GetGroups(void);
/// test if this group is emty
/// test if this group is empty
bool IsEmpty(void) const;
/// test if a special sub group is in this group
bool HasGroup(const char* Name) const;
src/Base/Persistence.cpp
+1 -1
View File
@@ -40,7 +40,7 @@ TYPESYSTEM_SOURCE_ABSTRACT(Base::Persistence,Base::BaseClass);
//**************************************************************************
// separator for other implemetation aspects
// separator for other implementation aspects
unsigned int Persistence::getMemSize (void) const
{
src/Base/PyExport.h
+2 -2
View File
@@ -118,8 +118,8 @@ public:
/** pointer and default constructor
* the good way would be not using pointer
* instead using a overwriten new operator in the
* HandledType class! But is not easy to inforce!
* instead using a overwritten new operator in the
* HandledType class! But is not easy to enforce!
*/
PyHandle(HandledType *ToHandel=0L)
:_pHandels(ToHandel) {
src/Base/PyObjectBase.cpp
+1 -1
View File
@@ -68,7 +68,7 @@ PyObjectBase::~PyObjectBase()
* the Py_TPFLAGS_BASETYPE flag. For example, the classes App::VectorPy and App::MatrixPy
* have removed this flag and its Python proxies App.Vector and App.Matrix cannot be subclassed.
* In case we want to allow to derive from subclasses of PyTypeObject in Python
* we must either reimplment tp_new, tp_dealloc, tp_getattr, tp_setattr, tp_repr or set them to
* we must either reimplement tp_new, tp_dealloc, tp_getattr, tp_setattr, tp_repr or set them to
* 0 and define tp_base as 0.
*/
src/Base/PyObjectBase.h
+1 -1
View File
@@ -266,7 +266,7 @@ public:
/** PyInit method
* Override this method to initialize a newly created
* instance of the class (Constuctor)
* instance of the class (Constructor)
*/
virtual int PyInit(PyObject* /*args*/, PyObject* /*kwd*/)
{
src/Base/StackWalker.cpp
+2 -2
View File
@@ -13,7 +13,7 @@
* (should also be enough)
* - Changed to compile correctly with the PSDK of VC7.0
* (GetFileVersionInfoSizeA and GetFileVersionInfoA is wrongly defined:
* it uses LPSTR instead of LPCSTR as first paremeter)
* it uses LPSTR instead of LPCSTR as first parameter)
* - Added declarations to support VC5/6 without using 'dbghelp.h'
* - Added a 'pUserData' member to the ShowCallstack function and the
* PReadProcessMemoryRoutine declaration (to pass some user-defined data,
@@ -1112,7 +1112,7 @@ BOOL StackWalker::ShowCallstack(HANDLE hThread, const CONTEXT *context, PReadPro
// if this returns ERROR_INVALID_ADDRESS (487) or ERROR_NOACCESS (998), you can
// assume that either you are done, or that the stack is so hosed that the next
// deeper frame could not be found.
// CONTEXT need not to be suplied if imageTyp is IMAGE_FILE_MACHINE_I386!
// CONTEXT need not to be supplied if imageTyp is IMAGE_FILE_MACHINE_I386!
if ( ! this->m_sw->pSW(imageType, this->m_hProcess, hThread, &s, &c, myReadProcMem, this->m_sw->pSFTA, this->m_sw->pSGMB, NULL) )
{
// INFO: "StackWalk64" does not set "GetLastError"...
src/Base/TimeInfo.cpp
+1 -1
View File
@@ -53,7 +53,7 @@ TimeInfo::~TimeInfo()
//**************************************************************************
// separator for other implemetation aspects
// separator for other implementation aspects
void TimeInfo::setCurrent(void)
{
src/Base/UnitsApi.cpp
+1 -1
View File
@@ -143,7 +143,7 @@ void UnitsApi::setSchema(UnitSystem s)
actSystem = SI1;
}
UserPrefSystem->setSchemaUnits(); // if necesarry a unit schema can change the constants in Quantity (e.g. mi=1.8km rather then 1.6km).
UserPrefSystem->setSchemaUnits(); // if necessary a unit schema can change the constants in Quantity (e.g. mi=1.8km rather then 1.6km).
}
src/Gui/3Dconnexion/GuiApplicationNativeEventAwareWin32.cpp
+1 -1
View File
@@ -703,7 +703,7 @@ bool Gui::GUIApplicationNativeEventAware::TranslateRawInputData(UINT nInputCode,
#endif
return true;
}
} else { // Zero out the data if the app is not in forground
} else { // Zero out the data if the app is not in foreground
deviceData.fAxes.assign(6, 0.f);
}
} else if (pRawInput->data.hid.bRawData[0] == 0x02) { // Rotation vector
src/Gui/BlenderNavigationStyle.cpp
+1 -1
View File
@@ -327,7 +327,7 @@ SbBool BlenderNavigationStyle::processSoEvent(const SoEvent * const ev)
if (curmode == NavigationStyle::SPINNING) { break; }
newmode = NavigationStyle::IDLE;
// The left mouse button has been released right now but
// we want to avoid that the event is procesed elsewhere
// we want to avoid that the event is processed elsewhere
if (this->lockButton1) {
this->lockButton1 = false;
processed = true;
src/Gui/CADNavigationStyle.cpp
+1 -1
View File
@@ -371,7 +371,7 @@ SbBool CADNavigationStyle::processSoEvent(const SoEvent * const ev)
if (curmode == NavigationStyle::SPINNING) { break; }
newmode = NavigationStyle::IDLE;
// The left mouse button has been released right now but
// we want to avoid that the event is procesed elsewhere
// we want to avoid that the event is processed elsewhere
if (this->lockButton1) {
this->lockButton1 = false;
processed = true;
src/Gui/CoinRiftWidget.cpp
+1 -1
View File
@@ -242,7 +242,7 @@ void CoinRiftWidget::resizeGL(int width, int height) {
void CoinRiftWidget::initializeGL()
{
makeCurrent();
// Infer hardware capabilites.
// Infer hardware capabilities.
#ifdef USE_FRAMEBUFFER
OVR::CAPI::GL::InitGLExtensions();
if (OVR::CAPI::GL::glBindFramebuffer == NULL) {
src/Gui/DlgToolbarsImp.h
+1 -1
View File
@@ -33,7 +33,7 @@ namespace Dialog {
/** This class implements the creation of user defined toolbars.
* In the left panel are shown all command groups with their command objects.
* If any changeable toolbar was created in the left panel are shown all commands
* of the currently edited toolbar, otherwise it is emtpy.
* of the currently edited toolbar, otherwise it is empty.
* All changes to a toolbar is done immediately.
*
* \author Werner Mayer
src/Gui/DockWindow.h
+1 -1
View File
@@ -60,7 +60,7 @@ public:
*/
virtual ~DockWindow();
/** @name methods to overrride
/** @name methods to override
*/
//@{
/// get called when the document is updated
src/Gui/DockWindowManager.h
+1 -1
View File
@@ -76,7 +76,7 @@ public:
/// Removes and destroys the QDockWidget and returns the widget
/// with name \a name added with @ref addDockWindow.
QWidget* removeDockWindow(const char* name);
/// Removes and destroys the QDockWidget that conains \a dock. \a dock
/// Removes and destroys the QDockWidget that contains \a dock. \a dock
/// does not get destroyed.
void removeDockWindow(QWidget* dock);
/// Returns the widget with name \a name added with @ref addDockWindow.
src/Gui/GraphvizView.cpp
+1 -1
View File
@@ -57,7 +57,7 @@ namespace Gui {
* @brief The GraphvizWorker class
*
* Implements a QThread class that does the actual conversion from dot to
* svg. All critical communcation is done using queued signals.
* svg. All critical communication is done using queued signals.
*
*/
src/Gui/Icons/Std_ViewScreenShot.svg
+1 -1
View File
@@ -20,7 +20,7 @@
version="1.1"><metadata
id="metadata16236"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>Genric Image</dc:title><dc:creator><cc:Agent><dc:title>Jakub Steiner</dc:title></cc:Agent></dc:creator><dc:subject><rdf:Bag><rdf:li>image</rdf:li><rdf:li>picture</rdf:li><rdf:li>snapshot</rdf:li><rdf:li>photo</rdf:li></rdf:Bag></dc:subject><cc:license
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>Generic Image</dc:title><dc:creator><cc:Agent><dc:title>Jakub Steiner</dc:title></cc:Agent></dc:creator><dc:subject><rdf:Bag><rdf:li>image</rdf:li><rdf:li>picture</rdf:li><rdf:li>snapshot</rdf:li><rdf:li>photo</rdf:li></rdf:Bag></dc:subject><cc:license
rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" /></cc:Work><cc:License
rdf:about="http://creativecommons.org/licenses/by/2.0/"><cc:permits
rdf:resource="http://web.resource.org/cc/Reproduction" /><cc:permits
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

src/Gui/NetworkRetriever.cpp
+2 -2
View File
@@ -151,7 +151,7 @@ void NetworkRetriever::setEnableTimestamp(bool ts)
/**
* If you are behind a proxy server then you have to specify your proxy url with \a proxy.
* Moreover, if the proxy requires user authentification then you can specify the username
* Moreover, if the proxy requires user authentication then you can specify the username
* with \a user and the password with \a passwd.
*/
void NetworkRetriever::setProxy( const QString& proxy, const QString& user, const QString& passwd )
@@ -272,7 +272,7 @@ bool NetworkRetriever::startDownload( const QString& startUrl )
wget->setWorkingDirectory( dir.path() );
}
// user authentification
// user authentication
if ( !d->proxy.isEmpty() )
{
if ( !d->user.isEmpty() )
src/Gui/Quarter/QuarterWidget.cpp
+4 -4
View File
@@ -110,7 +110,7 @@ using namespace SIM::Coin3D::Quarter;
the scene. Some of the settings will provide faster rendering, while
others gives you better quality rendering.
See \ref SoGLRenderAction::TransparencyType for a full descrition of the modes
See \ref SoGLRenderAction::TransparencyType for a full description of the modes
*/
/*!
@@ -118,7 +118,7 @@ using namespace SIM::Coin3D::Quarter;
Sets how rendering of primitives is done.
See \ref SoRenderManager::RenderMode for a full descrition of the modes
See \ref SoRenderManager::RenderMode for a full description of the modes
*/
/*!
@@ -126,7 +126,7 @@ using namespace SIM::Coin3D::Quarter;
Sets how stereo rendering is performed.
See \ref SoRenderManager::StereoMode for a full descrition of the modes
See \ref SoRenderManager::StereoMode for a full description of the modes
*/
enum StereoMode {
@@ -143,7 +143,7 @@ using namespace SIM::Coin3D::Quarter;
#define GL_MULTISAMPLE_BIT_EXT 0x20000000
#endif
//We need to avoid buffer swaping when initializing a QPainter on this widget
//We need to avoid buffer swapping when initializing a QPainter on this widget
#if defined(HAVE_QT5_OPENGL)
class CustomGLWidget : public QOpenGLWidget {
public:
src/Gui/Quarter/SoQTQuarterAdaptor.cpp
+1 -1
View File
@@ -587,7 +587,7 @@ void SIM::Coin3D::Quarter::SoQTQuarterAdaptor::resetToHomePosition(void)
}
// otherwise, cameras have changed in ways we don't understand since
// the last saveHomePosition() invokation, and so we're just going
// the last saveHomePosition() invocation, and so we're just going
// to ignore the reset request
}
src/Gui/Quarter/SoQTQuarterAdaptor.h
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Extends the QuarterWidget with all funcions the SoQtViewer has
* Extends the QuarterWidget with all functions the SoQtViewer has
* Copyright (C) 2014 Stefan Tröger <stefantroeger@gmx.net>
*
* This library is free software; you can redistribute it and/or
src/Gui/RevitNavigationStyle.cpp
+1 -1
View File
@@ -327,7 +327,7 @@ SbBool RevitNavigationStyle::processSoEvent(const SoEvent * const ev)
if (curmode == NavigationStyle::SPINNING) { break; }
newmode = NavigationStyle::IDLE;
// The left mouse button has been released right now but
// we want to avoid that the event is procesed elsewhere
// we want to avoid that the event is processed elsewhere
if (this->lockButton1) {
this->lockButton1 = false;
processed = true;
src/Gui/Stylesheets/Dark-blue.qss
+1 -1
View File
@@ -504,7 +504,7 @@ QTabBar {
background-color: transparent;
}
/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reseted as follows: */
/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reset as follows: */
QTabBar {
border-top: 1px solid #5a5a5a; /* set color for all QTabBars */
}
src/Gui/Stylesheets/Dark-green.qss
+1 -1
View File
@@ -504,7 +504,7 @@ QTabBar {
background-color: transparent;
}
/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reseted as follows: */
/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reset as follows: */
QTabBar {
border-top: 1px solid #5a5a5a; /* set color for all QTabBars */
}
src/Gui/Stylesheets/Dark-orange.qss
+1 -1
View File
@@ -504,7 +504,7 @@ QTabBar {
background-color: transparent;
}
/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reseted as follows: */
/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reset as follows: */
QTabBar {
border-top: 1px solid #5a5a5a; /* set color for all QTabBars */
}
src/Gui/Stylesheets/Light-blue.qss
+1 -1
View File
@@ -504,7 +504,7 @@ QTabBar {
background-color: transparent;
}
/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reseted as follows: */
/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reset as follows: */
QTabBar {
border-top: 1px solid #d2d2d2; /* set color for all QTabBars */
}
src/Gui/Stylesheets/Light-green.qss
+1 -1
View File
@@ -504,7 +504,7 @@ QTabBar {
background-color: transparent;
}
/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reseted as follows: */
/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reset as follows: */
QTabBar {
border-top: 1px solid #d2d2d2; /* set color for all QTabBars */
}
src/Gui/Stylesheets/Light-orange.qss
+1 -1
View File
@@ -504,7 +504,7 @@ QTabBar {
background-color: transparent;
}
/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reseted as follows: */
/* Workaround for QTabBars created from docked QDockWidgets which don't draw the border if not set and reset as follows: */
QTabBar {
border-top: 1px solid #d2d2d2; /* set color for all QTabBars */
}
src/Gui/TaskView/TaskSelectLinkProperty.h
+1 -1
View File
@@ -40,7 +40,7 @@ namespace Gui {
class ViewProvider;
namespace TaskView {
/** General Link/Selction editor for the Task view
/** General Link/Selection editor for the Task view
* This can be used as part of a TaskDialog to alter
* the content of a LinkProperty by user input/selection.
* If set active it reflects the selection to the Property
src/Gui/View.h
+1 -1
View File
@@ -81,7 +81,7 @@ public:
/// indicates if the view is in passive mode
bool isPassive(void) const {return bIsPassive;}
/** @name methods to overrride
/** @name methods to override
*/
//@{
/// get called when the document is updated
src/Gui/View3DInventorViewer.cpp
+2 -2
View File
@@ -2132,7 +2132,7 @@ void View3DInventorViewer::boxZoom(const SbBox2s& box)
void View3DInventorViewer::viewAll()
{
// in the scene graph we may have objects which we want to exlcude
// in the scene graph we may have objects which we want to exclude
// when doing a fit all. Such objects must be part of the group
// SoSkipBoundingGroup.
SoSearchAction sa;
@@ -2630,7 +2630,7 @@ void View3DInventorViewer::setCursorRepresentation(int modearg)
{
// There is a synchronization problem between Qt and SoQt which
// happens when popping up a context-menu. In this case the
// Qt::WA_UnderMouse attribute is resetted and never set again
// Qt::WA_UnderMouse attribute is reset and never set again
// even if the mouse is still in the canvas. Thus, the cursor
// won't be changed as long as the user doesn't leave and enter
// the canvas. To fix this we explicitly set Qt::WA_UnderMouse
src/Gui/ViewProvider.h
+1 -1
View File
@@ -128,7 +128,7 @@ public:
virtual std::string getElement(const SoDetail *) const { return std::string(); }
virtual SoDetail* getDetail(const char*) const { return 0; }
virtual std::vector<Base::Vector3d> getModelPoints(const SoPickedPoint *) const;
/// return the higlight lines for a given element or the whole shape
/// return the highlight lines for a given element or the whole shape
virtual std::vector<Base::Vector3d> getSelectionShape(const char* Element) const {
(void)Element;
return std::vector<Base::Vector3d>();
src/Gui/WidgetFactory.cpp
+1 -1
View File
@@ -1456,7 +1456,7 @@ Py::Object PyResource::setValue(const Py::Tuple& args)
}
/**
* If any resouce has been loaded this methods shows it as a modal dialog.
* If any resource has been loaded this methods shows it as a modal dialog.
*/
Py::Object PyResource::show(const Py::Tuple&)
{
src/Gui/WidgetFactory.h
+2 -2
View File
@@ -116,8 +116,8 @@ public:
virtual ~UiLoader();
/**
* Creates a widget of the type \a className withe the parent \a parent.
* Fore more details see the documentation to QWidgetFactory.
* Creates a widget of the type \a className with the parent \a parent.
* For more details see the documentation to QWidgetFactory.
*/
QWidget* createWidget(const QString & className, QWidget * parent=0,
const QString& name = QString());
src/Main/MainGui.cpp
+1 -1
View File
@@ -331,7 +331,7 @@ static LONG __stdcall MyCrashHandlerExceptionFilter(EXCEPTION_POINTERS* pEx)
#ifdef _M_IX86
if (pEx->ExceptionRecord->ExceptionCode == EXCEPTION_STACK_OVERFLOW)
{
// be sure that we have enought space...
// be sure that we have enough space...
static char MyStack[1024*128];
// it assumes that DS and SS are the same!!! (this is the case for Win32)
// change the stack only if the selectors are the same (this is the case for Win32)
src/Mod/Arch/ArchStructure.py
+1 -1
View File
@@ -65,7 +65,7 @@ for pre in Presets:
def makeStructure(baseobj=None,length=None,width=None,height=None,name="Structure"):
'''makeStructure([obj],[length],[width],[heigth],[swap]): creates a
'''makeStructure([obj],[length],[width],[height],[swap]): creates a
structure element based on the given profile object and the given
extrusion height. If no base object is given, you can also specify
length and width for a cubic object.'''
src/Mod/Draft/Draft.py
+1 -1
View File
@@ -1553,7 +1553,7 @@ def offset(obj,delta,copy=False,bind=False,sym=False,occ=False):
print("the offset tool is currently unable to offset a non-Draft object directly - Creating a copy")
def getRect(p,obj):
"returns length,heigh,placement"
"returns length,height,placement"
pl = obj.Placement.copy()
pl.Base = p[0]
diag = p[2].sub(p[0])
src/Mod/Draft/DraftSnap.py
+1 -1
View File
@@ -49,7 +49,7 @@ class Snapper:
3 functions are useful for the scriptwriter: snap(), constrain()
or getPoint() which is an all-in-one combo.
The indivudual snapToXXX() functions return a snap definition in
The individual snapToXXX() functions return a snap definition in
the form [real_point,marker_type,visual_point], and are not
meant to be used directly, they are all called when necessary by
the general snap() function.
src/Mod/Drawing/DrawingPatterns.py
+1 -1
View File
@@ -83,7 +83,7 @@ AutocadPatterns = {
"AR-RROOF":"", # seemingly random lines
"AR-RSHKE":"", # seemingly random tiles
"AR-SAND":"sand",
"BOX":"", # stupid unuseful square-inside-square
"BOX":"", # stupid useless square-inside-square
"BRASS":"", # horizontal ansi33
"BRICK":"brick",
"BRSTONE":"", # material symbol
src/Mod/Drawing/Gui/TaskOrthoViews.cpp
+1 -1
View File
@@ -463,7 +463,7 @@ void OrthoViews::calc_scale() // compute scale req
void OrthoViews::calc_offsets() // calcs SVG coords for centre of upper left view
{
// space_x is the emptry clear white space between views
// space_x is the empty clear white space between views
// gap_x is the centre - centre distance between views
float space_x = (page_dims[2] - scale * layout_width) / num_gaps_x;
src/Mod/Image/Gui/GLImageBox.cpp
+2 -2
View File
@@ -148,7 +148,7 @@ void GLImageBox::drawImage()
if (_image.hasValidData() == false)
return;
// Gets the size of the diplayed image area using the current display settings
// Gets the size of the displayed image area using the current display settings
// (in units of image pixels)
int dx, dy;
getDisplayedImageAreaSize(dx, dy);
@@ -213,7 +213,7 @@ void GLImageBox::drawImage()
}
}
// Gets the size of the diplayed image area using the current display settings
// Gets the size of the displayed image area using the current display settings
// (in units of image pixels)
void GLImageBox::getDisplayedImageAreaSize(int &dx, int &dy)
{
src/Mod/Image/Gui/OpenGLImageBox.cpp
+2 -2
View File
@@ -200,7 +200,7 @@ void GLImageBox::drawImage()
if (_image.hasValidData() == false)
return;
// Gets the size of the diplayed image area using the current display settings
// Gets the size of the displayed image area using the current display settings
// (in units of image pixels)
int dx, dy;
getDisplayedImageAreaSize(dx, dy);
@@ -265,7 +265,7 @@ void GLImageBox::drawImage()
}
}
// Gets the size of the diplayed image area using the current display settings
// Gets the size of the displayed image area using the current display settings
// (in units of image pixels)
void GLImageBox::getDisplayedImageAreaSize(int &dx, int &dy)
{
src/Mod/Inspection/Gui/AppInspectionGui.cpp
+1 -1
View File
@@ -69,7 +69,7 @@ PyMOD_INIT_FUNC(InspectionGui)
PyMOD_Return(0);
}
// instanciating the commands
// instantiating the commands
CreateInspectionCommands();
InspectionGui::ViewProviderInspection ::init();
InspectionGui::ViewProviderInspectionGroup ::init();
src/Mod/Material/StandardMaterial/TEMPLATE.FCMat
+32 -32
View File
@@ -40,10 +40,10 @@ UltimateTensileStrength = value MPa
; Poisson's ratio [unitless], see https://en.wikipedia.org/wiki/Poisson%27s_ratio for the details
PoissonRatio =
; Descrition to be updated
; Description to be updated
AmbientColor =
; Descrition to be updated
; Description to be updated
Color =
; Compressive strength https://en.wikipedia.org/wiki/Compressive_strength
@@ -52,76 +52,76 @@ CompressiveStrength =
; Density in [kg/m^3] https://en.wikipedia.org/wiki/Density
Density = value kg/m^3
; Descrition to be updated
; Description to be updated
DiffuseColor =
; Elasticity https://en.wikipedia.org/wiki/Elasticity_%28physics%29
Elasticity =
; Descrition to be updated
; Description to be updated
EmissiveColor =
; Descrition to be updated
; Description to be updated
Enlargen =
; Descrition to be updated
; Description to be updated
EnvironmentalEfficiencyClass =
; Descrition to be updated
; Description to be updated
ExecutionInstructions =
; Descrition to be updated
; Description to be updated
Finish =
; Descrition to be updated
; Description to be updated
FireResistanceClass =
; Descrition to be updated
; Description to be updated
FractureToughness =
; Descrition to be updated
; Description to be updated
FragmentShader =
; Descrition to be updated
; Description to be updated
KindOfMaterial =
; Descrition to be updated
; Description to be updated
KindOfMaterialDE =
; Descrition to be updated
; Description to be updated
MaterialNumber =
; Descrition to be updated
; Description to be updated
Model =
; Descrition to be updated
; Description to be updated
ModulusOfShare =
; Descrition to be updated
; Description to be updated
Norm =
; Descrition to be updated
; Description to be updated
SectionFillPattern =
; Descrition to be updated
; Description to be updated
SectionLinewidth =
; Descrition to be updated
; Description to be updated
Shininess =
; Descrition to be updated
; Description to be updated
SoundTransmissionClass =
; Descrition to be updated
; Description to be updated
SpecularColor =
; Descrition to be updated
; Description to be updated
StandardCode =
; Descrition to be updated
; Description to be updated
TexturePath =
; Descrition to be updated
; Description to be updated
TextureScaling =
; Thermal conductivity https://en.wikipedia.org/wiki/Thermal_conductivity
@@ -130,25 +130,25 @@ ThermalConductivity =
; Thermal expansion coefficient (linear) in [1/K] https://en.wikipedia.org/wiki/Thermal_expansion
ThermalExpansionCoefficient =
; Descrition to be updated
; Description to be updated
Transparency =
; Descrition to be updated
; Description to be updated
UltimateStrain =
; Descrition to be updated
; Description to be updated
UnitsPerQuantity =
; Descrition to be updated
; Description to be updated
VertexShader =
; Descrition to be updated
; Description to be updated
ViewColor =
; Descrition to be updated
; Description to be updated
ViewFillPattern =
; Descrition to be updated
; Description to be updated
ViewLinewidth =
; Yield strength in [MPa] https://en.wikipedia.org/wiki/Yield_%28engineering%29
src/Mod/Mesh/App/AppMeshPy.cpp
+1 -1
View File
@@ -127,7 +127,7 @@ public:
);
initialize("The functions in this module allow working with mesh objects.\n"
"A set of functions are provided for reading in registered mesh\n"
"file formats to either a new or exising document.\n"
"file formats to either a new or existing document.\n"
"\n"
"open(string) -- Create a new document and a Mesh feature\n"
" to load the file into the document.\n"
src/Mod/Mesh/App/Core/Algorithm.cpp
+6 -6
View File
@@ -932,12 +932,12 @@ void MeshAlgorithm::GetFacetsFromToolMesh(const MeshKernel& rToolMesh, const Bas
MeshAlgorithm cToolAlg(rToolMesh);
// To speed up the algorithm we use the grid built up from the associated mesh. For each grid
// element we check whether it lies completely inside or outside the toolmesh or even intersect
// element we check whether it lies completely inside or outside the toolmesh or even intersects
// with the toolmesh. So we can reduce the number of facets with further tests dramatically.
// If the grid box is outside the toolmesh all the facets inside can be skipped. If the grid
// box is inside the toolmesh all facets are stored with no further tests because they must
// also lie inside the toolmesh. Finally, if the grid box intersect with the toolmesh we must
// also check for each whether it intersect we the toolmesh as well.
// also lie inside the toolmesh. Finally, if the grid box intersects with the toolmesh we must
// also check for each whether it intersects with the toolmesh as well.
std::vector<unsigned long> aulInds;
for (clGridIter.Init(); clGridIter.More(); clGridIter.Next()) {
int ret = cToolAlg.Surround(clGridIter.GetBoundBox(), rcDir);
@@ -947,15 +947,15 @@ void MeshAlgorithm::GetFacetsFromToolMesh(const MeshKernel& rToolMesh, const Bas
// these facets can be removed without more checks
clGridIter.GetElements(raclCutted);
}
// the box intersect with toolmesh
// the box intersects with toolmesh
else if (ret == 0) {
// these facets must be tested for intersectons with the toolmesh
// these facets must be tested for intersections with the toolmesh
clGridIter.GetElements(aulInds);
}
// the box is outside the toolmesh but this could still mean that the triangles
// inside the grid intersect with the toolmesh
else if (ret == -1) {
// these facets must be tested for intersectons with the toolmesh
// these facets must be tested for intersections with the toolmesh
clGridIter.GetElements(aulInds);
}
}
src/Mod/Mesh/App/Core/Evaluation.cpp
+1 -1
View File
@@ -233,7 +233,7 @@ std::vector<unsigned long> MeshEvalOrientation::GetIndices() const
ulStartFacet = ULONG_MAX;
}
// in some very rare cases where we have some strange artefacts in the mesh structure
// in some very rare cases where we have some strange artifacts in the mesh structure
// we get false-positives. If we find some we check all 'invalid' faces again
cAlg.ResetFacetFlag(MeshFacet::TMP0);
cAlg.SetFacetsFlag(uIndices, MeshFacet::TMP0);
src/Mod/Mesh/App/Core/Evaluation.h
+1 -1
View File
@@ -104,7 +104,7 @@ private:
/**
* This class searches for inconsistent orientation of neighboured facets.
* Note: The 'TMP0' flag for facets must be resetted before using this class.
* Note: The 'TMP0' flag for facets must be reset before using this class.
* @author Werner Mayer
*/
class MeshExport MeshOrientationCollector : public MeshOrientationVisitor
src/Mod/Mesh/App/Core/Iterator.h
+2 -2
View File
@@ -59,7 +59,7 @@ public:
/** @name Transformation */
//@{
/// Transforms the returned facet points with the current tranformation
/// Transforms the returned facet points with the current transformation
inline void Transform( const Base::Matrix4D& rclTrf );
//@}
@@ -180,7 +180,7 @@ public:
/** @name Transformation */
//@{
/// Transforms the returned points with the current tranformation
/// Transforms the returned points with the current transformation
inline void Transform( const Base::Matrix4D& rclTrf );
//@}
src/Mod/Mesh/App/Core/SetOperations.cpp
+1 -1
View File
@@ -531,7 +531,7 @@ bool SetOperations::CollectFacetVisitor::AllowVisit (const MeshFacet& rclFacet,
if (it != _edges.end()) {
if (_addFacets == -1) {
// detemine if the facets shoud add or not only once
// determine if the facets should add or not only once
MeshGeomFacet facet = _mesh.GetFacet(rclFrom); // triangulated facet
MeshGeomFacet facetOther = it->second.facets[1-_side][0]; // triangulated facet from same edge and other mesh
Vector3f normalOther = facetOther.GetNormal();
src/Mod/Mesh/App/Core/Triangulation.h
+2 -2
View File
@@ -79,11 +79,11 @@ public:
const std::vector<MeshGeomFacet>& GetTriangles() const { return _triangles;}
/** Returns the topologic facets of the polygon. */
const std::vector<MeshFacet>& GetFacets() const { return _facets;}
/** Returns the the triangle to a given topologic facet. */
/** Returns the triangle to a given topologic facet. */
virtual MeshGeomFacet GetTriangle(const MeshPointArray&, const MeshFacet&) const;
/** Returns the length of the polygon */
float GetLength() const;
/** Get information about the pol<gons that were processed.
/** Get information about the polygons that were processed.
* It returns an array of the number of edges for each closed
* polygon.
*/
src/Mod/Mesh/App/GTSAlgos.cpp
+1 -1
View File
@@ -245,7 +245,7 @@ GtsSurface* GTSAlgos::createGTSSurface(const Mesh::MeshObject& Mesh)
Base::Vector3f Vertex;
// Geting all the points
// Getting all the points
GtsVertex ** aVertex = (GtsVertex **) malloc(Mesh.getKernel().CountPoints() * sizeof (GtsVertex *));
for (unsigned int PIter = 0;PIter < Mesh.getKernel().CountPoints(); PIter++)
{
src/Mod/Mesh/Gui/SoFCMeshFaceSet.cpp
+1 -1
View File
@@ -443,7 +443,7 @@ void SoFCMeshFaceSet::notify(SoNotList * node)
* If \a simplest is true then the model is built from the bounding box instead.
*
* For every move event the complete data set must be iterated to refresh internal Inventor data @see generatePrimitives().
* Doing this very often for very huge data sets slows down the system noticeably. Using a rough model as proxy instead of the orignal
* Doing this very often for very huge data sets slows down the system noticeably. Using a rough model as proxy instead of the original
* data set can speed up the user interaction extremely.
* @note The proxy will never be displayed. It's just used for the picking mechanism.
* @note The usage of the proxy might be confusing a little bit due to the fact that some details get lost. So it'll be possible
src/Mod/Mesh/Gui/SoFCMeshNode.cpp
+1 -1
View File
@@ -135,7 +135,7 @@ void SoFCMeshNode::setMesh(const Mesh::MeshObject* mesh)
* If \a simplest is true then the model is built from the bounding box instead.
*
* For every move event the complete data set must be iterated to refresh internal Inventor data @see generatePrimitives().
* Doing this very often for very huge data sets slows down the system noticeably. Using a rough model as proxy instead of the orignal
* Doing this very often for very huge data sets slows down the system noticeably. Using a rough model as proxy instead of the original
* data set can speed up the user interaction extremely.
* @note The proxy will never be displayed. It's just used for the picking mechanism.
* @note The usage of the proxy might be confusing a little bit due to the fact that some details get lost. So it'll be possible
src/Mod/Mesh/Gui/ViewProvider.cpp
+1 -1
View File
@@ -448,7 +448,7 @@ void ViewProviderMesh::attach(App::DocumentObject *pcFeat)
addDisplayMaskMode(pcWireRoot, "Wireframe");
// faces+wires
// Avoid any Z-buffer artefacts, so that the lines always
// Avoid any Z-buffer artifacts, so that the lines always
// appear on top of the faces
SoPolygonOffset* offset = new SoPolygonOffset();
offset->styles = SoPolygonOffset::FILLED;
src/Mod/Mesh/Gui/ViewProviderTransformDemolding.cpp
+2 -2
View File
@@ -123,7 +123,7 @@ void ViewProviderMeshTransformDemolding::attach(App::DocumentObject *pcFeat)
calcNormalVector();
calcMaterialIndex(SbRotation());
// geting center point
// getting center point
center = static_cast<Feature*>(pcObject)->Mesh.getValue().getKernel().GetBoundBox().GetCenter();
//SoGetBoundingBoxAction boxAction;
@@ -183,7 +183,7 @@ void ViewProviderMeshTransformDemolding::DragEndCallback(void)
SbRotation rot = pcTrackballDragger->rotation.getValue();
calcMaterialIndex(rot);
Base::Console().Log("View: Finish draging\n");
Base::Console().Log("View: Finish dragging\n");
}
src/Mod/MeshPart/App/MeshAlgos.cpp
+2 -2
View File
@@ -337,7 +337,7 @@ GtsSurface* MeshAlgos::createGTSSurface(MeshCore::MeshKernel* Mesh)
Base::Vector3f Vertex;
// Geting all the points
// Getting all the points
GtsVertex ** aVertex = (GtsVertex **) malloc(Mesh->CountPoints() * sizeof (GtsVertex *));
for (unsigned int PIter = 0;PIter < Mesh->CountPoints(); PIter++)
{
@@ -348,7 +348,7 @@ GtsSurface* MeshAlgos::createGTSSurface(MeshCore::MeshKernel* Mesh)
// cycling through the facets
for (unsigned int pFIter = 0;pFIter < Mesh->CountFacets(); pFIter++)
{
// geting the three points of the facet
// getting the three points of the facet
Mesh->GetFacetPoints(pFIter,p1,p2,p3);
// creating the edges and add the face to the surface
src/Mod/Points/Gui/ViewProvider.cpp
+2 -2
View File
@@ -347,7 +347,7 @@ void ViewProviderScattered::attach(App::DocumentObject* pcObj)
pcHighlight->documentName = pcObj->getDocument()->getName();
pcHighlight->subElementName = "Main";
// Hilight for selection
// Highlight for selection
pcHighlight->addChild(pcPointsCoord);
pcHighlight->addChild(pcPoints);
@@ -508,7 +508,7 @@ void ViewProviderStructured::attach(App::DocumentObject* pcObj)
pcHighlight->documentName = pcObj->getDocument()->getName();
pcHighlight->subElementName = "Main";
// Hilight for selection
// Highlight for selection
pcHighlight->addChild(pcPointsCoord);
pcHighlight->addChild(pcPoints);
src/Mod/Raytracing/App/PovTools.cpp
+2 -2
View File
@@ -377,7 +377,7 @@ void PovTools::transferToArray(const TopoDS_Face& aFace,gp_Vec** vertices,gp_Vec
return;
}
// geting the transformation of the shape/face
// getting the transformation of the shape/face
gp_Trsf myTransf;
Standard_Boolean identity = true;
if (!aLoc.IsIdentity()) {
@@ -386,7 +386,7 @@ void PovTools::transferToArray(const TopoDS_Face& aFace,gp_Vec** vertices,gp_Vec
}
Standard_Integer i;
// geting size and create the array
// getting size and create the array
nbNodesInFace = aPoly->NbNodes();
nbTriInFace = aPoly->NbTriangles();
*vertices = new gp_Vec[nbNodesInFace];
src/Mod/Raytracing/App/PovTools.h
+1 -1
View File
@@ -105,7 +105,7 @@ public:
const TopoDS_Shape& Shape,
float fMeshDeviation=0.1);
/// write a given shape as points and normal Vectors in a coma separeted format
/// write a given shape as points and normal Vectors in a comma separated format
static void writeShapeCSV(const char *FileName,
const TopoDS_Shape& Shape,
float fMeshDeviation,
src/Mod/ReverseEngineering/App/SurfaceTriangulation.cpp
+1 -1
View File
@@ -447,7 +447,7 @@ void ImageTriangulation::perform()
// Set parameters
ofm.setInputCloud (cloud_organized);
// This parameter is not yet implmented (pcl 1.7)
// This parameter is not yet implemented (pcl 1.7)
ofm.setMaxEdgeLength (1.5);
ofm.setTrianglePixelSize (1);
ofm.setTriangulationType (OrganizedFastMesh<PointXYZ>::TRIANGLE_ADAPTIVE_CUT);
src/Mod/Sandbox/Gui/AppSandboxGui.cpp
+1 -1
View File
@@ -270,7 +270,7 @@ PyMOD_INIT_FUNC(SandboxGui)
PyMOD_Return(0);
}
// instanciating the commands
// instantiating the commands
CreateSandboxCommands();
SandboxGui::Workbench::init();
SandboxGui::SoWidgetShape::initClass();
src/Mod/Sandbox/exportDRAWEXE.py
+4 -4
View File
@@ -161,7 +161,7 @@ def saveShape(csg,filename,shape,name,hasplacement = True,cleanshape=False):
sh=shape.copy()
sh.Placement=FreeCAD.Placement()
# it not yet tested if changing the placement recreated the
# tesselation. but for now we simply do the cleaing once again
# tessellation. but for now we simply do the cleaing once again
# to stay on the safe side
if cleanshape:
shape = shape.cleaned()
@@ -347,7 +347,7 @@ class Drawexporter(object):
self.csg.write('explode %s E\n' % subobj.Name )
self.csg.write('wire %s %s_1\n' %(sectionname,subobj.Name))
if sh.ShapeType == 'Face':
#we should use outer wire when it becomes avaiable
#we should use outer wire when it becomes available
self.csg.write('explode %s W\n' % subobj.Name )
#csg.write('tcopy %s_1 %s\n' %(subobj.Name,sectionname))
sectionname ='%s_1' % subobj.Name
@@ -551,7 +551,7 @@ class Drawexporter(object):
elif ob.TypeId == "Part::Extrusion" and ob.TaperAngle.Value == 0:
if checksupported: return True # The object is supported
self.process_object(ob.Base)
#Warning does not fully ressemle the functionallity of
#Warning does not fully resemble the functionality of
#Part::Extrusion
#csg.write('tcopy %s %s\n'%(ob.Base.Name,d1['name']))
facename=ob.Base.Name
@@ -589,7 +589,7 @@ class Drawexporter(object):
for i,subobj in enumerate(ob.Sections):
explodeshape = self.alwaysexplode or \
self.process_object(suboobj,True)
if explodeshape and False: #diabled TBD
if explodeshape and False: #disabled TBD
try:
raise NotImplementedError
sectionname = '%s-%02d-section' % (ob.Name,i)
src/Mod/Surface/Gui/AppSurfaceGui.cpp
+1 -1
View File
@@ -73,7 +73,7 @@ PyMOD_INIT_FUNC(SurfaceGui)
Base::Interpreter().runString("import Surface");
Base::Interpreter().runString("import PartGui");
// instanciating the commands
// instantiating the commands
CreateSurfaceCommands();
SurfaceGui::Workbench::init();
src/Mod/TechDraw/App/DrawSVGTemplate.cpp
+1 -1
View File
@@ -228,7 +228,7 @@ App::DocumentObjectExecReturn * DrawSVGTemplate::execute(void)
// Parse the document XML
QDomElement docElem = doc.documentElement();
// Obtain the size of the SVG document by reading the document attirbutes
// Obtain the size of the SVG document by reading the document attributes
Base::Quantity quantity;
// Obtain the width
src/Mod/TechDraw/Gui/MDIViewPage.cpp
+1 -1
View File
@@ -914,7 +914,7 @@ void MDIViewPage::clearSelection()
blockSelection(false);
}
//!Update QGVPage's selection based on Selection made outside Drawing Interace
//!Update QGVPage's selection based on Selection made outside Drawing Interface
//invoked from VPP
void MDIViewPage::selectFeature(App::DocumentObject *obj, const bool isSelected)
{
src/Mod/Test/Document.py
+1 -1
View File
@@ -89,7 +89,7 @@ class DocumentBasicCases(unittest.TestCase):
except:
FreeCAD.Console.PrintLog(" exception thrown, OK\n")
else:
self.fail("no exeption thrown")
self.fail("no exception thrown")
self.Doc.RedoCount
self.Doc.UndoNames
self.Doc.RedoNames
vagrant/Xenial/reset
+1 -1
View File
@@ -34,7 +34,7 @@ echo "DESTROYING ALL STATE OF SNAPD"
if systemctl is-active --quiet snapd.service snapd.socket; then
snapd_was_active=yes
echo
echo "Stoping snapd..."
echo "Stopping snapd..."
echo
(
set -x