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

Sketcher: Wrong mapping of constraints to axes

Browse Source 
==============================================

Expressions for remapping of geometry where simply wrong.

Surprisingly no bug reports were filed for this one.
This commit is contained in:
Abdullah Tahiri
2017-12-12 15:30:17 +01:00
committed by wmayer
parent 588f1bd795
commit c54c08cca4
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Mod/Sketcher/Gui/Command.cpp
View File

@@ -823,17 +823,17 @@ void CmdSketcherMergeSketches::activated(int iMsg)
for (int i=0; i<=(addedConstraints-baseConstraints); i++){
Sketcher::Constraint * constraint= mergesketch->Constraints.getValues()[i+baseConstraints];
if (constraint->First!=Sketcher::Constraint::GeoUndef ||
constraint->First==Sketcher::GeoEnum::HAxis ||
constraint->First==Sketcher::GeoEnum::VAxis) // not x, y axes or origin
if (constraint->First!=Sketcher::Constraint::GeoUndef &&
constraint->First!=Sketcher::GeoEnum::HAxis &&
constraint->First!=Sketcher::GeoEnum::VAxis) // not x, y axes or origin
constraint->First+=baseGeometry;
if (constraint->Second!=Sketcher::Constraint::GeoUndef ||
constraint->Second==Sketcher::GeoEnum::HAxis ||
constraint->Second==Sketcher::GeoEnum::VAxis) // not x, y axes or origin
if (constraint->Second!=Sketcher::Constraint::GeoUndef &&
constraint->Second!=Sketcher::GeoEnum::HAxis &&
constraint->Second!=Sketcher::GeoEnum::VAxis) // not x, y axes or origin
constraint->Second+=baseGeometry;
if (constraint->Third!=Sketcher::Constraint::GeoUndef ||
constraint->Third==Sketcher::GeoEnum::HAxis ||
constraint->Third==Sketcher::GeoEnum::VAxis) // not x, y axes or origin
if (constraint->Third!=Sketcher::Constraint::GeoUndef &&
constraint->Third!=Sketcher::GeoEnum::HAxis &&
constraint->Third!=Sketcher::GeoEnum::VAxis) // not x, y axes or origin
constraint->Third+=baseGeometry;
}