Changeset 19792

Timestamp:

11/23/15 16:40:07 (9 years ago)

Author:

dlcheng

Message:

CHG:Adding in colorbar height options and centering to test101.html

Location:

issm/trunk-jpl/src/m/plot

Files:

• applyoptions.js (modified) (2 diffs)
• plot_manager.js (modified) (1 diff)

issm/trunk-jpl/src/m/plot/applyoptions.js

@@ -139 +139 @@
                                 //c=colorbar(options.getfieldvalue('colorbarcornerposition'),'peer',gca);
                         } else { 
-                                var cheight = options.getfieldvalue('colorbarheight',options.getfieldvalue('canvassize',480));
-                                var cwidth = options.getfieldvalue('colorbarwidth',options.getfieldvalue('canvassize',480)/20);
+                                var canvassize = options.getfieldvalue('canvassize',480);
+                                var cheight = options.getfieldvalue('colorbarheight',0.95)*canvassize;
+                                var cwidth = options.getfieldvalue('colorbarwidth',canvassize/20);
                                 var cdivisions = cheight/4;
                                 var color;
                                 var ccanvas = $('<canvas id="'+options.getfieldvalue('canvasid')+'_colorbar" width="'+cwidth+'" height="'+cheight+'"></canvas>').insertAfter('#'+options.getfieldvalue('canvasid'));
-                                ccanvas.css({'vertical-align':'top','margin':'0px '+String(cwidth/4)+'px 0px '+String(cwidth/4)+'px'});
+                                ccanvas.css({'position':'relative','top':((canvassize-cheight)/-2).toFixed(2)+'px'});
                                 var ccontext = ccanvas[0].getContext('2d');
                                 for (var i = 0; i < cdivisions; i++) {
@@ -154 +155 @@
                                 }
                                 //Set colorbar lables
-                                var clabels = $('<ul id="'+options.getfieldvalue('canvasid')+'_colorbar_labels"></ul>').insertAfter('#'+options.getfieldvalue('canvasid')+'_colorbar');
-                                clabels.css({'width':'auto','height':String(options.getfieldvalue('canvassize',480)),'vertical-align':'top','list-style-type':'none','display':'inline-table','padding':'0px','margin':'0px '+String(cwidth/4)+'px 0px '+String(cwidth/4)+'px'});
+                                var clabels = $('<ul id="'+options.getfieldvalue('canvasid')+'_colorbar_labels"></ul>');
+                                clabels.css({'position':'relative','top':'0px','width':'auto','vertical-align':'top','height':String(cheight)+'px','list-style-type':'none','display':'inline-table','top':((canvassize-cheight)/2).toFixed(2)+'px','padding':'0px','margin':'0px '+String(cwidth/4)+'px 0px '+String(cwidth/4)+'px'});
+                                clabels.insertAfter('#'+options.getfieldvalue('canvasid')+'_colorbar');
                                 var labels = [];
                                 var cdivisions = 8;

issm/trunk-jpl/src/m/plot/plot_manager.js

@@ -15 +15 @@
 
         //standard plot: initialize open Gl for each canvas: 
-        $('<canvas id="'+options.getfieldvalue('canvasid')+'" width="'+options.getfieldvalue('canvassize',480)+'" height="'+options.getfieldvalue('canvassize',480)+'"></canvas>)').appendTo('body');
-        var canvas=document.getElementById(options.getfieldvalue('canvasid'));
+        var canvas = $('<div><canvas id="'+options.getfieldvalue('canvasid')+'" width="'+options.getfieldvalue('canvassize',480)+'" height="'+options.getfieldvalue('canvassize',480)+'"></canvas></div>)')
+        canvas.css({'height':String(options.getfieldvalue('canvassize',480)+'px')});
+        canvas.appendTo('body');
+        canvas=document.getElementById(options.getfieldvalue('canvasid'));
 
         // Initialize the GL context: