From c37bac565d73ab069263873307286eb19641b99c Mon Sep 17 00:00:00 2001
From: Nicolas Dufour <nicoduf@yahoo.fr>
Date: Sun, 7 Oct 2012 19:41:26 +0200
Subject: Translations. Fix for Bug #425202 (Script messages not translated).

(bzr r11749)
---
 share/extensions/funcplot.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'share/extensions/funcplot.py')

diff --git a/share/extensions/funcplot.py b/share/extensions/funcplot.py
index a868e92a4..a3a810028 100755
--- a/share/extensions/funcplot.py
+++ b/share/extensions/funcplot.py
@@ -25,11 +25,15 @@ Changes:
  * 21-Jun-2007: Tavmjong: Added polar coordinates
 
 '''
-import inkex, simplepath, simplestyle
+# standard library
 from math import *
 from random import *
-import gettext
-_ = gettext.gettext
+# local library
+import inkex
+import simplepath
+import simplestyle
+
+inkex.localize()
 
 def drawfunction(xstart, xend, ybottom, ytop, samples, width, height, left, bottom, 
     fx = "sin(x)", fpx = "cos(x)", fponum = True, times2pi = False, polar = False, isoscale = True, drawaxis = True, endpts = False):
-- 
cgit v1.2.3


From 398b8c550b6ece8e389cf263615c6463c50bbf0f Mon Sep 17 00:00:00 2001
From: Alvin Penner <penner@vaxxine.com>
Date: Tue, 23 Oct 2012 17:40:02 -0400
Subject: extensions. function plotter. prevent divide by zero. (Bug 1064863)

Fixed bugs:
  - https://launchpad.net/bugs/1064863

(bzr r11824)
---
 share/extensions/funcplot.py | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'share/extensions/funcplot.py')

diff --git a/share/extensions/funcplot.py b/share/extensions/funcplot.py
index a3a810028..08ac15dbb 100755
--- a/share/extensions/funcplot.py
+++ b/share/extensions/funcplot.py
@@ -43,6 +43,9 @@ def drawfunction(xstart, xend, ybottom, ytop, samples, width, height, left, bott
         xend   = 2 * pi * xend   
       
     # coords and scales based on the source rect
+    if xstart == xend:
+        inkex.errormsg(_("x-interval cannot be zero. Please modify 'Start X' or 'End X'"))
+        return []
     scalex = width / (xend - xstart)
     xoff = left
     coordx = lambda x: (x - xstart) * scalex + xoff  #convert x-value to coordinate
@@ -52,6 +55,9 @@ def drawfunction(xstart, xend, ybottom, ytop, samples, width, height, left, bott
         polar_scalex = width/2.0
         coordx = lambda x: x * polar_scalex + centerx  #convert x-value to coordinate
 
+    if ytop == ybottom:
+        inkex.errormsg(_("y-interval cannot be zero. Please modify 'Y top' or 'Y bottom'"))
+        return []
     scaley = height / (ytop - ybottom)
     yoff = bottom
     coordy = lambda y: (ybottom - y) * scaley + yoff  #convert y-value to coordinate
-- 
cgit v1.2.3


From 2b08d8b3cc50015423e45effabdb43e71c59621a Mon Sep 17 00:00:00 2001
From: Alvin Penner <penner@vaxxine.com>
Date: Sun, 23 Dec 2012 21:21:36 -0500
Subject: extensions. function plotter. patch by ~suv for clip rectangle (Bug
 492103)

Fixed bugs:
  - https://launchpad.net/bugs/492103

(bzr r11977)
---
 share/extensions/funcplot.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'share/extensions/funcplot.py')

diff --git a/share/extensions/funcplot.py b/share/extensions/funcplot.py
index 08ac15dbb..7f8fdafe1 100755
--- a/share/extensions/funcplot.py
+++ b/share/extensions/funcplot.py
@@ -28,6 +28,7 @@ Changes:
 # standard library
 from math import *
 from random import *
+from copy import deepcopy
 # local library
 import inkex
 import simplepath
@@ -217,6 +218,10 @@ class FuncPlot(inkex.Effect):
                         action="store", type="string", 
                         dest="fpofx", default="cos(x)",
                         help="f'(x) for plotting") 
+        self.OptionParser.add_option("--clip",
+                        action="store", type="inkbool",
+                        dest="clip", default=False,
+                        help="If True, clip with copy of source rectangle")
         self.OptionParser.add_option("--remove",
                         action="store", type="inkbool", 
                         dest="remove", default=True,
@@ -293,6 +298,16 @@ class FuncPlot(inkex.Effect):
                                 
                 # add path into SVG structure
                 node.getparent().append(newpath)
+                # option whether to clip the path with rect or not.
+                if self.options.clip:
+                    defs = self.xpathSingle('/svg:svg//svg:defs')
+                    if defs == None:
+                        defs = inkex.etree.SubElement(self.document.getroot(),inkex.addNS('defs','svg'))
+                    clip = inkex.etree.SubElement(defs,inkex.addNS('clipPath','svg'))
+                    clip.append(deepcopy(node))
+                    clipId = self.uniqueId('clipPath')
+                    clip.set('id', clipId)
+                    newpath.set('clip-path', 'url(#'+clipId+')')
                 # option wether to remove the rectangle or not.
                 if self.options.remove:
                     node.getparent().remove(node)
-- 
cgit v1.2.3