More typos
This commit is contained in:
@@ -95,14 +95,14 @@ public:
|
||||
|
||||
|
||||
|
||||
// Export an instance of the base class (to avoid warning C4275, see also
|
||||
// Export an instance of the base class (to avoid warning C4275, see also
|
||||
// C++ Language Reference/General Rules and Limitations on MSDN for more details.)
|
||||
//
|
||||
// For compiler gcc4.1 we need to define the template class outside namespace 'Gui'
|
||||
// otherwise we get the compiler error:
|
||||
// otherwise we get the compiler error:
|
||||
// 'explicit instantiation of 'class Base::Subject<const Gui::SelectionChanges&>'
|
||||
// in namespace 'Gui' (which does not enclose namespace 'Base')
|
||||
//
|
||||
//
|
||||
// It seems that this construct is not longer needed for gcc4.4 and even leads to
|
||||
// errors under Mac OS X. Thus, we check for version between 4.1 and 4.4.
|
||||
// It seems that for Mac OS X this can be completely ignored
|
||||
@@ -200,24 +200,24 @@ public:
|
||||
|
||||
|
||||
/** The Selection class
|
||||
* The selection singleton keeps track of the selection state of
|
||||
* The selection singleton keeps track of the selection state of
|
||||
* the whole application. It gets messages from all entities which can
|
||||
* alter the selection (e.g. tree view and 3D-view) and sends messages
|
||||
* to entities which need to keep track on the selection state.
|
||||
*
|
||||
* The selection consists mainly out of following information per selected object:
|
||||
* to entities which need to keep track on the selection state.
|
||||
*
|
||||
* The selection consists mainly out of following information per selected object:
|
||||
* - document (pointer)
|
||||
* - Object (pointer)
|
||||
* - list of subelements (list of strings)
|
||||
* - 3D coordinates where the user clicks to select (Vector3d)
|
||||
*
|
||||
* Also the preselection is managed. That means you can add a filter to prevent selection
|
||||
* Also the preselection is managed. That means you can add a filter to prevent selection
|
||||
* of unwanted objects or subelements.
|
||||
*/
|
||||
class GuiExport SelectionSingleton : public Base::Subject<const SelectionChanges&>
|
||||
{
|
||||
public:
|
||||
/// Add to selection
|
||||
/// Add to selection
|
||||
bool addSelection(const char* pDocName, const char* pObjectName=0, const char* pSubName=0, float x=0, float y=0, float z=0);
|
||||
/// Add to selection with several sub-elements
|
||||
bool addSelection(const char* pDocName, const char* pObjectName, const std::vector<std::string>& pSubNames);
|
||||
@@ -238,9 +238,9 @@ public:
|
||||
bool setPreselect(const char* pDocName, const char* pObjectName, const char* pSubName, float x=0, float y=0, float z=0);
|
||||
/// remove the present preselection
|
||||
void rmvPreselect();
|
||||
/// sets different coords for the preselection
|
||||
/// sets different coords for the preselection
|
||||
void setPreselectCoord(float x, float y, float z);
|
||||
/// returns the present preselection
|
||||
/// returns the present preselection
|
||||
const SelectionChanges& getPreselection(void) const;
|
||||
/// add a SelectionGate to control what is selectable
|
||||
void addSelectionGate(Gui::SelectionGate *gate);
|
||||
@@ -249,8 +249,8 @@ public:
|
||||
|
||||
|
||||
/** Returns the number of selected objects with a special object type
|
||||
* It's the convenient way to check if the right objects are selected to
|
||||
* perform an operation (GuiCommand). The check also detects base types.
|
||||
* It's the convenient way to check if the right objects are selected to
|
||||
* perform an operation (GuiCommand). The check also detects base types.
|
||||
* E.g. "Part" also fits on "PartImport" or "PartTransform types.
|
||||
* If no document name is given the active document is assumed.
|
||||
*/
|
||||
@@ -317,7 +317,7 @@ public:
|
||||
bool hasSelection() const;
|
||||
bool hasSelection(const char* doc) const;
|
||||
|
||||
/// Size of selcted entities for all documents
|
||||
/// Size of selected entities for all documents
|
||||
unsigned int size(void) const {
|
||||
return static_cast<unsigned int>(_SelList.size());
|
||||
}
|
||||
|
||||
@@ -329,7 +329,7 @@ class _Site(ArchFloor._Floor):
|
||||
if not "Terrain" in pl:
|
||||
obj.addProperty("App::PropertyLink","Terrain","Site",QT_TRANSLATE_NOOP("App::Property","The base terrain of this site"))
|
||||
if not "Address" in pl:
|
||||
obj.addProperty("App::PropertyString","Address","Site",QT_TRANSLATE_NOOP("App::Property","The street and house number of this site, with postal box or appartment number if needed"))
|
||||
obj.addProperty("App::PropertyString","Address","Site",QT_TRANSLATE_NOOP("App::Property","The street and house number of this site, with postal box or apartment number if needed"))
|
||||
if not "PostalCode" in pl:
|
||||
obj.addProperty("App::PropertyString","PostalCode","Site",QT_TRANSLATE_NOOP("App::Property","The postal or zip code of this site"))
|
||||
if not "City" in pl:
|
||||
|
||||
@@ -526,7 +526,7 @@
|
||||
<dc:title>[agryson] Alexander Gryson</dc:title>
|
||||
</cc:Agent>
|
||||
</dc:contributor>
|
||||
<dc:description>Three dots or circles in a horizontal sequence simiar to an ellipsis</dc:description>
|
||||
<dc:description>Three dots or circles in a horizontal sequence similar to an ellipsis</dc:description>
|
||||
<dc:subject>
|
||||
<rdf:Bag>
|
||||
<rdf:li>circle</rdf:li>
|
||||
|
||||
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
@@ -235,7 +235,7 @@ def read_z88_mesh(z88_mesh_input):
|
||||
input_continues = False
|
||||
elif z88_element_type == 16:
|
||||
# volume16 Z88 --> tetra10 FreeCAD
|
||||
# N1, N2, N4, N3, N5, N8, N10, N7, N6, N9, , Z88 to FC is differend as FC to Z88
|
||||
# N1, N2, N4, N3, N5, N8, N10, N7, N6, N9, , Z88 to FC is different as FC to Z88
|
||||
nd1 = int(linecolumns[0])
|
||||
nd2 = int(linecolumns[1])
|
||||
nd3 = int(linecolumns[2])
|
||||
@@ -373,7 +373,7 @@ def write_z88_mesh_to_file(femnodes_mesh, femelement_table, z88_element_type, f)
|
||||
n[3], n[1], n[2], n[0]))
|
||||
elif z88_element_type == 16:
|
||||
# tetra10 FreeCAD --> volume16 Z88
|
||||
# N1, N2, N4, N3, N5, N9, N8, N6, N10, N7, FC to Z88 is differend as Z88 to FC
|
||||
# N1, N2, N4, N3, N5, N9, N8, N6, N10, N7, FC to Z88 is different as Z88 to FC
|
||||
f.write("{0} {1}\n".format(element, z88_element_type, element))
|
||||
f.write("{0} {1} {2} {3} {4} {5} {6} {7} {8} {9}\n".format(
|
||||
n[0], n[1], n[3], n[2], n[4], n[8], n[7], n[5], n[9], n[6]))
|
||||
|
||||
@@ -129,7 +129,7 @@
|
||||
<dc:title>[agryson] Alexander Gryson</dc:title>
|
||||
</cc:Agent>
|
||||
</dc:contributor>
|
||||
<dc:description>Three dots or circles in a horizontal sequence simiar to an ellipsis</dc:description>
|
||||
<dc:description>Three dots or circles in a horizontal sequence similar to an ellipsis</dc:description>
|
||||
<dc:subject>
|
||||
<rdf:Bag>
|
||||
<rdf:li>circle</rdf:li>
|
||||
|
||||
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
@@ -966,7 +966,7 @@ public:
|
||||
Gui::Selection().rmvSelectionGate();
|
||||
Gui::Selection().addSelectionGate(selFilterGate);
|
||||
|
||||
// Constrait icon size in px
|
||||
// Constrain icon size in px
|
||||
int iconSize = 16;
|
||||
QPixmap cursorPixmap(cursor_genericconstraint),
|
||||
icon = Gui::BitmapFactory().pixmap(cmd->sPixmap).scaledToWidth(iconSize);
|
||||
@@ -4034,7 +4034,7 @@ void CmdSketcherConstrainPerpendicular::activated(int iMsg)
|
||||
}
|
||||
else {
|
||||
Base::Vector3d direction=point1-center;
|
||||
double tapprox=atan2(direction.y,direction.x)-phi; // we approximate the eccentric anomally by the polar
|
||||
double tapprox=atan2(direction.y,direction.x)-phi; // we approximate the eccentric anomaly by the polar
|
||||
|
||||
PoO = Base::Vector3d(center.x+majord*cos(tapprox)*cos(phi)-minord*sin(tapprox)*sin(phi),
|
||||
center.y+majord*cos(tapprox)*sin(phi)+minord*sin(tapprox)*cos(phi), 0);
|
||||
|
||||
Reference in New Issue
Block a user