From 66cfb9bac3b3d9b6ea8867e72629cc0a2f5a24ee Mon Sep 17 00:00:00 2001
From: Mario Voigt <mario.voigt@stadtfabrikanten.org>
Date: Thu, 28 Sep 2023 20:25:05 +0200
Subject: [PATCH] Fixes in chip_scratches. Add better support for fine grained
 settings

---
 .../chip_scratches/chip_scratches.inx         | 26 +++++++++----------
 .../chip_scratches/chip_scratches.py          | 12 ++++-----
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/extensions/fablabchemnitz/chip_scratches/chip_scratches.inx b/extensions/fablabchemnitz/chip_scratches/chip_scratches.inx
index 566a3de..2b122a9 100644
--- a/extensions/fablabchemnitz/chip_scratches/chip_scratches.inx
+++ b/extensions/fablabchemnitz/chip_scratches/chip_scratches.inx
@@ -8,31 +8,31 @@
             <param name="pgsizep" type="bool" gui-text="Default rectangle to page size?">true</param>
             <param name="rx" type="int" max="10000" gui-text="Width">1000</param>
             <param name="ry" type="int" max="10000" gui-text="Height">1000</param>
-            <param name="mainSize" type="float" max="100.0" gui-text="Size of objects">1.0</param>
-            <param name="mainNum" type="int" max="5000" gui-text="Number of objects">200</param>
+            <param name="mainSize" type="float" max="100.0" precision="3" gui-text="Size of objects (scale factor)">1.000</param>
+            <param name="mainNum" type="int" max="5000" gui-text="Number of objects (acts as multiplicator)">1</param>
         </page>
         <page name="Scratches" gui-text="Scratches">
             <param name="honp" type="bool" gui-text="Enable scratches">true</param>
-            <param name="hsize" type="float" max="100.0" min="-100.0" gui-text="Size of scratches">2.0</param>
-            <param name="hgrow" type="float" max="100.0" min="-100.0" gui-text="Grow scratches with distance">0.0</param>
-            <param name="hnum" type="float" max="100.0" gui-text="Number of scratches">0.2</param>
+            <param name="hsize" type="float" max="100.0" min="-100.0" precision="3" gui-text="Size of scratches">2.000</param>
+            <param name="hgrow" type="float" max="100.0" min="-100.0" precision="3" gui-text="Grow scratches with distance">0.000</param>
+            <param name="hnum" type="int" max="100.0" gui-text="Number of scratches">10</param>
             <param name="hrad" type="bool" gui-text="Angle scratches toward center">false</param>
-            <param name="hang" type="float" max="180.0" min="-180.0" gui-text="Angle from radius">90.</param>
-            <param name="hcurve" type="float" max="100.0" min="-100.0" gui-text="Change angle with distance">0.0</param>
+            <param name="hang" type="float" max="180.0" min="-180.0" precision="3" gui-text="Angle from radius">90.00</param>
+            <param name="hcurve" type="float" max="100.0" min="-100.0" precision="3" gui-text="Change angle with distance">0.000</param>
             <param name="hgrad" type="bool" gui-text="Use density gradient">false</param>
         </page>
         <page name="Chips" gui-text="Chips">
             <param name="conp" type="bool" gui-text="Enable chips">true</param>
-            <param name="csize" type="float" max="100.0" min="-100.0" gui-text="Size of chips">1.0</param>
-            <param name="cgrow" type="float" max="100.0" min="-100.0" gui-text="Grow chips with distance">0.0</param>
-            <param name="cnum" type="float" max="100.0" gui-text="Number of chips">1.0</param>
+            <param name="csize" type="float" max="100.0" min="-100.0" precision="3" gui-text="Size of chips">1.000</param>
+            <param name="cgrow" type="float" max="100.0" min="-100.0" precision="3" gui-text="Grow chips with distance">0.000</param>
+            <param name="cnum" type="int" max="100.0" gui-text="Number of chips">10</param>
             <param name="cgrad" type="bool" gui-text="Use density gradient">false</param>
         </page>
         <page name="Specks" gui-text="Specks">
             <param name="sonp" type="bool" gui-text="Enable specks">true</param>
-            <param name="ssize" type="float" max="100.0" min="-100.0" gui-text="Size of specks">1.0</param>
-            <param name="sgrow" type="float" max="100.0" min="-100.0" gui-text="Grow specks with distance">0.0</param>
-            <param name="snum" type="float" max="100.0" gui-text="Number of specks">10.0</param>
+            <param name="ssize" type="float" max="100.0" min="-100.0" precision="3" gui-text="Size of specks">1.000</param>
+            <param name="sgrow" type="float" max="100.0" min="-100.0" precision="3" gui-text="Grow specks with distance">0.000</param>
+            <param name="snum" type="int" max="100.0" gui-text="Number of specks">10</param>
             <param name="sgrad" type="bool" gui-text="Use density gradient">false</param>
         </page>
     </param>
diff --git a/extensions/fablabchemnitz/chip_scratches/chip_scratches.py b/extensions/fablabchemnitz/chip_scratches/chip_scratches.py
index 3b3a446..a1ea011 100644
--- a/extensions/fablabchemnitz/chip_scratches/chip_scratches.py
+++ b/extensions/fablabchemnitz/chip_scratches/chip_scratches.py
@@ -90,7 +90,7 @@ for number and size, as well as some specific to each type.
         pars.add_argument("--honp", type=inkex.Boolean, help="Enable scratches")
         pars.add_argument("--hsize", type=float, default=2.0, help="Size of scratches")
         pars.add_argument("--hgrow", type=float, default=0.0, help="Grow scratches with distance")
-        pars.add_argument("--hnum", type= float, default=0.2, help="Number of scratches")
+        pars.add_argument("--hnum", type= int, default=10, help="Number of scratches")
         pars.add_argument("--hrad", type=inkex.Boolean, default=False, help="Angle scratches toward center")
         pars.add_argument("--hang", type= float, default=90.0, help="Angle from radius")
         pars.add_argument("--hcurve", type= float, default=0.0, help="Change angle with distance")
@@ -98,12 +98,12 @@ for number and size, as well as some specific to each type.
         pars.add_argument("--conp", type=inkex.Boolean, default=True, help="Enable chips")
         pars.add_argument("--csize", type= float, default=1.0, help="Size of chips")
         pars.add_argument("--cgrow", type= float, default=0.0, help="Grow chips with distance")
-        pars.add_argument("--cnum", type= float, default=1.0, help="Number of chips")
+        pars.add_argument("--cnum", type= int, default=10, help="Number of chips")
         pars.add_argument("--cgrad", type=inkex.Boolean, default=False, help="Use density gradient")
         pars.add_argument("--sonp", type=inkex.Boolean, default=True, help="Enable specks")
         pars.add_argument("--ssize", type= float, default=1.0, help="Size of specks")
         pars.add_argument("--sgrow", type= float, default=0.0, help="Grow specks with distance")
-        pars.add_argument("--snum", type= float, default=10.0, help="Number of specks")
+        pars.add_argument("--snum", type= int, default=10, help="Number of specks")
         pars.add_argument("--sgrad", type=inkex.Boolean, default=False, help="Use density gradient")
         pars.add_argument("--Nmain", "--Overall")
 		
@@ -124,7 +124,7 @@ for number and size, as well as some specific to each type.
             'ry' :   ry,
             'size' : self.options.mainSize * self.options.hsize,
             'enable' : self.options.honp,
-            'num' :  int( self.options.mainNum * self.options.hnum ),
+            'num' :  self.options.mainNum * self.options.hnum,
             'grow' : self.options.hgrow,
             'radial' : self.options.hrad,
             'ang' : self.options.hang,
@@ -141,7 +141,7 @@ for number and size, as well as some specific to each type.
             'ry' :   ry,
             'size' : self.options.mainSize * self.options.csize,
             'enable' : self.options.conp,
-            'num' :  int( self.options.mainNum * self.options.cnum ),
+            'num' :  self.options.mainNum * self.options.cnum,
             'grow' : self.options.cgrow,
             'radial' : False,
             'ang' : False,
@@ -158,7 +158,7 @@ for number and size, as well as some specific to each type.
             'ry' :   ry,
             'size' : self.options.mainSize * self.options.ssize,
             'enable' : self.options.sonp,
-            'num' :  int( self.options.mainNum * self.options.snum ),
+            'num' :  self.options.mainNum * self.options.snum,
             'grow' : self.options.sgrow,
             'radial' : False,
             'ang' : False,