Fixed font family and size on print

geosolutions-it · May 23, 2017 · a653fe5 · a653fe5
1 parent 8956ff3
commit a653fe5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/web/client/components/print/Font.jsx b/web/client/components/print/Font.jsx
@@ -15,6 +15,7 @@ const Font = React.createClass({
         fonts: React.PropTypes.array,
         label: React.PropTypes.string,
         onChangeFamily: React.PropTypes.func,
+        onChangeName: React.PropTypes.func,
         onChangeSize: React.PropTypes.func,
         onChangeBold: React.PropTypes.func,
         onChangeItalic: React.PropTypes.func,
@@ -28,6 +29,7 @@ const Font = React.createClass({
             fonts: ['Verdana', 'Serif', 'SansSerif', 'Arial', 'Courier New', 'Tahoma', 'Times New Roman'],
             label: 'Font',
             onChangeFamily: () => {},
+            onChangeName: () => {},
             onChangeSize: () => {},
             family: '',
             size: 8,
@@ -37,9 +39,10 @@ const Font = React.createClass({
     },
     onChangeFamily(family) {
         this.props.onChangeFamily(family);
+        this.props.onChangeName(family);
     },
-    onChangeSize(size) {
-        this.props.onChangeSize(size);
+    onChangeSize(e) {
+        this.props.onChangeSize(parseFloat(e.target.value));
     },
     render() {
         return (

diff --git a/web/client/plugins/print/index.js b/web/client/plugins/print/index.js
@@ -119,6 +119,7 @@ const Font = connect((state) => ({
     italic: state.print && state.print.spec && state.print.spec.italic
 }), {
     onChangeFamily: setPrintParameter.bind(null, 'fontFamily'),
+    onChangeName: setPrintParameter.bind(null, 'fontName'),
     onChangeSize: setPrintParameter.bind(null, 'fontSize'),
     onChangeBold: setPrintParameter.bind(null, 'bold'),
     onChangeItalic: setPrintParameter.bind(null, 'italic')

diff --git a/web/client/utils/PrintUtils.js b/web/client/utils/PrintUtils.js
@@ -206,7 +206,7 @@ const PrintUtils = {
                                  width: spec.iconSize,
                                  minSymbolSize: spec.iconSize,
                                  fontFamily: spec.fontFamily,
-                                 LEGEND_OPTIONS: "forceLabels:" + (spec.forceLabels ? "on" : "") + ";fontAntialiasing:" + spec.antiAliasing + ";dpi:" + spec.legendDpi + ";fontStyle:" + (spec.bold && "bold" || (spec.italic && "italic") || ''),
+                                 LEGEND_OPTIONS: "forceLabels:" + (spec.forceLabels ? "on" : "") + ";fontAntialiasing:" + spec.antiAliasing + ";dpi:" + spec.legendDpi + ";fontStyle:" + (spec.bold && "bold" || (spec.italic && "italic") || '') + ";fontName:" + spec.fontFamily + ";fontSize:" + spec.fontSize,
                                  format: "image/png",
                                  ...assign({}, layer.params)
                              }