Y axis labels improvement in combined electronic structure diagrams (Issue 97)

client/bundle.js

@@ -3842,6 +3842,16 @@
 	  }
 
 
+	  setExternalYAxisMax(externalYAxisMax){
+	    this.externalYAxisMax = externalYAxisMax;
+	  }
+
+
+	  getYAxisMax(){
+	    return this.yAxisMax;
+	  }
+
+
 	  repaint(){
 	    // repaint Y axis
 	    this._resetYAxisLabelGroup();
@@ -3852,6 +3862,8 @@
 
 	    let min = Math.floor(this.yMin/yLabelGap)*yLabelGap;
 	    let max = Math.ceil(this.yMax/yLabelGap)*yLabelGap;
+	    this.yAxisMax = max;
+	    if (this.externalYAxisMax !== undefined) max = this.externalYAxisMax;
 
 	    if (this.yLabelText !== null) {
 	      for (let i = min; i < max+1; i = i + yLabelGap) {
@@ -6285,7 +6297,7 @@
 	 */
 
 	 /*
-	  Implements a graphical UI component composed of a DOS plotter and a 
+	  Implements a graphical UI component composed of a DOS plotter and a
 	  Band Structure plotter
 	 */
 
@@ -6357,6 +6369,8 @@
 	      this.dosPlotter.setPoints(dosData, codeName);
 
 	      if (this.hasDispData){
+	        this.bsPlotter.setExternalYAxisMax(this.dosPlotter.getYAxisMax());
+
 	        this.dosPlotter.setRepaintListener( (yZoom, yOffset) => {
 	          this.bsPlotter.setYZoomAndOffset(yZoom, yOffset);
 	          this.bsPlotter.repaint();

client/src/common/InteractivePlotterBase.js

@@ -181,6 +181,16 @@ class InteractivePlotterBase{
   }
 
 
+  setExternalYAxisMax(externalYAxisMax){
+    this.externalYAxisMax = externalYAxisMax;
+  }
+
+
+  getYAxisMax(){
+    return this.yAxisMax;
+  }
+
+
   repaint(){
     // repaint Y axis
     this._resetYAxisLabelGroup();
@@ -191,6 +201,8 @@ class InteractivePlotterBase{
 
     let min = Math.floor(this.yMin/yLabelGap)*yLabelGap;
     let max = Math.ceil(this.yMax/yLabelGap)*yLabelGap;
+    this.yAxisMax = max;
+    if (this.externalYAxisMax !== undefined) max = this.externalYAxisMax;
 
     if (this.yLabelText !== null) {
       for (let i = min; i < max+1; i = i + yLabelGap) {

client/src/material-mod/BSDOSPlotter.js

@@ -17,7 +17,7 @@
  */
 
  /*
-  Implements a graphical UI component composed of a DOS plotter and a 
+  Implements a graphical UI component composed of a DOS plotter and a
   Band Structure plotter
  */
 
@@ -89,6 +89,8 @@ class BSDOSPlotter{
       this.dosPlotter.setPoints(dosData, codeName);
 
       if (this.hasDispData){
+        this.bsPlotter.setExternalYAxisMax(this.dosPlotter.getYAxisMax());
+
         this.dosPlotter.setRepaintListener( (yZoom, yOffset) => {
           this.bsPlotter.setYZoomAndOffset(yZoom, yOffset);
           this.bsPlotter.repaint();