From c7e515a03a92bb9c1335c8175def3bc3ba508be5 Mon Sep 17 00:00:00 2001 From: Windell Oskay Date: Sun, 7 Aug 2016 19:24:16 -0700 Subject: [PATCH 1/2] Add "strip data" function to manual tab. Bump version. --- inkscape_driver/eggbot.inx | 5 +++-- inkscape_driver/eggbot.py | 15 +++++++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/inkscape_driver/eggbot.inx b/inkscape_driver/eggbot.inx index 3cbd930..eb20d56 100755 --- a/inkscape_driver/eggbot.inx +++ b/inkscape_driver/eggbot.inx @@ -1,7 +1,7 @@ <_name>EggBot Control - command.evilmadscientist.eggbot.rev275b1 + command.evilmadscientist.eggbot.rev280b1 org.inkscape.output.svg.inkscape eggbot.py inkex.py @@ -119,6 +119,7 @@ check the circuit board (EBB) firmware version. <_option value="enable-engraver" >Engraver On <_option value="disable-engraver" >Engraver Off <_option value="version-check" >Check EBB Version + <_option value="strip-data" >Strip plotter data from file EggBot Control Inkscape extension -Release 2.7.6, dated 2016-06-19 +Release 2.8.0, dated 2016-08-07 *EBB Firmware 1.96 or newer required for certain functions. diff --git a/inkscape_driver/eggbot.py b/inkscape_driver/eggbot.py index 5f62219..322a810 100755 --- a/inkscape_driver/eggbot.py +++ b/inkscape_driver/eggbot.py @@ -2,7 +2,7 @@ # Part of the Eggbot driver for Inkscape # https://github.com/evil-mad/EggBot # -# Version 2.7.7, dated July 6, 2016. +# Version 2.8.0, dated August 7, 2016. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -223,8 +223,19 @@ class EggBot( inkex.Effect ): elif self.options.tab == '"setup"': self.setupCommand() + elif self.options.tab == '"manual"': - self.manualCommand() + if self.options.manualType == "strip-data": + for node in self.svg.xpath( '//svg:WCB', namespaces=inkex.NSS ): + self.svg.remove( node ) + for node in self.svg.xpath( '//svg:eggbot', namespaces=inkex.NSS ): + self.svg.remove( node ) + inkex.errormsg( gettext.gettext( "I've removed all EggBot data from this SVG file. Have a great day!" ) ) + return + else: + self.manualCommand() + + if self.serialPort is not None: ebb_motion.doTimedPause(self.serialPort, 10) #Pause a moment for underway commands to finish... From de560504fefdead2468fb04c98e7812018c28354 Mon Sep 17 00:00:00 2001 From: Windell Oskay Date: Sun, 7 Aug 2016 19:25:12 -0700 Subject: [PATCH 2/2] Remove "Strip EggBot Data" extension functionality moved to "manual" tab of EggBot Control extension. --- inkscape_driver/eggbot_stripdata.inx | 17 ---------------- inkscape_driver/eggbot_stripdata.py | 30 ---------------------------- 2 files changed, 47 deletions(-) delete mode 100755 inkscape_driver/eggbot_stripdata.inx delete mode 100755 inkscape_driver/eggbot_stripdata.py diff --git a/inkscape_driver/eggbot_stripdata.inx b/inkscape_driver/eggbot_stripdata.inx deleted file mode 100755 index e9f03ec..0000000 --- a/inkscape_driver/eggbot_stripdata.inx +++ /dev/null @@ -1,17 +0,0 @@ - - - <_name>Strip Eggbot Data - command.evilmadscience.eggbot_stripdata1.eggbot - org.inkscape.output.svg.inkscape - eggbot_stripdata.py - inkex.py - - all - - - - - - diff --git a/inkscape_driver/eggbot_stripdata.py b/inkscape_driver/eggbot_stripdata.py deleted file mode 100755 index 9e5868b..0000000 --- a/inkscape_driver/eggbot_stripdata.py +++ /dev/null @@ -1,30 +0,0 @@ -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -import gettext -import inkex - -class EggBotStripData( inkex.Effect ): - def __init__( self ): - inkex.Effect.__init__( self ) - - def effect( self ): - '''Main entry point: check to see which tab is selected, and act accordingly.''' - self.svg = self.document.getroot() - for node in self.svg.xpath( '//svg:eggbot', namespaces=inkex.NSS ): - self.svg.remove( node ) - inkex.errormsg( gettext.gettext( "Okay, I've removed all Eggbot data from this Inkscape file. Have a nice day!" ) ) - -e = EggBotStripData() -e.affect()