Merge branch 'master' into 'master'

Master commit to prkos. Test of reverse merging

See merge request prkos/inkscape!1

10 files changed, 20 insertions, 20 deletions

diff --git a/.appveyor.yml b/.appveyor.yml
index 7ecfabd77..35f8ea22c 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -8,7 +8,7 @@ environment:
     - MSYSTEM: MINGW32
 
 build_script:
-  - C:\msys64\usr\bin\pacman -Syuu --needed --noconfirm --noprogressbar
+  - C:\msys64\usr\bin\pacman -Syuu --needed --noconfirm --noprogressbar --ask=127
   - C:\msys64\usr\bin\bash --login -c "$(cygpath ${APPVEYOR_BUILD_FOLDER})/buildtools/appveyor.sh"
 
 artifacts:
diff --git a/share/extensions/empty_generic.inx b/share/extensions/empty_generic.inx
index 4a89dfec5..af72a7c5a 100644
--- a/share/extensions/empty_generic.inx
+++ b/share/extensions/empty_generic.inx
@@ -37,7 +37,7 @@
     <inkscape:_templateinfo>
       <inkscape:_name>Generic canvas...</inkscape:_name>
       <inkscape:author>Tavmjong Bah</inkscape:author>
-      <inkscape:_shortdesc>Genric canvas of chosen size.</inkscape:_shortdesc>
+      <inkscape:_shortdesc>Generic canvas of chosen size.</inkscape:_shortdesc>
       <inkscape:date>2014-10-09</inkscape:date>
       <inkscape:_keywords>empty generic canvas</inkscape:_keywords>
     </inkscape:_templateinfo>
diff --git a/share/extensions/gcodetools.py b/share/extensions/gcodetools.py
index b00e4b58f..be471136e 100755
--- a/share/extensions/gcodetools.py
+++ b/share/extensions/gcodetools.py
@@ -35,6 +35,7 @@ History of CLT changes to engraving and other functions it uses:
 12 Jun ver 208 Now scales correctly if orientation points moved or stretched.
 12 Jun ver 209. Now detect if engraving toolshape not a function of radius
                 Graphics now indicate Gcode toolpath, limited by min(tool diameter/2,max-dist)
+24 Jan 2017 Removed hard-coded scale values from orientation point calculation
 TODO Change line division to be recursive, depending on what line is touched. See line_divide
 
 
@@ -77,7 +78,6 @@ import copy
 import sys
 import time
 import cmath
-import numpy
 import codecs
 import random
 # local library
@@ -92,6 +92,12 @@ import bezmisc
 if "errormsg" not in dir(inkex):
 	inkex.errormsg = lambda msg: sys.stderr.write((unicode(msg) + "\n").encode("UTF-8"))
 
+try:
+    import numpy
+except:
+    inkex.errormsg(_("Failed to import the numpy modules. These modules are required by this extension. Please install them and try again.  On a Debian-like system this can be done with the command, sudo apt-get install python-numpy."))
+    exit()
+
 
 def bezierslopeatt(((bx0,by0),(bx1,by1),(bx2,by2),(bx3,by3)),t):
 	ax,ay,bx,by,cx,cy,x0,y0=bezmisc.bezierparameterize(((bx0,by0),(bx1,by1),(bx2,by2),(bx3,by3)))
@@ -3603,7 +3609,7 @@ class Gcodetools(inkex.Effect):
 		self.OptionParser.add_option("",   "--min-arc-radius",				action="store", type="float", 		dest="min_arc_radius", default=".1",				help="All arc having radius less than minimum will be considered as straight line")		
 
 		self.OptionParser.add_option("",   "--engraving-sharp-angle-tollerance",action="store", type="float",	dest="engraving_sharp_angle_tollerance", default="150",		help="All angles thar are less than engraving-sharp-angle-tollerance will be thought sharp")		
-		self.OptionParser.add_option("",   "--engraving-max-dist",			action="store", type="float", 		dest="engraving_max_dist", default="10",					help="Distanse from original path where engraving is not needed (usually it's cutting tool diameter)")		
+		self.OptionParser.add_option("",   "--engraving-max-dist",			action="store", type="float", 		dest="engraving_max_dist", default="10",					help="Distance from original path where engraving is not needed (usually it's cutting tool diameter)")		
 		self.OptionParser.add_option("",   "--engraving-newton-iterations", action="store", type="int", 		dest="engraving_newton_iterations", default="4",			help="Number of sample points used to calculate distance")		
 		self.OptionParser.add_option("",   "--engraving-draw-calculation-paths",action="store", type="inkbool",	dest="engraving_draw_calculation_paths", default=False,		help="Draw additional graphics to debug engraving path")		
 		self.OptionParser.add_option("",   "--engraving-cutter-shape-function",action="store", type="string", 	dest="engraving_cutter_shape_function", default="w",		help="Cutter shape function z(w). Ex. cone: w. ")
@@ -5856,26 +5862,20 @@ class Gcodetools(inkex.Effect):
 				print_("Overruding height from 100 percents to %s" % doc_height)
 			if self.options.unit == "G21 (All units in mm)" : 
 				points = [[0.,0.,self.options.Zsurface],[100.,0.,self.options.Zdepth],[0.,100.,0.]]
-				orientation_scale = 3.5433070660
-				print_("orientation_scale < 0 ===> switching to mm units=%0.10f"%orientation_scale )
 			elif self.options.unit == "G20 (All units in inches)" :
 				points = [[0.,0.,self.options.Zsurface],[5.,0.,self.options.Zdepth],[0.,5.,0.]]
-				orientation_scale = 90
-				print_("orientation_scale < 0 ===> switching to inches units=%0.10f"%orientation_scale )
 			if self.options.orientation_points_count == "2" :
 				points = points[:2]
-			print_(("using orientation scale",orientation_scale,"i=",points))
 			for i in points :
-				si = [i[0]*orientation_scale, i[1]*orientation_scale]
 				g = inkex.etree.SubElement(orientation_group, inkex.addNS('g','svg'), {'gcodetools': "Gcodetools orientation point (%s points)" % self.options.orientation_points_count})
 				inkex.etree.SubElement(	g, inkex.addNS('path','svg'), 
 					{
 						'style':	"stroke:none;fill:#000000;", 	
-						'd':'m %s,%s 2.9375,-6.343750000001 0.8125,1.90625 6.843748640396,-6.84374864039 0,0 0.6875,0.6875 -6.84375,6.84375 1.90625,0.812500000001 z z' % (si[0], -si[1]+doc_height),
+						'd':'m %s,%s 2.9375,-6.343750000001 0.8125,1.90625 6.843748640396,-6.84374864039 0,0 0.6875,0.6875 -6.84375,6.84375 1.90625,0.812500000001 z z' % (i[0], -i[1]+doc_height),
 						'gcodetools': "Gcodetools orientation point arrow"
 					})
 
-				draw_text("(%s; %s; %s)" % (i[0],i[1],i[2]), (si[0]+10), (-si[1]-10+doc_height), group = g, gcodetools_tag = "Gcodetools orientation point text")
+				draw_text("(%s; %s; %s)" % (i[0],i[1],i[2]), (i[0]+10), (-i[1]-10+doc_height), group = g, gcodetools_tag = "Gcodetools orientation point text")
 
 		
 ################################################################################
diff --git a/share/extensions/polyhedron_3d.py b/share/extensions/polyhedron_3d.py
index 4f8462782..cc2e0722f 100755
--- a/share/extensions/polyhedron_3d.py
+++ b/share/extensions/polyhedron_3d.py
@@ -193,7 +193,7 @@ def get_darkened_colour( (r,g,b), factor):
                 + "%02X" % floor( factor*b ) #make the colour string
 
 def make_rotation_log(options):
-#makes a string recording the axes and angles of each roation, so an object can be repeated
+#makes a string recording the axes and angles of each rotation, so an object can be repeated
     return   options.r1_ax+str('%.2f'%options.r1_ang)+':'+\
              options.r2_ax+str('%.2f'%options.r2_ang)+':'+\
              options.r3_ax+str('%.2f'%options.r3_ang)+':'+\
diff --git a/src/extension/dependency.cpp b/src/extension/dependency.cpp
index b83c5380f..5e843ee11 100644
--- a/src/extension/dependency.cpp
+++ b/src/extension/dependency.cpp
@@ -104,7 +104,7 @@ Dependency::~Dependency (void)
     \return  Whether or not the dependency passes.
 
     This function depends largely on all of the enums.  The first level
-    that is evaluted is the \c _type.
+    that is evaluated is the \c _type.
 
     If the type is \c TYPE_EXTENSION then the id for the extension is
     looked up in the database.  If the extension is found, and it is
diff --git a/src/extension/effect.h b/src/extension/effect.h
index 143243a2e..f6eff09b1 100644
--- a/src/extension/effect.h
+++ b/src/extension/effect.h
@@ -45,7 +45,7 @@ class Effect : public Extension {
     void merge_menu (Inkscape::XML::Node * base, Inkscape::XML::Node * start, Inkscape::XML::Node * patern, Inkscape::XML::Node * mergee);
 
     /** \brief  This is the verb type that is used for all effect's verbs.
-                It provides convience functions and maintains a pointer
+                It provides convenience functions and maintains a pointer
                 back to the effect that created it.  */
     class EffectVerb : public Inkscape::Verb {
         private:
diff --git a/src/prefix.h b/src/prefix.h
index bdf3b6df4..ac3138ae6 100644
--- a/src/prefix.h
+++ b/src/prefix.h
@@ -44,7 +44,7 @@ extern "C" {
 #define br_prepend_prefix BR_NAMESPACE(br_prepend_prefix)
 
 #ifndef BR_NO_MACROS
-	/* These are convience macros that replace the ones usually used
+	/* These are convenience macros that replace the ones usually used
 	   in Autoconf/Automake projects */
 	#undef SELFPATH
 	#undef PREFIX
diff --git a/src/splivarot.cpp b/src/splivarot.cpp
index 7daaefdfa..cbb51f312 100644
--- a/src/splivarot.cpp
+++ b/src/splivarot.cpp
@@ -281,7 +281,7 @@ sp_pathvector_boolop(Geom::PathVector const &pathva, Geom::PathVector const &pat
         free(toCut);
     } else if ( bop == bool_op_cut ) {
         // il faut appeler pour desallouer PointData (pas vital, mais bon)
-        // the Booleen() function did not deallocated the point_data array in theShape, because this
+        // the Booleen() function did not deallocate the point_data array in theShape, because this
         // function needs it.
         // this function uses the point_data to get the winding number of each path (ie: is a hole or not)
         // for later reconstruction in objects, you also need to extract which path is parent of holes (nesting info)
@@ -659,7 +659,7 @@ BoolOpErrors Inkscape::ObjectSet::pathBoolOp(bool_op bop, const bool skip_undo,
         free(toCut);
     } else if ( bop == bool_op_cut ) {
         // il faut appeler pour desallouer PointData (pas vital, mais bon)
-        // the Booleen() function did not deallocated the point_data array in theShape, because this
+        // the Booleen() function did not deallocate the point_data array in theShape, because this
         // function needs it.
         // this function uses the point_data to get the winding number of each path (ie: is a hole or not)
         // for later reconstruction in objects, you also need to extract which path is parent of holes (nesting info)
diff --git a/src/svg-profile.h b/src/svg-profile.h
index 0baaf08e5..f312662d2 100644
--- a/src/svg-profile.h
+++ b/src/svg-profile.h
@@ -127,7 +127,7 @@ private:
                 return false;
             }
 
-            /** \brief A convience function to set a particular bit in the
+            /** \brief A convenience function to set a particular bit in the
                        bitfield
 
                 This function first find which integer the bit is in by
diff --git a/src/verbs.cpp b/src/verbs.cpp
index 38eff98ea..0e57063dc 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -575,7 +575,7 @@ SPAction *TextVerb::make_action(Inkscape::ActionContext const & context)
 }
 
 /**
- * A quick little convience function to make building actions
+ * A quick little convenience function to make building actions
  * a little bit easier.
  *
  * This function does a couple of things.  The most obvious is that