From 9e8352844823000d32e3b019acf6dce2d6d37cba Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Fri, 4 Oct 2019 23:47:42 +0300 Subject: [PATCH] - added the Distance Tool, Distance Min Tool, Jump To and Set Origin functions to the Edit Toolbar --- FlatCAMApp.py | 9 +++++++-- README.md | 1 + flatcamGUI/FlatCAMGUI.py | 17 +++++++++++++++-- share/distance16.png | Bin 0 -> 288 bytes share/distance32.png | Bin 0 -> 564 bytes share/distance_min16.png | Bin 0 -> 293 bytes share/distance_min32.png | Bin 0 -> 227 bytes share/measure16.png | Bin 511 -> 0 bytes share/measure32.png | Bin 1010 -> 0 bytes share/origin16.png | Bin 0 -> 339 bytes share/origin32.png | Bin 0 -> 603 bytes 11 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 share/distance16.png create mode 100644 share/distance32.png create mode 100644 share/distance_min16.png create mode 100644 share/distance_min32.png delete mode 100644 share/measure16.png delete mode 100644 share/measure32.png create mode 100644 share/origin16.png create mode 100644 share/origin32.png diff --git a/FlatCAMApp.py b/FlatCAMApp.py index 58563d9a..d5377245 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -2920,12 +2920,12 @@ class App(QtCore.QObject): self.dblsidedtool.install(icon=QtGui.QIcon('share/doubleside16.png'), separator=True) self.distance_tool = Distance(self) - self.distance_tool.install(icon=QtGui.QIcon('share/measure16.png'), pos=self.ui.menuedit, + self.distance_tool.install(icon=QtGui.QIcon('share/distance16.png'), pos=self.ui.menuedit, before=self.ui.menueditorigin, separator=False) self.distance_min_tool = DistanceMin(self) - self.distance_min_tool.install(icon=QtGui.QIcon('share/measure16.png'), pos=self.ui.menuedit, + self.distance_min_tool.install(icon=QtGui.QIcon('share/distance_min16.png'), pos=self.ui.menuedit, before=self.ui.menueditorigin, separator=True) @@ -3062,6 +3062,11 @@ class App(QtCore.QObject): self.ui.update_obj_btn.triggered.connect(lambda: self.editor2object()) self.ui.delete_btn.triggered.connect(self.on_delete) + self.ui.distance_btn.triggered.connect(lambda: self.distance_tool.run(toggle=True)) + self.ui.distance_min_btn.triggered.connect(lambda: self.distance_min_tool.run(toggle=True)) + self.ui.origin_btn.triggered.connect(self.on_set_origin) + self.ui.jmp_btn.triggered.connect(self.on_jump_to) + self.ui.shell_btn.triggered.connect(self.on_toggle_shell) self.ui.new_script_btn.triggered.connect(self.on_filenewscript) self.ui.open_script_btn.triggered.connect(self.on_fileopenscript) diff --git a/README.md b/README.md index e77c4efc..2776f97d 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,7 @@ CAD program, and create G-Code for Isolation routing. - in Gerber isolation section, the tool dia value is updated when changing from Circular to V-shape and reverse - in Tool Film, when punching holes in a positive film, if the resulting object geometry is the same as the source object geometry, the film will not ge generated - fixed a bug that when a Gerber object is edited and it has as solid_geometry a single Polygon, saving the result was failing due of len() function not working on a single Polygon +- added the Distance Tool, Distance Min Tool, Jump To and Set Origin functions to the Edit Toolbar 3.10.2019 diff --git a/flatcamGUI/FlatCAMGUI.py b/flatcamGUI/FlatCAMGUI.py index 0cf3fe8c..5a3018bb 100644 --- a/flatcamGUI/FlatCAMGUI.py +++ b/flatcamGUI/FlatCAMGUI.py @@ -317,7 +317,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow): # Separator self.menuedit.addSeparator() - self.menueditorigin = self.menuedit.addAction(QtGui.QIcon('share/origin.png'), _('Se&t Origin\tO')) + self.menueditorigin = self.menuedit.addAction(QtGui.QIcon('share/origin16.png'), _('Se&t Origin\tO')) self.menueditjump = self.menuedit.addAction(QtGui.QIcon('share/jump_to16.png'), _('Jump to Location\tJ')) # Separator @@ -688,6 +688,13 @@ class FlatCAMGUI(QtWidgets.QMainWindow): self.toolbargeo.addSeparator() self.delete_btn = self.toolbargeo.addAction(QtGui.QIcon('share/cancel_edit32.png'), _("&Delete")) + self.toolbargeo.addSeparator() + self.distance_btn = self.toolbargeo.addAction(QtGui.QIcon('share/distance32.png'), _("Distance Tool")) + self.distance_min_btn = self.toolbargeo.addAction(QtGui.QIcon('share/distance_min32.png'), + _("Distance Min Tool")) + self.origin_btn = self.toolbargeo.addAction(QtGui.QIcon('share/origin32.png'), _('Set Origin')) + self.jmp_btn = self.toolbargeo.addAction(QtGui.QIcon('share/jump_to16.png'), _('Jump to Location')) + # ######################################################################## # ########################## View Toolbar# ############################### @@ -712,7 +719,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow): # ########################## Tools Toolbar# ############################## # ######################################################################## self.dblsided_btn = self.toolbartools.addAction(QtGui.QIcon('share/doubleside32.png'), _("2Sided Tool")) - self.cutout_btn = self.toolbartools.addAction(QtGui.QIcon('share/cut16_bis.png'), _("&Cutout Tool")) + self.cutout_btn = self.toolbartools.addAction(QtGui.QIcon('share/cut16_bis.png'), _("Cutout Tool")) self.ncc_btn = self.toolbartools.addAction(QtGui.QIcon('share/ncc16.png'), _("NCC Tool")) self.paint_btn = self.toolbartools.addAction(QtGui.QIcon('share/paint20_1.png'), _("Paint Tool")) self.toolbartools.addSeparator() @@ -2089,6 +2096,12 @@ class FlatCAMGUI(QtWidgets.QMainWindow): self.toolbargeo.addSeparator() self.delete_btn = self.toolbargeo.addAction(QtGui.QIcon('share/cancel_edit32.png'), _("&Delete")) + self.toolbargeo.addSeparator() + self.distance_btn = self.toolbargeo.addAction(QtGui.QIcon('share/distance32.png'), _("Distance Tool")) + self.distance_min_btn = self.toolbargeo.addAction(QtGui.QIcon('share/distance_min32.png'), + _("Distance Min Tool")) + self.origin_btn = self.toolbargeo.addAction(QtGui.QIcon('share/origin32.png'), _('Set Origin')) + self.jmp_btn = self.toolbargeo.addAction(QtGui.QIcon('share/jump_to16.png'), _('Jump to Location')) # ## View Toolbar # ## self.replot_btn = self.toolbarview.addAction(QtGui.QIcon('share/replot32.png'), _("&Replot")) diff --git a/share/distance16.png b/share/distance16.png new file mode 100644 index 0000000000000000000000000000000000000000..4e0d2ab1905c919df70d4e4b3f593e5c732d00d0 GIT binary patch literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt^vJzX3_ zEPBsga`a+$6li^zzm%I@KViZH+ang&4NqDL=r3L2-Vqp3%$0aR=TM5gcx;k{*5<41 ztd~PC|9|}|>)+x&!=pmCJH&k!U0clc$C8zo@IC|mvH0ep7p^wMh7nCbMs#N zG%ZWV=zxo)=+i?|F)IIUAE`0_=_#Bi>b$+8IH6~X`=@n1tHR_0MeqA>{JG|M!-D>) kcDFlRWqvRCeE+4ig_CX*(~)IWKo2r_y85}Sb4q9e07r~<&j0`b literal 0 HcmV?d00001 diff --git a/share/distance32.png b/share/distance32.png new file mode 100644 index 0000000000000000000000000000000000000000..39cc3ca66b15036155d54fbe086b8d079047e3c1 GIT binary patch literal 564 zcmV-40?Yl0P)iOPIkK zG(-G5zG4k;@$G=>`-@RL!EY1;)-GO#0uKbU*bK?Hu!K2G<5*bJxQyk%DX@Xo|C--a zeo=uHj3;O&@Jj4PyRP|cNU($3HS`NXzl)2x;-=X4TQ$r(izx65r*eeP#kQy5u75XU zh1Kx;X{z~{vh7Tsz{i?TdCuu#{mwg7qE+P#((y*He6d2RW_+~Jui%SPI%x)Lw z`|+cZ=?_y=fr1K;NW$YsEt!IXqRf(~)cAxa2rx^X>R?-;$iT3_fH^($a&;HTE1s@? JF6*2UngH)5JbM5D literal 0 HcmV?d00001 diff --git a/share/distance_min32.png b/share/distance_min32.png new file mode 100644 index 0000000000000000000000000000000000000000..f11b9653fa0b12439526328215f78816609de69a GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2@;6XFV_@qq0b`B^||u96_XV21yJ%r$>(!tXCh-{r##6!q|QaSW-L zlbqnd-t^**qsjuF$C8dL5r-0(R`Mk^KDB#V$-NUECSvXMj;vWLOF!vJb2PKUB3^)N8mIPiF8t_)MYZ6JO{Rb zL&tIcdY)$nM%^cf15IG=l`c#U>&nm`j51^Y#(%$wC6IRI$=Uz_002ovPDHLkV1j|p B(?b9N diff --git a/share/measure32.png b/share/measure32.png deleted file mode 100644 index fff4e30522d97a40d773b535e5eb72a61a0a439f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1010 zcmVcFD-Qr#uXW{8kJWJ4DGLwrz*f>LM_(WOCl1+k#0G*BPJ5*koYFb}B^ zmrZ7m4?C;FIGZNRE&=hteYp3Wdw<`(bLX5HQB@AotOHg5AD~?TB66>YJbWMkB62(M z3GkhWoV(=&Rc%=dHgpNlPsunc?=>G!k^0C*bM3B;r~KAOwr9x9j1Sylb??{%615D}Z&yM8hl`T=-C zRX4+Np69&|OxOFxVzHxCDwV@A%_gFJNc>meR8%~$>(m|%z|E+5Qvf3JDsVRFZUN7# z>UuQJ^StB0`_xW35BwOn-mU;5@}P*E6OoTZBqt(o0OtdD6&O?1Z=>_3r>E}+mVw(; z^{vUt$)qtR5v$SY4v5H$mSw%!+1aUsgM+fZzOHL)YmRN(_`VPDimJ{<=Vi0mJ1on( z0vrP__x1Ii8W|b!8*MW71VrQn@J=$Bv^O?3oMN$Pmr5mPVPOGd3?lMV198W)tdD_X zB66)-t)AXZydi)wW@cz;XeXD;VT@sMagl+60cK`qn46nJReMC_z8LU%AOZX)BF|(p znVY+b12}PmzVG*sjg2_~`Fx&aG6_H?lVN;(9M^T#_x-1U_dL&gTvhK9ksc8_3;bzW z)^n*;>R%UgPXIwZKV(_8!`a-dy#ZpsHKOn5#=mO8}(PX;xNNC=?1fjzghPsE0ll0Cxa(uvRIZPG8)scq{}-QCUV>ME}55}eMKdSZ5Vwxg+n77_0Oe&?U+_5pCg7<0w8?au%g z=m=tu10Pbm3+J1zs1bk{LgE(*64fnA@=>6(B>*9auj)H(cZ*HMB4VrRt{JRV*7OHS gtL(q|YqlTz3n;nm6Sw!aMF0Q*07*qoM6N<$f+5nu`Tzg` diff --git a/share/origin16.png b/share/origin16.png new file mode 100644 index 0000000000000000000000000000000000000000..51e5f39bd1fdb9d2d954d1aa3bf68f5cc26a9166 GIT binary patch literal 339 zcmV-Z0j&OsP)!^z{cCmuXU>p6&Wo1EQqU`|=u#6#I@rFArMF#^l)^~6ll}B+F z=tQiId-RILY@9hxFo#V%;2dkw%_CN^k9n-)1kocw1X#Sm6Jz%Fp<@t5LC+LJl*KpAM@+#WXmXm36%;ZwkoC*U)%3QT+4OJEJy^SC2mG7I5% zy6_5k)A7Am63znG;_uQZk;hqn02IVe02ScWQ{YtGxb_r)y1sn}a)T&P##wHKF9HvQ z$G-tAXm0@Ah<}$-Hs}DeePM1V%LGfRFmt^pq@M$H3ng5_fpNRFd@JId z^;!cLj(u^EUe|gji2_$TG_Ccy*2NfS=W&S%=83j=T)0Bf zugHvc>^}s)c5p9Z+|x$dUSN~b$56^Uf$k8Tkvs$^T1SQ;%mcqPzt&vUyb(hIyXTW; z`;33aINQbwM(aJT{byK?IJZsrGpvbwn?!*CQ#@Lj+76})+L%`{t{&Bx$5`B1h-^6S zNmz)$6_s0HOxyy|Ejg?dZzdHErh)v>1$EDYaZHgp_5`1Zvu+Q7FQjZnU|Okd$Jcbf zf?n--4rlpqGWbm}iLt^8+sBmGR~|PbuI6#yvJh^O!?aYJm{H>%6Z3)H9)$v?tL*?6 pp3n<%%M6h1Y4G&_7d+#?<1h5{(A~gSP?Z1x002ovPDHLkV1l}!61)Ha literal 0 HcmV?d00001