diff --git a/src/Mod/Draft/Draft_rc.py b/src/Mod/Draft/Draft_rc.py index 0e264f33f..52010364f 100644 --- a/src/Mod/Draft/Draft_rc.py +++ b/src/Mod/Draft/Draft_rc.py @@ -2,7 +2,7 @@ # Resource object code # -# Created: Sun Sep 25 14:49:09 2011 +# Created: Fri Oct 14 14:31:06 2011 # by: The Resource Compiler for PyQt (Qt v4.7.3) # # WARNING! All changes made in this file will be lost! @@ -41749,6 +41749,244 @@ qt_resource_data = "\ \x0a\x20\x20\x20\x20\x20\x20\x3c\x2f\x67\x3e\x0a\x20\x20\x20\x20\ \x3c\x2f\x67\x3e\x0a\x20\x20\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\ \x67\x3e\x0a\ +\x00\x00\x0e\xb2\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x20\x73\x74\x61\x6e\x64\x61\x6c\x6f\x6e\x65\x3d\x22\ +\x6e\x6f\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x43\x72\x65\x61\x74\ +\x65\x64\x20\x77\x69\x74\x68\x20\x49\x6e\x6b\x73\x63\x61\x70\x65\ +\x20\x28\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x69\x6e\x6b\ +\x73\x63\x61\x70\x65\x2e\x6f\x72\x67\x2f\x29\x20\x2d\x2d\x3e\x0a\ +\x0a\x3c\x73\x76\x67\x0a\x20\x20\x20\x78\x6d\x6c\x6e\x73\x3a\x64\ +\x63\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x70\x75\x72\x6c\x2e\x6f\ +\x72\x67\x2f\x64\x63\x2f\x65\x6c\x65\x6d\x65\x6e\x74\x73\x2f\x31\ +\x2e\x31\x2f\x22\x0a\x20\x20\x20\x78\x6d\x6c\x6e\x73\x3a\x63\x63\ +\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x63\x72\x65\x61\x74\x69\x76\ +\x65\x63\x6f\x6d\x6d\x6f\x6e\x73\x2e\x6f\x72\x67\x2f\x6e\x73\x23\ +\x22\x0a\x20\x20\x20\x78\x6d\x6c\x6e\x73\x3a\x72\x64\x66\x3d\x22\ +\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\ +\x67\x2f\x31\x39\x39\x39\x2f\x30\x32\x2f\x32\x32\x2d\x72\x64\x66\ +\x2d\x73\x79\x6e\x74\x61\x78\x2d\x6e\x73\x23\x22\x0a\x20\x20\x20\ +\x78\x6d\x6c\x6e\x73\x3a\x73\x76\x67\x3d\x22\x68\x74\x74\x70\x3a\ +\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\ +\x30\x2f\x73\x76\x67\x22\x0a\x20\x20\x20\x78\x6d\x6c\x6e\x73\x3d\ +\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\ +\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x0a\x20\x20\x20\ +\x78\x6d\x6c\x6e\x73\x3a\x73\x6f\x64\x69\x70\x6f\x64\x69\x3d\x22\ +\x68\x74\x74\x70\x3a\x2f\x2f\x73\x6f\x64\x69\x70\x6f\x64\x69\x2e\ +\x73\x6f\x75\x72\x63\x65\x66\x6f\x72\x67\x65\x2e\x6e\x65\x74\x2f\ +\x44\x54\x44\x2f\x73\x6f\x64\x69\x70\x6f\x64\x69\x2d\x30\x2e\x64\ +\x74\x64\x22\x0a\x20\x20\x20\x78\x6d\x6c\x6e\x73\x3a\x69\x6e\x6b\ +\x73\x63\x61\x70\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\ +\x77\x2e\x69\x6e\x6b\x73\x63\x61\x70\x65\x2e\x6f\x72\x67\x2f\x6e\ +\x61\x6d\x65\x73\x70\x61\x63\x65\x73\x2f\x69\x6e\x6b\x73\x63\x61\ +\x70\x65\x22\x0a\x20\x20\x20\x77\x69\x64\x74\x68\x3d\x22\x36\x34\ +\x70\x78\x22\x0a\x20\x20\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x36\ +\x34\x70\x78\x22\x0a\x20\x20\x20\x69\x64\x3d\x22\x73\x76\x67\x32\ +\x39\x38\x35\x22\x0a\x20\x20\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\ +\x22\x31\x2e\x31\x22\x0a\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\ +\x65\x3a\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x30\x2e\x34\x38\x2e\ +\x31\x20\x72\x39\x37\x36\x30\x22\x0a\x20\x20\x20\x73\x6f\x64\x69\ +\x70\x6f\x64\x69\x3a\x64\x6f\x63\x6e\x61\x6d\x65\x3d\x22\x4e\x65\ +\x77\x20\x64\x6f\x63\x75\x6d\x65\x6e\x74\x20\x32\x22\x3e\x0a\x20\ +\x20\x3c\x64\x65\x66\x73\x0a\x20\x20\x20\x20\x20\x69\x64\x3d\x22\ +\x64\x65\x66\x73\x32\x39\x38\x37\x22\x20\x2f\x3e\x0a\x20\x20\x3c\ +\x73\x6f\x64\x69\x70\x6f\x64\x69\x3a\x6e\x61\x6d\x65\x64\x76\x69\ +\x65\x77\x0a\x20\x20\x20\x20\x20\x69\x64\x3d\x22\x62\x61\x73\x65\ +\x22\x0a\x20\x20\x20\x20\x20\x70\x61\x67\x65\x63\x6f\x6c\x6f\x72\ +\x3d\x22\x23\x66\x66\x66\x66\x66\x66\x22\x0a\x20\x20\x20\x20\x20\ +\x62\x6f\x72\x64\x65\x72\x63\x6f\x6c\x6f\x72\x3d\x22\x23\x36\x36\ +\x36\x36\x36\x36\x22\x0a\x20\x20\x20\x20\x20\x62\x6f\x72\x64\x65\ +\x72\x6f\x70\x61\x63\x69\x74\x79\x3d\x22\x31\x2e\x30\x22\x0a\x20\ +\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x70\x61\x67\ +\x65\x6f\x70\x61\x63\x69\x74\x79\x3d\x22\x30\x2e\x30\x22\x0a\x20\ +\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x70\x61\x67\ +\x65\x73\x68\x61\x64\x6f\x77\x3d\x22\x32\x22\x0a\x20\x20\x20\x20\ +\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x7a\x6f\x6f\x6d\x3d\x22\ +\x35\x2e\x35\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\ +\x70\x65\x3a\x63\x78\x3d\x22\x34\x33\x2e\x36\x34\x34\x33\x31\x33\ +\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\ +\x63\x79\x3d\x22\x33\x31\x2e\x35\x34\x35\x33\x37\x36\x22\x0a\x20\ +\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x63\x75\x72\ +\x72\x65\x6e\x74\x2d\x6c\x61\x79\x65\x72\x3d\x22\x6c\x61\x79\x65\ +\x72\x31\x22\x0a\x20\x20\x20\x20\x20\x73\x68\x6f\x77\x67\x72\x69\ +\x64\x3d\x22\x74\x72\x75\x65\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\ +\x6b\x73\x63\x61\x70\x65\x3a\x64\x6f\x63\x75\x6d\x65\x6e\x74\x2d\ +\x75\x6e\x69\x74\x73\x3d\x22\x70\x78\x22\x0a\x20\x20\x20\x20\x20\ +\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x67\x72\x69\x64\x2d\x62\x62\ +\x6f\x78\x3d\x22\x74\x72\x75\x65\x22\x0a\x20\x20\x20\x20\x20\x69\ +\x6e\x6b\x73\x63\x61\x70\x65\x3a\x77\x69\x6e\x64\x6f\x77\x2d\x77\ +\x69\x64\x74\x68\x3d\x22\x31\x32\x38\x30\x22\x0a\x20\x20\x20\x20\ +\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x77\x69\x6e\x64\x6f\x77\ +\x2d\x68\x65\x69\x67\x68\x74\x3d\x22\x37\x35\x36\x22\x0a\x20\x20\ +\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x77\x69\x6e\x64\ +\x6f\x77\x2d\x78\x3d\x22\x30\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\ +\x6b\x73\x63\x61\x70\x65\x3a\x77\x69\x6e\x64\x6f\x77\x2d\x79\x3d\ +\x22\x32\x32\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\ +\x70\x65\x3a\x77\x69\x6e\x64\x6f\x77\x2d\x6d\x61\x78\x69\x6d\x69\ +\x7a\x65\x64\x3d\x22\x31\x22\x20\x2f\x3e\x0a\x20\x20\x3c\x6d\x65\ +\x74\x61\x64\x61\x74\x61\x0a\x20\x20\x20\x20\x20\x69\x64\x3d\x22\ +\x6d\x65\x74\x61\x64\x61\x74\x61\x32\x39\x39\x30\x22\x3e\x0a\x20\ +\x20\x20\x20\x3c\x72\x64\x66\x3a\x52\x44\x46\x3e\x0a\x20\x20\x20\ +\x20\x20\x20\x3c\x63\x63\x3a\x57\x6f\x72\x6b\x0a\x20\x20\x20\x20\ +\x20\x20\x20\x20\x20\x72\x64\x66\x3a\x61\x62\x6f\x75\x74\x3d\x22\ +\x22\x3e\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x3c\x64\x63\x3a\x66\ +\x6f\x72\x6d\x61\x74\x3e\x69\x6d\x61\x67\x65\x2f\x73\x76\x67\x2b\ +\x78\x6d\x6c\x3c\x2f\x64\x63\x3a\x66\x6f\x72\x6d\x61\x74\x3e\x0a\ +\x20\x20\x20\x20\x20\x20\x20\x20\x3c\x64\x63\x3a\x74\x79\x70\x65\ +\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x72\x64\x66\x3a\ +\x72\x65\x73\x6f\x75\x72\x63\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\ +\x2f\x70\x75\x72\x6c\x2e\x6f\x72\x67\x2f\x64\x63\x2f\x64\x63\x6d\ +\x69\x74\x79\x70\x65\x2f\x53\x74\x69\x6c\x6c\x49\x6d\x61\x67\x65\ +\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x3c\x64\x63\ +\x3a\x74\x69\x74\x6c\x65\x3e\x3c\x2f\x64\x63\x3a\x74\x69\x74\x6c\ +\x65\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x2f\x63\x63\x3a\x57\x6f\ +\x72\x6b\x3e\x0a\x20\x20\x20\x20\x3c\x2f\x72\x64\x66\x3a\x52\x44\ +\x46\x3e\x0a\x20\x20\x3c\x2f\x6d\x65\x74\x61\x64\x61\x74\x61\x3e\ +\x0a\x20\x20\x3c\x67\x0a\x20\x20\x20\x20\x20\x69\x64\x3d\x22\x6c\ +\x61\x79\x65\x72\x31\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\ +\x63\x61\x70\x65\x3a\x6c\x61\x62\x65\x6c\x3d\x22\x4c\x61\x79\x65\ +\x72\x20\x31\x22\x0a\x20\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\ +\x70\x65\x3a\x67\x72\x6f\x75\x70\x6d\x6f\x64\x65\x3d\x22\x6c\x61\ +\x79\x65\x72\x22\x3e\x0a\x20\x20\x20\x20\x3c\x70\x61\x74\x68\x0a\ +\x20\x20\x20\x20\x20\x20\x20\x73\x74\x79\x6c\x65\x3d\x22\x6f\x70\ +\x61\x63\x69\x74\x79\x3a\x30\x2e\x36\x33\x35\x30\x30\x30\x30\x31\ +\x3b\x63\x6f\x6c\x6f\x72\x3a\x23\x30\x30\x30\x30\x30\x30\x3b\x66\ +\x69\x6c\x6c\x3a\x23\x30\x30\x30\x30\x30\x30\x3b\x66\x69\x6c\x6c\ +\x2d\x6f\x70\x61\x63\x69\x74\x79\x3a\x31\x3b\x66\x69\x6c\x6c\x2d\ +\x72\x75\x6c\x65\x3a\x65\x76\x65\x6e\x6f\x64\x64\x3b\x73\x74\x72\ +\x6f\x6b\x65\x3a\x6e\x6f\x6e\x65\x3b\x73\x74\x72\x6f\x6b\x65\x2d\ +\x77\x69\x64\x74\x68\x3a\x31\x2e\x33\x33\x38\x39\x39\x39\x39\x39\ +\x3b\x6d\x61\x72\x6b\x65\x72\x3a\x6e\x6f\x6e\x65\x3b\x76\x69\x73\ +\x69\x62\x69\x6c\x69\x74\x79\x3a\x76\x69\x73\x69\x62\x6c\x65\x3b\ +\x64\x69\x73\x70\x6c\x61\x79\x3a\x69\x6e\x6c\x69\x6e\x65\x3b\x6f\ +\x76\x65\x72\x66\x6c\x6f\x77\x3a\x76\x69\x73\x69\x62\x6c\x65\x3b\ +\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\ +\x64\x3a\x61\x63\x63\x75\x6d\x75\x6c\x61\x74\x65\x22\x0a\x20\x20\ +\x20\x20\x20\x20\x20\x64\x3d\x22\x6d\x20\x31\x37\x2e\x39\x32\x33\ +\x32\x39\x35\x2c\x31\x39\x2e\x32\x38\x31\x32\x35\x20\x2d\x36\x2e\ +\x38\x34\x33\x37\x35\x2c\x36\x2e\x30\x33\x31\x32\x35\x20\x35\x2e\ +\x33\x34\x33\x37\x35\x2c\x36\x2e\x30\x36\x32\x35\x20\x2d\x31\x32\ +\x2e\x33\x34\x33\x37\x34\x39\x35\x2c\x30\x20\x30\x2c\x38\x2e\x33\ +\x37\x35\x20\x31\x31\x2e\x39\x36\x38\x37\x34\x39\x35\x2c\x30\x20\ +\x2d\x35\x2e\x38\x31\x32\x35\x2c\x35\x2e\x35\x36\x32\x35\x20\x36\ +\x2e\x32\x38\x31\x32\x35\x2c\x36\x2e\x35\x39\x33\x37\x35\x20\x39\ +\x2e\x37\x38\x31\x32\x35\x2c\x2d\x39\x2e\x33\x34\x33\x37\x35\x20\ +\x38\x2e\x39\x33\x37\x35\x2c\x31\x30\x2e\x31\x35\x36\x32\x35\x20\ +\x36\x2e\x38\x34\x33\x37\x35\x2c\x2d\x36\x2e\x30\x33\x31\x32\x35\ +\x20\x2d\x36\x2e\x31\x32\x35\x2c\x2d\x36\x2e\x39\x33\x37\x35\x20\ +\x32\x38\x2e\x33\x31\x32\x35\x2c\x30\x20\x30\x2c\x2d\x38\x2e\x33\ +\x37\x35\x20\x2d\x32\x36\x2e\x32\x35\x2c\x30\x20\x34\x2e\x39\x30\ +\x36\x32\x35\x2c\x2d\x34\x2e\x36\x38\x37\x35\x20\x2d\x36\x2e\x32\ +\x38\x31\x32\x35\x2c\x2d\x36\x2e\x35\x39\x33\x37\x35\x20\x2d\x39\ +\x2e\x37\x38\x31\x32\x35\x2c\x39\x2e\x33\x34\x33\x37\x35\x20\x2d\ +\x38\x2e\x39\x33\x37\x35\x2c\x2d\x31\x30\x2e\x31\x35\x36\x32\x35\ +\x20\x7a\x22\x0a\x20\x20\x20\x20\x20\x20\x20\x69\x64\x3d\x22\x72\ +\x65\x63\x74\x33\x37\x38\x34\x2d\x32\x2d\x34\x22\x0a\x20\x20\x20\ +\x20\x20\x20\x20\x69\x6e\x6b\x73\x63\x61\x70\x65\x3a\x63\x6f\x6e\ +\x6e\x65\x63\x74\x6f\x72\x2d\x63\x75\x72\x76\x61\x74\x75\x72\x65\ +\x3d\x22\x30\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x72\x65\x63\ +\x74\x0a\x20\x20\x20\x20\x20\x20\x20\x73\x74\x79\x6c\x65\x3d\x22\ +\x63\x6f\x6c\x6f\x72\x3a\x23\x30\x30\x30\x30\x30\x30\x3b\x66\x69\ +\x6c\x6c\x3a\x23\x30\x30\x32\x37\x66\x66\x3b\x66\x69\x6c\x6c\x2d\ +\x6f\x70\x61\x63\x69\x74\x79\x3a\x31\x3b\x66\x69\x6c\x6c\x2d\x72\ +\x75\x6c\x65\x3a\x65\x76\x65\x6e\x6f\x64\x64\x3b\x73\x74\x72\x6f\ +\x6b\x65\x3a\x23\x30\x30\x30\x30\x30\x30\x3b\x73\x74\x72\x6f\x6b\ +\x65\x2d\x77\x69\x64\x74\x68\x3a\x31\x2e\x33\x33\x38\x39\x39\x39\ +\x39\x39\x30\x30\x30\x30\x30\x30\x30\x30\x33\x3b\x73\x74\x72\x6f\ +\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3a\x72\x6f\x75\x6e\x64\ +\x3b\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x6a\x6f\x69\x6e\ +\x3a\x72\x6f\x75\x6e\x64\x3b\x73\x74\x72\x6f\x6b\x65\x2d\x6d\x69\ +\x74\x65\x72\x6c\x69\x6d\x69\x74\x3a\x34\x3b\x73\x74\x72\x6f\x6b\ +\x65\x2d\x6f\x70\x61\x63\x69\x74\x79\x3a\x31\x3b\x73\x74\x72\x6f\ +\x6b\x65\x2d\x64\x61\x73\x68\x61\x72\x72\x61\x79\x3a\x6e\x6f\x6e\ +\x65\x3b\x73\x74\x72\x6f\x6b\x65\x2d\x64\x61\x73\x68\x6f\x66\x66\ +\x73\x65\x74\x3a\x30\x3b\x6d\x61\x72\x6b\x65\x72\x3a\x6e\x6f\x6e\ +\x65\x3b\x76\x69\x73\x69\x62\x69\x6c\x69\x74\x79\x3a\x76\x69\x73\ +\x69\x62\x6c\x65\x3b\x64\x69\x73\x70\x6c\x61\x79\x3a\x69\x6e\x6c\ +\x69\x6e\x65\x3b\x6f\x76\x65\x72\x66\x6c\x6f\x77\x3a\x76\x69\x73\ +\x69\x62\x6c\x65\x3b\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\ +\x67\x72\x6f\x75\x6e\x64\x3a\x61\x63\x63\x75\x6d\x75\x6c\x61\x74\ +\x65\x22\x0a\x20\x20\x20\x20\x20\x20\x20\x69\x64\x3d\x22\x72\x65\ +\x63\x74\x33\x37\x38\x34\x2d\x32\x22\x0a\x20\x20\x20\x20\x20\x20\ +\x20\x77\x69\x64\x74\x68\x3d\x22\x33\x32\x2e\x39\x30\x39\x30\x39\ +\x32\x22\x0a\x20\x20\x20\x20\x20\x20\x20\x68\x65\x69\x67\x68\x74\ +\x3d\x22\x38\x2e\x33\x36\x33\x36\x33\x36\x22\x0a\x20\x20\x20\x20\ +\x20\x20\x20\x78\x3d\x22\x32\x39\x2e\x30\x39\x30\x39\x31\x22\x0a\ +\x20\x20\x20\x20\x20\x20\x20\x79\x3d\x22\x32\x36\x2e\x37\x32\x37\ +\x32\x37\x32\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x72\x65\x63\ +\x74\x0a\x20\x20\x20\x20\x20\x20\x20\x73\x74\x79\x6c\x65\x3d\x22\ +\x63\x6f\x6c\x6f\x72\x3a\x23\x30\x30\x30\x30\x30\x30\x3b\x66\x69\ +\x6c\x6c\x3a\x23\x66\x66\x66\x66\x66\x66\x3b\x66\x69\x6c\x6c\x2d\ +\x6f\x70\x61\x63\x69\x74\x79\x3a\x31\x3b\x66\x69\x6c\x6c\x2d\x72\ +\x75\x6c\x65\x3a\x65\x76\x65\x6e\x6f\x64\x64\x3b\x73\x74\x72\x6f\ +\x6b\x65\x3a\x23\x30\x30\x30\x30\x30\x30\x3b\x73\x74\x72\x6f\x6b\ +\x65\x2d\x77\x69\x64\x74\x68\x3a\x31\x2e\x33\x33\x38\x39\x39\x39\ +\x39\x39\x30\x30\x30\x30\x30\x30\x30\x30\x33\x3b\x73\x74\x72\x6f\ +\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3a\x72\x6f\x75\x6e\x64\ +\x3b\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x6a\x6f\x69\x6e\ +\x3a\x72\x6f\x75\x6e\x64\x3b\x73\x74\x72\x6f\x6b\x65\x2d\x6d\x69\ +\x74\x65\x72\x6c\x69\x6d\x69\x74\x3a\x34\x3b\x73\x74\x72\x6f\x6b\ +\x65\x2d\x6f\x70\x61\x63\x69\x74\x79\x3a\x31\x3b\x73\x74\x72\x6f\ +\x6b\x65\x2d\x64\x61\x73\x68\x61\x72\x72\x61\x79\x3a\x6e\x6f\x6e\ +\x65\x3b\x73\x74\x72\x6f\x6b\x65\x2d\x64\x61\x73\x68\x6f\x66\x66\ +\x73\x65\x74\x3a\x30\x3b\x6d\x61\x72\x6b\x65\x72\x3a\x6e\x6f\x6e\ +\x65\x3b\x76\x69\x73\x69\x62\x69\x6c\x69\x74\x79\x3a\x76\x69\x73\ +\x69\x62\x6c\x65\x3b\x64\x69\x73\x70\x6c\x61\x79\x3a\x69\x6e\x6c\ +\x69\x6e\x65\x3b\x6f\x76\x65\x72\x66\x6c\x6f\x77\x3a\x76\x69\x73\ +\x69\x62\x6c\x65\x3b\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\ +\x67\x72\x6f\x75\x6e\x64\x3a\x61\x63\x63\x75\x6d\x75\x6c\x61\x74\ +\x65\x22\x0a\x20\x20\x20\x20\x20\x20\x20\x69\x64\x3d\x22\x72\x65\ +\x63\x74\x33\x37\x38\x34\x22\x0a\x20\x20\x20\x20\x20\x20\x20\x77\ +\x69\x64\x74\x68\x3d\x22\x32\x33\x2e\x32\x37\x32\x37\x32\x38\x22\ +\x0a\x20\x20\x20\x20\x20\x20\x20\x68\x65\x69\x67\x68\x74\x3d\x22\ +\x38\x2e\x33\x36\x33\x36\x33\x36\x22\x0a\x20\x20\x20\x20\x20\x20\ +\x20\x78\x3d\x22\x31\x2e\x38\x31\x38\x31\x38\x31\x39\x22\x0a\x20\ +\x20\x20\x20\x20\x20\x20\x79\x3d\x22\x32\x36\x2e\x37\x32\x37\x32\ +\x37\x32\x22\x20\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x70\x61\x74\x68\ +\x0a\x20\x20\x20\x20\x20\x20\x20\x73\x74\x79\x6c\x65\x3d\x22\x63\ +\x6f\x6c\x6f\x72\x3a\x23\x30\x30\x30\x30\x30\x30\x3b\x66\x69\x6c\ +\x6c\x3a\x23\x66\x66\x30\x30\x30\x30\x3b\x66\x69\x6c\x6c\x2d\x6f\ +\x70\x61\x63\x69\x74\x79\x3a\x31\x3b\x66\x69\x6c\x6c\x2d\x72\x75\ +\x6c\x65\x3a\x65\x76\x65\x6e\x6f\x64\x64\x3b\x73\x74\x72\x6f\x6b\ +\x65\x3a\x23\x30\x30\x30\x30\x30\x30\x3b\x73\x74\x72\x6f\x6b\x65\ +\x2d\x77\x69\x64\x74\x68\x3a\x31\x2e\x33\x33\x38\x39\x39\x39\x39\ +\x39\x3b\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\ +\x3a\x72\x6f\x75\x6e\x64\x3b\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\ +\x6e\x65\x6a\x6f\x69\x6e\x3a\x72\x6f\x75\x6e\x64\x3b\x73\x74\x72\ +\x6f\x6b\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\x6d\x69\x74\x3a\x34\ +\x3b\x73\x74\x72\x6f\x6b\x65\x2d\x6f\x70\x61\x63\x69\x74\x79\x3a\ +\x31\x3b\x73\x74\x72\x6f\x6b\x65\x2d\x64\x61\x73\x68\x61\x72\x72\ +\x61\x79\x3a\x6e\x6f\x6e\x65\x3b\x73\x74\x72\x6f\x6b\x65\x2d\x64\ +\x61\x73\x68\x6f\x66\x66\x73\x65\x74\x3a\x30\x3b\x6d\x61\x72\x6b\ +\x65\x72\x3a\x6e\x6f\x6e\x65\x3b\x76\x69\x73\x69\x62\x69\x6c\x69\ +\x74\x79\x3a\x76\x69\x73\x69\x62\x6c\x65\x3b\x64\x69\x73\x70\x6c\ +\x61\x79\x3a\x69\x6e\x6c\x69\x6e\x65\x3b\x6f\x76\x65\x72\x66\x6c\ +\x6f\x77\x3a\x76\x69\x73\x69\x62\x6c\x65\x3b\x65\x6e\x61\x62\x6c\ +\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3a\x61\x63\x63\ +\x75\x6d\x75\x6c\x61\x74\x65\x22\x0a\x20\x20\x20\x20\x20\x20\x20\ +\x64\x3d\x22\x6d\x20\x31\x35\x2e\x36\x35\x39\x30\x39\x31\x2c\x31\ +\x34\x2e\x36\x32\x37\x38\x34\x31\x20\x2d\x36\x2e\x38\x34\x33\x37\ +\x35\x30\x31\x2c\x36\x2e\x30\x33\x31\x32\x35\x20\x39\x2e\x31\x38\ +\x37\x35\x30\x30\x31\x2c\x31\x30\x2e\x34\x30\x36\x32\x35\x20\x2d\ +\x31\x30\x2e\x30\x33\x31\x32\x35\x30\x31\x2c\x39\x2e\x35\x39\x33\ +\x37\x35\x20\x36\x2e\x32\x38\x31\x32\x35\x30\x31\x2c\x36\x2e\x35\ +\x39\x33\x37\x35\x20\x39\x2e\x37\x38\x31\x32\x35\x2c\x2d\x39\x2e\ +\x33\x34\x33\x37\x35\x20\x38\x2e\x39\x33\x37\x35\x2c\x31\x30\x2e\ +\x31\x35\x36\x32\x35\x20\x36\x2e\x38\x34\x33\x37\x35\x2c\x2d\x36\ +\x2e\x30\x33\x31\x32\x35\x20\x2d\x39\x2e\x31\x38\x37\x35\x2c\x2d\ +\x31\x30\x2e\x34\x30\x36\x32\x35\x20\x31\x30\x2e\x30\x33\x31\x32\ +\x35\x2c\x2d\x39\x2e\x35\x39\x33\x37\x35\x20\x2d\x36\x2e\x32\x38\ +\x31\x32\x35\x2c\x2d\x36\x2e\x35\x39\x33\x37\x35\x20\x2d\x39\x2e\ +\x37\x38\x31\x32\x35\x2c\x39\x2e\x33\x34\x33\x37\x35\x20\x2d\x38\ +\x2e\x39\x33\x37\x35\x2c\x2d\x31\x30\x2e\x31\x35\x36\x32\x35\x20\ +\x7a\x22\x0a\x20\x20\x20\x20\x20\x20\x20\x69\x64\x3d\x22\x72\x65\ +\x63\x74\x33\x37\x36\x31\x22\x0a\x20\x20\x20\x20\x20\x20\x20\x69\ +\x6e\x6b\x73\x63\x61\x70\x65\x3a\x63\x6f\x6e\x6e\x65\x63\x74\x6f\ +\x72\x2d\x63\x75\x72\x76\x61\x74\x75\x72\x65\x3d\x22\x30\x22\x20\ +\x2f\x3e\x0a\x20\x20\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\ +\x0a\ \x00\x00\x12\x92\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ @@ -52743,6 +52981,10 @@ qt_resource_name = "\ \x00\x44\ \x00\x72\x00\x61\x00\x66\x00\x74\x00\x5f\x00\x41\x00\x64\x00\x64\x00\x50\x00\x6f\x00\x69\x00\x6e\x00\x74\x00\x2e\x00\x73\x00\x76\ \x00\x67\ +\x00\x0e\ +\x00\x9f\x01\x67\ +\x00\x44\ +\x00\x72\x00\x61\x00\x66\x00\x74\x00\x5f\x00\x57\x00\x69\x00\x70\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\ \x00\x10\ \x03\xff\x96\x67\ \x00\x44\ @@ -52823,8 +53065,8 @@ qt_resource_name = "\ qt_resource_struct = "\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x04\x00\x00\x00\x01\ -\x00\x00\x00\x10\x00\x02\x00\x00\x00\x02\x00\x00\x00\x39\ -\x00\x00\x00\x00\x00\x02\x00\x00\x00\x21\x00\x00\x00\x18\ +\x00\x00\x00\x10\x00\x02\x00\x00\x00\x02\x00\x00\x00\x3a\ +\x00\x00\x00\x00\x00\x02\x00\x00\x00\x22\x00\x00\x00\x18\ \x00\x00\x00\x38\x00\x02\x00\x00\x00\x05\x00\x00\x00\x13\ \x00\x00\x00\x1a\x00\x02\x00\x00\x00\x0e\x00\x00\x00\x05\ \x00\x00\x02\x3a\x00\x00\x00\x00\x00\x01\x00\x06\xb0\x72\ @@ -52846,39 +53088,40 @@ qt_resource_struct = "\ \x00\x00\x00\x64\x00\x00\x00\x00\x00\x01\x00\x00\x01\x64\ \x00\x00\x00\x96\x00\x00\x00\x00\x00\x01\x00\x00\x04\xc4\ \x00\x00\x00\x7c\x00\x00\x00\x00\x00\x01\x00\x00\x03\x12\ -\x00\x00\x05\xe8\x00\x00\x00\x00\x00\x01\x00\x0a\xef\x2f\ -\x00\x00\x06\x56\x00\x00\x00\x00\x00\x01\x00\x0b\x9a\x64\ +\x00\x00\x06\x0a\x00\x00\x00\x00\x00\x01\x00\x0a\xfd\xe5\ +\x00\x00\x05\x3c\x00\x00\x00\x00\x00\x01\x00\x0a\x2b\x7b\ +\x00\x00\x06\x78\x00\x00\x00\x00\x00\x01\x00\x0b\xa9\x1a\ \x00\x00\x02\xfc\x00\x00\x00\x00\x00\x01\x00\x08\x0d\xa6\ \x00\x00\x03\x86\x00\x00\x00\x00\x00\x01\x00\x08\xad\x0a\ \x00\x00\x03\xf6\x00\x00\x00\x00\x00\x01\x00\x08\xeb\xeb\ \x00\x00\x04\xbc\x00\x00\x00\x00\x00\x01\x00\x09\xaf\x7b\ -\x00\x00\x05\x3c\x00\x00\x00\x00\x00\x01\x00\x0a\x2b\x7b\ -\x00\x00\x06\x2a\x00\x00\x00\x00\x00\x01\x00\x0b\x50\xb7\ +\x00\x00\x05\x5e\x00\x00\x00\x00\x00\x01\x00\x0a\x3a\x31\ +\x00\x00\x06\x4c\x00\x00\x00\x00\x00\x01\x00\x0b\x5f\x6d\ \x00\x00\x04\x98\x00\x00\x00\x00\x00\x01\x00\x09\x7c\xcd\ \x00\x00\x04\x1c\x00\x00\x00\x00\x00\x01\x00\x09\x01\xd4\ \x00\x00\x03\x52\x00\x00\x00\x00\x00\x01\x00\x08\x70\x54\ -\x00\x00\x06\xc8\x00\x00\x00\x00\x00\x01\x00\x0b\xe4\x0c\ +\x00\x00\x06\xea\x00\x00\x00\x00\x00\x01\x00\x0b\xf2\xc2\ \x00\x00\x04\x72\x00\x00\x00\x00\x00\x01\x00\x09\x59\x5c\ \x00\x00\x02\xaa\x00\x00\x00\x00\x00\x01\x00\x07\xde\xeb\ -\x00\x00\x05\xba\x00\x00\x00\x00\x00\x01\x00\x0a\xc6\x9d\ +\x00\x00\x05\xdc\x00\x00\x00\x00\x00\x01\x00\x0a\xd5\x53\ \x00\x00\x03\xae\x00\x00\x00\x00\x00\x01\x00\x08\xbc\x5b\ \x00\x00\x04\xec\x00\x00\x00\x00\x00\x01\x00\x09\xe4\x0b\ \x00\x00\x03\xd2\x00\x00\x00\x00\x00\x01\x00\x08\xcf\x32\ \x00\x00\x02\xcc\x00\x00\x00\x00\x00\x01\x00\x07\xf1\x04\ -\x00\x00\x06\x78\x00\x00\x00\x00\x00\x01\x00\x0b\xb9\xba\ -\x00\x00\x07\x88\x00\x00\x00\x00\x00\x01\x00\x0c\x9b\x71\ -\x00\x00\x07\x66\x00\x00\x00\x00\x00\x01\x00\x0c\x58\x12\ -\x00\x00\x06\xea\x00\x00\x00\x00\x00\x01\x00\x0c\x0d\x44\ -\x00\x00\x07\x12\x00\x00\x00\x00\x00\x01\x00\x0c\x2e\x7d\ +\x00\x00\x06\x9a\x00\x00\x00\x00\x00\x01\x00\x0b\xc8\x70\ +\x00\x00\x07\xaa\x00\x00\x00\x00\x00\x01\x00\x0c\xaa\x27\ +\x00\x00\x07\x88\x00\x00\x00\x00\x00\x01\x00\x0c\x66\xc8\ +\x00\x00\x07\x0c\x00\x00\x00\x00\x00\x01\x00\x0c\x1b\xfa\ +\x00\x00\x07\x34\x00\x00\x00\x00\x00\x01\x00\x0c\x3d\x33\ \x00\x00\x05\x12\x00\x00\x00\x00\x00\x01\x00\x09\xf5\xc3\ -\x00\x00\x05\x8a\x00\x00\x00\x00\x00\x01\x00\x0a\x90\xaf\ +\x00\x00\x05\xac\x00\x00\x00\x00\x00\x01\x00\x0a\x9f\x65\ \x00\x00\x03\x2a\x00\x00\x00\x00\x00\x01\x00\x08\x43\x17\ -\x00\x00\x05\x62\x00\x00\x00\x00\x00\x01\x00\x0a\x3e\x11\ +\x00\x00\x05\x84\x00\x00\x00\x00\x00\x01\x00\x0a\x4c\xc7\ \x00\x00\x04\x48\x00\x00\x00\x00\x00\x01\x00\x09\x20\x0f\ -\x00\x00\x07\xae\x00\x00\x00\x00\x00\x01\x00\x0c\xa6\x1c\ -\x00\x00\x06\x9c\x00\x00\x00\x00\x00\x01\x00\x0b\xd4\xb2\ -\x00\x00\x06\x0a\x00\x00\x00\x00\x00\x01\x00\x0b\x28\xb0\ -\x00\x00\x07\x34\x00\x00\x00\x00\x00\x01\x00\x0c\x43\x0e\ +\x00\x00\x07\xd0\x00\x00\x00\x00\x00\x01\x00\x0c\xb4\xd2\ +\x00\x00\x06\xbe\x00\x00\x00\x00\x00\x01\x00\x0b\xe3\x68\ +\x00\x00\x06\x2c\x00\x00\x00\x00\x00\x01\x00\x0b\x37\x66\ +\x00\x00\x07\x56\x00\x00\x00\x00\x00\x01\x00\x0c\x51\xc4\ \x00\x00\x02\x56\x00\x00\x00\x00\x00\x01\x00\x07\x31\xd4\ \x00\x00\x02\x82\x00\x00\x00\x00\x00\x01\x00\x07\x68\x99\ " diff --git a/src/Mod/Draft/Makefile.am b/src/Mod/Draft/Makefile.am index 5ca11c497..0b9812345 100644 --- a/src/Mod/Draft/Makefile.am +++ b/src/Mod/Draft/Makefile.am @@ -94,6 +94,7 @@ EXTRA_DIST = \ Resources/icons/Draft_Trimex.svg \ Resources/icons/Draft_Upgrade.svg \ Resources/icons/Draft_Wire.svg \ + Resources/icons/Draft_Wipe.svg \ Resources/icons/Draft_WireToBSpline.svg \ Resources/icons/Draft_Construction.svg \ Resources/icons/Draft_Draft.svg \ diff --git a/src/Mod/Draft/Resources/Draft.qrc b/src/Mod/Draft/Resources/Draft.qrc index 051df7fbf..97f6fdb7e 100644 --- a/src/Mod/Draft/Resources/Draft.qrc +++ b/src/Mod/Draft/Resources/Draft.qrc @@ -33,6 +33,7 @@ icons/preferences-draft.svg icons/Draft_Draft.svg icons/Draft_2DShapeView.svg + icons/Draft_Wipe.svg patterns/concrete.svg patterns/cross.svg patterns/line.svg diff --git a/src/Mod/Draft/Resources/icons/Draft_Wipe.svg b/src/Mod/Draft/Resources/icons/Draft_Wipe.svg new file mode 100644 index 000000000..ae1abed29 --- /dev/null +++ b/src/Mod/Draft/Resources/icons/Draft_Wipe.svg @@ -0,0 +1,80 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/src/Mod/Draft/WorkingPlane.py b/src/Mod/Draft/WorkingPlane.py index fbbe396a2..327aaef6f 100644 --- a/src/Mod/Draft/WorkingPlane.py +++ b/src/Mod/Draft/WorkingPlane.py @@ -217,12 +217,15 @@ class plane: ax = point.getAngle(self.u) ay = point.getAngle(self.v) az = point.getAngle(self.axis) + bx = point.getAngle(fcvec.neg(self.u)) + by = point.getAngle(fcvec.neg(self.v)) + bz = point.getAngle(fcvec.neg(self.axis)) b = min(ax,ay,az) - if b == ax: + if b in [ax,bx]: return "x" - elif b == ay: + elif b in [ay,by]: return "y" - elif b == az: + elif b in [az,bz]: return "z" else: return None diff --git a/src/Mod/Draft/draftGui.py b/src/Mod/Draft/draftGui.py index b40e50775..e366af55a 100644 --- a/src/Mod/Draft/draftGui.py +++ b/src/Mod/Draft/draftGui.py @@ -292,6 +292,7 @@ class DraftToolBar: self.undoButton = self._pushbutton("undoButton", self.layout, icon='Draft_Rotate') self.finishButton = self._pushbutton("finishButton", self.layout, icon='Draft_Finish') self.closeButton = self._pushbutton("closeButton", self.layout, icon='Draft_Lock') + self.wipeButton = self._pushbutton("wipeButton", self.layout, icon='Draft_Wipe') self.xyButton = self._pushbutton("xyButton", self.layout) self.xzButton = self._pushbutton("xzButton", self.layout) self.yzButton = self._pushbutton("yzButton", self.layout) @@ -325,6 +326,7 @@ class DraftToolBar: QtCore.QObject.connect(self.delButton,QtCore.SIGNAL("toggled(bool)"),self.setDelMode) QtCore.QObject.connect(self.finishButton,QtCore.SIGNAL("pressed()"),self.finish) QtCore.QObject.connect(self.closeButton,QtCore.SIGNAL("pressed()"),self.closeLine) + QtCore.QObject.connect(self.wipeButton,QtCore.SIGNAL("pressed()"),self.wipeLine) QtCore.QObject.connect(self.undoButton,QtCore.SIGNAL("pressed()"),self.undoSegment) QtCore.QObject.connect(self.xyButton,QtCore.SIGNAL("clicked()"),self.selectXY) QtCore.QObject.connect(self.xzButton,QtCore.SIGNAL("clicked()"),self.selectXZ) @@ -403,9 +405,9 @@ class DraftToolBar: self.radiusValue.setToolTip(translate("draft", "Radius of Circle")) self.isRelative.setText(translate("draft", "&Relative")) self.isRelative.setToolTip(translate("draft", "Coordinates relative to last point or absolute (SPACE)")) - self.hasFill.setText(translate("draft", "&Filled")) - self.hasFill.setToolTip(translate("draft", "Check this if the object should appear as filled, otherwise it will appear as wireframe (F)")) - self.finishButton.setText(translate("draft", "F&inish")) + self.hasFill.setText(translate("draft", "F&illed")) + self.hasFill.setToolTip(translate("draft", "Check this if the object should appear as filled, otherwise it will appear as wireframe (i)")) + self.finishButton.setText(translate("draft", "&Finish")) self.finishButton.setToolTip(translate("draft", "Finishes the current drawing or editing operation (F)")) self.continueCmd.setToolTip(translate("draft", "If checked, command will not finish until you press the command button again")) self.continueCmd.setText(translate("draft", "&Continue")) @@ -417,6 +419,8 @@ class DraftToolBar: self.undoButton.setToolTip(translate("draft", "Undo the last segment (CTRL+Z)")) self.closeButton.setText(translate("draft", "&Close")) self.closeButton.setToolTip(translate("draft", "Finishes and closes the current line (C)")) + self.wipeButton.setText(translate("draft", "&Wipe")) + self.wipeButton.setToolTip(translate("draft", "Wipes the existing segments of this line and starts again from the last point (W)")) self.numFaces.setToolTip(translate("draft", "Number of sides")) self.offsetLabel.setText(translate("draft", "Offset")) self.xyButton.setText(translate("draft", "XY")) @@ -474,6 +478,7 @@ class DraftToolBar: self.hasFill.show() self.finishButton.show() self.closeButton.show() + self.wipeButton.show() self.undoButton.show() self.continueCmd.show() @@ -533,6 +538,7 @@ class DraftToolBar: self.delButton.hide() self.undoButton.hide() self.closeButton.hide() + self.wipeButton.hide() self.xyButton.hide() self.xzButton.hide() self.yzButton.hide() @@ -763,6 +769,10 @@ class DraftToolBar: "close button action" self.sourceCmd.finish(True) + def wipeLine(self): + "wipes existing segments of a line" + self.sourceCmd.wipe() + def selectXY(self): self.sourceCmd.selectHandler("XY") @@ -799,6 +809,8 @@ class DraftToolBar: if self.finishButton.isVisible(): self.finish() spec = True + elif txt.endsWith("w"): + self.wipeLine() elif txt.endsWith("c"): if self.closeButton.isVisible(): self.closeLine() diff --git a/src/Mod/Draft/draftTools.py b/src/Mod/Draft/draftTools.py index cd91add78..484571ecf 100755 --- a/src/Mod/Draft/draftTools.py +++ b/src/Mod/Draft/draftTools.py @@ -890,27 +890,32 @@ class editTracker(Tracker): class PlaneTracker(Tracker): "A working plane tracker" def __init__(self): + # getting screen distance + p1 = FreeCADGui.ActiveDocument.ActiveView.getPoint((100,100)) + p2 = FreeCADGui.ActiveDocument.ActiveView.getPoint((110,100)) + bl = (p2.sub(p1)).Length * (Draft.getParam("snapRange")/2) self.trans = coin.SoTransform() self.trans.translation.setValue([0,0,0]) m1 = coin.SoMaterial() - # m1.transparency.setValue(0.8) + m1.transparency.setValue(0.8) m1.diffuseColor.setValue([0.4,0.4,0.6]) c1 = coin.SoCoordinate3() - c1.point.setValues([[-1,-1,0],[1,-1,0],[1,1,0],[-1,1,0]]) - # f = coin.SoIndexedFaceSet() - # f.coordIndex.setValues([0,1,2,3]) + c1.point.setValues([[-bl,-bl,0],[bl,-bl,0],[bl,bl,0],[-bl,bl,0]]) + f = coin.SoIndexedFaceSet() + f.coordIndex.setValues([0,1,2,3]) m2 = coin.SoMaterial() - # m2.transparency.setValue(0.7) + m2.transparency.setValue(0.7) m2.diffuseColor.setValue([0.2,0.2,0.3]) c2 = coin.SoCoordinate3() - c2.point.setValues([[0,1,0],[0,0,0],[1,0,0],[-.05,.95,0],[0,1,0],[.05,.95,0],[.95,.05,0],[1,0,0],[.95,-.05,0]]) + c2.point.setValues([[0,bl,0],[0,0,0],[bl,0,0],[-.05*bl,.95*bl,0],[0,bl,0], + [.05*bl,.95*bl,0],[.95*bl,.05*bl,0],[bl,0,0],[.95*bl,-.05*bl,0]]) l = coin.SoLineSet() l.numVertices.setValues([3,3,3]) s = coin.SoSeparator() s.addChild(self.trans) - # s.addChild(m1) - # s.addChild(c1) - # s.addChild(f) + s.addChild(m1) + s.addChild(c1) + s.addChild(f) s.addChild(m2) s.addChild(c2) s.addChild(l) @@ -1219,6 +1224,7 @@ class Creator: def finish(self): self.snap.finalize() + self.extsnap.finalize() self.node=[] self.planetrack.finalize() if self.grid: self.grid.finalize() @@ -1344,6 +1350,7 @@ class Line(Creator): last = self.node[len(self.node)-2] newseg = Part.Line(last,point).toShape() self.obj.Shape = newseg + self.obj.ViewObject.Visibility = True if self.isWire: msg(translate("draft", "Pick next point, or (F)inish or (C)lose:\n")) else: @@ -1354,6 +1361,19 @@ class Line(Creator): self.obj.Shape = newshape msg(translate("draft", "Pick next point, or (F)inish or (C)lose:\n")) + def wipe(self): + "removes all previous segments and starts from last point" + if len(self.node) > 1: + print "nullifying" + #self.obj.Shape.nullify() + self.obj.ViewObject.Visibility = False + self.node = [self.node[-1]] + print "setting trackers" + self.linetrack.p1(self.node[0]) + self.planetrack.set(self.node[0]) + msg(translate("draft", "Pick next point:\n")) + print "done" + def numericInput(self,numx,numy,numz): "this function gets called by the toolbar when valid x, y, and z have been entered there" point = Vector(numx,numy,numz) @@ -2435,6 +2455,7 @@ class Modifier: def finish(self): self.node = [] self.snap.finalize() + self.extsnap.finalize() FreeCAD.activeDraftCommand = None if self.ui: self.ui.offUi() diff --git a/src/Mod/Draft/draftlibs/fcgeo.py b/src/Mod/Draft/draftlibs/fcgeo.py index c7770f22c..d311cdd38 100755 --- a/src/Mod/Draft/draftlibs/fcgeo.py +++ b/src/Mod/Draft/draftlibs/fcgeo.py @@ -414,10 +414,8 @@ def sortEdges(lEdges, aVertex=None): result = lookfor(aVertex,lEdges) if result[0] != 0: if isSameVertex(aVertex,result[3].Vertexes[0]): - print "1keeping" return lEdges else: - print "1flipping" if isinstance(result[3].Curve,Part.Line): return [Part.Line(aVertex.Point,result[3].Vertexes[0].Point).toShape()] elif isinstance(result[3].Curve,Part.Circle): @@ -442,10 +440,8 @@ def sortEdges(lEdges, aVertex=None): del lEdges[result[1]] next = sortEdges(lEdges, result[3].Vertexes[-((-result[2])^1)]) if isSameVertex(aVertex,result[3].Vertexes[0]): - print "keeping" olEdges += [result[3]] + next else: - print "flipping" if isinstance(result[3].Curve,Part.Line): newedge = Part.Line(aVertex.Point,result[3].Vertexes[0].Point).toShape() olEdges += [newedge] + next