Rebase + minor patch for header width at small scale

Author: clittle

layers/exporters/svg_objects.py

@@ -74,6 +74,7 @@ def _findSpace(words, width, height, maxFontSize):
     fitTextHeight = min(breakTextHeight, height) * 0.8
 
     longestWordLength = -9999
+    fitTextWidth = 9999
     for w in range(0, len(words)):
         word = words[w]
         longestWordLength = max(longestWordLength, len(word))
@@ -220,7 +221,7 @@ def build(height, width, label, config, variant='text', t1text=None, t2text=None
             upper = G(tx=0, ty=2.1)
             internal.append(upper)
             if t1text is not None:
-                fs, patch_text = _optimalFontSize(t1text, width, (height-80/2), maxFontSize=28)
+                fs, patch_text = _optimalFontSize(t1text, width, (height-5)/2, maxFontSize=28)
                 lines = len(patch_text)
                 y = (height-5)/4 + 2.1
                 if lines > 1:

layers/exporters/svg_templates.py

@@ -5,12 +5,14 @@
 
 try:
     from exporters.matrix_gen import MatrixGen
-    from exporters.svg_objects import G, SVG_HeaderBlock, SVG_Technique, Text, convertToPx,_optimalFontSize
+    from exporters.svg_objects import G, SVG_HeaderBlock, SVG_Technique, Text, convertToPx,_optimalFontSize, \
+        _getstringwidth
     from core.gradient import Gradient
     from core.filter import Filter
 except ModuleNotFoundError:
     from ..exporters.matrix_gen import MatrixGen
-    from ..exporters.svg_objects import G, SVG_HeaderBlock, SVG_Technique, Text, convertToPx, _optimalFontSize
+    from ..exporters.svg_objects import G, SVG_HeaderBlock, SVG_Technique, Text, convertToPx, _optimalFontSize, \
+        _getstringwidth
     from ..core.gradient import Gradient
     from ..core.filter import Filter
 
@@ -232,7 +234,6 @@ def export(self, showName, showID, lhandle, config, sort=0, scores=[], colors=[]
         tech_height = (convertToPx(config.height, config.unit) - header_offset -
                        convertToPx(config.border, config.unit)) / max(lengths)
         incre = tech_width + 10
-        set = 0
         for x in self.codex:
             disp = ''
             if showName and showID:
@@ -243,12 +244,11 @@ def export(self, showName, showID, lhandle, config, sort=0, scores=[], colors=[]
                 disp = x.tactic.id
 
             g = G(tx=index, ty=header_offset)
-            gt = G(tx=(tech_width / 2) + 2)
+
             index += incre
             fs, _ = _optimalFontSize(disp, tech_width, tech_height+10, maxFontSize=28)
-            if set == 0:
-                set = fs
-            tx = Text(ctype='TacticName', font_size=set, text=disp, position='middle')
+            tx = Text(ctype='TacticName', font_size=fs, text=disp, position='middle')
+            gt = G(tx=(tech_width)/2)
             gt.append(tx)
             a = self.get_tactic(x, tech_height, tech_width, colors=colors, subtechs=subtechs, exclude=exclude,
                                 mode=(showName, showID), scores=scores, config=config)