From 7858bd3f3f6acf19964274472062546d84986cad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20W=C3=BCst?= <sebi@timewaster.de>
Date: Sat, 13 Jul 2013 19:21:28 +0200
Subject: moved main hpgl processing to new classes, moved plotter control to a
 extension dialog

(bzr r12417.1.1)
---
 share/extensions/plotter.inx | 72 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 share/extensions/plotter.inx

(limited to 'share/extensions/plotter.inx')

diff --git a/share/extensions/plotter.inx b/share/extensions/plotter.inx
new file mode 100644
index 000000000..0dc5a35fc
--- /dev/null
+++ b/share/extensions/plotter.inx
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <_name>Plot</_name>
+    <id>org.ekips.filter.plot</id>
+	<dependency type="executable" location="extensions">plotter.py</dependency>
+    <dependency type="executable" location="extensions">hpgl_decoder.py</dependency>
+    <dependency type="executable" location="extensions">hpgl_encoder.py</dependency>
+    <dependency type="executable" location="extensions">inkex.py</dependency>
+    <_param name="introduction" type="description">Please make sure that all objects you want to plot are converted to paths. The plot will automatically be aligned to the zero point.</_param>
+    <param name="tab" type="notebook">
+        <page name="plotter" _gui-text="Plotter Settings">
+            <param name="pen" type="int" min="1" max="10" _gui-text="Pen number" _gui-description="The number of the pen (tool) to use, on most plotters 1 (Standard: '1')">1</param>
+            <param name="resolutionX" type="float" min="1.0" max="4096.0" precision="1" _gui-text="Resolution X (dpi)" _gui-description="The amount of steps the cutter moves if it moves for 1 inch on the X axis - Try different settings to find the one that fits your plotter (Default: 1016.0)">1016.0</param>
+            <param name="resolutionY" type="float" min="1.0" max="4096.0" precision="1" _gui-text="Resolution Y (dpi)" _gui-description="The amount of steps the cutter moves if it moves for 1 inch on the Y axis - Try different settings to find the one that fits your plotter (Default: 1016.0)">1016.0</param>
+            <param name="mirrorX" type="boolean" _gui-text="Mirror X-axis" _gui-description="Check this to mirror the X axis - Try different settings to find the one that fits your plotter (Default: Unchecked)">false</param>
+            <param name="mirrorY" type="boolean" _gui-text="Mirror Y-axis" _gui-description="Check this to mirror the Y axis - Try different settings to find the one that fits your plotter (Default: Unchecked)">false</param>
+            <param name="orientation" type="optiongroup" appearance="minimal" _gui-text="Orientation" _gui-description="Orientation of the plot - Try different settings to find the one that fits your plotter (Default: 90°)">
+                <option value="90">90°</option>
+                <option value="-90">-90°</option>
+                <option value="0">0°</option>
+                <option value="180">180°</option>
+            </param>
+            <param name="center" type="boolean" _gui-text="Center zero point" _gui-description="Check this if the plotter needs the zero point to be in the center of the drawing - Try different settings to find the one that fits your plotter (Default: Unchecked)">false</param>
+        </page>
+        <page name="misc" _gui-text="Connection">
+            <param name="serialPort" type="string" _gui-text="Serial Port" _gui-description="The port of your serial connection, on Windows something like 'COM1', on Linux something like: '/dev/ttyUSB0' (Default: COM1)">COM1</param>
+            <param name="serialBaudRate" type="optiongroup" appearance="minimal" _gui-text="Serial Baud rate" _gui-description="The Baud rate of your serial connection (Default: 9600)">
+                <option value="110">110</option>
+                <option value="300">300</option>
+                <option value="600">600</option>
+                <option value="1200">1200</option>
+                <option value="2400">2400</option>
+                <option value="4800">4800</option>
+                <option value="9600">9600</option>
+                <option value="14400">14400</option>
+                <option value="19200">19200</option>
+                <option value="28800">28800</option>
+                <option value="38400">38400</option>
+                <option value="56000">56000</option>
+                <option value="57600">57600</option>
+                <option value="115200">115200</option>
+            </param>
+            <_param name="serialHelp" type="description">This can be a physical serial connection or a virtual USB-to-Serial bridge. Ask your plotter manufacturer for drivers if needed.</_param>
+            <_param name="parallelHelp" type="description">Parallel (LPT) connections are not supported.</_param>
+        </page>
+        <page name="overcut" _gui-text="Overcut">
+            <param name="useOvercut" type="boolean" _gui-text="Use overcut" _gui-description="Check this to use the overcut, if not checked the 'Overcut' parameter is unused (Default: Checked)">true</param>
+            <param name="overcut" type="float" min="0.0" max="100.0" precision="2" _gui-text="Overcut (mm)" _gui-description="The distance in mm that will be cut over the starting point of the path to prevent open paths (Default: 1.00)">1.00</param>
+        </page>
+        <page name="toolOffset" _gui-text="Tool Offset">
+            <param name="useToolOffset" type="boolean" _gui-text="Use tool offset correction" _gui-description="Check this to use the tool offset correction, if not checked the 'Tool offset', 'Return Factor' and 'Precut' parameters are unused (Default: Checked)">true</param>
+            <param name="toolOffset" type="float" min="0.0" max="20.0" precision="2" _gui-text="Tool offset (mm)" _gui-description="The offset from the tool tip to the tool axis in mm (Default: 0.25)">0.25</param>
+            <param name="toolOffsetReturn" type="float" min="1.0" max="10.0" precision="2" _gui-text="Return factor" _gui-description="The return factor multiplied by the tool offset is the length that is used to guide the tool back to the original path after an overcut is performed, you can only determine this value by experimentation (Default: 2.50)">2.50</param>
+            <param name="precut" type="boolean" _gui-text="Use precut" _gui-description="Check this to cut a small line before the real drawing to align the tool orientation for the first cut (Default: Checked)">true</param>
+            <_param name="offsetNote" type="description">Please note that using the tool offset correction will move your drawing away from the zero point on both axes by the tool offset specified.</_param>
+        </page>
+        <page name="misc" _gui-text="Miscellaneous">
+            <param name="flat" type="float" min="0.1" max="10.0" precision="1" _gui-text="Curve flatness" _gui-description="Curves are divided into lines, this number controls how fine the curves will be reproduced, the smaller the finer (Default: '1.2')">1.2</param>
+            <param name="offsetX" type="float" min="-10000.0" max="10000.0" precision="2" _gui-text="X offset (mm)" _gui-description="The offset to move your plot away from the zero point in mm (Default: '0.00')">0.00</param>
+            <param name="offsetY" type="float" min="-10000.0" max="10000.0" precision="2" _gui-text="Y offset (mm)" _gui-description="The offset to move your plot away from the zero point in mm (Default: '0.00')">0.00</param>
+        </page>
+    </param>
+    <effect needs-live-preview="true">
+        <object-type>path</object-type>
+        <effects-menu>
+            <submenu _name="Plotter"/>
+        </effects-menu>
+    </effect>
+    <script>
+        <command reldir="extensions" interpreter="python">plotter.py</command>
+    </script>
+</inkscape-extension>
-- 
cgit v1.2.3


From 180b2dcb9d669d5fcf96547ed1a22f77e64bd79a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20W=C3=BCst?= <sebi@timewaster.de>
Date: Sun, 14 Jul 2013 22:00:32 +0200
Subject: small bugfixes

(bzr r12417.1.11)
---
 share/extensions/plotter.inx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'share/extensions/plotter.inx')

diff --git a/share/extensions/plotter.inx b/share/extensions/plotter.inx
index 0dc5a35fc..ebf675a85 100644
--- a/share/extensions/plotter.inx
+++ b/share/extensions/plotter.inx
@@ -60,7 +60,7 @@
             <param name="offsetY" type="float" min="-10000.0" max="10000.0" precision="2" _gui-text="Y offset (mm)" _gui-description="The offset to move your plot away from the zero point in mm (Default: '0.00')">0.00</param>
         </page>
     </param>
-    <effect needs-live-preview="true">
+    <effect needs-live-preview="false">
         <object-type>path</object-type>
         <effects-menu>
             <submenu _name="Plotter"/>
-- 
cgit v1.2.3


From 0cccda91e5b2d2ab5d21a6cc1365aa1c73d5bc9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20W=C3=BCst?= <sebi@timewaster.de>
Date: Thu, 3 Oct 2013 20:26:22 +0200
Subject: parser can now work with multiple pens, better exception handling

(bzr r12417.1.15)
---
 share/extensions/plotter.inx | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'share/extensions/plotter.inx')

diff --git a/share/extensions/plotter.inx b/share/extensions/plotter.inx
index ebf675a85..c837e1926 100644
--- a/share/extensions/plotter.inx
+++ b/share/extensions/plotter.inx
@@ -51,7 +51,9 @@
             <param name="useToolOffset" type="boolean" _gui-text="Use tool offset correction" _gui-description="Check this to use the tool offset correction, if not checked the 'Tool offset', 'Return Factor' and 'Precut' parameters are unused (Default: Checked)">true</param>
             <param name="toolOffset" type="float" min="0.0" max="20.0" precision="2" _gui-text="Tool offset (mm)" _gui-description="The offset from the tool tip to the tool axis in mm (Default: 0.25)">0.25</param>
             <param name="toolOffsetReturn" type="float" min="1.0" max="10.0" precision="2" _gui-text="Return factor" _gui-description="The return factor multiplied by the tool offset is the length that is used to guide the tool back to the original path after an overcut is performed, you can only determine this value by experimentation (Default: 2.50)">2.50</param>
+            <param name="space" type="description"> </param>
             <param name="precut" type="boolean" _gui-text="Use precut" _gui-description="Check this to cut a small line before the real drawing to align the tool orientation for the first cut (Default: Checked)">true</param>
+            <param name="space" type="description"> </param>
             <_param name="offsetNote" type="description">Please note that using the tool offset correction will move your drawing away from the zero point on both axes by the tool offset specified.</_param>
         </page>
         <page name="misc" _gui-text="Miscellaneous">
-- 
cgit v1.2.3


From 74ab23d467f0a8e128ae0c09f009878e49e94427 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20W=C3=BCst?= <sebi@timewaster.de>
Date: Sun, 6 Oct 2013 21:06:09 +0200
Subject: numerous optimizations, fixed bug tool offset correction calculates
 wrong points when length of line is smaller than tool offset

(bzr r12417.1.16)
---
 share/extensions/plotter.inx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'share/extensions/plotter.inx')

diff --git a/share/extensions/plotter.inx b/share/extensions/plotter.inx
index c837e1926..1232890c9 100644
--- a/share/extensions/plotter.inx
+++ b/share/extensions/plotter.inx
@@ -40,8 +40,9 @@
                 <option value="57600">57600</option>
                 <option value="115200">115200</option>
             </param>
-            <_param name="serialHelp" type="description">This can be a physical serial connection or a virtual USB-to-Serial bridge. Ask your plotter manufacturer for drivers if needed.</_param>
-            <_param name="parallelHelp" type="description">Parallel (LPT) connections are not supported.</_param>
+            <_param name="serialHelp" type="description">This can be a physical serial connection or a USB-to-Serial bridge. Ask your plotter manufacturer for drivers if needed.</_param>
+            <_param name="parallelHelp" type="description">Please note that Parallel (LPT) connections are not supported.</_param>
+            <_param name="hpglNote" type="description">Please note that only the HPGL command language is supported at the moment.</_param>
         </page>
         <page name="overcut" _gui-text="Overcut">
             <param name="useOvercut" type="boolean" _gui-text="Use overcut" _gui-description="Check this to use the overcut, if not checked the 'Overcut' parameter is unused (Default: Checked)">true</param>
-- 
cgit v1.2.3


From d88806501eed58d77af06eab96352a667d895063 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20W=C3=BCst?= <sebi@timewaster.de>
Date: Wed, 9 Oct 2013 21:35:15 +0200
Subject: small stuff

(bzr r12417.1.17)
---
 share/extensions/plotter.inx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'share/extensions/plotter.inx')

diff --git a/share/extensions/plotter.inx b/share/extensions/plotter.inx
index 1232890c9..b034fd4a5 100644
--- a/share/extensions/plotter.inx
+++ b/share/extensions/plotter.inx
@@ -9,16 +9,16 @@
     <_param name="introduction" type="description">Please make sure that all objects you want to plot are converted to paths. The plot will automatically be aligned to the zero point.</_param>
     <param name="tab" type="notebook">
         <page name="plotter" _gui-text="Plotter Settings">
-            <param name="pen" type="int" min="1" max="10" _gui-text="Pen number" _gui-description="The number of the pen (tool) to use, on most plotters 1 (Standard: '1')">1</param>
+            <param name="pen" type="int" min="0" max="10" _gui-text="Pen number" _gui-description="The number of the pen (tool) to use, on most plotters 1 (Standard: '1')">1</param>
             <param name="resolutionX" type="float" min="1.0" max="4096.0" precision="1" _gui-text="Resolution X (dpi)" _gui-description="The amount of steps the cutter moves if it moves for 1 inch on the X axis - Try different settings to find the one that fits your plotter (Default: 1016.0)">1016.0</param>
             <param name="resolutionY" type="float" min="1.0" max="4096.0" precision="1" _gui-text="Resolution Y (dpi)" _gui-description="The amount of steps the cutter moves if it moves for 1 inch on the Y axis - Try different settings to find the one that fits your plotter (Default: 1016.0)">1016.0</param>
-            <param name="mirrorX" type="boolean" _gui-text="Mirror X-axis" _gui-description="Check this to mirror the X axis - Try different settings to find the one that fits your plotter (Default: Unchecked)">false</param>
+            <param name="mirrorX" type="boolean" _gui-text="Mirror X-axis" _gui-description="Check this to mirror the X axis (Default: Unchecked)">false</param>
             <param name="mirrorY" type="boolean" _gui-text="Mirror Y-axis" _gui-description="Check this to mirror the Y axis - Try different settings to find the one that fits your plotter (Default: Unchecked)">false</param>
-            <param name="orientation" type="optiongroup" appearance="minimal" _gui-text="Orientation" _gui-description="Orientation of the plot - Try different settings to find the one that fits your plotter (Default: 90°)">
-                <option value="90">90°</option>
-                <option value="-90">-90°</option>
+            <param name="orientation" type="optiongroup" appearance="minimal" _gui-text="Orientation (CW)" _gui-description="Orientation of the plot - Try different settings to find the one that fits your plotter (Default: 0°)">
                 <option value="0">0°</option>
+                <option value="90">90°</option>
                 <option value="180">180°</option>
+                <option value="270">270°</option>
             </param>
             <param name="center" type="boolean" _gui-text="Center zero point" _gui-description="Check this if the plotter needs the zero point to be in the center of the drawing - Try different settings to find the one that fits your plotter (Default: Unchecked)">false</param>
         </page>
-- 
cgit v1.2.3


From 8bc4fd8b36f86b6a6c02a5118486bc7da999076f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20W=C3=BCst?= <sebi@timewaster.de>
Date: Sat, 19 Oct 2013 20:50:05 +0200
Subject: finished tool offset correction; optimized hpgl data; fixed texts,
 small bugs, parameters; added flow control parameter; and more

(bzr r12417.1.21)
---
 share/extensions/plotter.inx | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'share/extensions/plotter.inx')

diff --git a/share/extensions/plotter.inx b/share/extensions/plotter.inx
index b034fd4a5..dc4152180 100644
--- a/share/extensions/plotter.inx
+++ b/share/extensions/plotter.inx
@@ -40,6 +40,12 @@
                 <option value="57600">57600</option>
                 <option value="115200">115200</option>
             </param>
+            <param name="flowControl" type="optiongroup" appearance="minimal" _gui-text="Flow control" _gui-description="Software / Hardware flow control - Try different settings to find the one that fits your plotter (Default: Software)">
+                <option value="0">Software</option>
+                <option value="1">Hardware (RTS/CTS)</option>
+                <option value="2">Hardware (DSR/DTR)</option>
+            </param>
+            <param name="space" type="description"> </param>
             <_param name="serialHelp" type="description">This can be a physical serial connection or a USB-to-Serial bridge. Ask your plotter manufacturer for drivers if needed.</_param>
             <_param name="parallelHelp" type="description">Please note that Parallel (LPT) connections are not supported.</_param>
             <_param name="hpglNote" type="description">Please note that only the HPGL command language is supported at the moment.</_param>
@@ -49,10 +55,8 @@
             <param name="overcut" type="float" min="0.0" max="100.0" precision="2" _gui-text="Overcut (mm)" _gui-description="The distance in mm that will be cut over the starting point of the path to prevent open paths (Default: 1.00)">1.00</param>
         </page>
         <page name="toolOffset" _gui-text="Tool Offset">
-            <param name="useToolOffset" type="boolean" _gui-text="Use tool offset correction" _gui-description="Check this to use the tool offset correction, if not checked the 'Tool offset', 'Return Factor' and 'Precut' parameters are unused (Default: Checked)">true</param>
+            <param name="useToolOffset" type="boolean" _gui-text="Use tool offset correction" _gui-description="Check this to use the tool offset correction, if not checked the 'Tool offset' and 'Precut' parameters are unused (Default: Checked)">true</param>
             <param name="toolOffset" type="float" min="0.0" max="20.0" precision="2" _gui-text="Tool offset (mm)" _gui-description="The offset from the tool tip to the tool axis in mm (Default: 0.25)">0.25</param>
-            <param name="toolOffsetReturn" type="float" min="1.0" max="10.0" precision="2" _gui-text="Return factor" _gui-description="The return factor multiplied by the tool offset is the length that is used to guide the tool back to the original path after an overcut is performed, you can only determine this value by experimentation (Default: 2.50)">2.50</param>
-            <param name="space" type="description"> </param>
             <param name="precut" type="boolean" _gui-text="Use precut" _gui-description="Check this to cut a small line before the real drawing to align the tool orientation for the first cut (Default: Checked)">true</param>
             <param name="space" type="description"> </param>
             <_param name="offsetNote" type="description">Please note that using the tool offset correction will move your drawing away from the zero point on both axes by the tool offset specified.</_param>
-- 
cgit v1.2.3


From 873bd3de82d9d190b27f80466d64016ad3f84dc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20W=C3=BCst?= <sebi@timewaster.de>
Date: Sun, 20 Oct 2013 17:59:18 +0200
Subject: changed text

(bzr r12417.1.25)
---
 share/extensions/plotter.inx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'share/extensions/plotter.inx')

diff --git a/share/extensions/plotter.inx b/share/extensions/plotter.inx
index dc4152180..f0989ba1c 100644
--- a/share/extensions/plotter.inx
+++ b/share/extensions/plotter.inx
@@ -20,7 +20,7 @@
                 <option value="180">180°</option>
                 <option value="270">270°</option>
             </param>
-            <param name="center" type="boolean" _gui-text="Center zero point" _gui-description="Check this if the plotter needs the zero point to be in the center of the drawing - Try different settings to find the one that fits your plotter (Default: Unchecked)">false</param>
+            <param name="center" type="boolean" _gui-text="Center zero point" _gui-description="Check this if your plotter uses a centered zero point - Try different settings to find the one that fits your plotter (Default: Unchecked)">false</param>
         </page>
         <page name="misc" _gui-text="Connection">
             <param name="serialPort" type="string" _gui-text="Serial Port" _gui-description="The port of your serial connection, on Windows something like 'COM1', on Linux something like: '/dev/ttyUSB0' (Default: COM1)">COM1</param>
@@ -59,7 +59,7 @@
             <param name="toolOffset" type="float" min="0.0" max="20.0" precision="2" _gui-text="Tool offset (mm)" _gui-description="The offset from the tool tip to the tool axis in mm (Default: 0.25)">0.25</param>
             <param name="precut" type="boolean" _gui-text="Use precut" _gui-description="Check this to cut a small line before the real drawing to align the tool orientation for the first cut (Default: Checked)">true</param>
             <param name="space" type="description"> </param>
-            <_param name="offsetNote" type="description">Please note that using the tool offset correction will move your drawing away from the zero point on both axes by the tool offset specified.</_param>
+            <_param name="offsetNote" type="description">Please note that using the tool offset correction will move your plot away from the zero point by the tool offset specified.</_param>
         </page>
         <page name="misc" _gui-text="Miscellaneous">
             <param name="flat" type="float" min="0.1" max="10.0" precision="1" _gui-text="Curve flatness" _gui-description="Curves are divided into lines, this number controls how fine the curves will be reproduced, the smaller the finer (Default: '1.2')">1.2</param>
-- 
cgit v1.2.3


From ab8acd061c218268293120a933993a449461ff43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20W=C3=BCst?= <sebi@timewaster.de>
Date: Sun, 20 Oct 2013 18:00:51 +0200
Subject: changed text

(bzr r12417.1.26)
---
 share/extensions/plotter.inx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'share/extensions/plotter.inx')

diff --git a/share/extensions/plotter.inx b/share/extensions/plotter.inx
index f0989ba1c..f22df3380 100644
--- a/share/extensions/plotter.inx
+++ b/share/extensions/plotter.inx
@@ -59,7 +59,7 @@
             <param name="toolOffset" type="float" min="0.0" max="20.0" precision="2" _gui-text="Tool offset (mm)" _gui-description="The offset from the tool tip to the tool axis in mm (Default: 0.25)">0.25</param>
             <param name="precut" type="boolean" _gui-text="Use precut" _gui-description="Check this to cut a small line before the real drawing to align the tool orientation for the first cut (Default: Checked)">true</param>
             <param name="space" type="description"> </param>
-            <_param name="offsetNote" type="description">Please note that using the tool offset correction will move your plot away from the zero point by the tool offset specified.</_param>
+            <_param name="offsetNote" type="description">Please note that using the tool offset correction will move your plot away from the zero point by the tool offset.</_param>
         </page>
         <page name="misc" _gui-text="Miscellaneous">
             <param name="flat" type="float" min="0.1" max="10.0" precision="1" _gui-text="Curve flatness" _gui-description="Curves are divided into lines, this number controls how fine the curves will be reproduced, the smaller the finer (Default: '1.2')">1.2</param>
-- 
cgit v1.2.3


From 27839ab6126ade297f3e0f79f2dfa36de7964bc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20W=C3=BCst?= <sebi@timewaster.de>
Date: Sat, 26 Oct 2013 22:29:08 +0200
Subject: small changes (mainly text)

(bzr r12417.1.29)
---
 share/extensions/plotter.inx | 45 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

(limited to 'share/extensions/plotter.inx')

diff --git a/share/extensions/plotter.inx b/share/extensions/plotter.inx
index f22df3380..6aba009cf 100644
--- a/share/extensions/plotter.inx
+++ b/share/extensions/plotter.inx
@@ -8,20 +8,6 @@
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <_param name="introduction" type="description">Please make sure that all objects you want to plot are converted to paths. The plot will automatically be aligned to the zero point.</_param>
     <param name="tab" type="notebook">
-        <page name="plotter" _gui-text="Plotter Settings">
-            <param name="pen" type="int" min="0" max="10" _gui-text="Pen number" _gui-description="The number of the pen (tool) to use, on most plotters 1 (Standard: '1')">1</param>
-            <param name="resolutionX" type="float" min="1.0" max="4096.0" precision="1" _gui-text="Resolution X (dpi)" _gui-description="The amount of steps the cutter moves if it moves for 1 inch on the X axis - Try different settings to find the one that fits your plotter (Default: 1016.0)">1016.0</param>
-            <param name="resolutionY" type="float" min="1.0" max="4096.0" precision="1" _gui-text="Resolution Y (dpi)" _gui-description="The amount of steps the cutter moves if it moves for 1 inch on the Y axis - Try different settings to find the one that fits your plotter (Default: 1016.0)">1016.0</param>
-            <param name="mirrorX" type="boolean" _gui-text="Mirror X-axis" _gui-description="Check this to mirror the X axis (Default: Unchecked)">false</param>
-            <param name="mirrorY" type="boolean" _gui-text="Mirror Y-axis" _gui-description="Check this to mirror the Y axis - Try different settings to find the one that fits your plotter (Default: Unchecked)">false</param>
-            <param name="orientation" type="optiongroup" appearance="minimal" _gui-text="Orientation (CW)" _gui-description="Orientation of the plot - Try different settings to find the one that fits your plotter (Default: 0°)">
-                <option value="0">0°</option>
-                <option value="90">90°</option>
-                <option value="180">180°</option>
-                <option value="270">270°</option>
-            </param>
-            <param name="center" type="boolean" _gui-text="Center zero point" _gui-description="Check this if your plotter uses a centered zero point - Try different settings to find the one that fits your plotter (Default: Unchecked)">false</param>
-        </page>
         <page name="misc" _gui-text="Connection">
             <param name="serialPort" type="string" _gui-text="Serial Port" _gui-description="The port of your serial connection, on Windows something like 'COM1', on Linux something like: '/dev/ttyUSB0' (Default: COM1)">COM1</param>
             <param name="serialBaudRate" type="optiongroup" appearance="minimal" _gui-text="Serial Baud rate" _gui-description="The Baud rate of your serial connection (Default: 9600)">
@@ -41,25 +27,38 @@
                 <option value="115200">115200</option>
             </param>
             <param name="flowControl" type="optiongroup" appearance="minimal" _gui-text="Flow control" _gui-description="Software / Hardware flow control - Try different settings to find the one that fits your plotter (Default: Software)">
-                <option value="0">Software</option>
-                <option value="1">Hardware (RTS/CTS)</option>
-                <option value="2">Hardware (DSR/DTR)</option>
+                <option value="0">None</option>
+                <option value="1">Software</option>
+                <option value="2">Hardware</option>
             </param>
-            <param name="space" type="description"> </param>
+            <param name="space" type="description">&#xa0;</param>
             <_param name="serialHelp" type="description">This can be a physical serial connection or a USB-to-Serial bridge. Ask your plotter manufacturer for drivers if needed.</_param>
             <_param name="parallelHelp" type="description">Please note that Parallel (LPT) connections are not supported.</_param>
             <_param name="hpglNote" type="description">Please note that only the HPGL command language is supported at the moment.</_param>
         </page>
-        <page name="overcut" _gui-text="Overcut">
+        <page name="plotter" _gui-text="Plotter Settings">
+            <param name="pen" type="int" min="0" max="10" _gui-text="Pen number" _gui-description="The number of the pen (tool) to use, on most plotters 1 (Standard: '1')">1</param>
+            <param name="resolutionX" type="float" min="1.0" max="4096.0" precision="1" _gui-text="Resolution X (dpi)" _gui-description="The amount of steps the cutter moves if it moves for 1 inch on the X axis - Try different settings to find the one that fits your plotter (Default: 1016.0)">1016.0</param>
+            <param name="resolutionY" type="float" min="1.0" max="4096.0" precision="1" _gui-text="Resolution Y (dpi)" _gui-description="The amount of steps the cutter moves if it moves for 1 inch on the Y axis - Try different settings to find the one that fits your plotter (Default: 1016.0)">1016.0</param>
+            <param name="mirrorX" type="boolean" _gui-text="Mirror X-axis" _gui-description="Check this to mirror the X axis (Default: Unchecked)">false</param>
+            <param name="mirrorY" type="boolean" _gui-text="Mirror Y-axis" _gui-description="Check this to mirror the Y axis - Try different settings to find the one that fits your plotter (Default: Unchecked)">false</param>
+            <param name="orientation" type="optiongroup" appearance="minimal" _gui-text="Rotation (Clockwise)" _gui-description="Rotation of the plot - Try different settings to find the one that fits your plotter (Default: 0°)">
+                <option value="0">0°</option>
+                <option value="90">90°</option>
+                <option value="180">180°</option>
+                <option value="270">270°</option>
+            </param>
+            <param name="center" type="boolean" _gui-text="Center zero point" _gui-description="Check this if your plotter uses a centered zero point - Try different settings to find the one that fits your plotter (Default: Unchecked)">false</param>
+        </page>
+        <page name="overcutToolOffset" _gui-text="Overcut &#x26; Tool Offset">
             <param name="useOvercut" type="boolean" _gui-text="Use overcut" _gui-description="Check this to use the overcut, if not checked the 'Overcut' parameter is unused (Default: Checked)">true</param>
             <param name="overcut" type="float" min="0.0" max="100.0" precision="2" _gui-text="Overcut (mm)" _gui-description="The distance in mm that will be cut over the starting point of the path to prevent open paths (Default: 1.00)">1.00</param>
-        </page>
-        <page name="toolOffset" _gui-text="Tool Offset">
+            <param name="space" type="description">&#xa0;</param>
             <param name="useToolOffset" type="boolean" _gui-text="Use tool offset correction" _gui-description="Check this to use the tool offset correction, if not checked the 'Tool offset' and 'Precut' parameters are unused (Default: Checked)">true</param>
             <param name="toolOffset" type="float" min="0.0" max="20.0" precision="2" _gui-text="Tool offset (mm)" _gui-description="The offset from the tool tip to the tool axis in mm (Default: 0.25)">0.25</param>
             <param name="precut" type="boolean" _gui-text="Use precut" _gui-description="Check this to cut a small line before the real drawing to align the tool orientation for the first cut (Default: Checked)">true</param>
-            <param name="space" type="description"> </param>
-            <_param name="offsetNote" type="description">Please note that using the tool offset correction will move your plot away from the zero point by the tool offset.</_param>
+            <param name="space" type="description">&#xa0;</param>
+            <_param name="offsetNote" type="description">Please note that using the tool offset correction will move your plot away from the zero point by the length in mm specified by the tool offset.</_param>
         </page>
         <page name="misc" _gui-text="Miscellaneous">
             <param name="flat" type="float" min="0.1" max="10.0" precision="1" _gui-text="Curve flatness" _gui-description="Curves are divided into lines, this number controls how fine the curves will be reproduced, the smaller the finer (Default: '1.2')">1.2</param>
-- 
cgit v1.2.3


From 9d4d82ce94c327033bce64c289648c8f7b84c5e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20W=C3=BCst?= <sebi@timewaster.de>
Date: Sat, 2 Nov 2013 22:52:43 +0100
Subject: text changes

(bzr r12417.1.33)
---
 share/extensions/plotter.inx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'share/extensions/plotter.inx')

diff --git a/share/extensions/plotter.inx b/share/extensions/plotter.inx
index 6aba009cf..b950e0246 100644
--- a/share/extensions/plotter.inx
+++ b/share/extensions/plotter.inx
@@ -26,10 +26,10 @@
                 <option value="57600">57600</option>
                 <option value="115200">115200</option>
             </param>
-            <param name="flowControl" type="optiongroup" appearance="minimal" _gui-text="Flow control" _gui-description="Software / Hardware flow control - Try different settings to find the one that fits your plotter (Default: Software)">
+            <param name="flowControl" type="optiongroup" appearance="minimal" _gui-text="Flow control" _gui-description="Software / Hardware flow control - Try different settings to find the one that fits your plotter (Default: None)">
                 <option value="0">None</option>
-                <option value="1">Software</option>
-                <option value="2">Hardware</option>
+                <option value="1">Software (XON/XOFF)</option>
+                <option value="2">Hardware (RTS/CTS)</option>
             </param>
             <param name="space" type="description">&#xa0;</param>
             <_param name="serialHelp" type="description">This can be a physical serial connection or a USB-to-Serial bridge. Ask your plotter manufacturer for drivers if needed.</_param>
-- 
cgit v1.2.3