kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

source typo fixes pt5

Browse Source 
+ cleaning up some more non-short-URLs
Issue #2914
This commit is contained in:
Kunda
2017-03-03 16:43:42 -05:00
committed by Yorik van Havre
parent d751423dbd
commit 19f8fd4c10
58 changed files with 147 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Base/BaseClass.cpp
View File

@@ -89,7 +89,7 @@ Type BaseClass::getTypeId(void) const
void BaseClass::initSubclass(Base::Type &toInit,const char* ClassName, const char *ParentName,
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));

53
src/Base/Console.cpp
View File

@@ -153,13 +153,13 @@ bool ConsoleSingleton::IsMsgTypeEnabled(const char* sObs, FreeCAD_ConsoleMsgType
/** Prints a Message
* This method issues a Message.
* Messages are used show some non vital information. That means in the
* case FreeCAD running with GUI a Message in the status Bar apear. In console
* mode a message comes out.
* Messages are used to show some non vital information. That means when
* FreeCAD is running in GUI mode a Message appears on the status bar.
* In console mode a message is printed to the console.
* \par
* You can use a printf like interface like:
* \code
* Console().Message("Doing somthing important %d times\n",i);
* Console().Message("Doing something important %d times\n",i);
* \endcode
* @see Warning
* @see Error
@@ -179,10 +179,10 @@ void ConsoleSingleton::Message( const char *pMsg, ... )
/** Prints a Message
* This method issues a Warning.
* Messages are used to get the users attantion. That means in the
* case FreeCAD running with GUI a Message Box is poping up. In console
* mode a colored message comes out! So dont use careless. For information
* purpose the Log or Message method is more aprobiated.
* Messages are used to get the users attention. That means when
* FreeCAD is in GUI mode a Message Box pops up. In console
* mode a colored message is returned to the console! Don't use this carelessly.
* For information purposes the 'Log' or 'Message' methods are more appropriate.
* \par
* You can use a printf like interface like:
* \code
@@ -205,15 +205,15 @@ void ConsoleSingleton::Warning( const char *pMsg, ... )
}
/** Prints a Message
* This method issues an Error which makes some execution imposible.
* Errors are used to get the users attantion. That means in the
* case FreeCAD running with GUI a Error Message Box is poping up. In console
* mode a colored message comes out! So dont use this careless. For information
* purpose the Log or Message method is more aprobiated.
* This method issues an Error which makes some execution impossible.
* Errors are used to get the users attention. That means when FreeCAD
* is running in GUI mode an Error Message Box pops up. In console
* mode a colored message is printed to the console! Don't use this carelessly.
* For information purposes the 'Log' or 'Message' methods are more appropriate.
* \par
* You can use a printf like interface like:
* \code
* Console().Error("Somthing realy bad in %s happend\n",str);
* Console().Error("Something really bad in %s happened\n",str);
* \endcode
* @see Message
* @see Warning
@@ -233,15 +233,14 @@ void ConsoleSingleton::Error( const char *pMsg, ... )
/** Prints a Message
* this method is more for devlopment and tracking purpos.
* It can be used to track execution of algorithms and functions
* and put it in files. The normal user dont need to see it, its more
* for developers and experinced users. So in normal user modes the
* logging is switched of.
* This method is appropriate for development and tracking purposes.
* It can be used to track execution of algorithms and functions.
* The normal user doesn't need to see it, it's more for developers
* and experienced users. So in normal user mode the logging is switched off.
* \par
* You can use a printf like interface like:
* You can use a printf-like interface for example:
* \code
* Console().Log("Exectue part %d in algorithem %s\n",i,str);
* Console().Log("Execute part %d in algorithm %s\n",i,str);
* \endcode
* @see Message
* @see Warning
@@ -266,8 +265,8 @@ void ConsoleSingleton::Log( const char *pMsg, ... )
/** Delivers the time/date
* this method give you a string with the actual time/date. You can
* use that for Log() calls to make time stamps.
* This method gives you a string with the actual time/date. You can
* use that for Log() calls to make timestamps.
* @return Const string with the date/time
*/
const char* ConsoleSingleton::Time(void)
@@ -289,7 +288,7 @@ const char* ConsoleSingleton::Time(void)
/** Attaches an Observer to Console
* Use this method to attach a ConsoleObserver derived class to
* the Console. After the observer is attached all messages will also
* forwardet to it.
* be forwarded to it.
* @see ConsoleObserver
*/
void ConsoleSingleton::AttachObserver(ConsoleObserver *pcObserver)
@@ -391,9 +390,9 @@ PyMethodDef ConsoleSingleton::Methods[] = {
{"PrintWarning", (PyCFunction) ConsoleSingleton::sPyWarning, 1,
"PrintWarning -- Print a warning to the output"},
{"SetStatus", (PyCFunction) ConsoleSingleton::sPySetStatus, 1,
"Set the status for either Log, Msg, Wrn or Error for an observer"},
"Set the status for either Log, Msg, Wrn, or Error for an observer"},
{"GetStatus", (PyCFunction) ConsoleSingleton::sPyGetStatus, 1,
"Get the status for either Log, Msg, Wrn or Error for an observer"},
"Get the status for either Log, Msg, Wrn, or Error for an observer"},
{NULL, NULL, 0, NULL} /* Sentinel */
};
@@ -580,7 +579,7 @@ PyObject *ConsoleSingleton::sPySetStatus(PyObject * /*self*/, PyObject *args, Py
else if(strcmp(pstr2,"Err") == 0)
pObs->bErr = (Bool==0)?false:true;
else
Py_Error(Base::BaseExceptionFreeCADError,"Unknown Message Type (use Log,Err,Msg or Wrn)");
Py_Error(Base::BaseExceptionFreeCADError,"Unknown Message Type (use Log, Err, Msg, or Wrn)");
Py_INCREF(Py_None);
return Py_None;

10
src/Base/Console.h
View File

@@ -87,7 +87,7 @@ public:
/** The console class
* This class manage all the stdio stuff. This includes
* Messages, Warnings, Log entries and Errors. The incomming
* Messages, Warnings, Log entries and Errors. The incoming
* Messages are distributed with the FCConsoleObserver. The
* FCConsole class itself makes no IO, it's more like a manager.
* \par
@@ -98,7 +98,7 @@ public:
* Base::Console().Log("Stage: %d",i);
* \endcode
* \par
* ConsoleSingleton is abel to switch between several modes to, e.g. switch
* ConsoleSingleton is able to switch between several modes to, e.g. switch
* the logging on or off, or treat Warnings as Errors, and so on...
* @see ConsoleObserver
*/
@@ -125,7 +125,7 @@ public:
void DetachObserver(ConsoleObserver *pcObserver);
/// enumaration for the console modes
enum ConsoleMode{
Verbose = 1, // supress Log messages
Verbose = 1, // suppress Log messages
};
enum FreeCAD_ConsoleMsgType {
@@ -139,9 +139,9 @@ public:
void SetMode(ConsoleMode m);
/// Change mode
void UnsetMode(ConsoleMode m);
/// Enables or disables message types of a cetain console observer
/// Enables or disables message types of a certain console observer
ConsoleMsgFlags SetEnabledMsgType(const char* sObs, ConsoleMsgFlags type, bool b);
/// Enables or disables message types of a cetain console observer
/// Enables or disables message types of a certain console observer
bool IsMsgTypeEnabled(const char* sObs, FreeCAD_ConsoleMsgType type) const;
/// singleton

6
src/Base/Interpreter.h
View File

@@ -185,7 +185,7 @@ public:
/* Loads a module
*/
bool loadModule(const char* psModName);
/// Add an addtional pyhton path
/// Add an additional python path
void addPythonPath(const char* Path);
static void addType(PyTypeObject* Type,PyObject* Module, const char * Name);
//@}
@@ -194,9 +194,9 @@ public:
*/
//@{
/** Register a cleanup function to be called by finalize(). The cleanup function will be called with no
* arguments and should return no value. At most 32 cleanup functions can be registered.When the registration
* arguments and should return no value. At most 32 cleanup functions can be registered. When the registration
* is successful 0 is returned; on failure -1 is returned. The cleanup function registered last is called
* first. Each cleanup function will be called at most once. Since Python's internal finallization will have
* first. Each cleanup function will be called at most once. Since Python's internal finalization will have
* completed before the cleanup function, no Python APIs should be called by \a func.
*/
int cleanup(void (*func)(void));

17
src/Base/MemDebug.cpp
View File

@@ -28,8 +28,8 @@
* \section Overview
* In C++ applications there are a lot of ways to handle memory allocation and deallocation.
* As many ways to do it wrong or simply forget to free memory. One way to overcome
* this problem is e.g. usage of handle classes (like OpenCASCADE it does) or use a lot of factories.
* But all of them has drawbacks or performance penalties. One good way to get memory
* this problem is e.g. usage of handle classes (like OpenCASCADE does) or use a lot of factories.
* But all of them have drawbacks or performance penalties. One good way to get memory
* problems hunted down is the MSCRT Heap debugging facility. This set of functions
* opens the possibility to track and locate all kind of memory problems, e.g.
* memory leaks.
@@ -61,11 +61,10 @@ using namespace Base;
/** Memory debugging class
* This class is an interface to the Windows CRT debugging
* facility. If the define MemDebugOn in the src/FCConfig.h is
* set the class get intatiated
* globally and tracks all memory allocations on the heap. The
* result get written in the MemLog.txt in the active directory.
* set the class gets instantiated globally and tracks all memory allocations on the heap.
* The result gets written in the MemLog.txt in the active directory.
* \par
* NOTE: you must not instaciate this class!
* NOTE: you must not instantiate this class!
*
*
* \author Juergen Riegel
@@ -124,17 +123,17 @@ MemDebug::MemDebug()
// Open a log file for the hook functions to use
if ( logFile != NULL )
throw "Base::MemDebug::MemDebug():38: Dont call the constructor by your self!";
throw "Base::MemDebug::MemDebug():38: Don't call the constructor by your self!";
#if (_MSC_VER >= 1400)
fopen_s( &logFile, "MemLog.txt", "w" );
if ( logFile == NULL )
throw "Base::MemDebug::MemDebug():41: File IO Error. Canot open log file...";
throw "Base::MemDebug::MemDebug():41: File IO Error. Can't open log file...";
_strtime_s( timeStr, 15 );
_strdate_s( dateStr, 15 );
#elif (_MSC_VER >= 1200)
logFile = fopen( "MemLog.txt", "w" );
if ( logFile == NULL )
throw "Base::MemDebug::MemDebug():41: File IO Error. Canot open log file...";
throw "Base::MemDebug::MemDebug():41: File IO Error. Can't open log file...";
_strtime( timeStr );
_strdate( dateStr );
#endif

10
src/Base/Parameter.cpp
View File

@@ -1019,8 +1019,8 @@ ParameterManager::ParameterManager()
// Indicates whether full schema constraint checking should be done.
//
// gDoCreate
// Indicates whether entity reference nodes needs to be created or not
// Defaults to false
// Indicates whether entity reference nodes needs to be created or not.
// Defaults to false.
//
// gOutputEncoding
// The encoding we are to output in. If not set on the command line,
@@ -1191,7 +1191,7 @@ int ParameterManager::LoadDocument(const XERCES_CPP_NAMESPACE_QUALIFIER InputSou
parser->setErrorHandler(errReporter);
//
// Parse the XML file, catching any XML exceptions that might propogate
// Parse the XML file, catching any XML exceptions that might propagate
// out of it.
//
bool errorsOccured = false;
@@ -1444,9 +1444,9 @@ short DOMPrintFilter::acceptNode(const DOMNode* node) const
// The DOMWriter shall call getWhatToShow() before calling
// acceptNode(), to show nodes which are supposed to be
// shown to this filter.
//
// TODO:
// REVISIT: In case the DOMWriter does not follow the protocol,
// Shall the filter honour, or NOT, what it claimes
// Shall the filter honor, or NOT, what it claims
// (when it is constructed/setWhatToShow())
// it is interested in ?
//

2
src/Base/Persistence.h
View File

@@ -85,7 +85,7 @@ public:
/** This method is used to save large amounts of data to a binary file.
* Sometimes it makes no sense to write property data as XML. In case the
* amount of data is too big or the data type has a more effective way to
* save itself. In this cases it is possible to write the data in a seperate file
* save itself. In this cases it is possible to write the data in a separate file
* inside the document archive. In case you want do so you have to re-implement
* SaveDocFile(). First, you have to inform the framework in Save() that you want do so.
* Here an example from the Mesh module which can save a (pontetionaly big) triangle mesh:

18
src/Base/PyExport.h
View File

@@ -41,13 +41,13 @@
#include <Python.h>
#ifdef FC_OS_MACOSX
#undef toupper
#undef tolower
#undef isupper
#undef islower
#undef isspace
#undef isalpha
#undef isalnum
#undef toupper
#undef tolower
#undef isupper
#undef islower
#undef isspace
#undef isalpha
#undef isalnum
#endif
namespace Base
@@ -74,7 +74,7 @@ class PyObjectBase;
* The other case is that we have a member variable in our C++ class that holds the Python object
* then we either can create this Python in the constructor or create it the first time when GetPyObject()
* gets called. In the destructor then we must decrement the Python object to avoid a memory leak while
* GetPyObject() then increments the Python object everytime it gets called.
* GetPyObject() then increments the Python object every time it gets called.
*
* @remark One big consequence of this specification is that the programmer must know whether the Python interpreter
* gets the Python object or not. If the interpreter gets the object then it decrements the counter later on when
@@ -232,4 +232,4 @@ private:
} // namespace Base
#endif // BASE_PYEXPORT_H
#endif // BASE_PYEXPORT_H

2
src/Base/Quantity.h
View File

@@ -105,7 +105,7 @@ public:
void setFormat(const QuantityFormat& f) {
_Format = f;
}
/// transfer to user prefered unit/potence
/// transfer to user preferred unit/potence
QString getUserString(double &factor, QString &unitString)const;
QString getUserString(void) const { // to satisfy GCC
double dummy1;

4
src/Base/Type.cpp
View File

@@ -90,7 +90,7 @@ void *Type::createInstance(void)
void *Type::createInstanceByName(const char* TypeName, bool bLoadModule)
{
// if not allready, load the module
// if not already, load the module
if(bLoadModule)
{
// cut out the module name
@@ -98,7 +98,7 @@ void *Type::createInstanceByName(const char* TypeName, bool bLoadModule)
// ignore base modules
if(Mod != "App" && Mod != "Gui" && Mod != "Base")
{
// remember allready loaded modules
// remember already loaded modules
set<string>::const_iterator pos = loadModuleSet.find(Mod);
if(pos == loadModuleSet.end())
{

4
src/Base/UnitsApi.h
View File

@@ -62,9 +62,9 @@ public:
QString dummy2;
return UnitsApi::schemaTranslate(quant, dummy1, dummy2);
}
/// generate a value for a quantity with default user prefered system
/// generate a value for a quantity with default user preferred system
static double toDbl(PyObject *ArgObj,const Base::Unit &u=Base::Unit());
/// generate a value for a quantity with default user prefered system
/// generate a value for a quantity with default user preferred system
static Quantity toQuantity(PyObject *ArgObj,const Base::Unit &u=Base::Unit());
// set the number of decimals

6
src/Base/XMLTools.h
View File

@@ -86,7 +86,7 @@ inline StrX::StrX(const XMLCh* const toTranscode)
inline StrX::~StrX()
{
//delete [] fLocalForm; // dont work on VC7.1
//delete [] fLocalForm; // don't work on VC7.1
XERCES_CPP_NAMESPACE_QUALIFIER XMLString::release(&fLocalForm);
}
@@ -134,7 +134,7 @@ inline StrXUTF8::StrXUTF8(const XMLCh* const toTranscode)
XMLTransService::Codes res;
transcoder.reset(XERCES_CPP_NAMESPACE_QUALIFIER XMLPlatformUtils::fgTransService->makeNewTranscoderFor(XERCES_CPP_NAMESPACE_QUALIFIER XMLRecognizer::UTF_8, res, 4096, XERCES_CPP_NAMESPACE_QUALIFIER XMLPlatformUtils::fgMemoryManager));
if (res != XMLTransService::Ok)
throw Base::Exception("Cant create UTF-8 encoder in StrXUTF8::StrXUTF8()");
throw Base::Exception("Can't create UTF-8 encoder in StrXUTF8::StrXUTF8()");
}
//char outBuff[128];
@@ -250,7 +250,7 @@ inline XUTF8Str::XUTF8Str(const char* const fromTranscode)
XMLTransService::Codes res;
transcoder.reset(XERCES_CPP_NAMESPACE_QUALIFIER XMLPlatformUtils::fgTransService->makeNewTranscoderFor(XERCES_CPP_NAMESPACE_QUALIFIER XMLRecognizer::UTF_8, res, 4096, XERCES_CPP_NAMESPACE_QUALIFIER XMLPlatformUtils::fgMemoryManager));
if (res != XMLTransService::Ok)
throw Base::Exception("Cant create UTF-8 decoder in XUTF8Str::XUTF8Str()");
throw Base::Exception("Can't create UTF-8 decoder in XUTF8Str::XUTF8Str()");
}
static XMLCh outBuff[128];

2
src/Gui/3Dconnexion/GuiApplicationNativeEventAwareWin32.cpp
View File

@@ -354,7 +354,7 @@ bool Gui::GUIApplicationNativeEventAware::Is3dmouseAttached()
/*!
Initialize the window to recieve raw-input messages
Initialize the window to receive raw-input messages
This needs to be called initially so that Windows will send the messages from the 3D mouse to the window.
*/

2
src/Gui/Action.cpp
View File

@@ -649,7 +649,7 @@ void RecentFilesAction::appendFile(const QString& filename)
files.prepend(filename);
setFiles(files);
// update the XML structure and save the user paramter to disk (#0001989)
// update the XML structure and save the user parameter to disk (#0001989)
bool saveParameter = App::GetApplication().GetParameterGroupByPath
("User parameter:BaseApp/Preferences/General")->GetBool("SaveUserParameter", true);
if (saveParameter) {

9
src/Gui/CoinRiftWidget.h
View File

@@ -1,5 +1,6 @@
/**************************************************************************\
* Copyright (c) Bastiaan Veelo (Bastiaan a_t Veelo d_o_t net) & Juergen Riegel (FreeCAD@juergen-riegel.net)
* Copyright (c) Bastiaan Veelo (Bastiaan a_t Veelo d_o_t net)
* & Juergen Riegel (FreeCAD@juergen-riegel.net)
* All rights reserved. Contact me if the below is too restrictive for you.
*
* Redistribution and use in source and binary forms, with or without
@@ -34,7 +35,7 @@
#if BUILD_VR
// defines which methode to use to render
// defines which method to use to render
#define USE_SO_OFFSCREEN_RENDERER
//#define USE_FRAMEBUFFER
@@ -82,8 +83,8 @@ class CoinRiftWidget : public QGLWidget
GLuint frameBufferID[2], depthBufferID[2];
// A SoSceneManager has a SoRenderManager to do the rendering -- should we not use SoRenderManager instead?
// We are probably not that interested in events. SoSceneManager::setSceneGraph() searches for the camera
// and sets it in SoRenderManager, but its is actually only used for built-in stereo rendering. We sould
// probably eliminate that search...
// and sets it in SoRenderManager, but its is actually only used for built-in stereo rendering.
// FIXME: We should probably eliminate that search...
SoSceneManager *m_sceneManager;
#endif
#ifdef USE_SO_OFFSCREEN_RENDERER

2
src/Gui/CommandWindow.cpp
View File

@@ -454,7 +454,7 @@ Action * StdCmdWindowsMenu::createAction(void)
}
//===========================================================================
// Instanciation
// Instantiation
//===========================================================================

4
src/Gui/DAGView/DAGModel.cpp
View File

@@ -90,7 +90,7 @@ void LineEdit::keyPressEvent(QKeyEvent *eventIn)
QLineEdit::keyPressEvent(eventIn);
}
//I dont think I should have to call invalidate
//I don't think I should have to call invalidate
//and definitely not on the whole scene!
//if we have performance problems, this will definitely
//be something to re-visit. I am not wasting anymore time on
@@ -345,7 +345,7 @@ void Model::slotResetEdit(const ViewProviderDocumentObject& VPDObjectIn)
void Model::selectionChanged(const SelectionChanges& msg)
{
//note that treeview uses set selection which sends a message with just a document name
//TODO: note that treeview uses set selection which sends a message with just a document name
//and no object name. Have to explore further.
auto getAllEdges = [this](const Vertex &vertexIn)

4
src/Gui/DAGView/DAGView.cpp
View File

@@ -107,8 +107,8 @@ void View::onSelectionChanged(const SelectionChanges& msg)
}
}
//why am I getting a spontanous event with an empty name?
//also getting events after document has been removed from modelMap.
//FIXME: why am I getting a spontaneous event with an empty name?
//also getting events after the document has been removed from modelMap.
//just ignore for now.
// std::ostringstream stream;
// stream << std::endl << "couldn't find document of name: " << std::string(msg.pDocName) << std::endl << std::endl;

2
src/Gui/DlgRunExternal.h
View File

@@ -33,7 +33,7 @@ class Ui_DlgRunExternal;
/**
* The DlgRunExternal class implements a dialog to start and control external
* programms to edit FreeCAD controled content.
* programs to edit FreeCAD controlled content.
* \author Jürgen Riegel
*/
class GuiExport DlgRunExternal : public QDialog

14
src/Gui/Document.cpp
View File

@@ -427,7 +427,7 @@ void Document::slotNewObject(const App::DocumentObject& Obj)
d->_ViewProviderMap[&Obj] = pcProvider;
try {
// if succesfully created set the right name and calculate the view
// if successfully created set the right name and calculate the view
//FIXME: Consider to change argument of attach() to const pointer
pcProvider->attach(const_cast<App::DocumentObject*>(&Obj));
pcProvider->updateView();
@@ -1243,7 +1243,7 @@ bool Document::canClose ()
}
if (ok) {
// If a tsk dialog is open that doesn't allow other commands to modify
// If a task dialog is open that doesn't allow other commands to modify
// the document it must be closed by resetting the edit mode of the
// corresponding view provider.
if (!Gui::Control().isAllowedAlterDocument()) {
@@ -1399,7 +1399,7 @@ void Document::openCommand(const char* sName)
void Document::commitCommand(void)
{
getDocument()->commitTransaction();
getDocument()->commitTransaction();
}
void Document::abortCommand(void)
@@ -1468,10 +1468,10 @@ void Document::handleChildren3D(ViewProvider* viewProvider)
for (std::list<Gui::BaseView*>::iterator vIt = d->baseViews.begin();vIt != d->baseViews.end();++vIt) {
View3DInventor *activeView = dynamic_cast<View3DInventor *>(*vIt);
if (activeView && activeView->getViewer()->hasViewProvider(ChildViewProvider)) {
// Note about hasViewProvider()
//remove the viewprovider serves the purpose of detaching the inventor nodes from the
//top level root in the viewer. However, if some of the children were grouped beneath the object
//earlier they are not anymore part of the toplevel inventor node. we need to check for that.
// @Note hasViewProvider()
// remove the viewprovider serves the purpose of detaching the inventor nodes from the
// top level root in the viewer. However, if some of the children were grouped beneath the object
// earlier they are not anymore part of the toplevel inventor node. we need to check for that.
if (d->_editViewProvider == ChildViewProvider)
resetEdit();
activeView->getViewer()->removeViewProvider(ChildViewProvider);

2
src/Gui/FileDialog.h
View File

@@ -79,7 +79,7 @@ private:
// ----------------------------------------------------------------------
/**
* The FileOptionsDialog class provides an extensible file dialog with an additonal widget either at the right
* The FileOptionsDialog class provides an extensible file dialog with an additional widget either at the right
* or at the bottom, that can be shown or hidden with the 'Extended' button.
* @author Werner Mayer
*/

2
src/Gui/Flag.cpp
View File

@@ -253,7 +253,7 @@ void Flag::paintEvent(QPaintEvent* e)
painter.drawImage((width() - image.width())/2, 0, image);
painter.end();
#else
// draw the overlayed text using QPainter
// draw the overlaid text using QPainter
QPainter p(this);
p.fillRect(this->rect(), Qt::white);
p.setPen(Qt::black);

2
src/Gui/GuiConsole.cpp
View File

@@ -47,7 +47,7 @@ unsigned int GUIConsole::s_nRefCount = 0;
/** Constructor
* Open a Top level Window and redirect the
* stdin, stdout and stderr stream to it.
* Dont needet in Linux!
* Not needed in Linux!
*/
GUIConsole::GUIConsole (void)
{

10
src/Gui/GuiConsole.h
View File

@@ -30,13 +30,13 @@
namespace Gui {
/** The console window class
* This class opens a console window when instanciated
* and redirect the stdio streams to it as long it exists.
* This class opens a console window when instantiated
* and redirects the stdio streams to it as long it exists.
* This is for Windows only!
* After instanciation it automaticly register itself at
* After instantiation it automatically registers itself at
* the FCConsole class and gets all the FCConsoleObserver
* massages. The class must not used directly! Only the
* over the FCConsole class is allowed!
* messages. The class must not used directly! Only the
* FCConsole class is allowed!
* @see FCConsole
* \author Jürgen Riegel
*/

2
src/Gui/InputField.cpp
View File

@@ -216,7 +216,7 @@ void InputField::contextMenuEvent(QContextMenuEvent *event)
// call the menu and wait until its back
QAction *saveAction = menu->exec(event->globalPos());
// look what the user has choosen
// look what the user has chosen
if(saveAction == SaveValueAction)
pushToSavedValues();
else{

2
src/Gui/Inventor/SoAutoZoomTranslation.cpp
View File

@@ -62,7 +62,7 @@ void SoAutoZoomTranslation::initClass()
// * SoGetPrimitiveCountAction
// The element SoViewportRegionElement is enabled by the
// above listed actions.
// Addionally, SoViewVolumeElement is enabled for
// Additionally, SoViewVolumeElement is enabled for
// * SoAudioRenderAction
// * SoHandleEventAction
// And SoViewportRegionElement is enabled for

2
src/Gui/NavigationStyle.cpp
View File

@@ -915,7 +915,7 @@ void NavigationStyle::spin(const SbVec2f & pointerpos)
this->spinsamplecounter++;
acc_angle /= this->spinsamplecounter;
// FIXME: accumulate and average axis vectors aswell? 19990501 mortene.
// FIXME: accumulate and average axis vectors as well? 19990501 mortene.
this->spinincrement.setValue(newaxis, acc_angle);
// Don't carry too much baggage, as that'll give unwanted results

2
src/Gui/PrefWidgets.cpp
View File

@@ -515,7 +515,7 @@ void PrefQuantitySpinBox::contextMenuEvent(QContextMenuEvent *event)
// call the menu and wait until its back
QAction *userAction = menu->exec(event->globalPos());
// look what the user has choosen
// look what the user has chosen
if (userAction == saveValueAction) {
pushToHistory(this->text());
}

4
src/Gui/Quarter/QuarterWidget.cpp
View File

@@ -275,7 +275,7 @@ QuarterWidget::stateCursor(const SbName & state)
*/
/*!
Enable/disable the headlight. This wille toggle the SoDirectionalLight::on
Enable/disable the headlight. This will toggle the SoDirectionalLight::on
field (returned from getHeadlight()).
*/
void
@@ -502,7 +502,7 @@ QuarterWidget::stereoMode(void) const
/*!
The ratio between logical and physical pixel sizes -- obtained from the window that
the widget is located within, and updated whenver any change occurs, emitting a devicePixelRatioChanged signal. Only available for version Qt 5.6 and above (will be 1.0 for all previous versions)
the widget is located within, and updated whenever any change occurs, emitting a devicePixelRatioChanged signal. Only available for version Qt 5.6 and above (will be 1.0 for all previous versions)
*/
qreal

2
src/Gui/Quarter/QuarterWidgetP.cpp
View File

@@ -316,7 +316,7 @@ QuarterWidgetP::nativeEventFilter(void * message, long * result)
#ifdef HAVE_SPACENAV_LIB
XEvent * event = (XEvent *) message;
if (event->type == ClientMessage) {
// FIXME: I dont really like this, but the original XEvent will
// FIXME: I don't really like this, but the original XEvent will
// die before reaching the destination within the Qt system. To
// avoid this, we'll have to make a copy. We should try to find a
// workaround for this. (20101020 handegar)

4
src/Gui/Quarter/SoQTQuarterAdaptor.cpp
View File

@@ -174,7 +174,7 @@ void SIM::Coin3D::Quarter::SoQTQuarterAdaptor::init()
QWidget* SIM::Coin3D::Quarter::SoQTQuarterAdaptor::getWidget()
{
//we keep the function from SoQt as we want to introduce the QGraphicsView and then the GLWidget
//is seperated from the Widget used in layouts again
//is separated from the Widget used in layouts again
return this;
}
@@ -186,7 +186,7 @@ QWidget* SIM::Coin3D::Quarter::SoQTQuarterAdaptor::getGLWidget()
QWidget* SIM::Coin3D::Quarter::SoQTQuarterAdaptor::getWidget() const
{
//we keep the function from SoQt as we want to introduce the QGraphicsView and then the GLWidget
//is seperated from the Widget used in layouts again
//is separated from the Widget used in layouts again
return const_cast<SoQTQuarterAdaptor*>(this);
}

2
src/Gui/SelectionFilter.cpp
View File

@@ -368,7 +368,7 @@ bool SelectionFilter::parse(void)
{
Errors = "";
SelectionParser::YY_BUFFER_STATE my_string_buffer = SelectionParser::SelectionFilter_scan_string (Filter.c_str());
// be aware that this parser is not reentrant! Dont use with Threats!!!
// be aware that this parser is not reentrant! Don't use with Threats!!!
assert(!ActFilter);
ActFilter = this;
/*int my_parse_result =*/ SelectionParser::yyparse();

6
src/Gui/SelectionFilter.h
View File

@@ -92,7 +92,7 @@ protected:
* This object is a link between the selection
* filter class and the selection singleton. Created with a
* filter string and registered in the selection it will only
* allow the descibed object types to be selected.
* allow the described object types to be selected.
* @see SelectionFilter
* @see SelectionSingleton
*/
@@ -123,7 +123,7 @@ public:
bool allow(App::Document*, App::DocumentObject*, const char*);
private:
Py::Object gate;
Py::Object gate;
};
/**
@@ -166,7 +166,7 @@ public:
bool allow(App::Document*, App::DocumentObject*, const char*);
private:
SelectionFilterPy* filter;
SelectionFilterPy* filter;
};
// === Abstract syntax tree (AST) ===========================================

2
src/Gui/SelectionFilter.tab.c
View File

@@ -1103,7 +1103,7 @@ yyparse ()
`yyss': related to states.
`yyvs': related to semantic values.
Refer to the stacks thru separate pointers, to allow yyoverflow
Refer to the stacks through separate pointers, to allow yyoverflow
to reallocate them elsewhere. */
/* The state stack. */

6
src/Gui/SoFCCSysDragger.h
View File

@@ -132,14 +132,14 @@ private:
/*! @brief Coordinate System Dragger
*
* used to transform objects in 3d space. Set intial:
* used to transform objects in 3d space. Set initial:
* translation, rotation, translationIncrement and
* rotationIncrement. Use *IncrementCount* multiplied
* with *Increment for full double precision output.
*
* Dragger can be displayed in 2 modes: static scale and auto scale.
* for static you can set the field scale and you are done. For
* auto scale you set the field scale and call setupAutoScale with
* For static you can set the field scale and you are done.
* For autoscale you set the field scale & call setupAutoScale with
* the viewer camera. @see setUpAutoScale @see scale.
*/
class GuiExport SoFCCSysDragger : public SoDragger

2
src/Gui/SoFCUnifiedSelection.cpp
View File

@@ -538,7 +538,7 @@ void SoFCUnifiedSelection::GLRenderBelowPath(SoGLRenderAction * action)
// nothing picked, so restore the arrow cursor if needed
if (this->preSelection == 0) {
// this is called when a selection gate forbad to select an object
// this is called when a selection gate forbade to select an object
// and the user moved the mouse to an empty area
this->preSelection = -1;
QGLWidget* window;

2
src/Gui/TaskView/TaskView.cpp
View File

@@ -525,7 +525,7 @@ void TaskView::showDialog(TaskDialog *dlg)
ActiveCtrl = new TaskEditControl(this);
ActiveCtrl->buttonBox->setStandardButtons(dlg->getStandardButtons());
// make conection to the needed signals
// make connection to the needed signals
connect(ActiveCtrl->buttonBox,SIGNAL(accepted()),
this,SLOT(accept()));
connect(ActiveCtrl->buttonBox,SIGNAL(rejected()),

2
src/Gui/View3DInventorRiftViewer.cpp
View File

@@ -79,7 +79,7 @@ View3DInventorRiftViewer::~View3DInventorRiftViewer()
{
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Oculus");
// remeber last postion on close
// remember last position on close
hGrp->SetInt("RenderWindowPosX",pos().x());
hGrp->SetInt("RenderWindowPosY",pos().y());
hGrp->SetInt("RenderWindowSizeW",size().width());

4
src/Gui/View3DInventorViewer.cpp
View File

@@ -389,7 +389,7 @@ void View3DInventorViewer::init()
pcBackGround = new SoFCBackgroundGradient;
pcBackGround->ref();
// Set up foreground, overlayed scenegraph.
// Set up foreground, overlaid scenegraph.
this->foregroundroot = new SoSeparator;
this->foregroundroot->ref();
@@ -1531,7 +1531,7 @@ void View3DInventorViewer::renderScene(void)
glDepthRange(0.1,1.0);
#endif
// Immediately reschedule to get continous spin animation.
// Immediately reschedule to get continuous spin animation.
if (this->isAnimating()) {
this->getSoRenderManager()->scheduleRedraw();
}

6
src/Gui/View3DInventorViewer.h
View File

@@ -85,8 +85,8 @@ public:
Clip = 4, /**< Clip objects using a lasso. */
};
/** @name Modus handling of the viewer
* Here the you can switch on/off several features
* and modies of the Viewer
* Here you can switch several features on/off
* and modes of the Viewer
*/
//@{
enum ViewerMod {
@@ -101,7 +101,7 @@ public:
/** @name Anti-Aliasing modes of the rendered 3D scene
* Specifies Anti-Aliasing (AA) method
* - Smoothing enables OpenGL line and vertex smoothing (basicly depreciated)
* - Smoothing enables OpenGL line and vertex smoothing (basically depreciated)
* - MSAA is hardware multi sampling (with 2, 4 or 8 passes), a quite commom and efficient AA technique
*/
//@{

2
src/Gui/View3DViewerPy.h
View File

@@ -35,7 +35,7 @@ class View3DInventorViewer;
/**
* @brief Python interface for View3DInventorViewer
*
* The interface does not offer all methods the c++ View3DInventorViewer counterpart has, respectivly
* The interface does not offer all methods the c++ View3DInventorViewer counterpart has, respectively
* also not everything the QuarterWidget and the SoQtQuarterAdaptor offers. It only exposes
* methods with additioanl functionality in comparison to the View3DInventorPy class. Everything that
* can be done from there has no interface here.

6
src/Gui/ViewProviderOrigin.cpp
View File

@@ -111,7 +111,7 @@ void ViewProviderOrigin::setTemporaryVisibility(bool axis, bool plane) {
bool saveState = tempVisMap.empty();
try {
// Remember & Set axis visability
// Remember & Set axis visibility
for(App::DocumentObject* obj : origin->axes()) {
if (obj) {
Gui::ViewProvider* vp = Gui::Application::Instance->getViewProvider(obj);
@@ -124,7 +124,7 @@ void ViewProviderOrigin::setTemporaryVisibility(bool axis, bool plane) {
}
}
// Remember & Set plane visability
// Remember & Set plane visibility
for(App::DocumentObject* obj : origin->planes()) {
if (obj) {
Gui::ViewProvider* vp = Gui::Application::Instance->getViewProvider(obj);
@@ -140,7 +140,7 @@ void ViewProviderOrigin::setTemporaryVisibility(bool axis, bool plane) {
Base::Console().Error ("%s\n", ex.what() );
}
// Remember & Set self visability
// Remember & Set self visibility
tempVisMap[this] = isVisible();
setVisible(true);

16
src/Gui/ViewProviderOrigin.h
View File

@@ -38,7 +38,7 @@ class GuiExport ViewProviderOrigin : public ViewProviderDocumentObject
PROPERTY_HEADER(Gui::ViewProviderOrigin);
public:
/// Size of the origin as setted by the part.
/// Size of the origin as set by the part.
App::PropertyVector Size;
/// constructor.
@@ -46,7 +46,7 @@ public:
/// destructor.
virtual ~ViewProviderOrigin();
/// @name Override methodes
/// @name Override methods
///@{
virtual std::vector<App::DocumentObject*> claimChildren(void) const;
virtual std::vector<App::DocumentObject*> claimChildren3D(void) const;
@@ -58,19 +58,19 @@ public:
virtual void setDisplayMode(const char* ModeName);
///@}
/** @name Temporary visability mode
* Control the visability of origin and associated objects when needed
/** @name Temporary visibility mode
* Control the visibility of origin and associated objects when needed
*/
///@{
/// Set temporary visability of some of origin's objects e.g. while rotating or mirroring
/// Set temporary visibility of some of origin's objects e.g. while rotating or mirroring
void setTemporaryVisibility (bool axis, bool planes);
/// Returns true if the origin in temporary visability mode
/// Returns true if the origin in temporary visibility mode
bool isTemporaryVisibility ();
/// Reset the visability
/// Reset the visibility
void resetTemporaryVisibility ();
///@}
/// Returns default size. Use this if it is not possible to determin apropriate size by other means
/// Returns default size. Use this if it is not possible to determine appropriate size by other means
static double defaultSize() {return 10.;}
protected:
virtual void onChanged(const App::Property* prop);

2
src/Gui/ViewProviderOriginFeature.cpp
View File

@@ -55,7 +55,7 @@ ViewProviderOriginFeature::ViewProviderOriginFeature () {
QT_TRANSLATE_NOOP("App::Property", "Visual size of the feature"));
ShapeColor.setValue ( 50.f/255, 150.f/255, 250.f/255 ); // Set default color for origin (light-blue)
BoundingBox.setStatus(App::Property::Hidden, true); // Hide Boundingbox from the user due to it doesn't make sence
BoundingBox.setStatus(App::Property::Hidden, true); // Hide Boundingbox from the user due to it doesn't make sense
// Create node for scaling the origin
pScale = new SoScale ();

2
src/Gui/WinNativeGestureRecognizers.cpp
View File

@@ -195,7 +195,7 @@ typedef BOOL ( __stdcall * ptrSetGestureConfig) (
DWORD , // reserved, must be 0
UINT , // count of GESTURECONFIG structures
PGESTURECONFIG , // array of GESTURECONFIG structures, dwIDs will be processed in the
// order specified and repeated occurances will overwrite previous ones
// order specified and repeated occurrences will overwrite previous ones
UINT ); // sizeof(GESTURECONFIG)
void WinNativeGestureRecognizerPinch::TuneWindowsGestures(QWidget* target)

2
src/Gui/propertyeditor/PropertyItem.h
View File

@@ -315,7 +315,7 @@ protected:
};
/**
* Change a Unit based floating point number withing constraints.
* Change a Unit based floating point number within constraints.
* \author Stefan Troeger
*/
class GuiExport PropertyUnitConstraintItem: public PropertyUnitItem

2
src/Main/MainGui.cpp
View File

@@ -133,7 +133,7 @@ int main( int argc, char ** argv )
App::Application::Config()["ExeName"] = "FreeCAD";
App::Application::Config()["ExeVendor"] = "FreeCAD";
App::Application::Config()["AppDataSkipVendor"] = "true";
App::Application::Config()["MaintainerUrl"] = "http://www.freecadweb.org/wiki/index.php?title=Main_Page";
App::Application::Config()["MaintainerUrl"] = "http://www.freecadweb.org/wiki/Main_Page";
// set the banner (for logging and console)
App::Application::Config()["CopyrightInfo"] = sBanner;

4
src/Mod/AddonManager/AddonManager.py
View File

@@ -352,7 +352,7 @@ class MacroWorker(QtCore.QThread):
self.info_label.emit("Downloading list of macros...")
self.progressbar_show.emit(True)
macropath = FreeCAD.ParamGet('User parameter:BaseApp/Preferences/Macro').GetString("MacroPath",os.path.join(FreeCAD.ConfigGet("UserAppData"),"Macro"))
u = urllib2.urlopen("http://www.freecadweb.org/wiki/index.php?title=Macros_recipes")
u = urllib2.urlopen("http://www.freecadweb.org/wiki/Macros_recipes")
p = u.read()
u.close()
macros = re.findall("title=\"(Macro.*?)\"",p)
@@ -428,7 +428,7 @@ class ShowMacroWorker(QtCore.QThread):
mac = self.macros[self.idx][0].replace(" ","_")
mac = mac.replace("&","%26")
mac = mac.replace("+","%2B")
url = "http://www.freecadweb.org/wiki/index.php?title=Macro_"+mac
url = "http://www.freecadweb.org/wiki/Macro_"+mac
self.info_label.emit("Retrieving info from " + str(url))
u = urllib2.urlopen(url)
p = u.read()

2
src/Mod/Arch/ArchCutPlane.py
View File

@@ -129,7 +129,7 @@ class _CutPlaneTaskPanel:
def retranslateUi(self, TaskPanel):
TaskPanel.setWindowTitle(QtGui.QApplication.translate("Arch", "Cut Plane", None))
self.title.setText(QtGui.QApplication.translate("Arch", "Cut Plane options", None))
self.infoText.setText(QtGui.QApplication.translate("Arch", "Wich side to cut", None))
self.infoText.setText(QtGui.QApplication.translate("Arch", "Which side to cut", None))
self.combobox.addItems([QtGui.QApplication.translate("Arch", "Behind", None),
QtGui.QApplication.translate("Arch", "Front", None)])

2
src/Mod/Arch/ArchMaterial.py
View File

@@ -26,7 +26,7 @@ if FreeCAD.GuiUp:
from PySide import QtCore, QtGui
from DraftTools import translate
__title__ = "Arch Material Managment"
__title__ = "Arch Material Management"
__author__ = "Yorik van Havre"
__url__ = "http://www.freecadweb.org"

2
src/Mod/Arch/ArchStructure.py
View File

@@ -91,7 +91,7 @@ def makeStructure(baseobj=None,length=None,width=None,height=None,name="Structur
obj.Length = length
else:
if not baseobj:
# don't set the length if we have a base object, otherwise the lenght X height calc
# don't set the length if we have a base object, otherwise the length X height calc
# gets wrong
obj.Length = p.GetFloat("StructureLength",100)
if obj.Height > obj.Length:

2
src/Mod/Arch/ArchVRM.py
View File

@@ -356,7 +356,7 @@ class Renderer:
return 0
if DEBUG: print("failed, faces bboxes are not distinct")
# test 2: if Z bounds dont overlap, it's easy to know the closest
# test 2: if Z bounds don't overlap, it's easy to know the closest
if DEBUG: print("doing test 2")
if b1.ZMax < b2.ZMin:
return 2

2
src/Mod/Arch/importIFClegacy.py
View File

@@ -1457,7 +1457,7 @@ class IfcSchema:
entity["supertype"] = subtypeofmatch.groups()[0].upper() if subtypeofmatch else None
# find the shortest string matched from the end of the entity type header to the
# first occurence of a NO_ATTR string (when it occurs on a new line)
# first occurrence of a NO_ATTR string (when it occurs on a new line)
inner_str = re.search(";(.*?)$", raw_entity_str, re.DOTALL).groups()[0]
attrs_str = min([inner_str.partition("\r\n "+a)[0] for a in self.NO_ATTR])

2
src/Mod/Assembly/Gui/Workbench.cpp
View File

@@ -185,7 +185,7 @@ void Workbench::activated()
"Use for <b>testing purpose only!</b> The object structure is still changing.<br>"
"You might not be able to load your work in a newer Version of FreeCAD. <br><br>"
"For further information see the Assembly project page:<br>"
" <a href=\"http://www.freecadweb.org/wiki/index.php?title=Assembly_project\">http://www.freecadweb.org/wiki/index.php?title=Assembly_project</a> <br>"
" <a href=\"http://www.freecadweb.org/wiki/Assembly_project\">http://www.freecadweb.org/wiki/Assembly_project</a> <br>"
"Or the Assembly dedicated portion of our forum:<br>"
" <a href=\"http://forum.freecadweb.org/viewforum.php?f=20&sid=2a1a326251c44576f450739e4a74c37d\">http://forum.freecadweb.org/</a> <br>"
),

2
src/Mod/Draft/DraftTools.py
View File

@@ -129,7 +129,7 @@ def getPoint(target,args,mobile=False,sym=False,workingplane=True,noTracker=Fals
if mobile=True, the constraining occurs from the location of
mouse cursor when Shift is pressed, otherwise from last entered
point. If sym=True, x and y values stay always equal. If workingplane=False,
the point wont be projected on the Working Plane. if noTracker is True, the
the point won't be projected on the Working Plane. if noTracker is True, the
tracking line will not be displayed
'''

2
src/Mod/Path/App/ParamsHelper.h
View File

@@ -161,7 +161,7 @@
* an example of using tuple, and the more complex example #PARAM_ENUM_CONVERT
*
* Note that when generating comma separated list, the first and last comma are
* conveniently omited, so that the macros can be mixed with others intuitively
* conveniently omitted, so that the macros can be mixed with others intuitively
*/
#include <boost/preprocessor/cat.hpp>

2
src/Mod/Start/StartPage/StartPage.html
View File

@@ -78,7 +78,7 @@
2D shapes, and use them as guides to build architecutral \
objects.</p>')"
onMouseout="show('')"
href="ArchDesign.py">Architectual Design</a></li>
href="ArchDesign.py">Architectural Design</a></li>
<li><a onMouseover="show('<p>The <b>Mesh Workbench</b> is used to work with \
Mesh objects. Meshes are simpler 3D objects than Part objects, \
but they are often easier to import and export to/from other \

2
src/Mod/TechDraw/App/DrawProjGroup.h
View File

@@ -139,7 +139,7 @@ protected:
/// Annoying helper - keep in sync with DrawProjGroupItem::TypeEnums
/*!
* \todo {See note regarding App::PropertyEnumeration on my wiki page http://freecadweb.org/wiki/index.php?title=User:Ian.rees}
* \todo {See note regarding App::PropertyEnumeration on my wiki page http://freecadweb.org/wiki/User:Ian.rees}
* \return true iff 'in' is a valid name for an orthographic/isometric view
*/
bool checkViewProjType(const char *in);