From: johanengelen <johanengelen@users.sourceforge.net>
Date: Fri, 24 Nov 2006 21:36:32 +0000 (+0000)
Subject: Added  "multiply x-range with 2*pi" option to function plotter for easier use
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ff1686586f92b1d23d6303765a9cffee59fd7fef;p=inkscape.git

Added  "multiply x-range with 2*pi" option to function plotter for easier use
---

diff --git a/share/extensions/funcplot.inx b/share/extensions/funcplot.inx
index a7318ccbf..5c9ba6230 100644
--- a/share/extensions/funcplot.inx
+++ b/share/extensions/funcplot.inx
@@ -7,6 +7,7 @@
 	    <page name="sampling" _gui-text="Sampling">
 	        <param name="xstart" type="float" min="-1000.0" max="1000.0" _gui-text="Start x-value">0.0</param>
 	        <param name="xend" type="float" min="-1000.0" max="1000.0" _gui-text="End x-value">1.0</param>
+         	<param name="times2pi" type="boolean" _gui-text="Multiply x-range by 2*pi">false</param>
 	        <param name="ybottom" type="float" min="-1000.0" max="1000.0" _gui-text="y-value of rectangle's bottom">0.0</param>
 	        <param name="ytop" type="float" min="-1000.0" max="1000.0" _gui-text="y-value of rectangle's top">1.0</param>
 	        <param name="samples" type="int" min="2" max="1000" _gui-text="Samples">8</param>
diff --git a/share/extensions/funcplot.py b/share/extensions/funcplot.py
index f555bb612..d4154dfe7 100644
--- a/share/extensions/funcplot.py
+++ b/share/extensions/funcplot.py
@@ -25,8 +25,12 @@ from math import *
 from random import *
 
 def drawfunction(xstart, xend, ybottom, ytop, samples, width, height, left, top, 
-    fx = "sin(x)", fpx = "cos(x)", fponum = True):
-
+    fx = "sin(x)", fpx = "cos(x)", fponum = True, times2pi = False):
+    
+    if times2pi == True:
+        xstart = 2 * pi * xstart
+        xend   = 2 * pi * xend   
+    
     # step is the distance between nodes on x
     step = (xend - xstart) / (samples-1)
     third = step / 3.0
@@ -83,6 +87,10 @@ class FuncPlot(inkex.Effect):
                         action="store", type="float", 
                         dest="xend", default=1.0,
                         help="End x-value")
+        self.OptionParser.add_option("--times2pi",
+                        action="store", type="inkbool", 
+                        dest="times2pi", default=True,
+                        help="Multiply x-range by 2*pi")    
         self.OptionParser.add_option("--ybottom",
                         action="store", type="float", 
                         dest="ybottom", default=-1.0,
@@ -144,7 +152,8 @@ class FuncPlot(inkex.Effect):
                                 w,h,x,y,
                                 self.options.fofx, 
                                 self.options.fpofx,
-                                self.options.fponum)))
+                                self.options.fponum,
+                                self.options.times2pi)))
                 newpath.setAttribute('title', self.options.fofx)
                 
                 #newpath.setAttribute('desc', '!func;' + self.options.fofx + ';'