Commit Graph

308 Commits

Author SHA1 Message Date
Chris Hennes
c505ac1ee3 [Draft] Silence LGTM warnings about unused vars
LGTM only recognizes "_" and "unused" as variable names that are
expected to be unused, so switch to "_".
2021-09-26 13:34:16 -05:00
Chris Hennes
1761eb8ce0 Merge pull request #5046 from carlopav/Draft_fixSnapGrid
Draft: fix Snapper GridSnap not working over a face
2021-09-19 16:36:38 -05:00
Chris Hennes
68a027cf94 Draft: LGTM - don't catch BaseException 2021-09-19 14:36:38 -05:00
carlopav
31a8fc5c7d Draft: fix Snapper GridSnap not working over a face
ref. https://forum.freecadweb.org/viewtopic.php?f=23&t=62274&sid=4c9d07255e4f0db219b661c345768319

If the cursor is over a Face and no SnapCenter is active, the snapToObject method returns the current cursor point instead of None. Doing so the snap() method does not check for extension and grid snaps.
It seems this is a bug since the snap() already contains the deleted code.

One note: the no snaps case was moved before the lastObj setting, since if no snap point was found, it's not right to set it to a non snapped object.
2021-09-19 14:31:44 +02:00
luz paz
c03d4b1c10 Draft: fix comment typo 2021-09-08 10:22:26 -04:00
Yorik van Havre
d964653057 Merge pull request #5014 from marioalexis84/draft-gui_label
Draft: Prevent working plane from restoring after label command
2021-09-07 12:45:22 +02:00
marioalexis
bdbe3105ff Draft: Prevent working plane from restoring after label command 2021-09-07 02:50:38 -03:00
Yorik van Havre
1c8b803f9e Draft: Introduced Hatch command + object 2021-09-06 15:27:52 +02:00
Yorik van Havre
cbde274c9a Merge branch 'master' into Draft_addgroup 2021-09-06 12:02:36 +02:00
Yorik van Havre
42a8389e40 Restored docstring 2021-09-06 11:55:42 +02:00
Yorik van Havre
5c0517e620 Changed M shortcut to M,G 2021-09-06 11:53:28 +02:00
marioalexis
813114cab5 Draft: Fix variable referenced before assignment 2021-09-06 01:14:14 -03:00
Yorik van Havre
854fc52ff2 Merge pull request #4891 from Roy-043/Draft_Fix_Misplaced_Edit_Nodes_BezCurve_2
Draft: Fix misplaced Draft_Edit nodes for BezCurve 2nd version
2021-09-02 11:41:51 +02:00
Yorik van Havre
ab119685ff Merge pull request #4907 from Roy-043/Draft_fix_move_alt_copy_mode
Draft: Fix Draft_Move Alt copy mode
2021-09-02 11:41:07 +02:00
Yorik van Havre
62997b1bfa Merge pull request #4915 from carlopav/draft_snap_nodoc_fix
Draft: fixed Snap behaviour when no document is active.
2021-08-30 14:26:10 +02:00
carlopav
cd19082ac6 Update src/Mod/Draft/draftguitools/gui_snaps.py
Co-authored-by: Yorik van Havre <yorik.vanhavre@gmail.com>
2021-08-30 13:57:04 +02:00
Yorik van Havre
05c88d8ada Merge pull request #4905 from Roy-043/Draft_fix_trimex_wrong_units
Draft: Draft_Trimex: Fix wrong angle units in task panel
2021-08-16 16:22:47 +02:00
Yorik van Havre
a74792e3f6 Draft: Allow to stretch more complex Arch objects 2021-08-03 16:45:43 +02:00
Yorik van Havre
3b444b1cf3 Merge pull request #4927 from marioalexis84/draft-restore
Draft: Fix regression on WP and fixes #0004562
2021-08-02 15:52:42 +02:00
Yorik van Havre
bd0b5bbecd Merge pull request #4929 from marioalexis84/draft-multiselection
Draft: Enable multiple selection for dumb task dialog in Modification commands
2021-08-02 15:51:10 +02:00
Yorik van Havre
6a6fd946a5 Merge branch 'master' into Draft_Fix_Draft_SetStyle 2021-08-02 11:55:28 +02:00
Yorik van Havre
26ff21d93d Merge pull request #4879 from Roy-043/Draft_Fix_Layer_List_Issues
Draft: Fix 3 issues with the Draft Tray layer list
2021-08-02 11:54:11 +02:00
Roy-043
422bde4bf7 Draft: Fixed wrong cmd names in gui_planeproxy.py
Draft_SetWorkingPlaneProxy should be Draft_WorkingPlaneProxy
2021-08-01 13:14:30 +02:00
Roy-043
03a1b9b1c1 Draft: fix gui_offset.py wrong ghost if start angle of arc is larger
The ghost of an arc with a start angle that is larger than the end angle would be wrong.
2021-07-31 09:56:25 +02:00
Roy-043
5564b025fe Draft: Fix spelling gui_edit_draft_objects.py
"mset first angle" should be "set first angle".
2021-07-31 09:53:56 +02:00
marioalexis
b1a534930f Draft: Enable multiple selection for dumb task dialog in Modification commands 2021-07-19 02:45:17 -03:00
marioalexis
fd6290566d Draft: Save last WP used 2021-07-18 02:07:59 -03:00
marioalexis
1b8a886770 Draft: Fix regression generated in commit 76c7aa3 2021-07-18 02:07:08 -03:00
carlopav
543aad45f7 Draft: fixed Snap behaviour when no document is active.
Draft toolbar and statusbar can be activated also when no document is active, because Snap is not related to active document.
2021-07-11 10:09:46 +02:00
Roy-043
080e5473f0 Draft: Fix Draft_Move Alt copy mode
Draft_Move Alt copy mode was fixed. The modifications were taken from gui_rotate.py.
2021-07-04 10:22:54 +02:00
Roy-043
1db692e38b Draft: Draft_Trimex: Fix wrong angle units in taskpanel
The redraw function was changed to return a list [dist, ang] if the real argument is not True. With this list the action function 'knows' which units to display. This also made it possible to move the "self.ui." related stuff that was in the redraw function to the the action function.
I have also changed to tooltip texts by removing the article "The". This more in keeping with other tooltips.
2021-07-02 11:32:51 +02:00
Yorik van Havre
b64fddb2e0 Draft: Added Text Spacing and Line Spacing settings to Draft Set Style dialog 2021-07-01 12:59:49 +02:00
Yorik van Havre
dd53430d19 Merge pull request #4492 from marioalexis84/draft-wp_restore
Draft: Fixes #0004562: Active working plane changes when I close Draft Edit panel
2021-06-30 10:50:25 +02:00
Roy-043
d72f90d972 Draft: Fix misplaced Draft_Edit nodes for BezCurve 2nd version
The poles in the resetTrackersBezier function are in the CS of the geometric parent of the curve. Before using `p = obj.getGlobalPlacement().multVec(p)` the nodes have to be translated to the CS of the curve. Otherwise the effects of the curve's Placement would be added twice. See discussion: https://github.com/FreeCAD/FreeCAD/pull/4889



 the global coordinate system. They should therefore not be translated from the LCS to the GCS.
2021-06-26 09:42:56 +02:00
Yorik van Havre
54139caff9 Draft: Fixed construction group name 2021-06-22 12:38:22 +02:00
Roy-043
bc083a06c2 Draft: Fix wrong color format in gui_setstyle.py 2021-06-21 22:46:00 +02:00
Roy-043
3401a63d68 Fix 3 issues with the Draft Tray layer list
Fix 3 issues with the Draft Tray layer list:
The layer list should display even if there are no layers so that the "Add new Layer" option can be selected.
"Project" and "BuildingPart" objects should be added to the list (depending on "AutogroupAddGroups" of course).
The "LayerContainer" object should not be added to the list. Although it is in fact a group, it is just too confusing.
2021-06-21 21:11:52 +02:00
luz paz
0db5d84a7e Fix source comment typos
Found via `codespell -q 3 -L aci,ake,aline,alle,alledges,alocation,als,ang,anid,apoints,ba,beginn,behaviour,bloaded,bottome,byteorder,calculater,cancelled,cancelling,cas,cascade,centimetre,childs,colour,colours,commen,connexion,currenty,dof,doubleclick,dum,eiter,elemente,ende,feld,finde,findf,freez,hist,iff,indicies,initialisation,initialise,initialised,initialises,initialisiert,ist,kilometre,lod,mantatory,methode,metres,millimetre,modell,nd,noe,normale,normaly,nto,numer,oder,ontop,orgin,orginx,orginy,ot,pard,parms,pres,programm,que,recurrance,rougly,seperator,serie,sinc,strack,substraction,te,thist,thru,tread,uint,unter,vertexes,wallthickness,whitespaces -S ./.git,*.po,*.ts,./ChangeLog.txt,./src/3rdParty,./src/Mod/Assembly/App/opendcm,./src/CXX,./src/zipios++,./src/Base/swig*,./src/Mod/Robot/App/kdl_cp,./src/Mod/Import/App/SCL,./src/WindowsInstaller,./src/Doc/FreeCAD.uml,./build/doc/SourceDocu`
2021-06-10 17:33:40 -04:00
Yorik van Havre
c50bbd263d Merge pull request #4833 from carlopav/draft-fix-autogroup
Draft: fix Autogroup to fix Draft_OrthoArray crash when using active Std_Part.
2021-06-09 12:44:42 +02:00
marioalexis
1c918e9d9e Draft: Improve alignToSelection method on WorkingPlane 2021-06-06 21:30:20 -03:00
carlopav
d115db2cbb Draft: Autogroup, insert guard to prevent cyclic references
ref. Forum discussion: Draft_OrthoArray: Crash when using active Std_Part. https://forum.freecadweb.org/viewtopic.php?f=23&t=59155&p=508132#p508132

Autogroup try to add new created Draft Objects into the active Part, but if the Part is used as a Base for the new object this could create a cyclic reference. 
This behaviour is prevented by adding a check for " obj in active_part.InListRecursive"
2021-06-06 11:21:21 +02:00
Yorik van Havre
7b58a46ab7 Merge pull request #4827 from Roy-043/Draft_Fix_gui_stretch
Draft: Fix gui_stretch
2021-06-04 13:18:05 +02:00
Yorik van Havre
f9c0455385 Merge pull request #4816 from luzpaz/typos
Fix misc. typos
2021-06-04 13:16:21 +02:00
luz paz
097bb0769c Arch: fix typo in translate() 2021-06-03 14:36:21 -04:00
Roy-043
6cbd0cb9b4 Draft: Fix gui_stretch
If a wire is created to replace a rectangle, the MakeFace property of the wire should match that of the rectangle.
2021-06-02 14:28:56 +02:00
carlopav
267291567f Draft: Edit, cleanup of new GuiTools.addPoint methods
In new splitted addPoint methods, getObjectsInfo and the consequent checks have been removed and moved to main DraftEdit module in a new get_specific_object_info method.
This method returns the info for the selected object at a given position and the 3d Vector of the point clicked on the object.
2021-06-01 23:21:12 +02:00
carlopav
5841b737e1 Draft: Edit, moved resetTrackers for context menu actions to main module
The wrapper allows to call resetTrackers in the main module after the callback to the GuiTools is executed.

This is the last commit, many thanks to @matthijskooijman for having menthored me :)

I think it's helpful to have @matthijskooijman explanation on this use of the wrapper:

This defines a new wrapper function, that calls the original callback and then calls resetTrackers. Note that this creates a new function for every loop iteration, so each of these wrapper functions captures potentially different callback, self and obj values so things work as expected. Note I did something weird with the callback value there: Since functions like these capture a variable, not its value at the time of function definition, and loop variables like label and callback are a single variable shared between all loop iterations, capturing callback directly ends up with all wrappers calling the last callback (i.e. they all capture the same variable and by the time the wrappers are called, that variable will contain the last of the callbacks). This is commonly solved by using a default value in the function definition, since such a default value uses the value of the (in this case) callback variable, not capturing the variable.
2021-06-01 23:20:41 +02:00
carlopav
0ea4c5d2fe Draft: Edit, Added reverse wire option to context menu
Now Draft Edit can reverse the order of the points of a Draft_Wire
2021-06-01 22:53:24 +02:00
carlopav
28ced10d50 Draft: Edit, rewriting context menu system
get_edit_point_context_menu(self, edit_command, obj, node_idx)
get_edit_obj_context_menu(self, edit_command, obj, position)
that are called depending if the user is over an editpoint or over another part of the object.
2021-06-01 22:53:01 +02:00
carlopav
cc87ab4913 Draft: Edit, Split out addPoint in multiple methods in the GuiTools
Now Draft_Wire, Draft_BSpline, Draft_Bezcurve have their own methods to add points.
2021-06-01 21:57:38 +02:00