x, y and y1 titles are interpreted as LaTeX strings. For #1643.

Author: highperformancecoder

gui-js/libs/shared/src/lib/backend/minsky.ts

@@ -1766,10 +1766,10 @@ export class PlotWidget extends Item {
   updateIcon(a1: number): void {return this.callMethod('updateIcon',a1);}
   vectorRender(a1: number,a2: minsky__dummy): object {return this.callMethod('vectorRender',a1,a2);}
   width(): number {return this.callMethod('width');}
-  xlabel(...args: string[]): string {return this.callMethod('xlabel',...args);}
+  xlabel(...args: any[]): string {return this.callMethod('xlabel',...args);}
   xtickAngle(...args: number[]): number {return this.callMethod('xtickAngle',...args);}
-  y1label(...args: string[]): string {return this.callMethod('y1label',...args);}
-  ylabel(...args: string[]): string {return this.callMethod('ylabel',...args);}
+  y1label(...args: any[]): string {return this.callMethod('y1label',...args);}
+  ylabel(...args: any[]): string {return this.callMethod('ylabel',...args);}
   zoom(a1: number,a2: number,a3: number): void {return this.callMethod('zoom',a1,a2,a3);}
 }
 

model/plotWidget.cc

@@ -89,7 +89,7 @@ namespace minsky
     double w=iWidth()*z, h=iHeight()*z;
 
     // if any titling, draw an extra bounding box (ticket #285)
-    if (!title.empty()||!xlabel.empty()||!ylabel.empty()||!y1label.empty())
+    if (!title.empty()||!xlabel().empty()||!ylabel().empty()||!y1label().empty())
       {
         cairo_rectangle(cairo,-0.5*w+10,-0.5*h,w-20,h-10);
         cairo_set_line_width(cairo,1);
@@ -109,7 +109,7 @@ namespace minsky
         pango.setFontSize(fabs(fy));
         pango.setMarkup(latexToPango(title));   
         cairo_set_source_rgb(cairo,0,0,0);
-        cairo_move_to(cairo,0.5*(w-pango.width()), 0/*pango.height()*/);
+        cairo_move_to(cairo,0.5*(w-pango.width()), 0);
         pango.show();
 
         // allow some room for the title

model/plotWidget.h

@@ -22,6 +22,7 @@
 #include "renderNativeWindow.h"
 #include <TCL_obj_base.h>
 #include "classdesc_access.h"
+#include "latexMarkup.h"
 #include "plot.h"
 #include "variable.h"
 #include "variableValue.h"
@@ -62,6 +63,10 @@ namespace minsky
 
     bool xIsSecsSinceEpoch=false;
     bool redraw(int, int, int, int) override;
+
+    // shadow labels, so we can interpret as LaTeX code rather than Pango markup
+    std::string m_xlabel, m_ylabel, m_y1label;
+    
   public:
     using Item::x;
     using Item::y;
@@ -95,7 +100,24 @@ namespace minsky
 
     const PlotWidget* plotWidgetCast() const override {return this;}
     PlotWidget* plotWidgetCast() override {return this;}          
-    
+
+    /// shadowed label commands to allow latex intepretation
+    const std::string& xlabel() const {return m_xlabel;}
+    const std::string& xlabel(const std::string& x) {
+      ecolab::Plot::xlabel=latexToPangoNonItalicised(x);
+      return m_xlabel=x;
+    }
+    const std::string& ylabel() const {return m_ylabel;}
+    const std::string& ylabel(const std::string& x) {
+      ecolab::Plot::ylabel=latexToPangoNonItalicised(x);
+      return m_ylabel=x;
+    }
+    const std::string& y1label() const {return m_y1label;}
+    const std::string& y1label(const std::string& x) {
+      ecolab::Plot::y1label=latexToPangoNonItalicised(x);
+      return m_y1label=x;
+    }
+   
     void addPlotPt(double t); ///< add another plot point
     void updateIcon(double t) override {addPlotPt(t);}
     /// add vector/tensor curves to plot

schema/schema3.cc

@@ -495,9 +495,9 @@ namespace schema3
         if (y.ypercent) x1->percent=*y.ypercent;
         if (y.plotTabDisplay) x1->plotTabDisplay=*y.plotTabDisplay;
         if (y.plotType) x1->plotType=*y.plotType;
-        if (y.xlabel) x1->xlabel=*y.xlabel;
-        if (y.ylabel) x1->ylabel=*y.ylabel;
-        if (y.y1label) x1->y1label=*y.y1label;
+        if (y.xlabel) x1->xlabel(*y.xlabel);
+        if (y.ylabel) x1->ylabel(*y.ylabel);
+        if (y.y1label) x1->y1label(*y.y1label);
         if (y.nxTicks) x1->nxTicks=*y.nxTicks;
         if (y.nyTicks) x1->nyTicks=*y.nyTicks;
         if (y.xtickAngle) x1->xtickAngle=*y.xtickAngle;

schema/schema3.h

@@ -187,7 +187,7 @@ namespace schema3
       ItemBase(id,static_cast<const minsky::Item&>(p),ports), name(p.title),
       logx(p.logx), logy(p.logy), ypercent(p.percent), plotTabDisplay(p.plotTabDisplay),
       plotType(p.plotType),
-      xlabel(p.xlabel), ylabel(p.ylabel), y1label(p.y1label),
+      xlabel(p.xlabel()), ylabel(p.ylabel()), y1label(p.y1label()),
       nxTicks(p.nxTicks), nyTicks(p.nyTicks), xtickAngle(p.xtickAngle),
       exp_threshold(p.exp_threshold), legendGeometry(LegendGeometry(p)), palette(p.palette)
     {