Merge branch 'master' of https://github.com/FlyRanch/figurefirst

README.md

@@ -1,7 +1,9 @@
+FigureFirst is a python library to decorate and parse SVG files so they can serve as layout documents for matplotlib figures.
+
 See our github page for readme and examples: http://flyranch.github.io/figurefirst/
 
 Read the docs: http://figurefirst.readthedocs.io/en/latest/source/figurefirst.html#module-figurefirst
 
 Read our Scipy 2017 proceedings: http://conference.scipy.org/proceedings/scipy2017/lindsay.html
 
-If you use FigureFirst, please cite the above paper to help others find FigureFirst.
+If you use FigureFirst, please cite the above paper to help others find FigureFirst.

figurefirst/__init__.py

@@ -2,4 +2,5 @@
 #reload(svg_to_axes)
 from . import mpl_functions
 from .svg_to_axes import FigureLayout
-from . import mpl_fig_to_figurefirst_svg
+from . import mpl_fig_to_figurefirst_svg
+from . import svg_util

figurefirst/svg_to_axes.py

@@ -306,6 +306,7 @@ class FFSVGText(FFSVGItem,object):
 
     def __init__(self,tagnode):
         super(FFSVGItem,self).__init__(tagnode)
+        #print 'here'
         x = float(self.node.getAttribute('x'))
         y = float(self.node.getAttribute('y'))
         self.p1 = np.array([x,y,1])
@@ -317,6 +318,7 @@ def __init__(self,tagnode):
         #self.p1 = np.array([x,y,1])
         #self.p2 = np.array([x+w,h+y,1])
         self.load_style()
+        self.load_text()
         self.node.getElementsByTagName('tspan')[0].childNodes[0]
 
     def load_style(self):
@@ -627,7 +629,10 @@ def __init__(self, layout_filename, autogenlayers=True,make_mplfigures = False,
         # it is probably best to assert that the a.r's are the same
         # for now
         #assert self.layout_user_sx == self.layout_user_sy
-        assert (np.abs(self.layout_user_sx[0] - self.layout_user_sy[0]) < figurefirst_user_parameters.rounding_tolerance) #  rounding errors are a bitch
+        if np.abs(self.layout_user_sx[0] - self.layout_user_sy[0]) > figurefirst_user_parameters.rounding_tolerance:
+            warnings.warn("""The the scaling of the user units in x and y are different and may result in unexpected 
+                            behavior. Make sure that the aspect ratio defined by the viewbox attribute of the root 
+                            SVG node is the same as that given by the document hight and width.""")
         if make_mplfigures:
             self.make_mplfigures()
 

figurefirst/svg_util.py

@@ -0,0 +1,33 @@
+#utility functions for dealing with svg files.
+
+def replace_non_unique(in_filename,out_filename,
+                       search_string = 'text_to_replace',
+                       prefix = ''):
+    """parse the document 'in_filename' and replace all 
+    instances of the string 'search_string' with the 
+    unique string 'prefix_x'.
+
+    Parameters
+    ----------
+    in_filename : name of the file to parse
+
+    out_filename : name of the file to write. If 
+        out_filename is the same as in_filename
+        then the old document will be overwritten.
+
+    search_string : target string to search and replace. Note: 
+        when applying this function to svg layout documents
+        take care that you don't target strings that are 
+        common strings in the SVG language. e.g. 'label'
+
+    prefix : the prefix will be appended with a number and used
+        to replace each occurance of the search string.
+     """
+
+    with open(in_filename,'rt') as inf:
+        strdta = inf.read()
+        slist = strdta.split(search_string)
+        outstr = ''.join([s + prefix + '_%s'%(i) for i,s in enumerate(slist[:-1])])
+        outstr += slist[-1]
+        with open(out_filename,'wt') as outf:
+            outf.write(outstr)